jetrix-cvs — SVN commits

[jetrix-cvs] jetrix/src/java/net/jetrix/listeners TSpecListener.java,1.12,1.13

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/listeners
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28814/listeners

Modified Files:
	TSpecListener.java 
Log Message:
Changed to use the generified getProtocol method of ProtocolManager

Index: TSpecListener.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/listeners/TSpecListener.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TSpecListener.java	12 Jan 2005 18:43:44 -0000	1.12
--- TSpecListener.java	26 Apr 2005 20:41:06 -0000	1.13
***************
*** 49,53 ****
      public Client getClient(Socket socket) throws Exception
      {
!         TetrinetProtocol protocol = (TetrinetProtocol) ProtocolManager.getInstance().getProtocol(TetrinetProtocol.class);
          String init = protocol.readLine(new InputStreamReader(socket.getInputStream()));
  
--- 49,53 ----
      public Client getClient(Socket socket) throws Exception
      {
!         TetrinetProtocol protocol = ProtocolManager.getInstance().getProtocol(TetrinetProtocol.class);
          String init = protocol.readLine(new InputStreamReader(socket.getInputStream()));
  

[jetrix-cvs] jetrix/src/java/net/jetrix/agent QueryAgent.java,1.3,1.4

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/agent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21824/agent

Modified Files:
	QueryAgent.java 
Log Message:
Updated to use the new Protocol.readLine method

Index: QueryAgent.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/agent/QueryAgent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** QueryAgent.java	4 Apr 2005 09:36:15 -0000	1.3
--- QueryAgent.java	26 Apr 2005 20:29:25 -0000	1.4
***************
*** 136,140 ****
          // read the result
          String line = null;
!         while (!(line = in.readLine()).equals(QueryProtocol.OK))
          {
              List<String> tokens = parseQuotedTokens(line);
--- 136,141 ----
          // read the result
          String line = null;
!         QueryProtocol protocol = new QueryProtocol();
!         while (!QueryProtocol.OK.equals(line = protocol.readLine(in)))
          {
              List<String> tokens = parseQuotedTokens(line);
***************
*** 163,167 ****
          // read the result
          String line = null;
!         while (!(line = in.readLine()).equals(QueryProtocol.OK))
          {
              List<String> tokens = parseQuotedTokens(line);
--- 164,169 ----
          // read the result
          String line = null;
!         QueryProtocol protocol = new QueryProtocol();
!         while (!QueryProtocol.OK.equals(line = protocol.readLine(in)))
          {
              List<String> tokens = parseQuotedTokens(line);

[jetrix-cvs] jetrix/src/java/net/jetrix/agent ChannelInfo.java,1.1,1.2

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/agent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20039/agent

Modified Files:
	ChannelInfo.java 
Log Message:
Added isEmpty()

Index: ChannelInfo.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/agent/ChannelInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChannelInfo.java	12 Jan 2005 18:47:39 -0000	1.1
--- ChannelInfo.java	26 Apr 2005 20:26:28 -0000	1.2
***************
*** 97,100 ****
--- 97,108 ----
      }
  
+     /**
+      * @since 0.3
+      */
+     public boolean isEmpty()
+     {
+         return playernum == 0;
+     }
+ 
      public String toString()
      {

[jetrix-cvs] jetrix/src/java/net/jetrix/protocols AbstractProtocol.java,NONE,1.1 ConsoleProtocol.java,1.10,1.11 IRCProtocol.java,1.9,1.10 QueryProtocol.java,1.4,1.5 TetrinetProtocol.java,1.27,1.28

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/protocols
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18200/protocols

Modified Files:
	ConsoleProtocol.java IRCProtocol.java QueryProtocol.java 
	TetrinetProtocol.java 
Added Files:
	AbstractProtocol.java 
Log Message:
Protocol refactoring : introduced a readLine method in the ProtocolInterface
Added an AbstractProtocol class
Added more server messages in the getMessage parsing method

Index: TetrinetProtocol.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/protocols/TetrinetProtocol.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** TetrinetProtocol.java	4 Apr 2005 09:36:17 -0000	1.27
--- TetrinetProtocol.java	26 Apr 2005 20:23:59 -0000	1.28
***************
*** 20,24 ****
  package net.jetrix.protocols;
  
- import java.io.*;
  import java.util.*;
  
--- 20,23 ----
***************
*** 35,39 ****
   * @version $Revision$, $Date$
   */
! public class TetrinetProtocol implements Protocol
  {
      private static Map<String, String> styles = new HashMap<String, String>();
--- 34,38 ----
   * @version $Revision$, $Date$
   */
! public class TetrinetProtocol extends AbstractProtocol
  {
      private static Map<String, String> styles = new HashMap<String, String>();
***************
*** 104,109 ****
          Message m = null;
  
          // team <slot> teamname
!         if ("team".equals(cmd))
          {
              TeamMessage team = new TeamMessage();
--- 103,148 ----
          Message m = null;
  
+         // f <slot> <field>
+         if ("f".equals(cmd))
+         {
+             FieldMessage field = new FieldMessage();
+             field.setSlot(Integer.parseInt(st.nextToken()));
+             field.setField((st.hasMoreTokens()) ? st.nextToken() : null);
+             m = field;
+             m.setRawMessage(this, line);
+         }
+         // sb <to> <bonus> <from>
+         else if ("sb".equals(cmd))
+         {
+             int to = Integer.parseInt(st.nextToken());
+             String special = st.nextToken();
+             int from = Integer.parseInt(st.nextToken());
+ 
+             Class cls = specials.get(special);
+ 
+             SpecialMessage spmsg = null;
+             if (specials.keySet().contains(special))
+             {
+                 try
+                 {
+                     spmsg = (SpecialMessage) cls.newInstance();
+                 }
+                 catch (Exception e)
+                 {
+                     e.printStackTrace();
+                 }
+             }
+             else
+             {
+                 throw new IllegalArgumentException("Forged special detected from " + this);
+             }
+ 
+             spmsg.setSlot(to);
+             spmsg.setFromSlot(from);
+             m = spmsg;
+             m.setRawMessage(this, line);
+         }
          // team <slot> teamname
!         else if ("team".equals(cmd))
          {
              TeamMessage team = new TeamMessage();
***************
*** 193,196 ****
--- 232,255 ----
              m = msg;
          }
+         // newgame
+         else if ("newgame".equals(cmd))
+         {
+             NewGameMessage newgame = new NewGameMessage();
+             m = newgame;
+ 
+             // todo parse the game settings
+         }
+         // endgame
+         else if ("endgame".equals(cmd))
+         {
+             EndGameMessage end = new EndGameMessage();
+             m = end;
+         }
+         // ingame
+         else if ("ingame".equals(cmd))
+         {
+             IngameMessage ingame = new IngameMessage();
+             m = ingame;
+         }
          // playerlost <slot>
          else if ("playerlost".equals(cmd))
***************
*** 210,252 ****
              m.setRawMessage(this, line);
          }
!         // sb <to> <bonus> <from>
!         else if ("sb".equals(cmd))
          {
!             int to = Integer.parseInt(st.nextToken());
!             String special = st.nextToken();
!             int from = Integer.parseInt(st.nextToken());
! 
!             Class cls = specials.get(special);
! 
!             SpecialMessage spmsg = null;
!             if (specials.keySet().contains(special))
              {
!                 try
!                 {
!                     spmsg = (SpecialMessage) cls.newInstance();
!                 }
!                 catch (Exception e)
!                 {
!                     e.printStackTrace();
!                 }
              }
!             else
              {
!                 throw new IllegalArgumentException("Forged special detected from " + this);
              }
! 
!             spmsg.setSlot(to);
!             spmsg.setFromSlot(from);
!             m = spmsg;
!             m.setRawMessage(this, line);
          }
!         // f <slot> <field>
!         else if ("f".equals(cmd))
          {
!             FieldMessage field = new FieldMessage();
!             field.setSlot(Integer.parseInt(st.nextToken()));
!             field.setField((st.hasMoreTokens()) ? st.nextToken() : null);
!             m = field;
!             m.setRawMessage(this, line);
          }
  
--- 269,309 ----
              m.setRawMessage(this, line);
          }
!         // clientinfo <name> <version>
!         else if ("clientinfo".equals(cmd))
          {
!             ClientInfoMessage info = new ClientInfoMessage();
!             if (st.hasMoreTokens())
              {
!                 info.setName(st.nextToken());
              }
!             if (st.hasMoreTokens())
              {
!                 info.setVersion(st.nextToken());
              }
!             m = info;
          }
!         // playernum <num>
!         else if ("playernum".equals(cmd))
          {
!             PlayerNumMessage num = new PlayerNumMessage();
!             num.setSlot(Integer.parseInt(st.nextToken()));
!             m = num;
!         }
!         // playerjoin <num> <name>
!         else if ("playerjoin".equals(cmd))
!         {
!             JoinMessage join = new JoinMessage();
!             join.setSlot(Integer.parseInt(st.nextToken()));
!             join.setName(st.nextToken());
!             join.setRawMessage(this, line);
!             m = join;
!         }
!         // playerleave <num>
!         else if ("playerleave".equals(cmd))
!         {
!             LeaveMessage leave = new LeaveMessage();
!             leave.setSlot(Integer.parseInt(st.nextToken()));
!             leave.setRawMessage(this, line);
!             m = leave;
          }
  
***************
*** 285,288 ****
--- 342,346 ----
          else if (m instanceof WinlistMessage)       { return translate((WinlistMessage) m, locale); }
          else if (m instanceof NoopMessage)          { return translate((NoopMessage) m); }
+         else if (m instanceof CommandMessage)       { return translate((CommandMessage) m); }
          else
          {
***************
*** 331,334 ****
--- 389,408 ----
      }
  
+     public String translate(CommandMessage m)
+     {
+         StringBuilder message = new StringBuilder();
+         message.append("pline ");
+         message.append(m.getSlot());
+         message.append(" /");
+         message.append(m.getCommand());
+ 
+         for (int i = 0; i < m.getParameterCount(); i++)
+         {
+             message.append(" ");
+             message.append(m.getParameter(i));
+         }
+         return message.toString();
+     }
+ 
      public String translate(TeamMessage m)
      {
***************
*** 869,904 ****
      }
  
-     /**
-      * Read a line as defined in the TetriNET protocol (that's ending with a
-      * 0xFF character). 0xOA and 0xOD are also accepted as EOL characters.
-      *
-      * @param in the stream to be read
-      * @throws IOException thrown if the stream is closed
-      */
-     public String readLine(Reader in) throws IOException
-     {
-         StringBuilder input = new StringBuilder();
- 
-         int readChar;
-         while ((readChar = in.read()) != -1 && readChar != getEOL() && readChar != 0x0A && readChar != 0x0D)
-         {
-             if (readChar != 0x0A && readChar != 0x0D)
-             {
-                 input.append((char) readChar);
-             }
-         }
- 
-         if (readChar == -1)
-         {
-             throw new IOException("End of stream");
-         }
- 
-         return input.toString();
-     }
- 
-     public String toString()
-     {
-         return "[Protocol name=" + getName() + "]";
-     }
- 
  }
--- 943,945 ----

Index: IRCProtocol.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/protocols/IRCProtocol.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IRCProtocol.java	27 Oct 2004 00:15:39 -0000	1.9
--- IRCProtocol.java	26 Apr 2005 20:23:59 -0000	1.10
***************
*** 31,35 ****
   * @version $Revision$, $Date$
   */
! public class IRCProtocol implements Protocol
  {
      private static Map<String, String> styles = new HashMap<String, String>();
--- 31,35 ----
   * @version $Revision$, $Date$
   */
! public class IRCProtocol extends AbstractProtocol
  {
      private static Map<String, String> styles = new HashMap<String, String>();
***************
*** 413,423 ****
      }
  
!     public char getEOL() {
!         return '\n';
!     }
! 
!     public String toString()
      {
!         return "[Protocol name=" + getName() + "]";
      }
  
--- 413,419 ----
      }
  
!     public char getEOL()
      {
!         return '\n';
      }
  

Index: ConsoleProtocol.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/protocols/ConsoleProtocol.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ConsoleProtocol.java	4 Apr 2005 09:36:17 -0000	1.10
--- ConsoleProtocol.java	26 Apr 2005 20:23:59 -0000	1.11
***************
*** 30,34 ****
   * @version $Revision$, $Date$
   */
! public class ConsoleProtocol implements Protocol
  {
      private static Map<String, String> styles = new HashMap<String, String>();
--- 30,34 ----
   * @version $Revision$, $Date$
   */
! public class ConsoleProtocol extends AbstractProtocol
  {
      private static Map<String, String> styles = new HashMap<String, String>();
***************
*** 139,146 ****
      }
  
-     public String toString()
-     {
-         return "[Protocol name=" + getName() + "]";
-     }
- 
  }
--- 139,141 ----

Index: QueryProtocol.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/protocols/QueryProtocol.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueryProtocol.java	4 Apr 2005 09:36:17 -0000	1.4
--- QueryProtocol.java	26 Apr 2005 20:23:59 -0000	1.5
***************
*** 32,36 ****
   * @version $Revision$, $Date$
   */
! public class QueryProtocol implements Protocol
  {
      /** Line terminator */
--- 32,36 ----
   * @version $Revision$, $Date$
   */
! public class QueryProtocol extends AbstractProtocol
  {
      /** Line terminator */
***************
*** 93,98 ****
      }
  
!     public char getEOL() {
!         return EOL;
      }
  
--- 93,99 ----
      }
  
!     public char getEOL()
!     {
!         return 0xFF;
      }
  

--- NEW FILE: AbstractProtocol.java ---
/**
 * Jetrix TetriNET Server
 * Copyright (C) 2005  Emmanuel Bourg
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

package net.jetrix.protocols;

import net.jetrix.Protocol;

import java.io.Reader;
import java.io.IOException;

/**
 * @since 0.3
 *
 * @author Emmanuel Bourg
 * @version $Revision: 1.1 $, $Date: 2005/04/26 20:23:59 $
 */
public abstract class AbstractProtocol implements Protocol
{
    public String readLine(Reader in) throws IOException
    {
        StringBuffer input = new StringBuffer();

        int readChar;
        while ((readChar = in.read()) != -1 && readChar != getEOL() && readChar != 0x0A && readChar != 0x0D)
        {
            if (readChar != 0x0A && readChar != 0x0D)
            {
                input.append((char) readChar);
            }
        }

        if (readChar == -1)
        {
            throw new IOException("End of stream");
        }

        return input.toString();
    }

    public String toString()
    {
        return "[Protocol name=" + getName() + "]";
    }
}

[jetrix-cvs] jetrix/src/java/net/jetrix Protocol.java,1.10,1.11

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18200

Modified Files:
	Protocol.java 
Log Message:
Protocol refactoring : introduced a readLine method in the ProtocolInterface
Added an AbstractProtocol class
Added more server messages in the getMessage parsing method

Index: Protocol.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/Protocol.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Protocol.java	4 Jun 2004 14:44:03 -0000	1.10
--- Protocol.java	26 Apr 2005 20:23:58 -0000	1.11
***************
*** 21,24 ****
--- 21,26 ----
  
  import java.util.*;
+ import java.io.Reader;
+ import java.io.IOException;
  
  /**
***************
*** 80,82 ****
--- 82,96 ----
      char getEOL();
  
+     /**
+      * Read a line for this protocol. A line is ended by a \n or \r character,
+      * or by a protocol specific end of line as defined by the {@link #getEOL()}
+      * method.
+      *
+      * @since 0.3
+      *
+      * @param in the stream to be read
+      * @throws IOException thrown if the stream is closed
+      */
+     String readLine(Reader in) throws IOException;
+ 
  }

[jetrix-cvs] jetrix/src/java/net/jetrix/messages TextMessage.java,1.7,1.8

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13498

Modified Files:
	TextMessage.java 
Log Message:
no longer look for the resource bundle when no key is specified

Index: TextMessage.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages/TextMessage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TextMessage.java	3 Oct 2004 17:32:14 -0000	1.7
--- TextMessage.java	26 Apr 2005 20:15:36 -0000	1.8
***************
*** 20,26 ****
  package net.jetrix.messages;
  
! import net.jetrix.*;
  
! import java.util.*;
  
  /**
--- 20,30 ----
  package net.jetrix.messages;
  
! import java.util.HashMap;
! import java.util.Locale;
! import java.util.Map;
  
! import net.jetrix.Language;
! import net.jetrix.Protocol;
! import net.jetrix.Server;
  
  /**
***************
*** 43,60 ****
      public String getText()
      {
!         Locale defaultLocale = null;
! 
!         if (Server.getInstance() != null)
          {
!             // get the server locale configured in config.xml
!             defaultLocale = Server.getInstance().getConfig().getLocale();
          }
          else
          {
!             // get the default system locale
!             defaultLocale = Locale.getDefault();
!         }
  
!         return getText(defaultLocale);
      }
  
--- 47,71 ----
      public String getText()
      {
!         if (key == null)
          {
!             return text;
          }
          else
          {
!             Locale defaultLocale = null;
  
!             if (Server.getInstance() != null)
!             {
!                 // get the server locale configured in config.xml
!                 defaultLocale = Server.getInstance().getConfig().getLocale();
!             }
!             else
!             {
!                 // get the default system locale
!                 defaultLocale = Locale.getDefault();
!             }
! 
!             return getText(defaultLocale);
!         }
      }
  

[jetrix-cvs] jetrix/src/java/net/jetrix/messages TeamMessage.java,1.2,1.3

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12886

Modified Files:
	TeamMessage.java 
Log Message:
clean up

Index: TeamMessage.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages/TeamMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TeamMessage.java	1 Mar 2003 19:57:43 -0000	1.2
--- TeamMessage.java	26 Apr 2005 20:14:37 -0000	1.3
***************
*** 20,25 ****
  package net.jetrix.messages;
  
- import net.jetrix.*;
- 
  /**
   * A team change message.
--- 20,23 ----

[jetrix-cvs] jetrix/src/java/net/jetrix/messages SpecialMessage.java,1.2,1.3

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12590

Modified Files:
	SpecialMessage.java 
Log Message:
clean up

Index: SpecialMessage.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages/SpecialMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SpecialMessage.java	1 Mar 2003 19:57:43 -0000	1.2
--- SpecialMessage.java	26 Apr 2005 20:14:13 -0000	1.3
***************
*** 20,25 ****
  package net.jetrix.messages;
  
- import net.jetrix.*;
- 
  /**
   * A channel message for special blocks. Specials are attacks applied to
--- 20,23 ----

[jetrix-cvs] jetrix/src/java/net/jetrix/messages NukeFieldMessage.java,1.2,1.3

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11622

Modified Files:
	NukeFieldMessage.java 
Log Message:
clean up

Index: NukeFieldMessage.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages/NukeFieldMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NukeFieldMessage.java	1 Mar 2003 19:57:43 -0000	1.2
--- NukeFieldMessage.java	26 Apr 2005 20:12:10 -0000	1.3
***************
*** 20,25 ****
  package net.jetrix.messages;
  
- import net.jetrix.*;
- 
  /**
   *
--- 20,23 ----
***************
*** 31,34 ****
  {
  
- 
  }
--- 29,31 ----

[jetrix-cvs] jetrix/src/java/net/jetrix/messages AddLineMessage.java,1.2,1.3

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11270

Modified Files:
	AddLineMessage.java 
Log Message:
clean up

Index: AddLineMessage.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages/AddLineMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddLineMessage.java	1 Mar 2003 19:57:43 -0000	1.2
--- AddLineMessage.java	26 Apr 2005 20:11:14 -0000	1.3
***************
*** 20,25 ****
  package net.jetrix.messages;
  
- import net.jetrix.*;
- 
  /**
   *
--- 20,23 ----

[jetrix-cvs] jetrix/src/java/net/jetrix GameState.java,1.1,1.2

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9992

Modified Files:
	GameState.java 
Log Message:
Shifted the values of the game states to comply with tetrinetx

Index: GameState.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/GameState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GameState.java	28 Oct 2004 22:54:29 -0000	1.1
--- GameState.java	26 Apr 2005 20:09:11 -0000	1.2
***************
*** 25,29 ****
  public enum GameState
  {
!     STOPPED(0), STARTED(1), PAUSED(2);
  
      private int value;
--- 25,29 ----
  public enum GameState
  {
!     STOPPED(1), STARTED(2), PAUSED(3);
  
      private int value;

[jetrix-cvs] jetrix/src/java/net/jetrix/protocols TspecProtocol.java,1.8,1.9

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/protocols
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7072

Modified Files:
	TspecProtocol.java 
Log Message:
Fixed the parsing of plineact messages
Added the toString method

Index: TspecProtocol.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/protocols/TspecProtocol.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TspecProtocol.java	4 Apr 2005 09:36:18 -0000	1.8
--- TspecProtocol.java	26 Apr 2005 20:02:57 -0000	1.9
***************
*** 49,55 ****
          Message message = null;
  
!         if (line.startsWith("pline"))
          {
              SmsgMessage smsg = new SmsgMessage();
  
              if (line.indexOf("//") == 8)
--- 49,56 ----
          Message message = null;
  
!         if (line.startsWith("pline") && !line.startsWith("plineact"))
          {
              SmsgMessage smsg = new SmsgMessage();
+             smsg.setSlot(Integer.parseInt(line.substring(6, 7)));
  
              if (line.indexOf("//") == 8)
***************
*** 159,166 ****
      }
  
-     public String toString()
-     {
-         return "[Protocol name=" + getName() + "]";
-     }
- 
  }
--- 160,162 ----

[jetrix-cvs] jetrix/src/java/net/jetrix/messages ClientInfoMessage.java,NONE,1.1

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/messages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5420/src/java/net/jetrix/messages

Added Files:
	ClientInfoMessage.java 
Log Message:
no message

--- NEW FILE: ClientInfoMessage.java ---
/**
 * Jetrix TetriNET Server
 * Copyright (C) 2005  Emmanuel Bourg
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

package net.jetrix.messages;

import net.jetrix.Message;

/**
 * Information about the client (name & version).
 *
 * @author Emmanuel Bourg
 * @version $Revision: 1.1 $, $Date: 2005/04/26 19:59:24 $
 */
public class ClientInfoMessage extends Message
{
    private String name;
    private String version;

    public String getName()
    {
        return name;
    }

    public void setName(String name)
    {
        this.name = name;
    }

    public String getVersion()
    {
        return version;
    }

    public void setVersion(String version)
    {
        this.version = version;
    }
}

[jetrix-cvs] jetrix/src/java/net/jetrix/services VersionService.java,1.1,1.2

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17797/src/java/net/jetrix/services

Modified Files:
	VersionService.java 
Log Message:
Added a tray notification when a new version is available

Index: VersionService.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/services/VersionService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionService.java	10 Jan 2005 16:45:19 -0000	1.1
--- VersionService.java	13 Apr 2005 10:10:35 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
  
  import net.jetrix.config.ServerConfig;
+ import net.jetrix.SystrayManager;
  
  import java.net.*;
***************
*** 56,60 ****
          if (isNewVersionAvailable())
          {
!             log.warning("A new version is available (" + VersionService.getLatestVersion() + "), download it on http://jetrix.sf.net now!");
          }
      }
--- 57,63 ----
          if (isNewVersionAvailable())
          {
!             String message = "A new version is available (" + VersionService.getLatestVersion() + "), download it on http://jetrix.sf.net now!";
!             log.warning(message);
!             SystrayManager.notify(message, 0);
          }
      }

[jetrix-cvs] jetrix/lib jdic-tray-0.9.jar,NONE,1.1 jdic-tray-win-0.9.jar,NONE,1.1 tray.dll,NONE,1.1 systray4j-2.4.1.jar,1.1,NONE systray4j.dll,1.1,NONE

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17228/lib

Added Files:
	jdic-tray-0.9.jar jdic-tray-win-0.9.jar tray.dll 
Removed Files:
	systray4j-2.4.1.jar systray4j.dll 
Log Message:
Replaced systray4j by JDIC Tray

--- systray4j.dll DELETED ---

--- systray4j-2.4.1.jar DELETED ---

--- NEW FILE: jdic-tray-win-0.9.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: tray.dll ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jdic-tray-0.9.jar ---
(This appears to be a binary file; contents omitted.)

[jetrix-cvs] jetrix build.xml,1.34,1.35

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17228

Modified Files:
	build.xml 
Log Message:
Replaced systray4j by JDIC Tray

Index: build.xml
===================================================================
RCS file: /cvsroot/jetrix/jetrix/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** build.xml	12 Apr 2005 14:51:36 -0000	1.34
--- build.xml	13 Apr 2005 10:09:11 -0000	1.35
***************
*** 107,111 ****
        </fileset>
        <fileset dir="${src}/etc/icons">
!         <include name="jetrix.ico"/>
        </fileset>
      </jar>
--- 107,111 ----
        </fileset>
        <fileset dir="${src}/etc/icons">
!         <include name="jetrix-16x16.png"/>
        </fileset>
      </jar>
***************
*** 156,160 ****
      <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="systray4j-2.4.1"/></antcall>
    </target>
  
--- 156,161 ----
      <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>
  
***************
*** 207,212 ****
          <include name="jasper-runtime*.pack"/>
          <include name="jcrontab*.pack"/>
!         <include name="systray4j*.pack" />
!         <include name="systray4j*.dll" />
        </zipfileset>
        <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
--- 208,213 ----
          <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/">
***************
*** 236,240 ****
        </tarfileset>
        <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/">
!         <include name="jetrix-${version}.pack" />
          <include name="jetrix-launcher-${version}.jar" />
        </tarfileset>
--- 237,241 ----
        </tarfileset>
        <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/">
!         <include name="jetrix-${version}.jar.pack" />
          <include name="jetrix-launcher-${version}.jar" />
        </tarfileset>
***************
*** 244,252 ****
          <include name="commons-beanutils*.pack" />
          <include name="commons-lang*.pack" />
!         <include name="jetty.pack"/>
!         <include name="servlet-light.pack"/>
!         <include name="jasper-runtime.pack"/>
          <include name="jcrontab*.pack"/>
!         <include name="systray4j*.pack" />
        </tarfileset>
        <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
--- 245,254 ----
          <include name="commons-beanutils*.pack" />
          <include name="commons-lang*.pack" />
!         <include name="jetty*.pack"/>
!         <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/">

[jetrix-cvs] jetrix/src/java/net/jetrix SystrayManager.java,1.4,1.5

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17228/src/java/net/jetrix

Modified Files:
	SystrayManager.java 
Log Message:
Replaced systray4j by JDIC Tray

Index: SystrayManager.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/SystrayManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SystrayManager.java	10 Jan 2005 16:43:21 -0000	1.4
--- SystrayManager.java	13 Apr 2005 10:09:13 -0000	1.5
***************
*** 20,32 ****
  package net.jetrix;
  
! import java.io.*;
! import java.util.logging.*;
  
! import net.jetrix.config.*;
! import net.jetrix.listeners.*;
! import snoozesoft.systray4j.*;
  
  /**
!  * Manages the system tray (windows only).
   *
   * @author Emmanuel Bourg
--- 20,40 ----
  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.event.ActionEvent;
! import java.awt.event.ActionListener;
! import java.io.IOException;
! import java.util.logging.Level;
! import java.util.logging.Logger;
  
  /**
!  * Manages the system trayIcon (windows only).
   *
   * @author Emmanuel Bourg
***************
*** 37,93 ****
  {
      private static Logger log = Logger.getLogger("net.jetrix");
  
      /**
!      * Create and display the system tray menu.
       */
      public static void open()
      {
!         if (SysTrayMenu.isAvailable())
          {
              // build the menu items
!             SysTrayMenuItem itemExit = new SysTrayMenuItem("Stop && Exit", "exit");
!             itemExit.addSysTrayMenuListener(new SysTrayMenuAdapter()
              {
!                 public void menuItemSelected(SysTrayMenuEvent event)
                  {
!                     Server.getInstance().stop();
                  }
              });
  
!             SysTrayMenuItem itemAdmin = new SysTrayMenuItem("Administration", "admin");
!             SysTrayMenuListener adminListener = new SysTrayMenuAdapter()
              {
!                 public void menuItemSelected(SysTrayMenuEvent event)
                  {
!                     openWebAdmin();
                  }
  
!                 public void iconLeftDoubleClicked(SysTrayMenuEvent event)
                  {
!                     menuItemSelected(event);
                  }
-             };
-             itemAdmin.addSysTrayMenuListener(adminListener);
  
!             // build the systray icon
!             SysTrayMenuIcon icon = new SysTrayMenuIcon(Thread.currentThread().getContextClassLoader().getResource("jetrix.ico"));
!             icon.addSysTrayMenuListener(adminListener);
  
!             // build the menu
!             SysTrayMenu menu = new SysTrayMenu(icon);
!             menu.setToolTip("Jetrix TetriNET Server");
!             menu.addItem(itemExit);
!             menu.addItem(itemAdmin);
  
!             menu.showIcon();
          }
      }
  
      /**
!      * Remove the system tray menu.
       */
      public static void close()
      {
!         SysTrayMenu.dispose();
      }
  
--- 45,187 ----
  {
      private static Logger log = Logger.getLogger("net.jetrix");
+     private static TrayIcon trayIcon;
+     private static final String TITLE = "Jetrix TetriNET Server";
  
      /**
!      * Create and display the system trayIcon menu.
       */
      public static void open()
      {
!         if (trayIcon == null)
          {
+             SystemTray tray = null;
+ 
+             try
+             {
+                 tray = SystemTray.getDefaultSystemTray();
+             }
+             catch (Throwable t)
+             {
+                 log.log(Level.FINE, "System tray unavailable", t);
+                 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()));
! 
!             itemAdmin.addActionListener(new ActionListener()
              {
!                 public void actionPerformed(ActionEvent e)
                  {
!                     openWebAdmin();
                  }
              });
  
!             JMenuItem itemLink = new JMenuItem("Jetrix Website");
!             itemLink.addActionListener(new OpenURLActionListener("http://jetrix.sourceforge.net"));
! 
!             JMenuItem itemSupport = new JMenuItem("Technical Support");
!             itemSupport.addActionListener(new OpenURLActionListener("http://sourceforge.net/forum/forum.php?forum_id=172941"));
! 
!             JMenuItem itemExit = new JMenuItem("Stop & Exit");
!             itemExit.addActionListener(new ActionListener()
              {
!                 public void actionPerformed(ActionEvent e)
                  {
!                     Server.getInstance().stop();
                  }
+             });
  
!             // build the menu
!             final JPopupMenu menu = new JPopupMenu();
!             menu.add(itemAdmin);
!             menu.add(itemLink);
!             menu.add(itemSupport);
!             menu.addSeparator();
!             menu.add(itemExit);
! 
!             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"));
! 
!             trayIcon = new TrayIcon(icon, TITLE, menu);
!             trayIcon.setIconAutoSize(true);
!             trayIcon.addActionListener(new ActionListener()
!             {
!                 private long timestamp;
! 
!                 public void actionPerformed(ActionEvent e)
!                 {
!                     // emulates a double click listener
!                     if (e.getWhen() - timestamp < 750)
!                     {
!                         openWebAdmin();
!                     }
! 
!                     timestamp = e.getWhen();
!                 }
!             });
! 
!             // display the trayIcon icon
!             tray.addTrayIcon(trayIcon);
          }
      }
  
      /**
!      * Remove the system trayIcon menu.
       */
      public static void close()
      {
!         if (trayIcon != null)
!         {
!             SystemTray.getDefaultSystemTray().removeTrayIcon(trayIcon);
!             trayIcon = null;
!         }
!     }
! 
!     /**
!      * 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)
!      * @since 0.3
!      */
!     public static void notify(String message, int type)
!     {
!         if (trayIcon != null)
!         {
!             trayIcon.displayMessage(TITLE, message, type);
!         }
      }
  
***************
*** 112,128 ****
          if (port != 0)
          {
!             try
!             {
!                 // build the URL
!                 String adminUrl = "http://admin:" + config.getAdminPassword() + "@localhost:" + port;
  
!                 // open the browser
!                 Runtime runtime = Runtime.getRuntime();
!                 runtime.exec("rundll32 url.dll,FileProtocolHandler " + adminUrl);
!             }
!             catch (IOException e)
!             {
!                 log.log(Level.WARNING, e.getMessage(), e);
!             }
          }
      }
--- 206,248 ----
          if (port != 0)
          {
!             openURL("http://admin:" + config.getAdminPassword() + "@localhost:" + port);
!         }
!     }
  
!     /**
!      * Open the specified URL in the Browser.
!      *
!      * @since 0.3
!      */
!     private static void openURL(String url)
!     {
!         try
!         {
!             // open the browser
!             Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
!         }
!         catch (IOException e)
!         {
!             log.log(Level.WARNING, e.getMessage(), e);
!         }
!     }
! 
!     /**
!      * Action listener opening an URL.
!      *
!      * @since 0.3
!      */
!     private static class OpenURLActionListener implements ActionListener
!     {
!         private String url;
! 
!         public OpenURLActionListener(String url)
!         {
!             this.url = url;
!         }
! 
!         public void actionPerformed(ActionEvent e)
!         {
!             openURL(url);
          }
      }

[jetrix-cvs] jetrix/src/java/net/jetrix Launcher.java,1.3,1.4

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10075/src/java/net/jetrix

Modified Files:
	Launcher.java 
Log Message:
Added the pack200 task
The war file for the admin console is now packed

Index: Launcher.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/Launcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Launcher.java	9 Nov 2004 19:46:59 -0000	1.3
--- Launcher.java	12 Apr 2005 14:51:37 -0000	1.4
***************
*** 37,40 ****
--- 37,42 ----
  public class Launcher {
  
+     public static final String MAIN_CLASS = "net.jetrix.Server";
+ 
      /**
       * Server entry point. All classes, jar and zip files in the lib
***************
*** 55,59 ****
              if (filename.endsWith(".pack"))
              {
!                 String unpackedName = filename.substring(0, filename.length() - 4) + "jar";
                  JarOutputStream out = new JarOutputStream(new FileOutputStream(unpackedName));
  
--- 57,62 ----
              if (filename.endsWith(".pack"))
              {
!                 // remove the .pack extension at the end of the unpacked file
!                 String unpackedName = filename.substring(0, filename.lastIndexOf(".pack"));
                  JarOutputStream out = new JarOutputStream(new FileOutputStream(unpackedName));
  
***************
*** 63,66 ****
--- 66,70 ----
                  out.close();
  
+                 // delete the packed file
                  file.delete();
              }
***************
*** 98,102 ****
  
          // run the main method of the specified class
!         Class serverClass = loader.loadClass("net.jetrix.Server");
          serverClass.getMethod("main", args.getClass()).invoke(null, new Object[] { args });
      }
--- 102,106 ----
  
          // run the main method of the specified class
!         Class serverClass = loader.loadClass(MAIN_CLASS);
          serverClass.getMethod("main", args.getClass()).invoke(null, new Object[] { args });
      }

[jetrix-cvs] jetrix/lib Pack200Task.jar,NONE,1.1

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10075/lib

Added Files:
	Pack200Task.jar 
Log Message:
Added the pack200 task
The war file for the admin console is now packed

--- NEW FILE: Pack200Task.jar ---
(This appears to be a binary file; contents omitted.)

[jetrix-cvs] jetrix build.xml,1.33,1.34

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10075

Modified Files:
	build.xml 
Log Message:
Added the pack200 task
The war file for the admin console is now packed

Index: build.xml
===================================================================
RCS file: /cvsroot/jetrix/jetrix/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** build.xml	18 Jan 2005 00:58:31 -0000	1.33
--- build.xml	12 Apr 2005 14:51:36 -0000	1.34
***************
*** 2,5 ****
--- 2,7 ----
  <project name="Jetrix TetriNET Server" default="dist" basedir=".">
  
+   <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="lib/Pack200Task.jar"/>
+ 
    <property name="compile.debug"    value="true"/>
    <property name="compile.optimize" value="false"/>
***************
*** 109,115 ****
      </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">
--- 111,114 ----
***************
*** 138,149 ****
    </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">
--- 137,141 ----
    </target>
  
!   <target name="pack" depends="jar" description="Pack the dependencies to reduce the distribution size">
      <!-- Copy the JARs -->
      <copy todir="${build}/lib">
***************
*** 151,180 ****
      </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 -->
--- 143,167 ----
      </copy>
  
!     <!-- Pack the main JAR and the WAR for the administration console -->
!     <pack200 src="${dist}/lib/jetrix-${version}.jar" destfile="${dist}/lib/jetrix-${version}.jar.pack" gzipoutput="false" stripdebug="false" keepfileorder="false"/>
!     <pack200 src="${dist}/webapp/jetrix-admin-${version}.war" destfile="${dist}/webapp/jetrix-admin-${version}.war.pack" gzipoutput="false" stripdebug="false" keepfileorder="false"/>
  
!     <!-- Pack the dependencies -->
!     <antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-digester"/></antcall>
!     <antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-collections"/></antcall>
!     <antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-beanutils"/></antcall>
!     <antcall target="pack.lib" inheritAll="true"><param name="library" value="commons-lang-2.0-light"/></antcall>
!     <antcall target="pack.lib" inheritAll="true"><param name="library" value="jetty"/></antcall>
!     <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="systray4j-2.4.1"/></antcall>
    </target>
  
!   <target name="pack.lib" description="Pack the library specified by the ${library} property">
!     <pack200 src="${build}/lib/${library}.jar" destfile="${build}/lib/${library}.jar.pack" gzipoutput="false" stripdebug="true" keepfileorder="false"/>
    </target>
  
!   <target name="dist" depends="pack">
  
      <!-- Replace the tokens in the scripts -->
***************
*** 208,212 ****
        </zipfileset>
        <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/">
!         <include name="jetrix-${version}.pack" />
          <include name="jetrix-launcher-${version}.jar" />
        </zipfileset>
--- 195,199 ----
        </zipfileset>
        <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/lib/">
!         <include name="jetrix-${version}.jar.pack" />
          <include name="jetrix-launcher-${version}.jar" />
        </zipfileset>
***************
*** 216,222 ****
          <include name="commons-beanutils*.pack" />
          <include name="commons-lang*.pack" />
!         <include name="jetty.pack"/>
!         <include name="servlet-light.pack"/>
!         <include name="jasper-runtime.pack"/>
          <include name="jcrontab*.pack"/>
          <include name="systray4j*.pack" />
--- 203,209 ----
          <include name="commons-beanutils*.pack" />
          <include name="commons-lang*.pack" />
!         <include name="jetty*.pack"/>
!         <include name="servlet-light*.pack"/>
!         <include name="jasper-runtime*.pack"/>
          <include name="jcrontab*.pack"/>
          <include name="systray4j*.pack" />
***************
*** 224,228 ****
        </zipfileset>
        <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
!         <include name="*.war" />
        </zipfileset>
        <zipfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/">
--- 211,215 ----
        </zipfileset>
        <zipfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
!         <include name="*.war.pack" />
        </zipfileset>
        <zipfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/">
***************
*** 264,268 ****
        </tarfileset>
        <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
!         <include name="*.war" />
        </tarfileset>
        <tarfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/">
--- 251,255 ----
        </tarfileset>
        <tarfileset prefix="jetrix-${version}/lib/" dir="${dist}/webapp/">
!         <include name="*.war.pack" />
        </tarfileset>
        <tarfileset prefix="jetrix-${version}/lang/" dir="${src}/lang/">

[jetrix-cvs] jetrix/src/bin jetrix.bat,1.5,1.6 update.bat,1.3,1.4

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3147

Modified Files:
	jetrix.bat update.bat 
Log Message:
Use %JAVA_HOME%\bin\java.exe if %JAVA_HOME% is defined

Index: update.bat
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/bin/update.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** update.bat	12 Jan 2005 19:06:31 -0000	1.3
--- update.bat	11 Apr 2005 17:55:32 -0000	1.4
***************
*** 1,3 ****
  @echo off
  
! java -cp lib/jetrix-@version@.jar net.jetrix.tools.patcher.JetrixUpdate
--- 1,8 ----
  @echo off
  
! SETLOCAL
! 
! 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

Index: jetrix.bat
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/bin/jetrix.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** jetrix.bat	9 Nov 2004 19:46:59 -0000	1.5
--- jetrix.bat	11 Apr 2005 17:55:32 -0000	1.6
***************
*** 1,3 ****
  @echo off
  
! java -Djava.library.path=lib -jar lib/jetrix-launcher-@version@.jar
--- 1,8 ----
  @echo off
  
! SETLOCAL
! 
! 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

[jetrix-cvs] jetrix/src/site webspec.php,NONE,1.1

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/site
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17218

Added Files:
	webspec.php 
Log Message:
Added the WebSpec demonstration page

--- NEW FILE: webspec.php ---
<? include("header.inc.php") ?>

<h1>WebSpec</h1>

<p>Welcome on the WebSpec demonstration page. WebSpec is a simplified TSpec
client to watch the games in progress on a TetriNET server. It can be easily
embedded in a web site and is a natural companion for any TetriNET server.
WebSpec is based on the code of Jetrix and will be released under the GPL.</p>

<p>In order to try WebSpec you have to install the <a href="http://java.sun.com/j2se/1.5.0/download.jsp">Java Runtime Environment 5.0</a></p>

<div align="center">
  <iframe src="http://tetrinet.fr/applet/webspec.html" width="640" height="480" frameborder="0" scrolling="no"></iframe>
</div>

<? include("footer.inc.php") ?>

[jetrix-cvs] jetrix project.properties,1.9,1.10

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1810

Modified Files:
	project.properties 
Log Message:
updated the last stable version to 0.2.2

Index: project.properties
===================================================================
RCS file: /cvsroot/jetrix/jetrix/project.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** project.properties	22 Feb 2005 23:55:24 -0000	1.9
--- project.properties	7 Apr 2005 00:12:10 -0000	1.10
***************
*** 1,4 ****
  version=0.3-dev
! version.stable=0.2.1
  
  maven.junit.fork=true
--- 1,4 ----
  version=0.3-dev
! version.stable=0.2.2
  
  maven.junit.fork=true

[jetrix-cvs] jetrix/src/java/net/jetrix/listeners TSpecListener.java,1.12,1.12.2.1 TetrinetListener.java,1.19,1.19.2.1

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/listeners
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19936/src/java/net/jetrix/listeners

Modified Files:
      Tag: jetrix_0_2_branch
	TSpecListener.java TetrinetListener.java 
Log Message:
No longer rely on the default OS charset to read the client data

Index: TSpecListener.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/listeners/TSpecListener.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** TSpecListener.java	12 Jan 2005 18:43:44 -0000	1.12
--- TSpecListener.java	6 Apr 2005 23:46:38 -0000	1.12.2.1
***************
*** 50,54 ****
      {
          TetrinetProtocol protocol = (TetrinetProtocol) ProtocolManager.getInstance().getProtocol(TetrinetProtocol.class);
!         String init = protocol.readLine(new InputStreamReader(socket.getInputStream()));
  
          String dec = TetrinetProtocol.decode(init);
--- 50,54 ----
      {
          TetrinetProtocol protocol = (TetrinetProtocol) ProtocolManager.getInstance().getProtocol(TetrinetProtocol.class);
!         String init = protocol.readLine(new InputStreamReader(socket.getInputStream(), net.jetrix.config.ServerConfig.ENCODING));
  
          String dec = TetrinetProtocol.decode(init);

Index: TetrinetListener.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/listeners/TetrinetListener.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -d -r1.19 -r1.19.2.1
*** TetrinetListener.java	12 Jan 2005 18:43:39 -0000	1.19
--- TetrinetListener.java	6 Apr 2005 23:46:38 -0000	1.19.2.1
***************
*** 53,57 ****
          // read the first line sent by the client
          TetrinetProtocol protocol1 = (TetrinetProtocol) protocolManager.getProtocol(TetrinetProtocol.class);
!         String init = protocol1.readLine(new InputStreamReader(socket.getInputStream()));
  
          // test if the client is using the query protocol
--- 53,57 ----
          // read the first line sent by the client
          TetrinetProtocol protocol1 = (TetrinetProtocol) protocolManager.getProtocol(TetrinetProtocol.class);
!         String init = protocol1.readLine(new InputStreamReader(socket.getInputStream(), net.jetrix.config.ServerConfig.ENCODING));
  
          // test if the client is using the query protocol

[jetrix-cvs] jetrix/src/java/net/jetrix/config ServerConfig.java,1.29.2.1,1.29.2.2

[Emmanuel B. <sm...@us...>]

Update of /cvsroot/jetrix/jetrix/src/java/net/jetrix/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19711/src/java/net/jetrix/config

Modified Files:
      Tag: jetrix_0_2_branch
	ServerConfig.java 
Log Message:
"&" is now escaped in the channel description

Index: ServerConfig.java
===================================================================
RCS file: /cvsroot/jetrix/jetrix/src/java/net/jetrix/config/ServerConfig.java,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -C2 -d -r1.29.2.1 -r1.29.2.2
*** ServerConfig.java	17 Feb 2005 22:14:36 -0000	1.29.2.1
--- ServerConfig.java	6 Apr 2005 23:45:52 -0000	1.29.2.2
***************
*** 411,414 ****
--- 411,415 ----
                      String description = config.getDescription();
                      description = description.contains("<") ? "<![CDATA[" + description + "]]>" : description;
+                     description = description.replaceAll("&", "&amp;");
                      out.println("      <description>" + description + "</description>");
                  }