You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/03/17 16:26:03 UTC

svn commit: r755278 - /geronimo/server/branches/2.1.4/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/util/DBManager.java

Author: gawor
Date: Tue Mar 17 15:25:58 2009
New Revision: 755278

URL: http://svn.apache.org/viewvc?rev=755278&view=rev
Log:
Relax schema to support monitoring of multiple servers running on the same host. Patch from Ashish Jain (GERONIMO-4588)

Modified:
    geronimo/server/branches/2.1.4/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/util/DBManager.java

Modified: geronimo/server/branches/2.1.4/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/util/DBManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1.4/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/util/DBManager.java?rev=755278&r1=755277&r2=755278&view=diff
==============================================================================
--- geronimo/server/branches/2.1.4/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/util/DBManager.java (original)
+++ geronimo/server/branches/2.1.4/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/util/DBManager.java Tue Mar 17 15:25:58 2009
@@ -112,14 +112,16 @@
                             + "server_id   INTEGER PRIMARY KEY NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 0, INCREMENT BY 1),"
                             + "enabled     SMALLINT DEFAULT 1 NOT NULL,"
                             + "name        VARCHAR(128) DEFAULT NULL,"
-                            + "ip          VARCHAR(128) UNIQUE NOT NULL,"
+                            + "ip          VARCHAR(128) NOT NULL,"
                             + "port        INTEGER NOT NULL,"
                             + "protocol    INTEGER DEFAULT 1 NOT NULL,"
                             + "username    VARCHAR(128) NOT NULL,"
                             + "password    VARCHAR(1024) NOT NULL,"
                             + "added       TIMESTAMP NOT NULL,"
                             + "modified    TIMESTAMP NOT NULL,"
-                            + "last_seen   TIMESTAMP NOT NULL" + ")");
+                            + "last_seen   TIMESTAMP NOT NULL,"
+                            + "CONSTRAINT  UNQ_IP_PORT UNIQUE(ip,port)"
+                            + ")");
             pStmt.executeUpdate();
             pStmt = con
                     .prepareStatement("CREATE TABLE graphs("