Author: vhalbert(a)redhat.com Date: 2009-04-14 13:58:10 -0400 (Tue, 14 Apr 2009) New Revision: 771 Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java Log: Teiid 323 - refactured, removing unused Config API classes: ProductType, ProductTypeID and ConfigurationLock Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java 2009-04-13 22:26:25 UTC (rev 770) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationObjectEditor.java 2009-04-14 17:58:10 UTC (rev 771) @@ -85,17 +85,6 @@ */ void createConfiguration(ConfigurationID configID, Collection configObjects); - - /** - * This method is used only for importing a component type - */ -// void createComponentType(ComponentType compType); - - /** - * This method is used only for importing a service definition - */ -// void createServiceComponentDefn(ServiceComponentDefn serviceDefn); - /** * Create a new Configuration instance with the specified name ID. * @param configurationName for the new configuration (may not be null). @@ -118,17 +107,6 @@ Configuration createConfiguration(String configurationName, Date creationDate, Date lastChangedDate); /** - * <p>Copy-create method - creates a deep-copy of the original configuration, - * with the new name. The new name cannot be the same as the original - * configuration's name.</p> - * - * <p>All service component definitions, all deployed components, and all - * property values will also be copied. The copies will all retain their original - * short names; their full names will reflect the new configuration name.</p> - */ - // Configuration createConfiguration(Configuration original, String newName); - - /** * Create a new ComponentType instance with the specified name. * @param classTypeCode identifies the type of class this component type should represent * @see ComponentType for type codes @@ -148,31 +126,8 @@ * @return ComponentType */ ComponentType createComponentType(ComponentType componentType, String name); - - - /** - * Create a new ProductType instance with the specified name. Use - * {@link createProductType(String, Collection, boolean, boolean)} to - * also assign legal service types to this product type. - * @param name is the name of the ProductType - * @param deployable is a boolean indicating if the type can be deployed in a configuration - * @param monitored is a boolean insdicating if the type is to be monitored - * @return ComponentType - */ -// ProductType createProductType(String name, boolean deployable, boolean monitored); /** - * Create a new ProductType instance with the specified name. - * @param name is the name of the ProductType - * @param serviceComponentTypeIDs Collection of ComponentType objects which - * indicate the service types that belong to this product type - * @param deployable is a boolean indicating if the type can be deployed in a configuration - * @param monitored is a boolean insdicating if the type is to be monitored - * @return ComponentType - */ -// ProductType createProductType(String name, Collection serviceComponentTypes, boolean deployable, boolean monitored); - - /** * Create a new ComponentTypeDefn and update the ComponentType with the new defintion. * @param type is the ComponentType the definition will be added to * @param propertyDefinition are the attributes describing this definition @@ -184,12 +139,8 @@ */ ComponentTypeDefn createComponentTypeDefn(ComponentType type, PropertyDefinition propertyDefinition, boolean isEffectiveImmediately) ; + /** - * @deprecated as of v 2.0 beta 1, use {@link #createComponentTypeDefn(ComponentType, PropertyDefinition, boolean)} - */ - ComponentTypeDefn createComponentTypeDefn(ComponentType type, PropertyDefinition propertyDefinition); - - /** * Create a new ComponentTypeDefn instance with the specified name. To create * a basic PropertyDefinition, do the following: * @@ -209,11 +160,6 @@ ComponentTypeDefn createComponentTypeDefn(ComponentTypeID typeID, PropertyDefinition propertyDefinition, boolean isEffectiveImmediately) ; /** - * @deprecated as of v 2.0 beta 1, use {@link #createComponentTypeDefn(ComponentTypeID, PropertyDefinition, boolean)} - */ - ComponentTypeDefn createComponentTypeDefn(ComponentTypeID typeID, PropertyDefinition propertyDefinition) ; - - /** * Create a new PropDefnAllowedValue that will be added to the modifiable (cloned) * PropertyDefinition that was obtained from the ComponentTypeDefn. * @param typeDefn is the ComponentTypeDefn the allowed value will be added to @@ -296,23 +242,6 @@ ServiceComponentDefn createServiceComponentDefn(Configuration configuration, ComponentTypeID typeID, String componentName, String routingUUID); /** - * Creates a new ServiceComponentDefn for a given Configuration and - * ProductServiceConfig; also automatically "deploys" the service anywhere - * that this PSC is already deployed, by creating the necessary - * DeployedComponents (this will only work if the PSC parameter belongs - * to the Configuration parameter). - * @param configuration the Configuration containing the PSC; this will - * have the new ServiceComponentDefn added to it, plus any DeployedComponents - * created for the ServiceComponentDefn - * @param typeID type of the new ServiceComponentDefn - * @param componentName name for the new ServiceComponentDefn - * @param pscID ID of the ProductServiceConfig which this ServiceComponentDefn - * will belong to - * @return new ServiceComponentDefn - */ -// ServiceComponentDefn createServiceComponentDefn(Configuration configuration, ComponentTypeID typeID, String componentName, ProductServiceConfigID pscID); - - /** * Create a new ResourceDescriptor Component Definition instance with a specified configuration * @param configurationID that the new created component definition will be a part of * @param typeID is the type of component definition to create @@ -334,16 +263,6 @@ ResourceDescriptor createResourceDescriptor(Configuration configuration, ComponentTypeID typeID, String descriptorName); /** - * Create a new ResourceDescriptor Component Definition instance - * @param typeID is the type of component definition to create - * @param componentName is the name of the component - * @return the ResourceDescriptor instance with the specified ID. - * @throws IllegalArgumentException if either of the ID or data source ID is null - */ - // ResourceDescriptor createResourceDescriptor(ComponentTypeID typeID, String componentName); - - - /** * Create a new SharedResource instance * @param typeID is the type of component definition to create * @param resourceName is the name of the shared resource @@ -352,42 +271,8 @@ */ SharedResource createSharedResource(ComponentTypeID typeID, String resourceName) ; - + /** - * Create a new DeployedComponent instance representing a deployed VM. - * The Configuration parameter <i>will</i> be updated with the new - * deployed component. - * @param instanceName is the name assigned to this instance - * @param configuration the configuration the vm is deployed within. - * @param hostId the host the vm is deployed on. - * @param vmComponentDefn is the VM component definition to be deployed. - * @return the DeployedComponent instance with the specified ID. - * @throws IllegalArgumentException if either of the IDs are null - */ -// DeployedComponent createDeployedVMComponent(String instanceName, Configuration configuration, HostID hostId, VMComponentDefn vmComponentDefn); - - /** - * Create a new DeployedComponent instance representing a deployed VM. - * This method has the advantage of allowing the creation of - * a deployed component entirely with ID objects, without needing any - * of the full objects themselves. However, it is the responsibility of - * the client that the ComponentTypeID parameter and the VMComponentDefnID - * parameter both indicate the vm type. Also, the local - * Configuration object represented by the ConfigurationID will <i>not</i> - * be updated with this new DeployedComponent object. - * @param instanceName is the name assigned to this instance - * @param configurationID the configuration the vm is deployed within. - * @param hostId the host the vm is deployed on. - * @param vmComponentDefnID is the ID of the VM component definition to be deployed. - * @param componentTypeID is the <i>type</i> of the service to be deployed - * @return the DeployedComponent instance with the specified ID. - * @throws IllegalArgumentException if either of the IDs are null - * - * @see createDeployedVMComponent(String, Configuration, HostID, VMComponentDefn) - */ - // DeployedComponent createDeployedVMComponent(String instanceName, ConfigurationID configurationID, HostID hostId, VMComponentDefnID vmComponentDefnID, ComponentTypeID vmComponentTypeID); - - /** * Create a new DeployedComponent instance respresenting a deployed Service. * This method has the advantage of allowing the creation of * a deployed component entirely with ID objects, without needing any @@ -410,82 +295,6 @@ DeployedComponent createDeployedServiceComponent(String instanceName, ConfigurationID configurationID, HostID hostId, VMComponentDefnID vmId, ServiceComponentDefnID serviceComponentDefnID, ComponentTypeID serviceComponentTypeID); /** - * Create a new DeployedComponent instance respresenting a deployed Service. - * The Configuration parameter <i>will</i> be updated with the new - * deployed component. - * @param instanceName is the name assigned to this instance - * @param configuration the vm is deployed within. - * @param hostId the host the vm is deployed in. - * @param vmId the VM that the service is deployed in. - * @param serviceComponentDefnID is the service component definition to be deployed - * @param componentTypeID is the <i>type</i> of the service to be deployed - * @return the DeployedComponent instance with the specified ID. - * @throws IllegalArgumentException if either of the IDs null - */ -// DeployedComponent createDeployedServiceComponent(String instanceName, Configuration configuration, HostID hostId, VMComponentDefnID vmId, ServiceComponentDefn serviceComponentDefn, ProductServiceConfigID pscID); - - /** - * Copy-creation method, creates a new PSC from the given PSC, with the - * new given name, and inserts it into the given Configuration. The - * configuration parameter must match the configuration which the - * original PSC belongs to. This will also deep-copy the - * ServiceComponentDefns that are grouped by the originalPSC - * parameter. - * @param configuration which the originalPSC is from, and - * which the new PSC will be put in; this will be modified - * @param originalPSC the PSC to copy from - * @param newName new String name for the new PSC - * @return newly-created ProductServiceConfig object - */ -// ProductServiceConfig createProductServiceConfig(Configuration configuration, ProductServiceConfig originalPSC, String newName); - - /** - * Copy-creation method, creates a new PSC from the given PSC, with the - * new given name, and inserts it into the target Configuration. Any - * ServiceComponentDefns grouped by the originalPSC will be deep-copied - * to the targetConfiguration. - * The originConfiguration parameter must be the Configuration which the - * orignalPSC originates from (because it must contain the - * ServiceComponentDefns which are grouped by the originalPSC). - * @param targetConfiguration to put the new PSC in; this will be modified - * @param originConfiguration which the originalPSC exists in - this is - * needed to retrieve any original ServiceComponentDefns from - * @param originalPSC the PSC to copy from - * @param newName new String name for the new PSC - * @return newly-created ProductServiceConfig object - */ - // ProductServiceConfig createProductServiceConfig(Configuration targetConfiguration, Configuration originConfiguration, ProductServiceConfig originalPSC, String newName); - - /** - * Allows the creation of an empty ProductServiceConfig entirely from - * ID objects. Use {@link #addServiceComponentDefn} or - * {@link #removeServiceComponentDefn} in conjuncture with this method. - */ - // ProductServiceConfig createProductServiceConfig(ConfigurationID configurationID, ProductTypeID productTypeID, String componentName); - - /** - * Allows the creation of an empty ProductServiceConfig entirely from - * ID objects. Use {@link #addServiceComponentDefn} or - * {@link #removeServiceComponentDefn} in conjuncture with this method. - */ -// ProductServiceConfig createProductServiceConfig(Configuration configuration, ProductTypeID productTypeID, String componentName); - - /** - * Deploys the ServiceComponentDefns indicated by the ProductServiceConfig, - * contained by the Configuration, onto the specified Host and VM. - * @param configuration the Configuration which contains the - * ServiceComponentDefns, the ProductServiceConfig, and the VMComponentDefn - * @param psc the ProductServiceConfig which groups the ServiceComponentDefns - * to be deployed - * @param hostId ID of the host on which the services will be deployed - * @param vmId ID of the VMComponentDefn on which the services will be - * deployed - * @return Collection of DeployedComponent objects, each representing - * one of the deployed ServiceComponentDefns - */ - // Collection deployProductServiceConfig(Configuration configuration, ProductServiceConfig psc, HostID hostId, VMComponentDefnID vmId); - - /** * Deploys a ServiceComponentDefn to the specified VM. * This method is harmless to call if the * ServiceComponentDefn is already deployed. It is @@ -519,7 +328,7 @@ void setRoutingUUID(ServiceComponentDefn serviceComponentDefn, String newRoutingUUID); /** - * <p>Sets whether the indicated ServiceComponentDefn is enabled for deployment + * <p>Sets whether the indicated ServiceComponentDefn is enabled for starting * (when the PSC which contains it is * {@link #deployProductServiceConfig deployed}) or not. This method * can also either automatically create the necessary @@ -575,16 +384,15 @@ * @see #deployProductServiceConfig deployProductServiceConfig */ +// +// DeployedComponent setEnabled(Configuration configuration, ServiceComponentDefn serviceComponentDefn, VMComponentDefn vm, boolean enabled) +// throws ConfigurationException; - DeployedComponent setEnabled(Configuration configuration, ServiceComponentDefn serviceComponentDefn, VMComponentDefn vm, boolean enabled) - throws ConfigurationException; - /** - * It simply updates the DeployedComponent by setting the specified service - * enabled value. + * It updates the DeployedComponent by setting its enabled flag. */ - DeployedComponent setEnabled(ServiceComponentDefnID serviceComponentDefnID, DeployedComponent deployComponent, boolean enabled); + DeployedComponent setEnabled(DeployedComponent deployComponent, boolean enabled); /** Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java 2009-04-13 22:26:25 UTC (rev 770) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java 2009-04-14 17:58:10 UTC (rev 771) @@ -1718,18 +1718,11 @@ } - public DeployedComponent setEnabled(ServiceComponentDefnID serviceComponentDefnID, DeployedComponent deployedcomponent, boolean enabled) { - if ( serviceComponentDefnID == null ) { - throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, ServiceComponentDefnID.class.getName())); - } + public DeployedComponent setEnabled(DeployedComponent deployedcomponent, boolean enabled) { if ( deployedcomponent == null ) { throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, DeployedComponent.class.getName())); } - if (!deployedcomponent.getDeployedComponentDefnID().equals(serviceComponentDefnID)) { - return deployedcomponent; - } - boolean oldEnabled = deployedcomponent.isEnabled(); //if a change is not being made to the enabled value, this whole method //will be essentially bypassed @@ -1738,9 +1731,8 @@ BasicDeployedComponent basicDC = (BasicDeployedComponent) verifyTargetClass(deployedcomponent,BasicDeployedComponent.class); basicDC.setIsEnabled(enabled); - createExchangeAction(basicDC.getID(),ConfigurationModel.Attribute.IS_ENABLED, serviceComponentDefnID, Boolean.valueOf(enabled)); + createExchangeAction(basicDC.getID(),ConfigurationModel.Attribute.IS_ENABLED, deployedcomponent.getDeployedComponentDefnID(), Boolean.valueOf(enabled)); - return basicDC; } //end if enabled!= oldEnabled @@ -1748,171 +1740,31 @@ return deployedcomponent; } - - public DeployedComponent setEnabled(Configuration configuration, ServiceComponentDefn serviceComponentDefn, VMComponentDefn vm, boolean enabled) - throws ConfigurationException { - if ( configuration == null ) { - throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, Configuration.class.getName())); - } - if ( serviceComponentDefn == null ) { - throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, ServiceComponentDefn.class.getName())); - } - if ( vm == null ) { - throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, VMComponentDefn.class.getName())); - } - - ServiceComponentDefnID svcID = (ServiceComponentDefnID) serviceComponentDefn.getID(); - - DeployedComponent dc = configuration.getDeployedServiceForVM(svcID, vm); - return this.setEnabled(svcID, dc, enabled); - - - //if a change is not being made to the enabled value, this whole method - //will be essentially bypassed -// if (enabled != dc.isEnabled()){ -// dc = this.setEnabled(svcID, dc, enabled); // -// BasicConfiguration targetConfig = (BasicConfiguration) verifyTargetClass(configuration,BasicConfiguration.class); -// -// -// // if disabling and there are deployed components, then undeploy the components -// if (!enabled && deleteDeployedComps) { -// -// if (!deps.isEmpty()) { -// DeployedComponent deployedService; -// DeployedComponentID deployedServiceID; -// result = new ArrayList(deps.size()); -// for (Iterator it=deps.iterator(); it.hasNext(); ) { -// deployedService = (DeployedComponent) it.next(); -// deployedServiceID = (DeployedComponentID) deployedService.getID(); -// -// this.createDestroyAction(deployedServiceID, deployedService); -// targetConfig.removeComponentObject(deployedServiceID ); -// -// DeployedComponent ds = targetConfig.getDeployedComponent(deployedServiceID); -// if (ds != null) { -// throw new ConfigurationException("Deployed Component " + deployedServiceID + " was not removed"); //$NON-NLS-1$ //$NON-NLS-2$ -// } -// DeployedComponent newService = (DeployedComponent) deployedService.clone(); -// result.add(newService); -// } -// } -// } else if (enabled){ -// //we must automagically create DeployedComponents for the newly- -// //enabled service defn, wherever its PSC has already been deployed -// ProductServiceConfigID pscID = (ProductServiceConfigID) psc.getID(); -// result = this.deployServiceDefn(targetConfig,serviceComponentDefn,pscID); -// -// } -// -// //this will overwrite the service if it already is in the Configuration -// targetConfig.addComponentDefn(psc); -// -// } //end if enabled!= oldEnabled -// if (result == null){ -// result = Collections.EMPTY_LIST; -// +// public DeployedComponent setEnabled(Configuration configuration, ServiceComponentDefn serviceComponentDefn, VMComponentDefn vm, boolean enabled) +// throws ConfigurationException { +// if ( configuration == null ) { +// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, Configuration.class.getName())); // } -// return result; - - - } - - -// public Configuration addHostComponent(Configuration t, Host host) { -// -// BasicConfiguration target = (BasicConfiguration) verifyTargetClass(t,BasicConfiguration.class); -// -// target.addHost(host); -// -// createCreationAction(host.getID(), host); -// -// return target; -// } - - - /** - * Adds an existing ServiceComponentDefn to indicated PSC; the - * ServiceComponentDefn is assumed to already belong to the indicated - * Configuration. The ServiceComponentDefn will be removed from - * any PSC it previously belonged to. - * @param configuration the Configuration containing the - * ServiceComponentDefn - * @param psc ProductServiceConfig to have service comp defn added to - * @param serviceComponentDefnID will be added to the indicated - * ProductServiceConfiguration (and removed from any PSC it previously - * belonged to). - */ -// public ProductServiceConfig addServiceComponentDefn(Configuration configuration, ProductServiceConfig psc, ServiceComponentDefnID serviceComponentDefnID){ -// return this.addServiceComponentDefn(psc, serviceComponentDefnID); -// } - - /** - * Adds an existing ServiceComponentDefn to indicated PSC. - * The ServiceComponentDefn will be removed from - * any PSC it previously belonged to. - - * @param psc ProductServiceConfig to have service comp defn added to - * @param serviceComponentDefnID will be added to the indicated - * ProductServiceConfiguration (and removed from any PSC it previously - * belonged to). - */ -// public ProductServiceConfig addServiceComponentDefn(ProductServiceConfig psc, ServiceComponentDefnID serviceComponentDefnID){ -// if ( psc == null ) { -// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, ProductServiceConfig.class.getName())); +// if ( serviceComponentDefn == null ) { +// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, ServiceComponentDefn.class.getName())); // } -// if ( serviceComponentDefnID == null ) { -// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, ServiceComponentDefnID.class.getName())); +// if ( vm == null ) { +// throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0089, VMComponentDefn.class.getName())); // } // -// BasicProductServiceConfig basicPSC = (BasicProductServiceConfig) verifyTargetClass(psc,BasicProductServiceConfig.class); -// basicPSC.addServiceComponentDefnID(serviceComponentDefnID); +// ServiceComponentDefnID svcID = (ServiceComponentDefnID) serviceComponentDefn.getID(); // -// //todo get old PSC of this service defn -// //ProductServiceConfigID oldValue = serviceComponentDefn.getParentComponentTypeID(); -// createExchangeAction(serviceComponentDefnID,ConfigurationModel.Attribute.PSC_NAME, null, basicPSC.getID()); +// DeployedComponent dc = configuration.getDeployedServiceForVM(svcID, vm); +// return this.setEnabled(dc, enabled); // // -// ProductServiceConfig newDefn = (ProductServiceConfig) basicPSC.clone(); -// return newDefn; -// } - - /** - * Adds the service type represented by the indicated ComponentType to - * the list of legal service types of the indicated ProductType. - * @param productType ProductType to have a new service type added to - * @param serviceComponentType ComponentType to be added to the - * ProductType - */ -// public ProductType addServiceComponentType(ProductType productType, ComponentType serviceComponentType){ -// BasicProductType basicProdType = (BasicProductType)productType; // -// ComponentTypeID productTypeID = (ComponentTypeID)basicProdType.getID(); -// this.setParentComponentTypeID(serviceComponentType, productTypeID); -// //add the service ComponentTypeID to the BasicProductType -// basicProdType.addServiceTypeID((ComponentTypeID)serviceComponentType.getID()); -// -// return basicProdType; // } - /** - * Removes the service type represented by the indicated ComponentType from - * the list of legal service types of the indicated ProductType. - * @param productType ProductType to have the service type taken from - * @param serviceComponentType ComponentType to be taken from the - * ProductType - */ -// public ProductType removeServiceComponentType(ProductType productType, ComponentType serviceComponentType){ -// BasicProductType basicProdType = (BasicProductType)productType; -// -// ComponentTypeID productTypeID = (ComponentTypeID)basicProdType.getID(); -// this.setParentComponentTypeID(serviceComponentType, productTypeID); -// //add the service ComponentTypeID to the BasicProductType -// basicProdType.removeServiceTypeID((ComponentTypeID)serviceComponentType.getID()); -// -// return basicProdType; -// } + + /** * Sets the LogConfiguration in effect for the Configuration */