Author: vhalbert(a)redhat.com Date: 2009-04-14 13:59:24 -0400 (Tue, 14 Apr 2009) New Revision: 772 Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ComponentData.java branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ProcessData.java branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemState.java branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceID.java Log: Teiid 323 - added serializedid to impacted classes due to removing PSCData Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ComponentData.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ComponentData.java 2009-04-14 17:58:10 UTC (rev 771) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ComponentData.java 2009-04-14 17:59:24 UTC (rev 772) @@ -30,7 +30,12 @@ */ public class ComponentData implements Serializable { - // Name that this object represents. + /** + * + */ + private static final long serialVersionUID = 1276023440163989298L; + + // Name that this object represents. private String name; /** indicates if component is in operational configuration */ Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java 2009-04-14 17:58:10 UTC (rev 771) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/HostData.java 2009-04-14 17:59:24 UTC (rev 772) @@ -30,8 +30,12 @@ */ public class HostData extends ComponentData { - // Collection of ProcessData objects - private Collection processes; + /** + * + */ + private static final long serialVersionUID = -7192156515568357069L; + // Collection of ProcessData objects + private Collection<ProcessData> processes; private Properties properties; @@ -40,7 +44,7 @@ * * @param hostName Name of host */ - public HostData(String hostName, Collection processes, boolean deployed, boolean registered, Properties props) { + public HostData(String hostName, Collection<ProcessData> processes, boolean deployed, boolean registered, Properties props) { super(hostName, deployed, registered); this.processes = processes; this.properties = props; Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ProcessData.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ProcessData.java 2009-04-14 17:58:10 UTC (rev 771) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ProcessData.java 2009-04-14 17:59:24 UTC (rev 772) @@ -23,7 +23,6 @@ package com.metamatrix.platform.admin.api.runtime; import java.util.Collection; -import java.util.Iterator; import com.metamatrix.common.config.api.ComponentDefnID; import com.metamatrix.core.util.HashCodeUtil; @@ -34,9 +33,15 @@ */ public class ProcessData extends ComponentData { - /** Collection of serviceData objects */ - private Collection services; + /** + * + */ + private static final long serialVersionUID = -4648970293578256936L; + + /** Collection of serviceData objects */ + private Collection<ServiceData> services; + /** defines vm in configuration */ private ComponentDefnID defnID; @@ -52,7 +57,7 @@ * @param vmController VMController implementation * @param hostName Name of host VM is running on */ - public ProcessData(String hostName, String processName, String port, ComponentDefnID defnID, Collection services, boolean deployed, boolean registered) { + public ProcessData(String hostName, String processName, String port, ComponentDefnID defnID, Collection<ServiceData> services, boolean deployed, boolean registered) { super(processName, deployed, registered); this.hostName = hostName; this.defnID = defnID; @@ -67,7 +72,7 @@ * * @return List of ServiceData objects */ - public Collection getServices() { + public Collection<ServiceData> getServices() { return services; } Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java 2009-04-14 17:58:10 UTC (rev 771) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ServiceData.java 2009-04-14 17:59:24 UTC (rev 772) @@ -26,14 +26,16 @@ import java.util.Date; import com.metamatrix.common.config.api.ComponentDefnID; -import com.metamatrix.common.config.api.DeployedComponent; -import com.metamatrix.common.config.model.BasicServiceComponentDefn; - import com.metamatrix.platform.service.api.ServiceID; public class ServiceData extends ComponentData { - /** Identifies service for purpose of looking up in registry */ + /** + * + */ + private static final long serialVersionUID = 2408872419190347292L; + + /** Identifies service for purpose of looking up in registry */ private ServiceID serviceID; /** @@ -47,9 +49,7 @@ /** indicates if service is an essential service */ private boolean essential; - - private DeployedComponent deployedComponent; - + /** defines service in configuration */ private ComponentDefnID defnID; @@ -77,16 +77,16 @@ * @throws RegistryException if an an error occurs creating remote instance of service. */ public ServiceData(ServiceID serviceID, String serviceName, String instanceName, - ComponentDefnID defnID, DeployedComponent deployedComponent, + ComponentDefnID defnID, String deployedComponentName, Collection queueNames, int state, Date time, boolean essential, boolean deployed, boolean registered, Throwable initError) { // super(serviceName, deployed, registered); - super(BasicServiceComponentDefn.getDisplayableName(deployedComponent.getName()), deployed, registered); + super(deployedComponentName, deployed, registered); this.serviceID = serviceID; + this.defnID = defnID; - this.deployedComponent = deployedComponent; this.queueNames = queueNames; this.currentState = state; this.stateChangeTime = time; @@ -126,11 +126,7 @@ public ComponentDefnID getComponentDefnID() { return this.defnID; } - - public DeployedComponent getDeployedComponent() { - return this.deployedComponent; - } - + public Throwable getInitError() { return this.initError; } @@ -160,7 +156,10 @@ if ( obj instanceof ServiceData ) { ServiceData that = (ServiceData) obj; - return deployedComponent.equals(that.getDeployedComponent()); + return (this.serviceID.getHostName().equals(that.getServiceID().getHostName()) && + this.serviceID.getProcessName().equals(that.serviceID.getProcessName()) && + this.getComponentDefnID().equals(that.getComponentDefnID())); +//eployedComponent.equals(that.getDeployedComponent()); // return defnID.equals(that.getComponentDefnID()); } Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemState.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemState.java 2009-04-14 17:58:10 UTC (rev 771) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemState.java 2009-04-14 17:59:24 UTC (rev 772) @@ -36,7 +36,11 @@ */ public class SystemState implements Serializable { - private Collection hosts; + /** + * + */ + private static final long serialVersionUID = 8316522636781619120L; + private Collection<HostData> hosts; /** * Create a new instance of VMRegistryBinding. @@ -78,7 +82,7 @@ List services = new ArrayList(); - // loop thru all hosts/processes/psc and + // loop thru all hosts/processes and // get serviceData objects. Iterator hosts = this.hosts.iterator(); while (hosts.hasNext()) { Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceID.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceID.java 2009-04-14 17:58:10 UTC (rev 771) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/service/api/ServiceID.java 2009-04-14 17:59:24 UTC (rev 772) @@ -26,7 +26,11 @@ public class ServiceID implements Serializable { - private long id; +/** + * + */ + private static final long serialVersionUID = 1776393684657738553L; + private long id; private String hostName; private String processName;