[jetrix-cvs] SF.net SVN: jetrix:[808] monitor/trunk/src

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

Revision: 808
          http://jetrix.svn.sourceforge.net/jetrix/?rev=808&view=rev
Author:   smanux
Date:     2009-03-30 15:28:42 +0000 (Mon, 30 Mar 2009)

Log Message:
-----------
Implemented the check on the server aliases on adding a new server

Modified Paths:
--------------
    monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerInfoDao.java
    monitor/trunk/src/main/webapp/server-add.jsp
    monitor/trunk/src/test/java/net/jetrix/monitor/dao/ServerInfoDaoTest.java

Modified: monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerInfoDao.java
===================================================================
--- monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerInfoDao.java	2009-03-30 14:49:23 UTC (rev 807)
+++ monitor/trunk/src/main/java/net/jetrix/monitor/dao/ServerInfoDao.java	2009-03-30 15:28:42 UTC (rev 808)
@@ -68,7 +68,7 @@
      */
     public boolean exists(ServerInfo server)
     {
-        Query query = getSession().createQuery("FROM ServerInfo WHERE IP = :ip OR hostname = :name");
+        Query query = getSession().createQuery("FROM ServerInfo WHERE IP = :ip OR hostname = :name OR :ip IN elements(aliases)");
         query.setParameter("ip", server.getIP());
         query.setParameter("name", server.getHostname());
         List result = query.list();

Modified: monitor/trunk/src/main/webapp/server-add.jsp
===================================================================
--- monitor/trunk/src/main/webapp/server-add.jsp	2009-03-30 14:49:23 UTC (rev 807)
+++ monitor/trunk/src/main/webapp/server-add.jsp	2009-03-30 15:28:42 UTC (rev 808)
@@ -11,11 +11,10 @@
 <%
     String hostname = request.getParameter("hostname");
 
-    InetAddress address = null;
     try
     {
         // lookup the IP
-        address = InetAddress.getByName(hostname);
+        InetAddress address = InetAddress.getByName(hostname);
 
         WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
         ServerInfoDao dao = (ServerInfoDao) context.getBean("serverInfoDao");

Modified: monitor/trunk/src/test/java/net/jetrix/monitor/dao/ServerInfoDaoTest.java
===================================================================
--- monitor/trunk/src/test/java/net/jetrix/monitor/dao/ServerInfoDaoTest.java	2009-03-30 14:49:23 UTC (rev 807)
+++ monitor/trunk/src/test/java/net/jetrix/monitor/dao/ServerInfoDaoTest.java	2009-03-30 15:28:42 UTC (rev 808)
@@ -36,4 +36,12 @@
 
         assertNotNull("server 1 not found", server);
     }
+
+    public void testExists() throws Exception
+    {
+        ServerInfo server = dao.getServer(1);
+
+        assertNotNull("server 1 not found", server);
+        assertTrue("server 1 doesn't not exist", dao.exists(server));
+    }
 }


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