Author: bdonlan
Date: 2005-06-15 00:19:04 -0400 (Wed, 15 Jun 2005)
New Revision: 765
Added:
trunk/clients/Javer2/COPYING
trunk/clients/Javer2/config.xml
trunk/clients/Javer2/src/org/haverdev/haver/server/ServerContext.java
Modified:
trunk/clients/Javer2/build.xml
trunk/clients/Javer2/nbproject/project.properties
trunk/clients/Javer2/src/org/haverdev/haver/server/AcceptLoop.java
trunk/clients/Javer2/src/org/haverdev/haver/server/AuthenticationProcess.java
trunk/clients/Javer2/src/org/haverdev/haver/server/ChannelBase.java
trunk/clients/Javer2/src/org/haverdev/haver/server/ChatChannel.java
trunk/clients/Javer2/src/org/haverdev/haver/server/DefaultLobby.java
trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannel.java
trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannelPlugin.java
trunk/clients/Javer2/src/org/haverdev/haver/server/Entity.java
trunk/clients/Javer2/src/org/haverdev/haver/server/EntityBase.java
trunk/clients/Javer2/src/org/haverdev/haver/server/EntityLoader.java
trunk/clients/Javer2/src/org/haverdev/haver/server/InitContext.java
trunk/clients/Javer2/src/org/haverdev/haver/server/Lobby.java
trunk/clients/Javer2/src/org/haverdev/haver/server/LoginContext.java
trunk/clients/Javer2/src/org/haverdev/haver/server/Main.java
trunk/clients/Javer2/src/org/haverdev/haver/server/NormalContext.java
trunk/clients/Javer2/src/org/haverdev/haver/server/PersistBot.java
trunk/clients/Javer2/src/org/haverdev/haver/server/PersistantLobby.java
trunk/clients/Javer2/src/org/haverdev/haver/server/SSLAcceptLoop.java
trunk/clients/Javer2/src/org/haverdev/haver/server/StatsBot.java
trunk/clients/Javer2/src/org/haverdev/haver/server/UserBase.java
trunk/clients/Javer2/src/org/haverdev/haver/server/UserCommandReflect.java
trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
trunk/clients/Javer2/src/org/haverdev/haver/server/UserContextFactory.java
trunk/clients/Javer2/src/org/haverdev/haver/server/UserEntity.java
trunk/clients/Javer2/src/org/haverdev/haver/server/Xiao.java
Log:
Preparations for future virtual server support of some kind.
Also, COPYING. And about time, too. Now you can legally copy it :P
Added: trunk/clients/Javer2/COPYING
===================================================================
--- trunk/clients/Javer2/COPYING 2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/COPYING 2005-06-15 04:19:04 UTC (rev 765)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Modified: trunk/clients/Javer2/build.xml
===================================================================
--- trunk/clients/Javer2/build.xml 2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/build.xml 2005-06-15 04:19:04 UTC (rev 765)
@@ -66,4 +66,32 @@
nbproject/build-impl.xml file.
-->
+ <target name="jar" depends="init,compile,-pre-pre-jar,-pre-jar">
+ <jar destfile="${dist.jar.dir}/JaverClient.jar"
basedir="${build.classes.dir}">
+ <include name="org/haverdev/client/**"/>
+ <include name="org/haverdev/common/**"/>
+ <include name="org/haverdev/javer2/**"/>
+ <exclude name="org/haverdev/javer2/CMod**"/>
+ <include name="org/haverdev/haver/NonblockingOutputStream**"/>
+ <manifest>
+ <attribute name="Main-Class"
value="org.haverdev.javer2.JaverForm"/>
+ </manifest>
+ </jar>
+ <jar destfile="${dist.jar.dir}/JaverServer.jar"
basedir="${build.classes.dir}">
+ <include name="org/haverdev/common/**"/>
+ <include name="org/haverdev/haver/**"/>
+ <manifest>
+ <attribute name="Main-Class"
value="org.haverdev.haver.server.Main"/>
+ </manifest>
+ </jar>
+ <jar destfile="${dist.jar.dir}/CMod.jar"
basedir="${build.classes.dir}">
+ <include name="org/haverdev/client/**"/>
+ <include name="org/haverdev/common/**"/>
+ <include name="org/haverdev/haver/NonblockingOutputStream**"/>
+ <include name="org/haverdev/javer2/CMod**"/>
+ <manifest>
+ <attribute name="Main-Class" value="org.haverdev.javer2.CMod"/>
+ </manifest>
+ </jar>
+ </target>
</project>
Added: trunk/clients/Javer2/config.xml
===================================================================
--- trunk/clients/Javer2/config.xml 2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/config.xml 2005-06-15 04:19:04 UTC (rev 765)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- This is what the XML haver config file may look like.
+ This is very much not final.
+ -->
+<haver>
+
+ <host name="uvmonkey.no-ip.org">
+ <param name="PingTimout">30</param>
+ <param name="PingInterval">60</param>
+ <param name="HandshakeTimeout">120</param>
+
+ <userstore provider="org.haverdev.haver.server.FileUserStore">
+ <param name="Path">store</param>
+ </userstore>
+
+ <lobby provider="org.haverdev.haver.server.DefaultLobby" />
+
+ <authentication>
+ <method name="basic"
provider="org.haverdev.haver.server.BasicAuthentication">
+ <digest havername="sha1" javaname="SHA-1" />
+ <digest havername="sha256" javaname="SHA-256" />
+ <digest havername="sha512" javaname="SHA-512" />
+ </method>
+ </authentication>
+
+ <plugin provider="org.haverdev.haver.server.DynamicChannelPlugin">
+ channels.txt
+ </plugin>
+
+ <plugin provider="org.haverdev.haver.server.EntityLoader">
+ <entity name="&StatsBot"
provider="org.haverdev.haver.server.StatsBot" />
+ <entity name="&Xiao" provider="org.haverdev.haver.server.Xiao" />
+ </plugin>
+
+ <listener provider="org.haverdev.haver.server.AcceptLoop">
+ <port>7070</port>
+ </listener>
+ </host>
+
+</haver>
Property changes on: trunk/clients/Javer2/config.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/clients/Javer2/nbproject/project.properties
===================================================================
--- trunk/clients/Javer2/nbproject/project.properties 2005-06-11 19:27:49 UTC
(rev 764)
+++ trunk/clients/Javer2/nbproject/project.properties 2005-06-15 04:19:04 UTC
(rev 765)
@@ -37,7 +37,7 @@
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
-main.class=org.haverdev.javer2.JaverForm
+main.class=org.haverdev.haver.server.Main
manifest.file=manifest.mf
platform.active=default_platform
run.classpath=\
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/AcceptLoop.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/AcceptLoop.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/AcceptLoop.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -19,15 +19,16 @@
protected ServerSocket socket;
protected int port;
+ protected ServerContext ctx;
- public static void startListening() throws Throwable {
+ public static void startListening(ServerContext ctx) throws Throwable {
String[] ports =
HaverEncoding.optionSplit(System.getProperty("org.haverdev.haver.server.AcceptLoop.listenPorts"));
for (int i = 0; i < ports.length; i++) {
int port = Integer.decode(ports[i]).intValue();
try {
ServerSocket socket = new ServerSocket(port);
- new AcceptLoop(socket, port).start();
+ new AcceptLoop(ctx, socket, port).start();
} catch (Throwable t) {
Logger.getLogger(AcceptLoop.class).error("While opening
listening socket on port " + port, t);
throw t;
@@ -37,9 +38,10 @@
}
/** Creates a new instance of AcceptLoop */
- protected AcceptLoop(ServerSocket s, int port) throws IOException {
+ protected AcceptLoop(ServerContext ctx, ServerSocket s, int port) throws
IOException {
Logger.getLogger(getClass()).info("Listening on port " + port);
this.port = port;
+ this.ctx = ctx;
socket = s;
setName("Listening socket on port " + port);
}
@@ -58,7 +60,7 @@
Logger.getLogger(getClass()).info(
"Accepted connection from " + Misc.prettySocket(s)
);
- new UserConnection(s);
+ new UserConnection(ctx, s);
}
} catch (Throwable t) {
Logger.getLogger(getClass()).error(t);
Modified:
trunk/clients/Javer2/src/org/haverdev/haver/server/AuthenticationProcess.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/AuthenticationProcess.java
2005-06-11 19:27:49 UTC (rev 764)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/AuthenticationProcess.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -30,6 +30,7 @@
MergingContext ctx = new MergingContext();
UserCommandHandler authctx = null;
+ ServerContext serverctx;
AuthProvider getProvider(String proto, UserConnection conn, UserInfo info)
{
try {
@@ -66,12 +67,13 @@
}
/** Creates a new instance of AuthenticationProcess */
- public AuthenticationProcess(UserConnection conn, UserInfo info) {
+ public AuthenticationProcess(ServerContext serverctx, UserConnection conn,
UserInfo info) {
ctx.add(this);
- this.conn = conn;
- this.info = info;
+ this.conn = conn;
+ this.info = info;
+ this.serverctx = serverctx;
}
public void start() throws PropagatedException {
@@ -104,7 +106,7 @@
public void accept() {
try {
- conn.entity = new UserEntity(info);
+ conn.entity = new UserEntity(serverctx, info);
conn.entity.attach(conn);
}
catch (PropagatedException e) {
@@ -113,7 +115,7 @@
return;
}
- conn.context = UserContextFactory.constructState(conn,
System.getProperty("haver.postLoginContext"));
+ conn.context = UserContextFactory.constructState(serverctx, conn,
System.getProperty("haver.postLoginContext"));
conn.sendLine(new String[] { "HELLO", info.getName() });
log.info("User logged in: " + info.getName());
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/ChannelBase.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/ChannelBase.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/ChannelBase.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -19,7 +19,8 @@
static final String[] emptyArray = {};
- public ChannelBase() {
+ public ChannelBase(ServerContext ctx) {
+ super(ctx);
setPersistant(true);
}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/ChatChannel.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/ChatChannel.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/ChatChannel.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -13,12 +13,13 @@
public class ChatChannel extends ChannelBase {
/** Creates a new instance of ChatChannel */
- public ChatChannel(String name) {
+ public ChatChannel(ServerContext ctx, String name) {
+ this(ctx);
setName(name);
}
- public ChatChannel() {
-
+ public ChatChannel(ServerContext ctx) {
+ super(ctx);
}
public void distributePart(Entity who) {
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/DefaultLobby.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/DefaultLobby.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/DefaultLobby.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -14,11 +14,13 @@
*/
public class DefaultLobby extends ChannelBase {
- public DefaultLobby(String name) {
+ public DefaultLobby(ServerContext ctx, String name) {
+ super(ctx);
setName(name);
}
- public DefaultLobby() {
+ public DefaultLobby(ServerContext ctx) {
+ super(ctx);
setName("&lobby");
}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannel.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannel.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannel.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -14,7 +14,8 @@
public class DynamicChannel extends ChatChannel {
/** Creates a new instance of DynamicChannel */
- public DynamicChannel() {
+ public DynamicChannel(ServerContext ctx) {
+ super(ctx);
}
volatile boolean isClosing = false;
@@ -49,7 +50,7 @@
unregister(users[i]);
}
- Lobby.theLobby.unregister(this);
+ ctx.getLobby().unregister(this);
}
}
Modified:
trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannelPlugin.java
===================================================================
---
trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannelPlugin.java
2005-06-11 19:27:49 UTC (rev 764)
+++
trunk/clients/Javer2/src/org/haverdev/haver/server/DynamicChannelPlugin.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -22,11 +22,14 @@
static HashMap theChannels = new HashMap();
static String file =
System.getProperty("org.haverdev.haver.server.DynamicChannelPlugin.store");
- public DynamicChannelPlugin(UserConnection conn, String name) {
- super(conn, name);
+ static ServerContext ctx; // XXX inner classes?
+
+ public DynamicChannelPlugin(ServerContext ctx, UserConnection conn, String
name) {
+ super(ctx, conn, name);
}
- public static void initPlugin() {
+ public static void initPlugin(ServerContext ctx) {
+ DynamicChannelPlugin.ctx = ctx;
try {
FileInputStream f = new FileInputStream(file);
InputStreamReader r = new InputStreamReader(f);
@@ -36,10 +39,10 @@
String name = b.readLine();
if (name == null) break;
- DynamicChannel chan = new DynamicChannel();
+ DynamicChannel chan = new DynamicChannel(ctx);
chan.setName(name);
theChannels.put(name, chan);
- Lobby.theLobby.register(chan);
+ ctx.getLobby().register(chan);
}
b.close();
} catch (Throwable t) {
@@ -65,11 +68,11 @@
public synchronized void handle_OPEN(String[] args) throws
PropagatedException {
String channel = args[1];
- DynamicChannel newchan = new DynamicChannel();
+ DynamicChannel newchan = new DynamicChannel(ctx);
newchan.setName(channel);
- Lobby.theLobby.register(newchan);
- if (newchan != Lobby.theLobby.lookup("channel", channel))
+ ctx.getLobby().register(newchan);
+ if (newchan != ctx.getLobby().lookup("channel", channel))
throw new AlreadyExistsException("channel", channel);
theChannels.put(channel, newchan);
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/Entity.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/Entity.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/Entity.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -23,4 +23,6 @@
public String getName();
public boolean isPersistant();
+
+ public ServerContext getServerContext();
}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/EntityBase.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/EntityBase.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/EntityBase.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -14,7 +14,16 @@
String name = null;
boolean persistant = false;
+ protected ServerContext ctx;
+ public EntityBase(ServerContext ctx) {
+ this.ctx = ctx;
+ }
+
+ public ServerContext getServerContext() {
+ return ctx;
+ }
+
public void setName(String name) {
this.name = name;
}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/EntityLoader.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/EntityLoader.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/EntityLoader.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -21,7 +21,7 @@
private EntityLoader() {
}
- static final void initEntity(String name) throws Throwable {
+ static final void initEntity(ServerContext ctx, String name) throws
Throwable {
String clas = System.getProperty(name + ".class");
String arg = System.getProperty(name + ".argument", name);
@@ -30,20 +30,20 @@
ClassLoader loader = ClassLoader.getSystemClassLoader();
Class theClass = loader.loadClass(clas);
- Class[] proto = {name.getClass()};
- Object[] args = {arg};
+ Class[] proto = {ServerContext.class, String.class};
+ Object[] args = {ctx, arg};
Constructor cons = theClass.getConstructor(proto);
Object ret = cons.newInstance(args);
- Lobby.theLobby.register((Entity)ret);
+ ctx.getLobby().register((Entity)ret);
}
- public static final void initPlugin() {
+ public static final void initPlugin(ServerContext ctx) {
String[] entities =
HaverEncoding.optionSplit(System.getProperty("org.haverdev.haver.server.EntityLoader.entities"));
for (int i = 0; i < entities.length; i++) {
log.info("Initializing entity " + entities[i] + "...");
try {
- initEntity(entities[i]);
+ initEntity(ctx, entities[i]);
} catch (Throwable t) {
log.error("When initializing entity " + entities[i], t);
}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/InitContext.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/InitContext.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/InitContext.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -13,8 +13,8 @@
*/
public class InitContext extends UserCommandReflect {
- public InitContext(UserConnection conn, String name) {
- super(conn, name);
+ public InitContext(ServerContext ctx, UserConnection conn, String name) {
+ super(ctx, conn, name);
}
public void handle_HAVER(String[] args) throws PropagatedException {
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/Lobby.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/Lobby.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/Lobby.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -16,10 +16,10 @@
private Lobby() {
}
- public static Channel theLobby = null;
+ // public static Channel theLobby = null;
public synchronized static void initLobby(String classname) throws
Throwable {
- if (theLobby != null)
+/* if (theLobby != null)
throw new IllegalStateException("Lobby is already set");
ClassLoader l = ClassLoader.getSystemClassLoader();
Class clas = l.loadClass(classname);
@@ -30,5 +30,6 @@
Channel c = (Channel)m.newInstance(args);
c.register(c);
theLobby = c;
+ */
}
}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/LoginContext.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/LoginContext.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/LoginContext.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -15,8 +15,8 @@
AuthenticationProcess auth = null;
- public LoginContext(UserConnection conn, String name) {
- super(conn, name);
+ public LoginContext(ServerContext ctx, UserConnection conn, String name) {
+ super(ctx, conn, name);
}
public void handle_IDENT(String[] args) throws PropagatedException {
@@ -31,15 +31,15 @@
if (conn.writer == null) // Too late
return;
}
- if (Lobby.theLobby.contains("user", args[1]))
+ if (ctx.getLobby().contains("user", args[1]))
throw new UserAlreadyExists(args[1]);
Misc.checkName(args[1], false);
log.info("User gave name: " + args[1]);
- UserInfo info = Main.theStore.getUser(args[1]);
+ UserInfo info = ctx.getStore().getUser(args[1]);
// XXX
- auth = new AuthenticationProcess(conn, info);
+ auth = new AuthenticationProcess(ctx, conn, info);
//conn.context = auth.getContext(); // XXX
((MergingContext)conn.context).add(auth.getContext()); // XXX
auth.start();
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/Main.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/Main.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/Main.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -17,39 +17,42 @@
*/
public final class Main {
- static public UserStore theStore = null;
+ ServerContext ctx;
+ //static public UserStore theStore = null;
+
/** Main is never instantiated */
private Main() {
}
- static final void initStore(String impl) throws Throwable {
- ClassLoader loader = ClassLoader.getSystemClassLoader();
- Class theClass = loader.loadClass(impl);
- Class[] nothing_p = {};
- Object[] nothing_a = {};
- Constructor m = theClass.getConstructor(nothing_p);
- theStore = (UserStore)m.newInstance(nothing_a);
+ UserStore initStore(String impl) throws Throwable {
+ return (UserStore)Class.forName(impl).newInstance();
}
- static final void initPlugin(String what) throws Throwable {
- ClassLoader loader = ClassLoader.getSystemClassLoader();
- Class theClass = loader.loadClass(what);
- Class[] nothing = {};
- Object[] nothing_o = {};
- Method m = theClass.getDeclaredMethod("initPlugin", nothing);
- m.invoke(null, nothing_o);
+ Channel initLobby(String impl) throws Throwable {
+ Class c = Class.forName(impl);
+ Class[] proto = { ServerContext.class, String.class };
+ Object[] args = { ctx, "&lobby" };
+ Constructor cons = c.getConstructor(proto);
+ return (Channel)cons.newInstance(args);
}
- static final void initListener(String what) throws Throwable {
- ClassLoader loader = ClassLoader.getSystemClassLoader();
- Class theClass = loader.loadClass(what);
- Class[] nothing = {};
- Object[] nothing_o = {};
- Method m = theClass.getDeclaredMethod("startListening", nothing);
- m.invoke(null, nothing_o);
+ void initPlugin(String what) throws Throwable {
+ Class theClass = Class.forName(what);
+ Class[] proto = { ServerContext.class };
+ Object[] args = { ctx };
+ Method m = theClass.getDeclaredMethod("initPlugin", proto);
+ m.invoke(null, args);
}
+ void initListener(String what) throws Throwable {
+ Class theClass = Class.forName(what);
+ Class[] proto = { ServerContext.class };
+ Object[] args = { ctx };
+ Method m = theClass.getDeclaredMethod("startListening", proto);
+ m.invoke(null, args);
+ }
+
public static final void main(String[] args) {
if (args.length == 0){
System.err.println("Pass one or more configuration files as
arguments");
@@ -58,7 +61,7 @@
try {
for (int i = 0; i < args.length; i++)
loadConfig(args[i]);
- bootstrap();
+ new Main().bootstrap();
} catch (Throwable t) {
t.printStackTrace();
System.exit(1);
@@ -70,7 +73,7 @@
System.getProperties().load(config);
}
- static final void bootstrap() throws Throwable {
+ final void bootstrap() throws Throwable {
if (System.getProperty("haver.hostname") == null) {
Logger.getRootLogger().error("You have not configured
haver.hostname. That is bad. Fix it.");
@@ -79,8 +82,12 @@
// Configure the logger
PropertyConfigurator.configure(System.getProperties());
- Lobby.initLobby(System.getProperty("haver.Lobby"));
- initStore(System.getProperty("haver.UserStore",
"org.haverdev.haver.server.DefaultUserStore"));
+ Channel lobby = initLobby(System.getProperty("haver.Lobby"));
+ UserStore store = initStore(System.getProperty("haver.UserStore",
"org.haverdev.haver.server.DefaultUserStore"));
+ String hostname = System.getProperty("haver.hostname");
+ if (hostname == null)
+ throw new IllegalArgumentException("haver.hostname is not set");
+ ctx = new ServerContext(store, lobby, hostname);
String[] plugins =
HaverEncoding.optionSplit(System.getProperty("haver.Plugins"));
for (int i = 0; i < plugins.length; i++) {
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/NormalContext.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/NormalContext.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/NormalContext.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -13,13 +13,13 @@
* @author bdonlan
*/
public class NormalContext extends UserCommandReflect {
- public NormalContext(UserConnection conn, String name) {
- super(conn, name);
+ public NormalContext(ServerContext ctx, UserConnection conn, String name) {
+ super(ctx, conn, name);
}
public void handle_TO(String[] args) throws PropagatedException {
String who = args[1];
- User them = (User)Lobby.theLobby.lookup("user", who);
+ User them = (User)ctx.getLobby().lookup("user", who);
if (them == null)
throw new UserNotFound(who);
String margs[] = new String[args.length - 2];
@@ -32,7 +32,7 @@
public void handle_LIST(String[] args) throws PropagatedException {
String channel = args[1];
String filter = args[2];
- Channel theChannel = (Channel)Lobby.theLobby.lookup("channel",
channel);
+ Channel theChannel = (Channel)ctx.getLobby().lookup("channel",
channel);
if (theChannel == null)
throw new ChannelNotFound(channel);
String[] members = theChannel.getNames(filter);
@@ -44,27 +44,28 @@
public void handle_JOIN(String[] args) throws PropagatedException {
String channel = args[1];
- Channel chan_e = (Channel)Lobby.theLobby.lookup("channel", channel);
+ Channel chan_e = (Channel)ctx.getLobby().lookup("channel", channel);
if (chan_e == null)
throw new ChannelNotFound(channel);
// Special case!
- if (chan_e == Lobby.theLobby)
+ if (chan_e == ctx.getLobby())
throw new Forbidden("&lobby");
conn.entity.join(chan_e);
}
public void handle_PART(String[] args) throws PropagatedException {
String channel = args[1];
- Channel chan_e = (Channel)Lobby.theLobby.lookup("channel", channel);
+ Channel chan_e = (Channel)ctx.getLobby().lookup("channel", channel);
// Special case!
- if (chan_e == Lobby.theLobby)
+ // XXX: better place?
+ if (chan_e == ctx.getLobby())
throw new Forbidden("&lobby");
conn.entity.part(chan_e);
}
public void handle_IN(String[] args) throws PropagatedException {
String channel = args[1]; // TODO: check presence
- Channel chan_e = (Channel)Lobby.theLobby.lookup("channel", channel);
+ Channel chan_e = (Channel)ctx.getLobby().lookup("channel", channel);
if (chan_e == null)
throw new ChannelNotFound(channel);
String[] margs = new String[args.length - 2];
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/PersistBot.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/PersistBot.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/PersistBot.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -14,7 +14,8 @@
public class PersistBot extends UserBase implements User {
/** Creates a new instance of PersistBot */
- public PersistBot(String name) {
+ public PersistBot(ServerContext ctx, String name) {
+ super(ctx);
setName(name);
}
@@ -42,7 +43,7 @@
uefrom.getInfo().setProperty("persistant", "false");
else if (arg.equals("commit")) {
try {
- ((PersistantLobby)Lobby.theLobby).commit();
+ ((PersistantLobby)ctx.getLobby()).commit();
} catch (java.io.IOException e) {
Logger.getLogger(getClass()).error("While forcing a commit",
e);
}
Modified:
trunk/clients/Javer2/src/org/haverdev/haver/server/PersistantLobby.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/PersistantLobby.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/PersistantLobby.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -29,8 +29,8 @@
static final Logger logger = Logger.getLogger(PersistantLobby.class);
/** Creates a new instance of PersistentLobby */
- public PersistantLobby() throws java.io.IOException, PropagatedException {
- super();
+ public PersistantLobby(ServerContext ctx) throws java.io.IOException,
PropagatedException {
+ super(ctx);
setPersistant(false);
storePath =
System.getProperty("org.haverdev.haver.server.PersistantLobby.storePath");
@@ -58,8 +58,8 @@
commitTimer.schedule(commitTask, commitInterval, commitInterval);
}
- public PersistantLobby(String name) throws IOException,
PropagatedException {
- this();
+ public PersistantLobby(ServerContext ctx, String name) throws IOException,
PropagatedException {
+ this(ctx);
setName(name);
}
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/SSLAcceptLoop.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/SSLAcceptLoop.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/SSLAcceptLoop.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -16,11 +16,11 @@
*/
public class SSLAcceptLoop extends AcceptLoop {
- protected SSLAcceptLoop(ServerSocket s, int port) throws Throwable {
- super(s, port);
+ protected SSLAcceptLoop(ServerContext ctx, ServerSocket s, int port)
throws Throwable {
+ super(ctx, s, port);
}
- public static void startListening() throws Throwable {
+ public static void startListening(ServerContext ctx) throws Throwable {
String[] ports =
System.getProperty("org.haverdev.haver.server.SSLAcceptLoop.listenPorts").split("[,
]+");
ServerSocketFactory ssocketFactory =
SSLServerSocketFactory.getDefault();
@@ -31,7 +31,7 @@
SSLServerSocket ssocket;
ssocket =
(SSLServerSocket)ssocketFactory.createServerSocket(port);
ssocket.setWantClientAuth(true);
- new SSLAcceptLoop(ssocket, port).start();
+ new SSLAcceptLoop(ctx, ssocket, port).start();
} catch (Throwable t) {
Logger.getLogger(SSLAcceptLoop.class).error("While opening
listening socket on port " + port, t);
throw t;
Added: trunk/clients/Javer2/src/org/haverdev/haver/server/ServerContext.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/ServerContext.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/ServerContext.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -0,0 +1,42 @@
+/*
+ * ServerContext.java
+ *
+ * Created on June 14, 2005, 11:14 PM
+ *
+ * To change this template, choose Tools | Options and locate the template
under
+ * the Source Creation and Management node. Right-click the template and choose
+ * Open. You can then make changes to the template in the Source Editor.
+ */
+
+package org.haverdev.haver.server;
+
+/**
+ *
+ * @author bdonlan
+ */
+public class ServerContext {
+
+ UserStore store;
+ Channel lobby;
+ String hostname;
+
+ /** Creates a new instance of ServerContext */
+ public ServerContext(UserStore store, Channel lobby, String hostname) {
+ this.store = store;
+ this.lobby = lobby;
+ this.hostname = hostname;
+ }
+
+ public UserStore getStore() {
+ return store;
+ }
+
+ public Channel getLobby() {
+ return lobby;
+ }
+
+ public String getHostname() {
+ return hostname;
+ }
+
+}
Property changes on:
trunk/clients/Javer2/src/org/haverdev/haver/server/ServerContext.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/StatsBot.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/StatsBot.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/StatsBot.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -13,11 +13,13 @@
public class StatsBot extends UserBase implements User {
/** Creates a new instance of StatsBot */
- public StatsBot(String name) {
+ public StatsBot(ServerContext ctx, String name) {
+ super(ctx);
setName(name);
}
- public StatsBot() {
+ public StatsBot(ServerContext ctx) {
+ super(ctx);
}
static String[] formats = { " bytes", " Kbytes", " Mbytes", " Gbytes" };
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/UserBase.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/UserBase.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/UserBase.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -17,7 +17,8 @@
public abstract class UserBase extends EntityBase implements User {
/** Creates a new instance of UserBase */
- public UserBase() {
+ public UserBase(ServerContext ctx) {
+ super(ctx);
}
public void notifyQuit(Entity who, String type, String detail) {
Modified:
trunk/clients/Javer2/src/org/haverdev/haver/server/UserCommandReflect.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/UserCommandReflect.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/UserCommandReflect.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -18,16 +18,18 @@
protected UserConnection conn;
protected String name;
+ protected ServerContext ctx;
- public UserCommandReflect(UserConnection conn, String name) {
+ public UserCommandReflect(ServerContext ctx, UserConnection conn, String
name) {
this.conn = conn;
this.name = name;
+ this.ctx = ctx;
}
protected void advance() throws PropagatedException {
try {
synchronized (conn) { // XXX: racy?
- conn.context = UserContextFactory.constructState(conn,
System.getProperty(name + ".successor"));
+ conn.context = UserContextFactory.constructState(ctx, conn,
System.getProperty(name + ".successor"));
}
} catch (Throwable t) {
throw new InternalCommandException("UNKNOWN", t);
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/UserConnection.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -25,6 +25,8 @@
static Timer timer = new Timer(true);
+ ServerContext serverctx;
+
Socket sock;
OutputStream nws;
PrintWriter writer;
@@ -115,9 +117,10 @@
}
/** Creates a new instance of UserConnection */
- public UserConnection(Socket s) throws IOException {
+ public UserConnection(ServerContext ctx, Socket s) throws IOException {
+ serverctx = ctx;
try {
- context = UserContextFactory.constructState(this, "init");
+ context = UserContextFactory.constructState(serverctx, this,
"init");
} catch (Throwable t) {
log.error("When initializing client context", t);
s.close();
@@ -198,6 +201,10 @@
try {
processLine(line);
}
+ catch (InternalCommandException e) {
+ sendLine(e.clientReport());
+ log.error("Internal command exception", e);
+ }
catch (PropagatedException e) {
sendLine(e.clientReport());
}
Modified:
trunk/clients/Javer2/src/org/haverdev/haver/server/UserContextFactory.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/UserContextFactory.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/UserContextFactory.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -15,7 +15,7 @@
*/
public final class UserContextFactory {
- public static UserCommandHandler constructState(UserConnection conn,
String stateName) {
+ public static UserCommandHandler constructState(ServerContext sctx,
UserConnection conn, String stateName) {
try {
MergingContext ctx = new MergingContext();
String subcontexts = System.getProperty("haver.state." +
stateName);
@@ -23,7 +23,7 @@
throw new IllegalArgumentException("Subhandler " + stateName +
" not configured");
String[] ctx_arr = HaverEncoding.optionSplit(subcontexts);
for (int i = 0; i < ctx_arr.length; i++) {
- ctx.add(constructSubhandler(conn, ctx_arr[i]));
+ ctx.add(constructSubhandler(sctx, conn, ctx_arr[i]));
}
return ctx;
} catch (Exception e) {
@@ -33,13 +33,13 @@
}
}
- public static UserCommandHandler constructSubhandler(UserConnection conn,
String name) throws Exception {
+ public static UserCommandHandler constructSubhandler(ServerContext ctx,
UserConnection conn, String name) throws Exception {
String classname = System.getProperty(name + ".class");
ClassLoader c = ClassLoader.getSystemClassLoader();
Class clas = c.loadClass(classname);
- Class[] proto = {conn.getClass(), name.getClass()};
- Object[] args = {conn, name};
+ Class[] proto = {ServerContext.class, conn.getClass(),
name.getClass()};
+ Object[] args = {ctx, conn, name};
Constructor cons = clas.getConstructor(proto);
Object ret = cons.newInstance(args);
return (UserCommandHandler)ret;
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/UserEntity.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/UserEntity.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/UserEntity.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -22,7 +22,8 @@
return info;
}
- public UserEntity(UserInfo info) throws PropagatedException {
+ public UserEntity(ServerContext ctx, UserInfo info) throws
PropagatedException {
+ super(ctx);
this.info = info;
setName(info.getName());
}
@@ -32,7 +33,7 @@
throw new IllegalStateException("Trying to attach when already
live");
this.conn = conn;
channels = new HashSet();
- join(Lobby.theLobby);
+ join(ctx.getLobby());
}
public void detach() {
Modified: trunk/clients/Javer2/src/org/haverdev/haver/server/Xiao.java
===================================================================
--- trunk/clients/Javer2/src/org/haverdev/haver/server/Xiao.java
2005-06-11 19:27:49 UTC (rev 764)
+++ trunk/clients/Javer2/src/org/haverdev/haver/server/Xiao.java
2005-06-15 04:19:04 UTC (rev 765)
@@ -26,7 +26,8 @@
static final Logger log = Logger.getLogger(Xiao.class);
/** Creates a new instance of Xiao */
- public Xiao(String name) {
+ public Xiao(ServerContext ctx, String name) {
+ super(ctx);
setName(name);
}
