[teiid-commits] teiid SVN: r729 - in trunk: client/src/main/java/com/metamatrix/admin/objects and 6 other directories.

Author: shawkins Date: 2009-04-08 07:50:41 -0400 (Wed, 08 Apr 2009) New Revision: 729 Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionTableModel.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java trunk/server/src/main/java/com/metamatrix/platform/security/api/MetaMatrixSessionInfo.java trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerSessionService.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestLogonImpl.java Log: TEIID-475 fully removing product references Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.java 2009-04-08 11:50:41 UTC (rev 729) @@ -126,15 +126,7 @@ */ public String getApplicationName(); - /** - * Get the Product Name - * - * @return String of the Product Name - */ - public String getProductName(); - - /** * Get the unique MetaMatrix session * within a given MetaMatrix System * Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java =================================================================== --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java 2009-04-08 11:50:41 UTC (rev 729) @@ -38,7 +38,6 @@ private String sessionID; private String vdbName = ""; //$NON-NLS-1$ private String vdbVersion = ""; //$NON-NLS-1$ - private String productName = ""; //$NON-NLS-1$ private String ipAddress = ""; //$NON-NLS-1$ private String hostName = ""; //$NON-NLS-1$ private long lastPingTime; @@ -70,7 +69,6 @@ result.append(AdminPlugin.Util.getString("MMSession.ID")).append(sessionID); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMSession.VDB_Name")).append(vdbName); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMSession.VDB_Version")).append(vdbVersion); //$NON-NLS-1$ - result.append(AdminPlugin.Util.getString("MMSession.Product")).append(productName); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMSession.Last_Ping_Time")).append(getLastPingTimeString()); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMSession.State")).append(getStateAsString()); //$NON-NLS-1$ result.append(AdminPlugin.Util.getString("MMSession.IPAddress")).append(ipAddress); //$NON-NLS-1$ @@ -163,27 +161,7 @@ this.applicationName = name; } - - /** - * Get the Product Names - * - * @return String of the Product Names - */ - public String getProductName() { - return productName; - } - - /** - * Set the Product Names - * @param name - */ - public void setProductName(String name) { - this.productName = name; - } - - - /** * Get the unique MetaMatrix session * within a given MetaMatrix System * Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionPanel.java =================================================================== --- trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionPanel.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionPanel.java 2009-04-08 11:50:41 UTC (rev 729) @@ -396,8 +396,6 @@ data[i][SessionTableModel.VDB_VERSION_COLUMN_NUM] = vdbVersStr; String sessionState = ACTIVE_TEXT; data[i][SessionTableModel.STATE_COLUMN_NUM] = sessionState; - data[i][SessionTableModel.PRODUCT_COLUMN_NUM]= u.getProductName(); - } return data; } Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionTableModel.java =================================================================== --- trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionTableModel.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/SessionTableModel.java 2009-04-08 11:50:41 UTC (rev 729) @@ -38,9 +38,8 @@ public static final int LOGGED_IN_COLUMN_NUM = 3; public static final int VDB_NAME_COLUMN_NUM = 4; public static final int VDB_VERSION_COLUMN_NUM = 5; - public static final int PRODUCT_COLUMN_NUM = 6; - public static final int LAST_PING_TIME = 7; - public static final int STATE_COLUMN_NUM = 8; + public static final int LAST_PING_TIME = 6; + public static final int STATE_COLUMN_NUM = 7; //Note-- positions must match USER_NAME_COLUMN_NUM, etc., below. public final static String LOGGED_IN_AT = ConsolePlugin.Util.getString("SessionTableModel.Logged_In_At_1"); //$NON-NLS-1$ @@ -52,7 +51,6 @@ LOGGED_IN_AT, ConsolePlugin.Util.getString("SessionTableModel.VDB_Name_5"), //$NON-NLS-1$ ConsolePlugin.Util.getString("SessionTableModel.VDB_Ver._6"), //$NON-NLS-1$ - ConsolePlugin.Util.getString("SessionTableModel.Product_7"), //$NON-NLS-1$ ConsolePlugin.Util.getString("SessionTableModel.Last_Ping_Time_8"), //$NON-NLS-1$ ConsolePlugin.Util.getString("SessionTableModel.State_9") }; //$NON-NLS-1$ Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringAdminImpl.java 2009-04-08 11:50:41 UTC (rev 729) @@ -911,7 +911,6 @@ session.setLastUpdated(new Date(info.getTimeCreated())); session.setVDBName(vdbName); session.setVDBVersion(vdbVersionString); - session.setProductName(info.getProductName()); session.setLastPingTime(info.getLastPingTime()); session.setSessionState(MetaMatrixSessionState.ACTIVE); session.setIPAddress(info.getClientIp()); Modified: trunk/server/src/main/java/com/metamatrix/platform/security/api/MetaMatrixSessionInfo.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/api/MetaMatrixSessionInfo.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/server/src/main/java/com/metamatrix/platform/security/api/MetaMatrixSessionInfo.java 2009-04-08 11:50:41 UTC (rev 729) @@ -37,7 +37,6 @@ private long lastPingTime; private long timeCreated; private String applicationName; - private String product; private Properties productInfo; private String clientIp; private String clientHostname; @@ -47,11 +46,10 @@ * Master constructor, allows a MetaMatrixSessionInfo to be created with * any state and any timestamps. */ - public MetaMatrixSessionInfo(MetaMatrixSessionID sessionID, String userName, long timeCreated, String applicationName, Properties productInfo, String product, String clientIp, String clientHostname){ + public MetaMatrixSessionInfo(MetaMatrixSessionID sessionID, String userName, long timeCreated, String applicationName, Properties productInfo, String clientIp, String clientHostname){ this.timeCreated = timeCreated; this.lastPingTime = timeCreated; this.applicationName = applicationName; - this.product = product; this.sessionToken = new SessionToken(sessionID, userName); this.productInfo = productInfo; this.clientIp = clientIp; @@ -93,10 +91,6 @@ this.lastPingTime = lastPingTime; } - public String getProductName() { - return this.product; - } - public SessionToken getSessionToken(){ return this.sessionToken; } Modified: trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/server/src/main/java/com/metamatrix/platform/security/session/service/SessionServiceImpl.java 2009-04-08 11:50:41 UTC (rev 729) @@ -198,14 +198,11 @@ String authenticatedUserName = authenticatedToken.getUserName(); - String productName = "Platform"; //$NON-NLS-1$ - // // Validate VDB and version if logging on to server product... // String vdbName = properties.getProperty(ProductInfoConstants.VIRTUAL_DB); if (vdbName != null) { - productName = "Integration Server"; //$NON-NLS-1$ String vdbVersion = properties.getProperty(ProductInfoConstants.VDB_VERSION); VirtualDatabaseID vdbID = null; try { @@ -240,9 +237,8 @@ creationTime, applicationName, productInfo, - productName, properties.getProperty(MMURL.CONNECTION.CLIENT_IP_ADDRESS), - properties.getProperty(MMURL.CONNECTION.CLIENT_HOSTNAME)); + properties.getProperty(MMURL.CONNECTION.CLIENT_HOSTNAME)); newSession.setTrustedToken(trustedToken); this.sessionCache.put(newSession.getSessionID(), newSession); return newSession; Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerSessionService.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerSessionService.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerSessionService.java 2009-04-08 11:50:41 UTC (rev 729) @@ -91,8 +91,8 @@ Properties productInfo1 = new Properties(); productInfo1.put(ProductInfoConstants.VIRTUAL_DB, "vdb1"); //$NON-NLS-1$ productInfo1.put(ProductInfoConstants.VDB_VERSION, "1");//$NON-NLS-1$ - MetaMatrixSessionInfo info1 = new MetaMatrixSessionInfo(id1, "user1", 1, "app1", productInfo1, "product1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - null, null); //$NON-NLS-1$ + MetaMatrixSessionInfo info1 = new MetaMatrixSessionInfo(id1, "user1", 1, "app1", productInfo1, null, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + null); //$NON-NLS-1$ sessions.add(info1); @@ -100,8 +100,8 @@ Properties productInfo2 = new Properties(); productInfo2.put(ProductInfoConstants.VIRTUAL_DB, "vdb2"); //$NON-NLS-1$ productInfo2.put(ProductInfoConstants.VDB_VERSION, "2"); //$NON-NLS-1$ - MetaMatrixSessionInfo info2 = new MetaMatrixSessionInfo(id2, "user2", 2, "app2", productInfo2, "product2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - null, null); //$NON-NLS-1$ + MetaMatrixSessionInfo info2 = new MetaMatrixSessionInfo(id2, "user2", 2, "app2", productInfo2, null, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + null); //$NON-NLS-1$ sessions.add(info2); return sessions; Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java 2009-04-08 11:50:41 UTC (rev 729) @@ -473,10 +473,6 @@ assertEquals("vdb1", session.getVDBName()); //$NON-NLS-1$ assertEquals("1", session.getVDBVersion()); //$NON-NLS-1$ assertEquals("app1", session.getApplicationName()); //$NON-NLS-1$ - assertEquals("product1", session.getProductName()); //$NON-NLS-1$ - - - results = admin.getSessions("1"); //$NON-NLS-1$ assertEquals(1, results.size()); } Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestLogonImpl.java =================================================================== --- trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestLogonImpl.java 2009-04-08 00:05:32 UTC (rev 728) +++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/server/TestLogonImpl.java 2009-04-08 11:50:41 UTC (rev 729) @@ -51,7 +51,7 @@ MetaMatrixSessionInfo resultInfo = new MetaMatrixSessionInfo( new MetaMatrixSessionID(1), userName, 0, applicationName, new Properties(), - "product", null, null); //$NON-NLS-1$ //$NON-NLS-2$ + null, null); //$NON-NLS-1$ //$NON-NLS-2$ Mockito.stub(ssi.createSession(userName, null, null, applicationName, p)).toReturn(resultInfo);