From 1ad65f32aca6e53ddfa302ffebb8e8b5f7503e81 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 9 Jan 2013 18:21:15 +0000 Subject: [PATCH] Moving port and web location configuration to commandline parameters. --- .../java/com/gempukku/lotro/async/LotroAsyncServer.java | 8 +++++--- .../gempukku/lotro/async/LotroServerPipelineFactory.java | 4 ++-- .../lotro/async/handler/RootUriRequestHandler.java | 5 +++-- .../gempukku/lotro/async/handler/WebRequestHandler.java | 7 +++++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java index 65ace2b98..35c678aab 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroAsyncServer.java @@ -1,6 +1,5 @@ package com.gempukku.lotro.async; -import com.gempukku.lotro.common.ApplicationConfiguration; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelFactory; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; @@ -10,6 +9,9 @@ import java.util.concurrent.Executors; public class LotroAsyncServer { public static void main(String[] server) { + int port = Integer.parseInt(server[0]); + String webLocation = server[1]; + ChannelFactory factory = new NioServerSocketChannelFactory( Executors.newCachedThreadPool(), @@ -18,10 +20,10 @@ public class LotroAsyncServer { ServerBootstrap bootstrap = new ServerBootstrap(factory); - bootstrap.setPipelineFactory(new LotroServerPipelineFactory()); + bootstrap.setPipelineFactory(new LotroServerPipelineFactory(webLocation)); bootstrap.setOption("child.tcpNoDelay", true); bootstrap.setOption("child.keepAlive", true); - bootstrap.bind(new InetSocketAddress(Integer.parseInt(ApplicationConfiguration.getProperty("port")))); + bootstrap.bind(new InetSocketAddress(port)); } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java index 3498c1e9d..4b9aa257e 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroServerPipelineFactory.java @@ -21,7 +21,7 @@ public class LotroServerPipelineFactory implements ChannelPipelineFactory { private Map _context; private UriRequestHandler _uriRequestHandler; - public LotroServerPipelineFactory() { + public LotroServerPipelineFactory(String webPath) { Map objects = new HashMap(); objects.put(PacksStorage.class, PacksStorageBuilder.createPacksStorage()); DaoBuilder.fillObjectMap(objects); @@ -37,7 +37,7 @@ public class LotroServerPipelineFactory implements ChannelPipelineFactory { objects.put(LongPollingSystem.class, longPollingSystem); _context = objects; - _uriRequestHandler = new RootUriRequestHandler(_context); + _uriRequestHandler = new RootUriRequestHandler(_context, webPath); } public ChannelPipeline getPipeline() throws Exception { diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java index 548feabea..50ef6edea 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java @@ -12,7 +12,7 @@ public class RootUriRequestHandler implements UriRequestHandler { private String _serverContextPath ="/gemp-lotr-server/"; private String _webContextPath="/gemp-lotr/"; private HallRequestHandler _hallRequestHandler; - private WebRequestHandler _webRequestHandler = new WebRequestHandler(); + private WebRequestHandler _webRequestHandler; private LoginRequestHandler _loginRequestHandler; private StatusRequestHandler _statusRequestHandler; private DeckRequestHandler _deckRequestHandler; @@ -30,7 +30,8 @@ public class RootUriRequestHandler implements UriRequestHandler { private PlayerStatsRequestHandler _playerStatsRequestHandler; private TournamentRequestHandler _tournamentRequestHandler; - public RootUriRequestHandler(Map context) { + public RootUriRequestHandler(Map context, String webPath) { + _webRequestHandler = new WebRequestHandler(webPath); _hallRequestHandler = new HallRequestHandler(context); _deckRequestHandler = new DeckRequestHandler(context); _loginRequestHandler = new LoginRequestHandler(context); diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java index 1bdd680cd..5299a85f7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java @@ -1,7 +1,6 @@ package com.gempukku.lotro.async.handler; import com.gempukku.lotro.async.ResponseWriter; -import com.gempukku.lotro.common.ApplicationConfiguration; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.handler.codec.http.HttpRequest; @@ -10,7 +9,11 @@ import java.lang.reflect.Type; import java.util.Map; public class WebRequestHandler implements UriRequestHandler { - private String _root = ApplicationConfiguration.getProperty("web.folder"); + private String _root; + + public WebRequestHandler(String root) { + _root = root; + } @Override public void handleRequest(String uri, HttpRequest request, Map context, ResponseWriter responseWriter, MessageEvent e) throws Exception {