Revision: 8437
http://languagetool.svn.sourceforge.net/languagetool/?rev=8437&view=rev
Author: dnaber
Date: 2012-11-22 22:50:53 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
http/https server: print URL under which the service can be reached on startup
Modified Paths:
--------------
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
trunk/JLanguageTool/src/main/java/org/languagetool/server/Server.java
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
2012-11-22 22:30:48 UTC (rev 8436)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPSServer.java
2012-11-22 22:50:53 UTC (rev 8437)
@@ -56,6 +56,7 @@
*/
public HTTPSServer(HTTPSServerConfig config, boolean runInternally, String
host, Set<String> allowedIps) {
this.port = config.getPort();
+ this.host = host;
try {
if (host == null) {
server = HttpsServer.create(new InetSocketAddress(port), 0);
@@ -136,4 +137,9 @@
}
}
+ @Override
+ protected String getProtocol() {
+ return "https";
+ }
+
}
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
2012-11-22 22:30:48 UTC (rev 8436)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/server/HTTPServer.java
2012-11-22 22:50:53 UTC (rev 8437)
@@ -89,6 +89,7 @@
*/
public HTTPServer(HTTPServerConfig config, boolean runInternally, String
host, Set<String> allowedIps) {
this.port = config.getPort();
+ this.host = host;
try {
if (host == null) {
server = HttpServer.create(new InetSocketAddress(port), 0);
@@ -126,5 +127,10 @@
}
}
+ @Override
+ protected String getProtocol() {
+ return "http";
+ }
+
}
Modified: trunk/JLanguageTool/src/main/java/org/languagetool/server/Server.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/server/Server.java
2012-11-22 22:30:48 UTC (rev 8436)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/server/Server.java
2012-11-22 22:50:53 UTC (rev 8437)
@@ -31,8 +31,10 @@
*
* @since 2.0
*/
-class Server {
+abstract class Server {
+ protected abstract String getProtocol();
+
protected static final Set<String> DEFAULT_ALLOWED_IPS = new
HashSet<String>(Arrays.asList(
"0:0:0:0:0:0:0:1", // Suse Linux IPv6 stuff
"0:0:0:0:0:0:0:1%0", // some(?) Mac OS X
@@ -40,13 +42,15 @@
));
protected int port;
+ protected String host;
protected HttpServer server;
/**
* Start the server.
*/
public void run() {
- System.out.println("Starting server on port " + port + "...");
+ final String hostName = host != null ? host : "localhost";
+ System.out.println("Starting server on " + getProtocol() + "://" +
hostName + ":" + port + "...");
server.start();
System.out.println("Server started");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
