[jetrix-cvs] SF.net SVN: jetrix:[805] jetrix/trunk

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

Revision: 805
          http://jetrix.svn.sourceforge.net/jetrix/?rev=805&view=rev
Author:   smanux
Date:     2009-02-25 22:36:44 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Moved the web admin to port 31460
Fixed a NPE in HttpListener.isRunning()

Modified Paths:
--------------
    jetrix/trunk/doc/changelog.txt
    jetrix/trunk/src/etc/conf/server.xml
    jetrix/trunk/src/java/net/jetrix/listeners/HttpListener.java
    jetrix/trunk/src/site/faq.php
    jetrix/trunk/src/site/user-guide.php

Modified: jetrix/trunk/doc/changelog.txt
===================================================================
--- jetrix/trunk/doc/changelog.txt	2009-02-25 21:54:38 UTC (rev 804)
+++ jetrix/trunk/doc/changelog.txt	2009-02-25 22:36:44 UTC (rev 805)
@@ -18,6 +18,7 @@
 - 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
 - The IP of the server is no longer submitted to tfast.org since the site is dead
+- The web administration console has been moved from port 8080 to port 31460
 
 Developer visible changes
 - added a readLine(Reader) method in the Protocol interface

Modified: jetrix/trunk/src/etc/conf/server.xml
===================================================================
--- jetrix/trunk/src/etc/conf/server.xml	2009-02-25 21:54:38 UTC (rev 804)
+++ jetrix/trunk/src/etc/conf/server.xml	2009-02-25 22:36:44 UTC (rev 805)
@@ -41,7 +41,7 @@
     <listener class="net.jetrix.listeners.TetrinetListener"/>
     <listener class="net.jetrix.listeners.TSpecListener"/>
     <listener class="net.jetrix.listeners.IRCListener" port="31456" auto-start="false"/>
-    <listener class="net.jetrix.listeners.HttpListener" port="8080"/>
+    <listener class="net.jetrix.listeners.HttpListener" port="31460"/>
   </listeners>
 
   <!-- Services -->

Modified: jetrix/trunk/src/java/net/jetrix/listeners/HttpListener.java
===================================================================
--- jetrix/trunk/src/java/net/jetrix/listeners/HttpListener.java	2009-02-25 21:54:38 UTC (rev 804)
+++ jetrix/trunk/src/java/net/jetrix/listeners/HttpListener.java	2009-02-25 22:36:44 UTC (rev 805)
@@ -39,7 +39,7 @@
     private org.mortbay.jetty.Server jetty;
     private Logger log = Logger.getLogger("net.jetrix");
     private boolean initialized;
-    private int port = 8080;
+    private int port = 31460;
 
     public HttpListener()
     {
@@ -87,39 +87,45 @@
 
     public void start()
     {
-        try
+        if (!isRunning())
         {
-            if (!initialized)
+            try
             {
-                init();
-                initialized = true;
+                if (!initialized)
+                {
+                    init();
+                    initialized = true;
+                }
+                jetty.start();
+                log.info("Web administration console started on port " + getPort());
             }
-            jetty.start();
-            log.info("Web administration console started on port " + getPort());
+            catch (MultiException e)
+            {
+                log.log(Level.SEVERE, "Unable to start the Web administration console on port " + getPort(), e);
+            }
         }
-        catch (MultiException e)
-        {
-            log.log(Level.SEVERE, "Unable to start the Web administration console on port " + getPort(), e);
-        }
     }
 
     public void stop()
     {
-        try
+        if (isRunning())
         {
-            jetty.stop();
-            log.info("Web administration console stopped");
+            try
+            {
+                jetty.stop();
+                log.info("Web administration console stopped");
+            }
+            catch (InterruptedException e)
+            {
+                e.printStackTrace();
+            }
         }
-        catch (InterruptedException e)
-        {
-            e.printStackTrace();
-        }
     }
 
     public void run() { }
 
     public boolean isRunning()
     {
-        return jetty.isStarted();
+        return jetty != null && jetty.isStarted();
     }
 }

Modified: jetrix/trunk/src/site/faq.php
===================================================================
--- jetrix/trunk/src/site/faq.php	2009-02-25 21:54:38 UTC (rev 804)
+++ jetrix/trunk/src/site/faq.php	2009-02-25 22:36:44 UTC (rev 805)
@@ -7,9 +7,9 @@
 
 <h3>How do I log on the administration console?</h3>
 
-<p>Open your browser and go to your server on the 8080 port:</p>
+<p>Open your browser and go to your server on the 31460 port:</p>
 
-<code>http://tetrinet.yourhostname.net:8080</code>
+<code>http://tetrinet.yourhostname.net:31460</code>
 
 <p>A username and a password are requested, type <tt>admin</tt>, as username,
 and use the administrator password defined in the <tt>server.xml</tt> file. The

Modified: jetrix/trunk/src/site/user-guide.php
===================================================================
--- jetrix/trunk/src/site/user-guide.php	2009-02-25 21:54:38 UTC (rev 804)
+++ jetrix/trunk/src/site/user-guide.php	2009-02-25 22:36:44 UTC (rev 805)
@@ -126,7 +126,7 @@
     &lt;listener class="net.jetrix.listeners.TetrinetListener"/&gt;
     &lt;listener class="net.jetrix.listeners.TSpecListener"/&gt;
     &lt;listener class="net.jetrix.listeners.IRCListener" port="31456"/&gt;
-    &lt;listener class="net.jetrix.listeners.HttpListener" port="8080"/&gt;
+    &lt;listener class="net.jetrix.listeners.HttpListener" port="31460"/&gt;
   &lt;/listeners&gt;
 
 </div>
@@ -148,7 +148,7 @@
 
 <p>An administration console is integrated to Jetrix, you can use it with any
 modern browser to change most of the configuration without restarting the 
-server. The console is available on the port 8080 of your server. You'll be 
+server. The console is available on the port 31460 of your server. You'll be 
 prompted for a username and a password, just type in <tt>admin</tt> and the
 administrator password to enter (<tt>adminpass</tt> by default).</p>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.