[jetrix-cvs] SF.net SVN: jetrix:[807] monitor/trunk/src/main/webapp

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

Revision: 807
          http://jetrix.svn.sourceforge.net/jetrix/?rev=807&view=rev
Author:   smanux
Date:     2009-03-30 14:49:23 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
Added an XML data sheet for each server

Modified Paths:
--------------
    monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties
    monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties
    monitor/trunk/src/main/webapp/WEB-INF/web.xml
    monitor/trunk/src/main/webapp/index.jsp
    monitor/trunk/src/main/webapp/server.jsp
    monitor/trunk/src/main/webapp/stylesheets/style.css

Added Paths:
-----------
    monitor/trunk/src/main/webapp/images/xml.png
    monitor/trunk/src/main/webapp/robots.txt
    monitor/trunk/src/main/webapp/server-xml.jsp

Modified: monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties
===================================================================
--- monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties	2009-03-30 10:25:07 UTC (rev 806)
+++ monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties	2009-03-30 14:49:23 UTC (rev 807)
@@ -4,6 +4,7 @@
 word.players = Players
 word.channel = Channel
 word.channels = Channels
+word.datasheet = Data Sheet
 word.version = Version
 word.team = Team
 word.nick = Nick

Modified: monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties
===================================================================
--- monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties	2009-03-30 10:25:07 UTC (rev 806)
+++ monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties	2009-03-30 14:49:23 UTC (rev 807)
@@ -4,6 +4,7 @@
 word.players = Joueurs
 word.channel = Channel
 word.channels = Channels
+word.datasheet = Feuille de donn\xE9es
 word.version = Version
 word.team = \xC9quipe
 word.nick = Pseudo

Modified: monitor/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- monitor/trunk/src/main/webapp/WEB-INF/web.xml	2009-03-30 10:25:07 UTC (rev 806)
+++ monitor/trunk/src/main/webapp/WEB-INF/web.xml	2009-03-30 14:49:23 UTC (rev 807)
@@ -26,6 +26,11 @@
     <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
   </filter>
 
+  <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <servlet>
     <servlet-name>servers-xml</servlet-name>
     <jsp-file>/servers-xml.jsp</jsp-file>
@@ -36,11 +41,16 @@
     <url-pattern>/servers.xml</url-pattern>
   </servlet-mapping>
 
-  <filter-mapping>
-    <filter-name>hibernateFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+  <servlet>
+    <servlet-name>server-xml</servlet-name>
+    <jsp-file>/server-xml.jsp</jsp-file>
+  </servlet>
 
+  <servlet-mapping>
+    <servlet-name>server-xml</servlet-name>
+    <url-pattern>/server.xml</url-pattern>
+  </servlet-mapping>
+
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>

Added: monitor/trunk/src/main/webapp/images/xml.png
===================================================================
(Binary files differ)


Property changes on: monitor/trunk/src/main/webapp/images/xml.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: monitor/trunk/src/main/webapp/index.jsp
===================================================================
--- monitor/trunk/src/main/webapp/index.jsp	2009-03-30 10:25:07 UTC (rev 806)
+++ monitor/trunk/src/main/webapp/index.jsp	2009-03-30 14:49:23 UTC (rev 807)
@@ -34,6 +34,7 @@
   <title><fmt:message key="title.servers"/></title>
   <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
   <link rel="Shorcut Icon" href="favicon.ico">
+  <link rel="alternate" type="text/xml" title="Servers XML summary" href="servers.xml">
   <script type="text/javascript" src="scripts/sortable.js"></script>
 </head>
 <body>


Property changes on: monitor/trunk/src/main/webapp/robots.txt
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision HeadURL
Added: svn:eol-style
   + native

