[teiid-commits] teiid SVN: r498 - in trunk: common-internal/src/main/java/com/metamatrix/common/config/api and 7 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Wed Feb 25 13:12:41 EST 2009
Author: rareddy
Date: 2009-02-25 13:12:40 -0500 (Wed, 25 Feb 2009)
New Revision: 498
Modified:
trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Host.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicHost.java
trunk/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceState.java
trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryHostInfo.java
trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryPanel.java
trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java
Log:
TEIID-283: removing port information from the Host properties.
Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -32,15 +32,8 @@
* @since 4.3
*/
public interface Host extends AdminObject {
-
-
/**
- * Port Number Property
- */
- public static final String PORT_NUMBER = "hostControllerPortNumber"; //$NON-NLS-1$
-
- /**
* Install Directory Property
*/
public static final String INSTALL_DIR = "metamatrix.installationDir"; //$NON-NLS-1$
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Host.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Host.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Host.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -55,17 +55,8 @@
*/
String getTempDirectory();
-
+
/**
- * returns the host controller port number;
- * @return
- * @since 4.3
- */
- String getPort();
-
-
-
- /**
* Return the address that should be used to bind to the host
* @return
* @since 4.3
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/HostType.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -30,8 +30,6 @@
public static final String COMPONENT_TYPE_NAME = "Host"; //$NON-NLS-1$
- public static final String PORT_NUMBER = com.metamatrix.admin.api.objects.Host.PORT_NUMBER;
-
public static final String INSTALL_DIR = com.metamatrix.admin.api.objects.Host.INSTALL_DIR;
public static final String LOG_DIRECTORY = com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY;
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicHost.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicHost.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicHost.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -70,13 +70,7 @@
return FileUtils.buildDirectoryPath(new String[] {datadir, "temp"}); //$NON-NLS-1$
}
- /**
- * @see com.metamatrix.common.config.api.Host#getPort()
- * @since 4.3
- */
- public String getPort() {
- return getProperty(HostType.PORT_NUMBER);
- }
+
/**
* Return a deep cloned instance of this object. Subclasses must override
* this method.
Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceState.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceState.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceState.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -30,4 +30,12 @@
public static final int STATE_INIT_FAILED = 4;
public static final int STATE_NOT_REGISTERED = 5;
public static final int STATE_DATA_SOURCE_UNAVAILABLE = 6;
+
+ public final static String[] stateAsString = {"Not_Initialized", //$NON-NLS-1$
+ "Running", //$NON-NLS-1$
+ "Closed", //$NON-NLS-1$
+ "Failed", //$NON-NLS-1$
+ "Init_Failed", //$NON-NLS-1$
+ "Not_Registered", //$NON-NLS-1$
+ "Data_Source_Unavailable"}; //$NON-NLS-1$
}
Modified: trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -120,9 +120,7 @@
it = hosts.iterator();
for (int i = 0; it.hasNext(); i++) {
Host curHost = (Host)it.next();
- info[i] = new SummaryHostInfo(curHost.getName(),
- curHost.getProperty(HostType.PORT_NUMBER),
- hostStatus(curHost.getName(), hostData));
+ info[i] = new SummaryHostInfo(curHost.getName(), hostStatus(curHost.getName(), hostData));
}
return info;
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/PropertyConstants.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -37,21 +37,7 @@
static final String ESSENTIAL_PROP =
DeployPkgUtils.getString("property.service.essential"); //$NON-NLS-1$
- //
- // Process
- //
-// static final String LOG_PROP =
-// DeployPkgUtils.getString("property.process.logfile"); //$NON-NLS-1$
-// static final String MAX_HEAP_PROP =
-// DeployPkgUtils.getString("property.process.maxheap"); //$NON-NLS-1$
-// static final String MIN_HEAP_PROP =
-// DeployPkgUtils.getString("property.process.minheap"); //$NON-NLS-1$
- //
- // Host
- //
- static final String PORT_PROP = HostType.PORT_NUMBER;
-// DeployPkgUtils.getString("property.host.portnumber"); //$NON-NLS-1$
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryHostInfo.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryHostInfo.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryHostInfo.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -29,12 +29,10 @@
public static final int NOT_RUNNING = 2;
private String hostName;
- private String hostPortNum;
private int hostStatus;
- public SummaryHostInfo(String hostName, String hostPortNum, int status){
+ public SummaryHostInfo(String hostName, int status){
this.hostName = hostName;
- this.hostPortNum = hostPortNum;
this.hostStatus = status;
}
@@ -42,10 +40,6 @@
return hostName;
}
- public String getHostPortNum(){
- return hostPortNum;
- }
-
public int getHostStatus(){
return hostStatus;
}
Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryPanel.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryPanel.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/SummaryPanel.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -92,7 +92,7 @@
private JPanel stopLightPanel;
private String[] connectionsTableColumns = {"Product", "Connections"};
private TableWidget hostTable;
- private String[] hostTableColumns = {"Host Identifier", "Port Number", "Status"};
+ private String[] hostTableColumns = {"Host Identifier", "Status"};
private GridBagLayout sysStateLayout;
private AutoRefresher arRefresher;
@@ -314,17 +314,15 @@
data = new Object[1][3];
data[0][0] = "";
data[0][1] = "";
- data[0][2] = "";
} else {
data = new Object[hostInfo.length][3];
for (int i = 0; i < hostInfo.length; i++) {
data[i][0] = hostInfo[i].getHostName();
- data[i][1] = hostInfo[i].getHostPortNum();
if (hostInfo[i].getHostStatus() == SummaryHostInfo.RUNNING) {
- data[i][2] = "Running";
+ data[i][1] = "Running";
} else if (hostInfo[i].getHostStatus() ==
SummaryHostInfo.NOT_RUNNING) {
- data[i][2] = "Not Running";
+ data[i][1] = "Not Running";
}
}
}
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -151,7 +151,6 @@
public void testAddHost() throws Exception {
String hostIdentifier = BOGUS_HOST;
Properties hostProperties = new Properties();
- hostProperties.setProperty(Host.PORT_NUMBER, String.valueOf(15001));
hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s43401\\"); //$NON-NLS-1$
hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s43401\\data"); //$NON-NLS-1$
hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s43401\\log"); //$NON-NLS-1$
@@ -162,7 +161,6 @@
public void testAddHostIP() throws Exception {
String hostIdentifier = BOGUS_HOST_IP;
Properties hostProperties = new Properties();
- hostProperties.setProperty(Host.PORT_NUMBER, String.valueOf(15001));
hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s43401\\"); //$NON-NLS-1$
hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s43401\\data"); //$NON-NLS-1$
hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s43401\\log"); //$NON-NLS-1$
@@ -173,7 +171,6 @@
public void testAddHostFullyQualifiedName() throws Exception {
String hostIdentifier = BOGUS_HOST_FULLY_QUALIFIED;
Properties hostProperties = new Properties();
- hostProperties.setProperty(Host.PORT_NUMBER, String.valueOf(15001));
hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s43401\\"); //$NON-NLS-1$
hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s43401\\data"); //$NON-NLS-1$
hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s43401\\log"); //$NON-NLS-1$
Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java 2009-02-25 17:45:32 UTC (rev 497)
+++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/HelperTestConfiguration.java 2009-02-25 18:12:40 UTC (rev 498)
@@ -113,10 +113,6 @@
validateComponentObject(h);
ArgCheck.isNotNull(h.getProperties(), "Host does not have any properties"); //$NON-NLS-1$
- String hostPortNumber = h.getProperty(HostType.PORT_NUMBER);
- ArgCheck.isNotNull(hostPortNumber, "Host " + h.getFullName() + " does not have a host port number"); //$NON-NLS-1$ //$NON-NLS-2$
-
-
}
public static void validateAuthenticationProviders(Collection providers) throws ConfigurationException {
More information about the teiid-commits
mailing list