Author: vhalbert(a)redhat.com Date: 2009-04-11 20:31:57 -0400 (Sat, 11 Apr 2009) New Revision: 756 Added: branches/remove_psc/common-internal/src/test/resources/properties.cdk Removed: branches/remove_psc/common-internal/XMLElementNames.java Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationModelContainer.java 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/ConfigurationModelContainerImpl.java branches/remove_psc/common-internal/src/test/java/com/metamatrix/common/config/xml/TestXMLConfigurationImportExportUtility.java Log: Teiid 323 - refactured the xml configuration classes to simplify importing/exporting and to clean up the removal of psc, resourcepool and product type related info Deleted: branches/remove_psc/common-internal/XMLElementNames.java =================================================================== --- branches/remove_psc/common-internal/XMLElementNames.java 2009-04-11 17:17:48 UTC (rev 755) +++ branches/remove_psc/common-internal/XMLElementNames.java 2009-04-12 00:31:57 UTC (rev 756) @@ -1,746 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.config.xml; - -import com.metamatrix.common.config.util.ConfigurationPropertyNames; - -/** -* This class structure mimics the structure of a Configuration XML -* document and defines all of the element and attribute names for that -* document type. -*/ -public interface XMLElementNames { - - /** - * This is used as the delimiter of all XML element names. - */ - public static final String DELIMITER = "."; //$NON-NLS-1$ - - /** - * This should be the root Element name for all Configuration XML Documents. - */ - // public static final String ELEMENT = "ConfigurationDocument"; //$NON-NLS-1$ - - /** - * This is the class that represents the Configurations Element which contains - * all of the XML elements that represent Configuration objects. - */ - - /** - * This is the class that represents the Configuration Element which contains - * all of the XML elements that represent a Configuration object. - */ - public static class Configuration { - - /** - * This is the name of the Configurations Element. - */ - public static final String ELEMENT = "Configuration"; //$NON-NLS-1$ - /** - * This is the class that represents the ServiceComponentDefns Element which contains - * all of the XML elements that represent a ServiceComponentDefns object. - */ - public static class ServiceComponentDefns { - - /** - * This is the name of the ServiceComponentDefns Element. - */ - public static final String ELEMENT = Configuration.ELEMENT + DELIMITER + "ServiceComponentDefns"; //$NON-NLS-1$ - - /** - * This is the class that represents the ServiceComponentDefn Element which contains - * all of the XML elements that represent a ServiceComponentDefn object. - */ - public static class ServiceComponentDefn { - - /** - * This is the name of the ServiceComponentDefn Element. - */ - public static final String ELEMENT = "ServiceComponentDefn"; //$NON-NLS-1$ - - public static class Attributes extends ComponentObject.Attributes{ - public static final String ROUTING_UUID = "routingUUID"; //$NON-NLS-1$ - } - } - } - - - /** - * This is the class that represents the VMComponentDefns Element which contains - * all of the XML elements that represent a VMComponentDefns object. - */ - public static class VMComponentDefns { - - /** - * This is the name of the VMComponentDefns Element. - */ - public static final String ELEMENT = Configuration.ELEMENT + DELIMITER +"VMComponentDefns"; //$NON-NLS-1$ - - /** - * This is the class that represents the VMComponentDefn Element which contains - * all of the XML elements that represent a VMComponentDefn object. - */ - public static class VMComponentDefn { - - /** - * This is the name of the VMComponentDefn Element. - */ - public static final String ELEMENT = "VMComponentDefn"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ComponentObject.Attributes{ - } - } - } - - - - /** - * This is the class that represents the DeployedComponents Element which contains - * all of the XML elements that represent a DeployedComponents object. - */ - public static class DeployedComponents { - - /** - * This is the name of the DeployedComponents Element. - */ - public static final String ELEMENT = Configuration.ELEMENT + DELIMITER + "DeployedComponents"; //$NON-NLS-1$ - - /** - * This is the class that represents the DeployedComponent Element which contains - * all of the XML elements that represent a DeployedComponent object. - */ - public static class DeployedComponent { - - /** - * This is the name of the DeployedComponent Element. - */ - public static final String ELEMENT = "DeployedComponent"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ComponentObject.Attributes{ - public static final String HOST_ID = "HostID"; //$NON-NLS-1$ -// public static final String PRODUCT_SERVICE_CONFIG_ID = "ProductServiceConfigID"; //$NON-NLS-1$ - public static final String SERVICE_COMPONENT_DEFN_ID = "ServiceComponentDefnID"; //$NON-NLS-1$ - public static final String VM_COMPONENT_DEFN_ID = "VMComponentDefnID"; //$NON-NLS-1$ - } - } - } - - - /** - * This is the class that represents the ComponentDefnID Element which contains - * all of the XML elements that represent a ComponentDefnID object. - */ - public static final class ComponentDefnID{ - - /** - * This is the name of the ComponentDefnID Element. - */ - public static final String ELEMENT = "ComponentDefnID"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ID.Attributes { - } - } - - /** - * This is the class that represents the DeployedComponentID Element which contains - * all of the XML elements that represent a DeployedComponentID object. - */ - public static final class DeployedComponentID{ - - /** - * This is the name of the DeployedComponentID Element. - */ - public static final String ELEMENT = "DeployedComponentID"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ID.Attributes { - } - } - - /** - * This is the class that represents the ProductServiceConfigID Element which contains - * all of the XML elements that represent a ProductServiceConfigID object. - */ -// public static final class ProductServiceConfigID{ -// -// /** -// * This is the name of the ProductServiceConfigID Element. -// */ -// public static final String ELEMENT = "ProductServiceConfigID"; //$NON-NLS-1$ -// -// /** -// * This class defines the Attributes of the Element class that -// * contains it. Note that this class just inherits its attributes -// * from its configuration object superclass. -// */ -// public static class Attributes extends ID.Attributes { -// } -// } - - /** - * This is the class that represents the VMComponentDefnID Element which contains - * all of the XML elements that represent a VMComponentDefnID object. - */ - public static final class VMComponentDefnID{ - - /** - * This is the name of the VMComponentDefnID Element. - */ - public static final String ELEMENT = "VMComponentDefnID"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ID.Attributes { - } - } - - /** - * This is the class that represents the VMComponentDefnID Element which contains - * all of the XML elements that represent a VMComponentDefnID object. - */ - public static final class ServiceComponentDefnID{ - - /** - * This is the name of the ServiceComponentDefnID Element. - */ - public static final String ELEMENT = "ServiceComponentDefnID"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ID.Attributes { - } - } - - /** - * This is the class that represents the ConfigurationInfo Element which contains - * all of the XML elements that represent a ConfigurationInfo object. - */ - public static class ConfigurationInfo { - - /** - * This is the name of the ServiceComponentDefnID Element. - */ - public static final String ELEMENT = "ConfigurationInfo"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. - */ - public static class Attributes { - public static final String LAST_CHANGED_DATE = "LastChangedDate"; //$NON-NLS-1$ - public static final String CREATION_DATE = "CreationDate"; //$NON-NLS-1$ - } - } - - /** - * This is the class that represents the LogConfiguration Element which contains - * all of the XML elements that represent a LogConfiguration object. - */ - public static class LogConfiguration { - - /** - * This is the name of the LogConfiguration Element. - */ - public static final String ELEMENT = "LogConfiguration"; //$NON-NLS-1$ - - } - - } - // } - - /** - * This is the class that represents the ComponentObject Element which contains - * all of the XML elements that represent a ComponentObject object. - */ - public static class ComponentObject { - public static class Attributes { - public static final String NAME = "Name"; //$NON-NLS-1$ - public static final String COMPONENT_TYPE = "ComponentType"; //$NON-NLS-1$ - } - } - - /** - * This is the class that represents the Properties Element which contains - * all of the XML elements that represent a Properties object. - */ - public static class Properties { - - /** - * This is the name of the Properties Element. - */ - public static final String ELEMENT = "Properties"; //$NON-NLS-1$ - - /** - * This is the class that represents the Property Element which contains - * all of the XML elements that represent a Property object. - */ - public static class Property { - - /** - * This is the name of the Property Element. - */ - public static final String ELEMENT = "Property"; //$NON-NLS-1$ - - - /** - * This class defines the Attributes of the Element class that - * contains it. - */ - public static class Attributes { - public static final String NAME = "Name"; //$NON-NLS-1$ - } - - } - } - - /** - * This is the class that represents the ChangeHistory Properties Element which contains - * all of the XML elements that represent the change information for the object. - */ - public static class ChangeHistory { - - /** - * This is the name of the ChangeHistory Element. - */ - public static final String ELEMENT = "ChangeHistory"; //$NON-NLS-1$ - - /** - * This is the class that represents the Property Element which contains - * all of the XML elements that represent a Property object. - */ - public static class Property { - - /** - * This is the name of the Property Element. - */ - public static final String ELEMENT = "Property"; //$NON-NLS-1$ - - - /** - * This class defines the Attributes of the Element class that - * contains it. - */ - public static class Attributes { - public static final String NAME = "Name"; //$NON-NLS-1$ - } - - public static class NAMES { - public static final String LAST_CHANGED_DATE = "LastChangedDate"; //$NON-NLS-1$ - public static final String LAST_CHANGED_BY = "LastChangedBy"; //$NON-NLS-1$ - public static final String CREATION_DATE = "CreationDate"; //$NON-NLS-1$ - public static final String CREATED_BY = "CreatedBy"; //$NON-NLS-1$ - - } - } - } - - - /** - * This is the class that represents the ID Element which contains - * all of the XML elements that represent a ID object. - */ - public static class ID { - // these are the shared attributes of all ID Elements - - /** - * This class defines the Attributes of the Element class that - * contains it. - */ - public static class Attributes { - public static final String NAME = "Name"; //$NON-NLS-1$ - } - } - - - /** - * This is the class that represents the HostID Element which contains - * all of the XML elements that represent a HostID object. - */ - public static final class HostID { - - /** - * This is the name of the HostID Element. - */ - public static final String ELEMENT = "HostID"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ID.Attributes { - } - } - - - - - - /** - * This is the class that represents the Hosts Element which contains - * all of the XML elements that represent a Hosts object. - */ -// public static class Hosts { -// -// /** -// * This is the name of the Hosts Element. -// */ -// public static final String ELEMENT = "Hosts"; //$NON-NLS-1$ -// -// /** -// * This is the class that represents the Host Element which contains -// * all of the XML elements that represent a Host object. -// */ -// public static class Host { -// -// /** -// * This is the name of the Host Element. -// */ -// public static final String ELEMENT = "Host"; //$NON-NLS-1$ -// -// } -// } - - /** - * This is the class that represents the Resources Element which contains - * all of the XML elements that represent a Resource object. - */ - public static class Resources { - - /** - * This is the name of the Hosts Element. - */ - public static final String ELEMENT = "Resources"; //$NON-NLS-1$ - - /** - * This is the class that represents the Resource Element which contains - * all of the XML elements that represent a Resource object. - */ - public static class Resource { - - /** - * This is the name of the Resource Element. - */ - public static final String ELEMENT = "Resource"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ComponentObject.Attributes{ - } - - - } - } - - /** - * This is the class that represents the ServiceComponentDefns Element which contains - * all of the XML elements that represent a ServiceComponentDefns object. - */ - public static class ConnectorComponents { - - /** - * This is the name of the ServiceComponentDefns Element. - */ - public static final String ELEMENT = "ConnectorBindings"; //$NON-NLS-1$ - - /** - * This is the class that represents the ConnectorBinding Element which contains - * all of the XML elements that represent a ConnectorBinding object. - */ - public static class ConnectorComponent { - - /** - * This is the name of the ConnectorBinding Element. - */ - public static final String ELEMENT = "Connector"; //$NON-NLS-1$ - - public static class Attributes extends ComponentObject.Attributes{ - public static final String QUEUED_SERVICE = "QueuedService"; //$NON-NLS-1$ -// public static final String IS_ENABLED = "IsEnabled"; - public static final String ROUTING_UUID = "routingUUID"; //$NON-NLS-1$ - } - } - } - - - - /** - * This is the class that represents the ComponentTypeID Element which contains - * all of the XML elements that represent a ComponentTypeID object. - */ - public static class ComponentTypeID { - - /** - * This is the name of the ComponentTypeID Element. - */ - public static final String ELEMENT = "ComponentTypeID"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. Note that this class just inherits its attributes - * from its configuration object superclass. - */ - public static class Attributes extends ID.Attributes { - } - - } - - /** - * This is the class that represents the ComponentTypes Element which contains - * all of the XML elements that represent a ComponentTypes object. - */ - public static class ComponentTypes { - - /** - * This is the name of the ComponentTypes Element. - */ - public static final String ELEMENT = "ComponentTypes"; //$NON-NLS-1$ - - /** - * This is the class that represents the ComponentType Element which contains - * all of the XML elements that represent a ComponentType object. - */ - public static class ComponentType { - - /** - * This is the name of the ComponentType Element. - */ - public static final String ELEMENT = "ComponentType"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. - */ - public static class Attributes { - public static final String NAME = "Name"; //$NON-NLS-1$ - public static final String PARENT_COMPONENT_TYPE = "ParentComponentType"; //$NON-NLS-1$ - public static final String SUPER_COMPONENT_TYPE = "SuperComponentType"; //$NON-NLS-1$ - public static final String COMPONENT_TYPE_CODE = "ComponentTypeCode"; //$NON-NLS-1$ - public static final String DEPLOYABLE = "Deployable"; //$NON-NLS-1$ - public static final String DEPRECATED = "Deprecated"; //$NON-NLS-1$ - public static final String MONITORABLE = "Monitorable"; //$NON-NLS-1$ - } - - - /** - * This is the class that represents the ComponentTypeDefn Element which contains - * all of the XML elements that represent a ComponentTypeDefn object. - */ - public static class ComponentTypeDefn { - - /** - * This is the name of the ComponentTypeDefn Element. - */ - public static final String ELEMENT = "ComponentTypeDefn"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. - */ - public static class Attributes { - public static final String DEPRECATED = "Deprecated"; //$NON-NLS-1$ - } - - /** - * This is the class that represents the PropertyDefinition Element which contains - * all of the XML elements that represent a PropertyDefinition object. - */ - public static class PropertyDefinition { - - /** - * This is the name of the PropertyDefinition Element. - */ - public static final String ELEMENT = "PropertyDefinition"; //$NON-NLS-1$ - - /** - * This class defines the Attributes of the Element class that - * contains it. - */ - public static class Attributes { - public static final String NAME = "Name"; //$NON-NLS-1$ - public static final String DISPLAY_NAME = "DisplayName"; //$NON-NLS-1$ - public static final String SHORT_DESCRIPTION ="ShortDescription"; //$NON-NLS-1$ - public static final String DEFAULT_VALUE = "DefaultValue"; //$NON-NLS-1$ - public static final String MULTIPLICITY = "Multiplicity"; //$NON-NLS-1$ - public static final String PROPERTY_TYPE = "PropertyType"; //$NON-NLS-1$ - public static final String VALUE_DELIMITER = "ValueDelimiter"; //$NON-NLS-1$ - public static final String IS_CONSTRAINED_TO_ALLOWED_VALUES = "IsConstrainedToAllowedValues"; //$NON-NLS-1$ - public static final String IS_EXPERT = "IsExpert"; //$NON-NLS-1$ - public static final String IS_HIDDEN = "IsHidden"; //$NON-NLS-1$ - public static final String IS_MASKED = "IsMasked"; //$NON-NLS-1$ - public static final String IS_MODIFIABLE = "IsModifiable"; //$NON-NLS-1$ - public static final String IS_PREFERRED = "IsPreferred"; //$NON-NLS-1$ - } - - /** - * This is the class that represents the AllowedValue Element which contains - * all of the XML elements that represent a AllowedValue object. - */ - public static class AllowedValue { - - /** - * This is the name of the AllowedValue Element. - */ - public static final String ELEMENT = "AllowedValue"; //$NON-NLS-1$ - } - - } - - } - } - } - - /** - * This is the class that represents the ProductTypes Element which contains - * all of the XML elements that represent a ProductType object. - */ -// public static class ProductTypes { -// public static final String ELEMENT = "ProductTypes"; //$NON-NLS-1$ -// -// /** -// * This is the class that represents the ProductType Element which contains -// * all of the XML elements that represent a ProductType object. -// * Note that it extends teh ComponentType element definition. -// */ -// public static class ProductType extends ComponentTypes.ComponentType{ -// public static final String ELEMENT = "ProductType"; //$NON-NLS-1$ -// } -// } - - - - - /** - * This is the class that represents the Header Element which contains - * all of the XML elements that represent a Header object. - */ - public static class Header { - - /** - * This is the name of the Header Element. - */ - public static final String ELEMENT = "Header"; //$NON-NLS-1$ - - /** - * This is the class that represents the UserName Element which contains - * all of the XML elements that represent a UserName object. - */ - public static class UserCreatedBy { - - /** - * This is the name of the UserName Element. - */ - public static final String ELEMENT = ConfigurationPropertyNames.USER_CREATED_BY; - } - - /** - * This is the class that represents the ApplicationCreatedDate Element which contains - * all of the XML elements that represent a ApplicationCreatedDate object. - */ - public static class ApplicationCreatedBy { - - /** - * This is the name of the ApplicationCreatedDate Element. - */ - public static final String ELEMENT = ConfigurationPropertyNames.APPLICATION_CREATED_BY; - } - - /** - * This is the class that represents the ApplicationVersionCreatedBy Element which contains - * all of the XML elements that represent a ApplicationVersionCreatedBy object. - */ - public static class ApplicationVersionCreatedBy { - - /** - * This is the name of the ApplicationVersionCreatedBy Element. - */ - public static final String ELEMENT = ConfigurationPropertyNames.APPLICATION_VERSION_CREATED_BY; - } - - /** - * This is the class that represents the Time Element which contains - * all of the XML elements that represent a Time object. - */ - public static class Time { - - /** - * This is the name of the Time Element. - */ - public static final String ELEMENT = ConfigurationPropertyNames.TIME; - } - - /** - * This is the class that represents the DocumentTypeVersion Element which contains - * all of the XML elements that represent a DocumentTypeVersion object. - */ - public static class ConfigurationVersion { - - /** - * This is the name of the DocumentTypeVersion Element. - */ - public static final String ELEMENT = ConfigurationPropertyNames.CONFIGURATION_VERSION; - } - - /** - * This is the class that represents the MetaMatrixServerVersion Element which contains - * all of the XML elements that represent a ProductServiceConfigs object. - */ - public static class MetaMatrixSystemVersion { - - /** - * This is the name of the MetaMatrixServerVersion Element. - */ - public static final String ELEMENT = ConfigurationPropertyNames.METAMATRIX_SYSTEM_VERSION; - } - } - - -} Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationModelContainer.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationModelContainer.java 2009-04-11 17:17:48 UTC (rev 755) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConfigurationModelContainer.java 2009-04-12 00:31:57 UTC (rev 756) @@ -100,7 +100,6 @@ * @since 4.1 */ ComponentTypeDefn getComponentTypeDefinition(ComponentTypeID typeID, String defnName); - /** * Return the ComponentType for the specified name 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-11 17:17:48 UTC (rev 755) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java 2009-04-12 00:31:57 UTC (rev 756) @@ -2785,11 +2785,12 @@ //we must automagically create DeployedComponents for the newly- //enabled service defn, wherever its PSC has already been deployed DeployedComponent aDeployedComponent = null; - HostID hostID = null; + ConfigurationID configID = (ConfigurationID)targetConfig.getID(); ServiceComponentDefnID serviceDefnID = (ServiceComponentDefnID)basicService.getID(); VMComponentDefn vm = targetConfig.getVMComponentDefn(vmID); + HostID hostID = vm.getHostID(); DeployedComponent deployComponent = targetConfig.getDeployedServiceForVM( serviceDefnID, vm); // if its not deployed, deploy it Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java =================================================================== --- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java 2009-04-11 17:17:48 UTC (rev 755) +++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java 2009-04-12 00:31:57 UTC (rev 756) @@ -295,9 +295,11 @@ return getSuperComponentTypeDefinitions(defnMap, defns, superType); } - + - public ComponentType getComponentType(String fullName) { + + + public ComponentType getComponentType(String fullName) { if (compTypes.containsKey(fullName)) { return (ComponentType) compTypes.get(fullName); } Modified: branches/remove_psc/common-internal/src/test/java/com/metamatrix/common/config/xml/TestXMLConfigurationImportExportUtility.java =================================================================== --- branches/remove_psc/common-internal/src/test/java/com/metamatrix/common/config/xml/TestXMLConfigurationImportExportUtility.java 2009-04-11 17:17:48 UTC (rev 755) +++ branches/remove_psc/common-internal/src/test/java/com/metamatrix/common/config/xml/TestXMLConfigurationImportExportUtility.java 2009-04-12 00:31:57 UTC (rev 756) @@ -34,10 +34,10 @@ import junit.framework.TestCase; import com.metamatrix.common.config.api.Configuration; -import com.metamatrix.common.config.api.ConfigurationID; import com.metamatrix.common.config.api.ConfigurationModelContainer; import com.metamatrix.common.config.api.ConfigurationObjectEditor; import com.metamatrix.common.config.api.ConnectorArchive; +import com.metamatrix.common.config.api.ConnectorBinding; import com.metamatrix.common.config.api.ConnectorBindingType; import com.metamatrix.common.config.api.ExtensionModule; import com.metamatrix.common.config.api.VMComponentDefn; @@ -45,7 +45,7 @@ import com.metamatrix.common.config.model.BasicConnectorArchive; import com.metamatrix.common.config.model.BasicExtensionModule; import com.metamatrix.common.config.model.ConfigurationModelContainerAdapter; -import com.metamatrix.common.config.model.ConfigurationModelContainerImpl; +import com.metamatrix.common.config.util.ConfigurationImportExportUtility; import com.metamatrix.common.util.ByteArrayHelper; import com.metamatrix.core.util.FileUtils; import com.metamatrix.core.util.UnitTestUtil; @@ -339,6 +339,46 @@ } } + public void testloadConnectorBindingAndType() throws Exception { + ConfigurationObjectEditor editor = new BasicConfigurationObjectEditor(); + ConfigurationImportExportUtility utility= new XMLConfigurationImportExportUtility(); + + String filename = UnitTestUtil.getTestDataPath() + File.separator+ "properties.cdk"; + + InputStream in = new FileInputStream(filename); + + Object[] bandt = utility.importConnectorBindingAndType(in, editor, null); + + if (bandt == null || bandt.length != 2) { + fail("didnt import both, binding and type"); + } + if ( bandt[1] instanceof ConnectorBinding) { + + } else { + fail("Not connector binding instance"); + } + if ( bandt[0] instanceof ConnectorBindingType) { + + } else { + fail("No connector type instance"); + } + } + + public void testloadConnectorBinding() throws Exception { + ConfigurationObjectEditor editor = new BasicConfigurationObjectEditor(); + ConfigurationImportExportUtility utility= new XMLConfigurationImportExportUtility(); + + String filename = UnitTestUtil.getTestDataPath() + File.separator+ "properties.cdk"; + + InputStream in = new FileInputStream(filename); + + ConnectorBinding cb = utility.importConnectorBinding(in, editor, null); + + if (cb == null) { + fail("didnt import binding"); + } + } + public void testImportExportConfig() throws Exception { String fileToImport = UnitTestUtil.getTestDataPath()+"/config-original.xml"; //$NON-NLS-1$ Added: branches/remove_psc/common-internal/src/test/resources/properties.cdk =================================================================== --- branches/remove_psc/common-internal/src/test/resources/properties.cdk (rev 0) +++ branches/remove_psc/common-internal/src/test/resources/properties.cdk 2009-04-12 00:31:57 UTC (rev 756) @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ConfigurationDocument> + <Header> + <ApplicationCreatedBy>Connec</ApplicationCreatedBy> + <ApplicationVersionCreatedBy>4.0:1681</ApplicationVersionCreatedBy> + <UserCreatedBy>MetaMatrixAdmin</UserCreatedBy> + <DocumentTypeVersion>1.0</DocumentTypeVersion> + <MetaMatrixSystemVersion>3.0</MetaMatrixSystemVersion> + <Time>2004-01-30T15:22:05.296-06:00</Time> + </Header> + <ComponentTypes> + <ComponentType Name="Oracle 8 JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors"> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" Multiplicity="1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="false" IsExpert="false" IsHidden="false" IsMasked="true" IsModifiable="true" IsPreferred="true" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximun number of connections for the connection pool" DefaultValue="5" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" Multiplicity="1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Pool Shrinking Enabled" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="false" Multiplicity="0..1" PropertyType="Boolean" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" Multiplicity="1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="false" IsExpert="false" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="true" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximun number of connections for each connector ID for the connection pool" DefaultValue="5" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory" Multiplicity="0..1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false" Multiplicity="0..1" PropertyType="Boolean" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.oracle.OracleDriver" Multiplicity="1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="false" IsExpert="false" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue="" Multiplicity="0..1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8ResultsTranslator" Multiplicity="0..1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8SQLTranslator" Multiplicity="0..1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJbase.jar;extensionjar:MJutil.jar;extensionjar:MJoracle.jar;extensionjar:jdbcconn.jar" Multiplicity="1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="false" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8Capabilities" Multiplicity="0..1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:&lt;port1521&gt;;SID=&lt;sid&gt;" Multiplicity="1" PropertyType="String" ValueDelimiter="," IsConstrainedToAllowedValues="false" IsExpert="false" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="true" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries. A value &lt;= 0 indicates batching is OFF." DefaultValue="0" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="false" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ComponentTypeDefn Deprecated="false"> + <PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" /> + </ComponentTypeDefn> + <ChangeHistory> + <Property Name="LastChangedBy">ConfigurationStartup</Property> + <Property Name="CreatedBy">ConfigurationStartup</Property> + </ChangeHistory> + </ComponentType> + </ComponentTypes> + <ConnectorBindings> + <Connector Name="SOAPTest" ComponentType="Oracle 8 JDBC Connector" QueuedService="false"> + <Properties> + <Property Name="property1">PropVal1</Property> + <Property Name="property2">PropVal2</Property> + <Property Name="property3">com.metamatrix.cdk.propertyVal</Property> + </Properties> + <ChangeHistory> + <Property Name="LastChangedBy">metamatrixadmin</Property> + <Property Name="LastChangedDate">2004-01-30T15:20:14.968-06:00</Property> + <Property Name="CreatedBy">metamatrixadmin</Property> + <Property Name="CreationDate">2004-01-30T15:20:14.968-06:00</Property> + </ChangeHistory> + </Connector> + </ConnectorBindings> +</ConfigurationDocument> +