Added: monitor/trunk/src/main/webapp/server-xml.jsp
===================================================================
--- monitor/trunk/src/main/webapp/server-xml.jsp	                        (rev 0)
+++ monitor/trunk/src/main/webapp/server-xml.jsp	2009-03-30 14:49:23 UTC (rev 807)
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<%@ page import="java.util.Locale" %>
+<%@ page import="org.springframework.web.context.WebApplicationContext" %>
+<%@ page import="org.springframework.web.context.ContextLoader" %>
+<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
+<%@ page import="net.jetrix.monitor.ServerInfo" %>
+<%@ page import="net.jetrix.monitor.dao.ServerInfoDao" %>
+<%@ page import="net.jetrix.agent.ChannelInfo" %>
+<%@ page import="net.jetrix.agent.PlayerInfo" %>
+<%@ page contentType="text/xml" pageEncoding="UTF-8" %>
+<%
+    WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
+    ServerInfoDao dao = (ServerInfoDao) context.getBean("serverInfoDao");
+
+    ServerInfo server = dao.getServer(Long.parseLong(request.getParameter("id")));
+
+    String countryName = "Unknown";
+    String localizedCountryName = "Unknown";
+    String countryFlag = "United Nations";
+
+    if (server.getCountry() != null) {
+        Locale locale = new Locale("en", server.getCountry());
+        countryName = locale.getDisplayCountry(Locale.ENGLISH);
+        localizedCountryName = locale.getDisplayCountry(request.getLocale());
+        countryFlag = countryName;
+    }
+
+    boolean viewable = server.isSpectate() && server.getSpectatorPassword() != null;
+%>
+<tetrinet-server
+      id="<%= server.getId() %>"
+      name="<%= server.getHostname() %>"
+<%      if (server.getVersion() != null) { %>
+      version="<%= StringEscapeUtils.escapeXml(server.getVersion()) %>"
+<%      } %>
+<%      if (server.getDescription() != null) { %>
+      description="<%= StringEscapeUtils.escapeXml(server.getDescription()) %>"
+<%      } %>
+      spec="<%= server.isSpectate() ? "true" : "false" %>"
+<%      if (server.getCountry() != null) {
+            Locale locale = new Locale("en", server.getCountry());
+%>
+      country="<%= server.getCountry() %>"
+      countryName="<%= locale.getDisplayCountry(Locale.ENGLISH) %>"
+<%      } %>
+      ping="<%= server.getStats().getPing() %>"
+      players="<%= server.getStats().getPlayerCount() %>"
+      activePlayers="<%= server.getStats().getActivePlayerCount() %>"
+      channels="<%= server.getStats().getChannelCount() %>"
+      activeChannels="<%= server.getStats().getActiveChannelCount() %>">
+
+<%  if (!server.getChannels().isEmpty()) { %>
+  <channels>
+<%      for (ChannelInfo channel : server.getChannels()) { %>
+    <channel name="<%= StringEscapeUtils.escapeXml(channel.getName()) %>" description="<%= StringEscapeUtils.escapeXml(channel.getDescription()) %>" status="<%= channel.getStatus() %>" players="<%= channel.getPlayernum() %>" max-players="<%= channel.getPlayermax() %>"/>
+<%      } %>
+  </channels>
+<%  } %>
+
+<%  if (!server.getPlayers().isEmpty()) { %>
+  <players>
+<%      for (PlayerInfo player : server.getPlayers()) { %>
+    <player name="<%= StringEscapeUtils.escapeXml(player.getNick()) %>" team="<%= StringEscapeUtils.escapeXml(player.getTeam()) %>" channel="<%= StringEscapeUtils.escapeXml(player.getChannel()) %>" status="<%= player.getStatus() %>" slot="<%= player.getSlot() %>" auth="<%= player.getAuthenticationLevel() %>" client="<%= StringEscapeUtils.escapeXml(player.getVersion()) %>"/>
+<%      } %>
+  </players>
+<%  } %>
+</tetrinet-server>


Property changes on: monitor/trunk/src/main/webapp/server-xml.jsp
___________________________________________________________________
Added: svn:keywords
   + Date Author Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: monitor/trunk/src/main/webapp/server.jsp
===================================================================
--- monitor/trunk/src/main/webapp/server.jsp	2009-03-30 10:25:07 UTC (rev 806)
+++ monitor/trunk/src/main/webapp/server.jsp	2009-03-30 14:49:23 UTC (rev 807)
@@ -8,6 +8,7 @@
 <%@ page import="net.jetrix.monitor.dao.ServerInfoDao" %>
 <%@ page import="net.jetrix.monitor.StyleUtils" %>
 <%@ page import="java.net.URLEncoder" %>
+<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
 <%
     WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
     ServerInfoDao dao = (ServerInfoDao) context.getBean("serverInfoDao");
@@ -37,6 +38,7 @@
   </title>
   <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
   <link rel="Shorcut Icon" href="favicon.ico">
+  <link rel="alternate" type="text/xml" title="<%= StringEscapeUtils.escapeHtml(server.getHostname()) %> XML data sheet" href="server.xml?id=<%= server.getId() %>">
   <script type="text/javascript" src="scripts/sortable.js"></script>
 </head>
 <body>
@@ -223,5 +225,11 @@
 
 <%  } %>
 
+<hr>
+
+<div align="right">
+  <a href="server.xml?id=<%= server.getId() %>" class="datasheet"><fmt:message key="word.datasheet"/></a>
+</div>
+
 </body>
 </html>

Modified: monitor/trunk/src/main/webapp/stylesheets/style.css
===================================================================
--- monitor/trunk/src/main/webapp/stylesheets/style.css	2009-03-30 10:25:07 UTC (rev 806)
+++ monitor/trunk/src/main/webapp/stylesheets/style.css	2009-03-30 14:49:23 UTC (rev 807)
@@ -36,3 +36,10 @@
 .sortarrow {
     display: none;
 }
+
+a.datasheet {
+    background-image: url("../images/xml.png");
+    background-repeat: no-repeat;
+    padding-left: 40px;
+    text-decoration: none;
+}


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