[teiid-commits] teiid SVN: r745 - in branches/remove_psc/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
Thu Apr 9 23:06:06 EDT 2009


Author: vhalbert at redhat.com
Date: 2009-04-09 23:06:06 -0400 (Thu, 09 Apr 2009)
New Revision: 745

Added:
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java
   branches/remove_psc/common-internal/src/test/resources/config-original.xml
Removed:
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfig.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigComponentType.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigID.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfig.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfigType.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductType.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PSCData.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PscID.java
Modified:
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/AuthenticationProviderID.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingID.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefnID.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.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/BasicDeployedComponent.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicUtil.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModel.java
   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/ConfigurationObjectEditorHelper.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationVisitor.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ImportExportUtility.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_Visitor.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/RuntimeStateAdminAPI.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/SystemState.java
   branches/remove_psc/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDBDefn.java
   branches/remove_psc/common-internal/src/test/java/com/metamatrix/common/config/xml/TestXMLConfigurationImportExportUtility.java
Log:
Teiid 323 - removing the psc nomeclature

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -41,7 +41,6 @@
 import com.metamatrix.common.config.api.VMComponentDefn;
 import com.metamatrix.common.config.api.exceptions.ConfigurationException;
 import com.metamatrix.common.config.model.BasicHost;
-import com.metamatrix.common.config.model.BasicProductType;
 import com.metamatrix.common.config.reader.CurrentConfigurationReader;
 import com.metamatrix.common.config.reader.PropertiesConfigurationReader;
 import com.metamatrix.common.properties.UnmodifiableProperties;
@@ -301,8 +300,9 @@
      */
     public Collection getProductTypes() throws ConfigurationException {
     	Collection c = new ArrayList(1);
-    	c.add(BasicProductType.PRODUCT_TYPE);
-        return  c;
+    	return c;
+//    	c.add(BasicProductType.PRODUCT_TYPE);
+//        return  c;
     }
       
     /**

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/AuthenticationProviderID.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/AuthenticationProviderID.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/AuthenticationProviderID.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -36,28 +36,28 @@
         super(fullName);
     }
     
-    public AuthenticationProviderID(String name, ProductServiceConfigID pscID) {
-        super(AuthenticationProviderID.createName(Configuration.NEXT_STARTUP_ID, name, pscID));
-    } 
+//    public AuthenticationProviderID(String name, ProductServiceConfigID pscID) {
+//        super(AuthenticationProviderID.createName(Configuration.NEXT_STARTUP_ID, name, pscID));
+//    } 
     
     
     /**
     * Responsible for creating the structuring id for this VM Component
     */
     
-    private static final String createName(ConfigurationID configID, String name, ProductServiceConfigID pscID) {
-		Assertion.isNotNull(configID);
-		Assertion.isNotNull(name);
-       
-        
-        StringBuffer sb = new StringBuffer();
-        sb.append(pscID.getName());
-        sb.append(IDVerifier.DELIMITER_CHARACTER);        
-        sb.append(name);
-
-        return sb.toString();
-
-  }
+//    private static final String createName(ConfigurationID configID, String name, ProductServiceConfigID pscID) {
+//		Assertion.isNotNull(configID);
+//		Assertion.isNotNull(name);
+//       
+//        
+//        StringBuffer sb = new StringBuffer();
+//        sb.append(pscID.getName());
+//        sb.append(IDVerifier.DELIMITER_CHARACTER);        
+//        sb.append(name);
+//
+//        return sb.toString();
+//
+//  }
       
 
 

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingID.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingID.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingID.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -36,28 +36,28 @@
         super(fullName);
     }
     
-    public ConnectorBindingID(String name, ProductServiceConfigID pscID) {
-        super(ConnectorBindingID.createName(Configuration.NEXT_STARTUP_ID, name, pscID));
-    } 
+//    public ConnectorBindingID(String name) {
+//        super(ConnectorBindingID.createName(Configuration.NEXT_STARTUP_ID, name, pscID));
+//    } 
     
     
     /**
     * Responsible for creating the structuring id for this VM Component
     */
     
-    private static final String createName(ConfigurationID configID, String name, ProductServiceConfigID pscID) {
-		Assertion.isNotNull(configID);
-		Assertion.isNotNull(name);
-       
-        
-        StringBuffer sb = new StringBuffer();
-        sb.append(pscID.getName());
-        sb.append(IDVerifier.DELIMITER_CHARACTER);        
-        sb.append(name);
-
-        return sb.toString();
-
-  }
+//    private static final String createName(ConfigurationID configID, String name) {
+//		Assertion.isNotNull(configID);
+//		Assertion.isNotNull(name);
+//       
+//        
+//        StringBuffer sb = new StringBuffer();
+//        sb.append(pscID.getName());
+//        sb.append(IDVerifier.DELIMITER_CHARACTER);        
+//        sb.append(name);
+//
+//        return sb.toString();
+//
+//  }
       
 
 

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfig.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfig.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfig.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,78 +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.api;
-
-import java.util.Collection;
-
-import com.metamatrix.common.config.model.ConfigurationVisitor;
-
-/**
- * <p>A ProductServiceConfig (or PSC) is a named collection of service
- * definitions.  A PSC can be deployed, which in effect deploys it's
- * contained service definitions.<p>
- *
- * <p>The <i>type</i> of a PSC will be an instance of ProductType.  The
- * inherited <code>getComponentTypeID</code> method will return a
- * ComponentTypeID object.</p>
- *
- * @see ServiceComponentDefn
- * @see ProductType  
- */
-public interface ProductServiceConfig extends ComponentDefn {
-
-    public static final ComponentTypeID PSC_COMPONENT_TYPE_ID = new ComponentTypeID(ProductServiceConfigComponentType.COMPONENT_TYPE_NAME);
-
-
-    /**
-     *@link dependency
-     */
-
-    /*#ServiceComponentDefnID lnkServiceComponentDefnID;*/
-    /**
-     * Returns a Collection of ServiceComponentDefnID objects, which
-     * represent the service component definitions that are contained
-     * by this product service configuration.
-     */
-    Collection getServiceComponentDefnIDs();
-    
-    /**
-     * Indicates if the service belongs to this PSC.
-     * @returns boolean true if the service is contained in this PSC.
-     */
-    boolean containsService(ServiceComponentDefnID serviceID);
-    
-        
-    /**
-     * Indicates if this Service Definition is enabled within the PSC
-     * that contains it; "enabled" refers to it being enabled for
-     * deployment, if the containing PSC is deployed.
-     * @return boolean indicating if this service definition will be deployed
-     * if the PSC which contains it is deployed
-     */
-    boolean isServiceEnabled(ServiceComponentDefnID serviceID);
-    
-    
-    void accept(ConfigurationVisitor visitor);
-
-}
-

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigComponentType.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigComponentType.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigComponentType.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,33 +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.api;
-
-  /**
-* The <code>DeployedComponentType</code> 
-*/
-
-public interface ProductServiceConfigComponentType extends ComponentType {
-
-    public static final String COMPONENT_TYPE_NAME = "ProductServiceConfig"; //$NON-NLS-1$
-
-}

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigID.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigID.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductServiceConfigID.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,92 +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.api;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-public class ProductServiceConfigID extends ComponentDefnID  {
-
-
-    /**
-     * The name of the built-in, standard PSC of the
-     * MetaMatrix Server product
-     */
-    public static final String STANDARD_METAMATRIX_SERVER_PSC = "MetaMatrixServerFull"; //$NON-NLS-1$
-
-    /**
-     * The name of the built-in, Query Engine only PSC of the
-     * MetaMatrix Server product
-     */
-    public static final String METAMATRIX_SERVER_QUERY_ENGINE_PSC = "QueryEngine"; //$NON-NLS-1$
-
-    /**
-     * The name of the built-in, standard PSC of the
-     * MetaData Server product
-     */
-    public static final String STANDARD_METADATA_SERVER_PSC   = "MetaBaseServerStandard"; //$NON-NLS-1$
-
-    /**
-     * The name of the built-in, standard PSC of the
-     * Platform product
-     */
-    public static final String STANDARD_PLATFORM_PSC = "PlatformStandard"; //$NON-NLS-1$
-
-    /**
-     * The name of the built-in, standard PSC of the
-     * Connector product
-     */
-    public static final String STANDARD_CONNECTOR_PSC = "MMProcessPSC"; //$NON-NLS-1$
-
-    /**
-     * The Collection of the names of the four build-in, standard
-     * PSCs, one for each product type (@see {@link #ALL_PRODUCT_TYPES}).
-     */
-    public static final Collection ALL_STANDARD_PSC_NAMES;
-
-
-    static{
-        ALL_STANDARD_PSC_NAMES = new ArrayList(4);
-        ALL_STANDARD_PSC_NAMES.add(STANDARD_METAMATRIX_SERVER_PSC);
-        ALL_STANDARD_PSC_NAMES.add(METAMATRIX_SERVER_QUERY_ENGINE_PSC);
-        ALL_STANDARD_PSC_NAMES.add(STANDARD_METADATA_SERVER_PSC);
-        ALL_STANDARD_PSC_NAMES.add(STANDARD_PLATFORM_PSC);
-//        ALL_STANDARD_PSC_NAMES.add(STANDARD_CONNECTOR_PSC);
-    }
-
-
-
-
-    public ProductServiceConfigID(ConfigurationID configID, String name) {
-        super(configID, name);
-    }
-
-    public ProductServiceConfigID(String fullName) {
-        super(fullName);
-    }
-}
-
-
-
-
-

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,69 +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.api;
-
-import java.util.Collection;
-
-import com.metamatrix.common.config.model.BasicProductType;
-
-/**
- * <p>A Product, in this context, is simply a named collection of
- * Service types.  For example, the MetaMatrix Server product has
- * these service types: Query service, Transaction service, and
- * RuntimeMetadata service.</p>
- *
- * <p>A Product is a ComponentType subclass; it is a ComponentType, but
- * has references to other ComponentTypes (specifically, ComponentTypes
- * representing types of services).  Since it is a ComponentType, it
- * can be thought of as representing a type of Product (either Platform,
- * MetaData Server, or MetaMatrix Server).</p>
- * 
- * <p><b>Note:</b> Product type names where moved to 
- * {@link com.metamatrix.core.util.MetaMatrixProductVersion} in
- * version 5.0 so that other classes that don't have a dependency on
- * com.metamatrix.common can reference them.</p>
- */
-public interface ProductType extends ComponentType {
-    public static final String COMPONENT_TYPE_NAME = "Product"; //$NON-NLS-1$
-    
-    public static final ComponentTypeID PRODUCT_TYPE_ID = new ComponentTypeID(COMPONENT_TYPE_NAME);
-    public static final ComponentTypeID PRODUCT_SUPER_TYPE_ID = new ComponentTypeID(COMPONENT_TYPE_NAME);
-    
-
-    /**
-     * Returns a Collection of ComponentTypeID objects, each representing
-     * a type of service that this Product is comprised of
-     * @return Collection of ComponentTypeID objects
-     */
-    Collection getComponentTypeIDs();
-
-
-    /**
-     * Returns true if thie component type is contained in
-     * this instance of the product type.
-     * @param componentTypeID is the id of the component type to check for.
-     * @return boolean is true if the component type is contained in the product type
-     */
-    boolean contains(ComponentTypeID componentTypeID);
-}
-

Added: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java	                        (rev 0)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -0,0 +1,68 @@
+/*
+ * 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.api;
+
+import java.util.Collection;
+
+
+/**
+ * <p>A Product, in this context, is simply a named collection of
+ * Service types.  For example, the MetaMatrix Server product has
+ * these service types: Query service, Transaction service, and
+ * RuntimeMetadata service.</p>
+ *
+ * <p>A Product is a ComponentType subclass; it is a ComponentType, but
+ * has references to other ComponentTypes (specifically, ComponentTypes
+ * representing types of services).  Since it is a ComponentType, it
+ * can be thought of as representing a type of Product (either Platform,
+ * MetaData Server, or MetaMatrix Server).</p>
+ * 
+ * <p><b>Note:</b> Product type names where moved to 
+ * {@link com.metamatrix.core.util.MetaMatrixProductVersion} in
+ * version 5.0 so that other classes that don't have a dependency on
+ * com.metamatrix.common can reference them.</p>
+ */
+public interface ProductType extends ComponentType {
+    public static final String COMPONENT_TYPE_NAME = "Product"; //$NON-NLS-1$
+    
+    public static final ComponentTypeID PRODUCT_TYPE_ID = new ComponentTypeID(COMPONENT_TYPE_NAME);
+    public static final ComponentTypeID PRODUCT_SUPER_TYPE_ID = new ComponentTypeID(COMPONENT_TYPE_NAME);
+    
+
+    /**
+     * Returns a Collection of ComponentTypeID objects, each representing
+     * a type of service that this Product is comprised of
+     * @return Collection of ComponentTypeID objects
+     */
+    Collection getComponentTypeIDs();
+
+
+    /**
+     * Returns true if thie component type is contained in
+     * this instance of the product type.
+     * @param componentTypeID is the id of the component type to check for.
+     * @return boolean is true if the component type is contained in the product type
+     */
+    boolean contains(ComponentTypeID componentTypeID);
+}
+


Property changes on: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductType.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,60 +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.api;
-
-
-public class ProductTypeID extends ComponentTypeID  {
-	 public static final ProductTypeID PRODUCT_TYPE_ID = new ProductTypeID(ProductType.COMPONENT_TYPE_NAME);      
-
-//    /**
-//     * This is a Collection of all known type names of
-//     * products - it is needed by the JDBC spi impl and is
-//     * not really intended for public use.  (In other words,
-//     * it is a hack!)
-//     */
-//    public static final Collection ALL_PRODUCT_TYPES;
-//
-//
-//
-//    static{
-//        ALL_PRODUCT_TYPES = new ArrayList(3);
-//        ALL_PRODUCT_TYPES.add(ProductType.PLATFORM_TYPE_NAME);
-//        ALL_PRODUCT_TYPES.add(ProductType.METAMATRIX_SERVER_TYPE_NAME);
-//        ALL_PRODUCT_TYPES.add(ProductType.METADATA_SERVER_TYPE_NAME);
-//        ALL_PRODUCT_TYPES.add(ProductType.CONNECTOR_PRODUCT_TYPE_NAME);
-//
-//    }
-//
-
-
-
-
-    public ProductTypeID(String fullName) {
-        super(fullName);
-    }
-}
-
-
-
-
-

Added: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java	                        (rev 0)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -0,0 +1,60 @@
+/*
+ * 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.api;
+
+
+public class ProductTypeID extends ComponentTypeID  {
+	 public static final ProductTypeID PRODUCT_TYPE_ID = new ProductTypeID(ProductType.COMPONENT_TYPE_NAME);      
+
+//    /**
+//     * This is a Collection of all known type names of
+//     * products - it is needed by the JDBC spi impl and is
+//     * not really intended for public use.  (In other words,
+//     * it is a hack!)
+//     */
+//    public static final Collection ALL_PRODUCT_TYPES;
+//
+//
+//
+//    static{
+//        ALL_PRODUCT_TYPES = new ArrayList(3);
+//        ALL_PRODUCT_TYPES.add(ProductType.PLATFORM_TYPE_NAME);
+//        ALL_PRODUCT_TYPES.add(ProductType.METAMATRIX_SERVER_TYPE_NAME);
+//        ALL_PRODUCT_TYPES.add(ProductType.METADATA_SERVER_TYPE_NAME);
+//        ALL_PRODUCT_TYPES.add(ProductType.CONNECTOR_PRODUCT_TYPE_NAME);
+//
+//    }
+//
+
+
+
+
+    public ProductTypeID(String fullName) {
+        super(fullName);
+    }
+}
+
+
+
+
+


Property changes on: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ProductTypeID.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefnID.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefnID.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefnID.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -35,23 +35,20 @@
         super(fullName);
     }
     
-    public ServiceComponentDefnID(ConfigurationID configID, String name, ProductServiceConfigID pscID) {
- 		super(ServiceComponentDefnID.createName(configID, name, pscID));
-    } 
+//    public ServiceComponentDefnID(ConfigurationID configID, String name) {
+// 		super(ServiceComponentDefnID.createName(configID, name));
+//    } 
     
     
     /**
     * Responsible for creating the structuring id for this VM Component
     */
-    private static final String createName(ConfigurationID configID, String name, ProductServiceConfigID pscID) {
+    private static final String createName(ConfigurationID configID, String name) {
 		Assertion.isNotNull(configID);
-		Assertion.isNotNull(pscID);
 		Assertion.isNotNull(name);
 
         StringBuffer sb = new StringBuffer(configID.getName());
         sb.append(IDVerifier.DELIMITER_CHARACTER);        
-        sb.append(pscID.getName());
-        sb.append(IDVerifier.DELIMITER_CHARACTER);        
         sb.append(name);
 
         return sb.toString();

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfiguration.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -48,9 +48,7 @@
 import com.metamatrix.common.config.api.DeployedComponentID;
 import com.metamatrix.common.config.api.Host;
 import com.metamatrix.common.config.api.HostID;
-import com.metamatrix.common.config.api.ProductServiceConfig;
-import com.metamatrix.common.config.api.ProductServiceConfigID;
-import com.metamatrix.common.config.api.ProductTypeID;
+
 import com.metamatrix.common.config.api.ResourceDescriptor;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
 import com.metamatrix.common.config.api.ServiceComponentDefnID;

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-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -2420,9 +2420,9 @@
      * the startup configuration should not be modifiable.  But, this method
      * is needed by the JDBC service provider.)
      */
-    public void setStartupConfiguration(ConfigurationID configurationID) throws ConfigurationException {
-        this.createExchangeAction(configurationID, ConfigurationModel.Attribute.STARTUP_CONFIGURATION, configurationID, configurationID);
-    }
+//    public void setStartupConfiguration(ConfigurationID configurationID) throws ConfigurationException {
+//        this.createExchangeAction(configurationID, ConfigurationModel.Attribute.STARTUP_CONFIGURATION, configurationID, configurationID);
+//    }
 
     /**
      * Sets the system next startup configuration

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicDeployedComponent.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicDeployedComponent.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicDeployedComponent.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -33,7 +33,6 @@
 import com.metamatrix.common.config.api.DeployedComponent;
 import com.metamatrix.common.config.api.DeployedComponentID;
 import com.metamatrix.common.config.api.HostID;
-import com.metamatrix.common.config.api.ProductServiceConfigID;
 import com.metamatrix.common.config.api.ServiceComponentDefnID;
 import com.metamatrix.common.config.api.VMComponentDefnID;
 import com.metamatrix.common.namedobject.BaseID;

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfig.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfig.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfig.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,129 +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.model;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-
-import com.metamatrix.common.config.api.ConfigurationID;
-import com.metamatrix.common.config.api.ProductServiceConfig;
-import com.metamatrix.common.config.api.ProductServiceConfigID;
-import com.metamatrix.common.config.api.ProductType;
-import com.metamatrix.common.config.api.ProductTypeID;
-import com.metamatrix.common.config.api.ServiceComponentDefnID;
-
-
-public class BasicProductServiceConfig extends BasicComponentDefn implements ProductServiceConfig, Serializable {
-
-	// key - ServiceComponentDefnID
-	// value = Boolean indicating if the service enabled
-	private HashMap serviceComponentDefnIDs;
-
-
-    public BasicProductServiceConfig(ConfigurationID configurationID, ProductServiceConfigID componentID) {
-        super(configurationID, componentID, ProductType.PRODUCT_TYPE_ID);
-        serviceComponentDefnIDs = new HashMap();
-
-    }
-
-    protected BasicProductServiceConfig(BasicProductServiceConfig psc) {
-        super(psc);
-        this.serviceComponentDefnIDs = new HashMap(psc.serviceComponentDefnIDs);
-    }
-    
-    public boolean isServiceEnabled(ServiceComponentDefnID serviceID) {
-    	if (serviceComponentDefnIDs.containsKey(serviceID)) {
-    		Boolean b = (Boolean) serviceComponentDefnIDs.get(serviceID);
-    		return b.booleanValue();
-    	}
-    	
-		return false;		    	
-    	    	
-    }
-
-	public void setServiceEnabled(ServiceComponentDefnID serviceID, boolean isEnabled) {
-		if (serviceComponentDefnIDs.containsKey(serviceID)) {
-    		serviceComponentDefnIDs.put(serviceID, Boolean.valueOf(isEnabled));
-		}			
-	}
-	
-	public boolean containsService(ServiceComponentDefnID serviceID) {
-		if (serviceComponentDefnIDs.containsKey(serviceID)) {
-			return true;
-		}
-		return false;		
-	}
-    
-         
-	
-    /**
-     * Returns a cloned Collection of ServiceComponentDefnID objects, which
-     * represent the service component definitions that are contained
-     * by this product service configuration.
-     */
-    public Collection getServiceComponentDefnIDs(){
-        return new HashSet(this.serviceComponentDefnIDs.keySet());
-    }
-
-    /**
-     * This method is used to reset the assigned services in a PSC.  
-     * When the PSC is being updated with a new list, this enables
-     * the map to be cleared prior to adding the ones that are
-     * suppose to be in the map, saving the processing of having 
-     * to compare which ones don't belong.
-     */
-    void resetServices() { 
-        this.serviceComponentDefnIDs.clear();
-    }
-
-
-    /**
-     * Package-level method used by {@link BasicConfigurationObjectEditor}
-     * to alter this instance
-     */
-    void addServiceComponentDefnID(ServiceComponentDefnID serviceDefnID){
-        this.serviceComponentDefnIDs.put(serviceDefnID, Boolean.TRUE);
-    }
-
-    /**
-     * Package-level method used by {@link BasicConfigurationObjectEditor}
-     * to alter this instance
-     */
-    void removeServiceComponentDefnID(ServiceComponentDefnID serviceDefnID){
-        this.serviceComponentDefnIDs.remove(serviceDefnID);
-    }
-
-    /**
-     * Return a deep cloned instance of this object.  Subclasses must override
-     *  this method.
-     *  @return the object that is the clone of this instance.
-     */
-    public synchronized Object clone() {
-    	 return new BasicProductServiceConfig(this);
-    }
-    
-       
-}
-

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfigType.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfigType.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductServiceConfigType.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,58 +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.model;
-
-import java.util.Collection;
-
-import com.metamatrix.common.config.api.ComponentTypeID;
-import com.metamatrix.common.config.api.ProductServiceConfigComponentType;
-
-public class BasicProductServiceConfigType extends BasicComponentType implements ProductServiceConfigComponentType {
-
-
-    BasicProductServiceConfigType(ComponentTypeID id, ComponentTypeID parentID, ComponentTypeID superID, boolean deployable, boolean deprecated, boolean monitored) {
-        super(id, parentID, superID, deployable, deprecated, monitored);
-    }
-
-    protected BasicProductServiceConfigType(BasicProductServiceConfigType type) {
-        super(type);
-         
-    }
- 
-    /**
-     * Return a deep cloned instance of this object.  Subclasses must override
-     *  this method.
-     *  @return the object that is the clone of this instance.
-     */
-    public synchronized Object clone() {
-
-        BasicProductServiceConfigType result = null;
-	    result = new BasicProductServiceConfigType(this);
-
-        Collection defns = this.getComponentTypeDefinitions();
-        result.setComponentTypeDefinitions(defns);
-		return result;
-        
-
-    }
-}

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductType.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductType.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicProductType.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,97 +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.model;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashSet;
-
-import com.metamatrix.common.config.api.ComponentTypeID;
-import com.metamatrix.common.config.api.ProductType;
-import com.metamatrix.common.config.api.ProductTypeID;
-
-public class BasicProductType extends BasicComponentType implements ProductType,  Serializable  {
-	public static final ProductType PRODUCT_TYPE = new BasicProductType(ProductTypeID.PRODUCT_TYPE_ID, null, ProductType.PRODUCT_SUPER_TYPE_ID,  false, false, false);
-
-    private HashSet componentTypeIDs;
-    
-    public BasicProductType(ComponentTypeID id, ComponentTypeID parentID, ComponentTypeID superID, boolean deployable, boolean deprecated, boolean monitored) {
-        super(id, parentID, superID,deployable,deprecated,monitored) ;
-        
-        
-        componentTypeIDs = new HashSet();
-
-    }
-
-    protected BasicProductType(BasicProductType component) {
-        super(component);
-        this.componentTypeIDs = new HashSet(component.componentTypeIDs);
-   }
-    
-    
-    /**
-     * Returns a cloned Collection of ComponentTypeID objects, each representing
-     * a type of service that this Product is comprised of
-     * @return Collection of ComponentTypeID objects
-     */
-    public Collection getComponentTypeIDs(){
-        return new HashSet(this.componentTypeIDs);
-    }
-    
-    public boolean contains(ComponentTypeID componentTypeID) {
-        return (componentTypeIDs.contains(componentTypeID)); 
-        
-    }
-    
-
-    /**
-     * Package-level method used by {@link BasicConfigurationObjectEditor}
-     * to alter this instance
-     */
-    void addServiceTypeID(ComponentTypeID serviceComponentTypeID){
-        this.componentTypeIDs.add(serviceComponentTypeID);
-    }
-
-    /**
-     * Package-level method used by {@link BasicConfigurationObjectEditor}
-     * to alter this instance
-     */
-    void removeServiceTypeID(ComponentTypeID serviceComponentTypeID){
-        this.componentTypeIDs.remove(serviceComponentTypeID);
-    }
-    
-    
-    
-    /**
-     * Return a deep cloned instance of this object.  Subclasses must override
-     *  this method.
-     *  @return the object that is the clone of this instance.
-     */
-       public synchronized Object clone() {
-            BasicProductType result = new BasicProductType(this);
-
-             return result;
-        }    
-
-
-}

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicUtil.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicUtil.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicUtil.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -30,6 +30,7 @@
 import com.metamatrix.common.config.api.ComponentTypeID;
 import com.metamatrix.common.config.api.Configuration;
 import com.metamatrix.common.config.api.ConfigurationID;
+import com.metamatrix.common.config.api.ConfigurationObjectEditor;
 import com.metamatrix.common.config.api.ConnectorBinding;
 import com.metamatrix.common.config.api.ConnectorBindingID;
 import com.metamatrix.common.config.api.DeployedComponent;
@@ -37,11 +38,7 @@
 import com.metamatrix.common.config.api.Host;
 import com.metamatrix.common.config.api.HostID;
 import com.metamatrix.common.config.api.HostType;
-import com.metamatrix.common.config.api.ProductServiceConfig;
-import com.metamatrix.common.config.api.ProductServiceConfigComponentType;
-import com.metamatrix.common.config.api.ProductServiceConfigID;
-import com.metamatrix.common.config.api.ProductType;
-import com.metamatrix.common.config.api.ProductTypeID;
+
 import com.metamatrix.common.config.api.ResourceDescriptor;
 import com.metamatrix.common.config.api.ResourceDescriptorID;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
@@ -60,7 +57,21 @@
  * @since 4.2
  */
 public class BasicUtil {
+	
+	   private static ConfigurationObjectEditor editor = new BasicConfigurationObjectEditor();
 
+	    
+	    /**
+	     * Returns a COnfigurationObjectEditor that does not create actions.  This editor,
+	     * because it doesn't maintain any state, is sharable for reuse. 
+	     * @return
+	     * @since 4.3
+	     */
+	    public static ConfigurationObjectEditor getEditor() {
+	        return editor;
+	    }    
+
+
     /**
      *  static method that is used to create the specified instance type of BasicComponentDefn.
      *  @param defnTypeCode identifies the type of class this component defn should represent
@@ -73,12 +84,6 @@
     public static final BasicComponentDefn createComponentDefn(int defnTypeCode, ConfigurationID configID, ComponentTypeID typeID, String defnName)  {
 
         BasicComponentDefn defn = null;
-//        if (defnTypeCode == ComponentDefn.VM_COMPONENT_CODE) {
-//            VMComponentDefnID vmID = new VMComponentDefnID(configID, defnName);
-//            defn = new BasicVMComponentDefn(configID, vmID, typeID);
-//            
-//            
-//        } else 
             
         if (defnTypeCode == ComponentDefn.RESOURCE_DESCRIPTOR_COMPONENT_CODE) {
             ResourceDescriptorID descriptorID = new ResourceDescriptorID(configID,defnName);
@@ -114,38 +119,15 @@
         if (defnTypeCode == ComponentDefn.VM_COMPONENT_CODE) {
             VMComponentDefnID vmID = new VMComponentDefnID(configID, hostID, defnName);
             defn = new BasicVMComponentDefn(configID, hostID, vmID, typeID);
-        }
+        } else {
+            Assertion.assertTrue(true, "DefnTypeCode:" + defnTypeCode + " is not defined in BasicUtil.createComponentODefn for VM"); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
         return defn;
     }
     
     
     /**
-     *  static method that is used to create the specified instance type of BasicComponentDefn.
-     *  @param defnTypeCode identifies the type of class this component defn should represent
-     *      @see ComponentDefn for type codes
-     *  @param configID is the ConfigurationID identifying what configuration this defn belongs
-     *  @param typeID is the ComponentTypeID identifying this new created BasicComponentType
-     *  @param defnName is the name of the component defn
-     *  @return BasicComponentDefn
-     */
-//    public static final BasicComponentDefn createComponentDefn(int defnTypeCode, ConfigurationID configID, String defnName)  {
-//
-//        BasicComponentDefn defn = null;
-//            
-//        if (defnTypeCode == ComponentDefn.PSC_COMPONENT_CODE) { 
-//            ProductServiceConfigID pscID = new ProductServiceConfigID(configID, defnName);
-//            defn = new BasicProductServiceConfig(configID, pscID);            
-//                             
-//        } else {
-//           Assertion.assertTrue(true, "DefnTypeCode:" + defnTypeCode + " is not defined in BasicUtil.createComponentDefn"); //$NON-NLS-1$ //$NON-NLS-2$
-//        }
-//        
-//        return defn;
-//    }
-    
-    
-    
-    /**
      *  static method that is used to create the specified instance type of BasicComponentObject
      *  for a PSC.
      *  @param defnTypeCode identifies the type of class this component defn should represent
@@ -161,10 +143,6 @@
         if (defnTypeCode == ComponentDefn.SHARED_RESOURCE_COMPONENT_CODE) {
              SharedResourceID id = new SharedResourceID(objName);
              defn = new BasicSharedResource(id, typeID);
-//        } else if (defnTypeCode == ComponentDefn.PRODUCT_COMPONENT_CODE) {
-//             ProductTypeID id = new ProductTypeID(objName);
-//             defn = new BasicProductType(id, typeID);     
-//
         } else {
                 Assertion.assertTrue(true, "DefnTypeCode:" + defnTypeCode + " is not defined in BasicUtil.createComponentObject"); //$NON-NLS-1$ //$NON-NLS-2$
         }
@@ -199,10 +177,6 @@
         } else if (name.equalsIgnoreCase(Configuration.COMPONENT_TYPE_NAME)) {
             type = new BasicComponentType(typeID, parentID, superID, deployable, false, monitored);
             classTypeCode =  ComponentType.CONFIGURATION_COMPONENT_TYPE_CODE;
-        
-//        } else if (name.equalsIgnoreCase(ProductServiceConfigComponentType.COMPONENT_TYPE_NAME)) {
-//            type = new BasicProductServiceConfigType(typeID, parentID, superID, deployable, false, monitored);
-//            classTypeCode =  ComponentType.PSC_COMPONENT_TYPE_CODE;
            
         } else if (name.equalsIgnoreCase("DeployedComponent")) { //$NON-NLS-1$
  //           type = new BasicDeployedComponentType(typeID, parentID, superID, deployable, false, monitored);
@@ -210,22 +184,12 @@
 
             classTypeCode =  ComponentType.DEPLOYED_COMPONENT_TYPE_CODE;
             
-            
-//        } else //if (name.equalsIgnoreCase(ProductType.COMPONENT_TYPE_NAME) ||
-//                        if (       classTypeCode == ComponentType.PRODUCT_COMPONENT_TYPE_CODE ) {
-//            ProductTypeID prodtypeID = new ProductTypeID(name);
-//            classTypeCode =  ComponentType.PRODUCT_COMPONENT_TYPE_CODE;
-//            
-//            type = new BasicProductType(prodtypeID, parentID, superID, deployable, false, monitored);
-            
         } else if (classTypeCode == ComponentType.CONNECTOR_COMPONENT_TYPE_CODE) {
             type = new BasicConnectorBindingType(typeID, parentID, superID, deployable, false, monitored);
         } else if (classTypeCode == ComponentType.AUTHPROVIDER_COMPONENT_TYPE_CODE) {
             type = new BasicAuthenticationProviderType(typeID, parentID, superID, deployable, false, monitored);
         } else if (classTypeCode == ComponentType.SERVICE_COMPONENT_TYPE_CODE) {
             type = new BasicServiceComponentType(typeID, parentID, superID, deployable, false, monitored);
-//        } else if (classTypeCode == ComponentType.PSC_COMPONENT_TYPE_CODE) {
-//            type = new BasicProductServiceConfigType(typeID, parentID, superID, deployable, false, monitored);
         
 //        } else if (classTypeCode == ComponentDefn.VM_COMPONENT_TYPE_CODE) {
 //            type = new BasicVMComponentDefnType(typeID, parentID, superID, deployable, false, monitored);            
@@ -244,8 +208,14 @@
 
             
         } else {
-            Assertion.assertTrue(true, "ClassTypeCode:" + classTypeCode + " is not defined in BasicUtil.createComponentType"); //$NON-NLS-1$ //$NON-NLS-2$
+        	throw new RuntimeException("ComponentType Exception "  + classTypeCode);
+            //Assertion.assertTrue(true, "ClassTypeCode:" + classTypeCode + " is not defined in BasicUtil.createComponentType"); //$NON-NLS-1$ //$NON-NLS-2$
         }
+        
+        if (type == null) {
+        	throw new RuntimeException("Null Type");
+        }
+        
 
         type.setComponentTypeCode(classTypeCode);
 
@@ -365,6 +335,25 @@
 
     return -1;
 }  
+
+
+public static boolean isValdComponentTypeCode(int code) {
+	switch (code) {
+	case ComponentType.AUTHPROVIDER_COMPONENT_TYPE_CODE:
+	case ComponentType.CONFIGURATION_COMPONENT_TYPE_CODE:
+	case ComponentType.CONNECTOR_COMPONENT_TYPE_CODE:
+	case ComponentType.DEPLOYED_COMPONENT_TYPE_CODE:
+	case ComponentType.HOST_COMPONENT_TYPE_CODE:
+	case ComponentType.PRODUCT_COMPONENT_TYPE_CODE:
+	case ComponentType.RESOURCE_COMPONENT_TYPE_CODE:
+	case ComponentType.SERVICE_COMPONENT_TYPE_CODE:
+	case ComponentType.VM_COMPONENT_TYPE_CODE:
+		return true;
+
+	//	break;
+	}
+	return false;
+}
     
 
 }

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModel.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModel.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModel.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -79,7 +79,7 @@
         // System Configurations
         public static final AttributeDefinition CURRENT_CONFIGURATION   = new AttributeDefinition(6,"Current Configuation"); //$NON-NLS-1$
         public static final AttributeDefinition NEXT_STARTUP_CONFIGURATION   = new AttributeDefinition(16,"Next Startup Configuation"); //$NON-NLS-1$
-        public static final AttributeDefinition STARTUP_CONFIGURATION   = new AttributeDefinition(17,"Startup Configuation"); //$NON-NLS-1$
+ //       public static final AttributeDefinition STARTUP_CONFIGURATION   = new AttributeDefinition(17,"Startup Configuation"); //$NON-NLS-1$
     
 
         public static final AttributeDefinition UPDATE_PSC   = new AttributeDefinition(20,"Update PSC"); //$NON-NLS-1$

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-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -43,10 +43,6 @@
 import com.metamatrix.common.config.api.DeployedComponentID;
 import com.metamatrix.common.config.api.Host;
 import com.metamatrix.common.config.api.HostID;
-import com.metamatrix.common.config.api.ProductServiceConfig;
-import com.metamatrix.common.config.api.ProductServiceConfigID;
-import com.metamatrix.common.config.api.ProductType;
-import com.metamatrix.common.config.api.ProductTypeID;
 import com.metamatrix.common.config.api.ResourceDescriptor;
 import com.metamatrix.common.config.api.ResourceDescriptorID;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
@@ -136,7 +132,6 @@
 
             configObjects.addAll(getComponentTypes().values());
 
-            configObjects.addAll(getProductTypes());
 
             configObjects.addAll(getResources());
 
@@ -363,20 +358,7 @@
      return pools;
    }
 
-   public ProductType getProductType(String name) {
-	    if (BasicProductType.PRODUCT_TYPE.getName().equalsIgnoreCase(name)) {
-	    	return BasicProductType.PRODUCT_TYPE;
-	    }
-    	return null;
-   }
 
-   public Collection<ProductType> getProductTypes() {
-       Collection<ProductType> pts = new ArrayList<ProductType>(1);
-       pts.add(BasicProductType.PRODUCT_TYPE);
-       return pts;
-   }
-
-
    public SharedResource getResource(String resourceName) {
    		if (resources.containsKey(resourceName)) {
    			return (SharedResource) resources.get(resourceName);

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationObjectEditorHelper.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationObjectEditorHelper.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationObjectEditorHelper.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -164,25 +164,25 @@
      * needed by the JDBC spi and maybe the import/export tool.
      */
 
- public static void setEnabled(ServiceComponentDefnID serviceComponentDefnID, ProductServiceConfig psc, boolean enabled) {
-    	Assertion.isNotNull(serviceComponentDefnID);
-    	Assertion.isNotNull(psc);
+// public static void setEnabled(ServiceComponentDefnID serviceComponentDefnID, ProductServiceConfig psc, boolean enabled) {
+//    	Assertion.isNotNull(serviceComponentDefnID);
+//    	Assertion.isNotNull(psc);
+//
+//
+//        if (!psc.containsService(serviceComponentDefnID)) {
+//        	return;
+//        }
+//
+//        boolean oldEnabled = psc.isServiceEnabled(serviceComponentDefnID);
+//        //if a change is not being made to the enabled value, this whole method
+//        //will be essentially bypassed
+//        if (enabled != oldEnabled){
+//            BasicProductServiceConfig basicPSC = (BasicProductServiceConfig) verifyTargetClass(psc,BasicProductServiceConfig.class);
+//			basicPSC.setServiceEnabled(serviceComponentDefnID, enabled);
+//
+//        } //end if enabled!= oldEnabled
+// }
 
-
-        if (!psc.containsService(serviceComponentDefnID)) {
-        	return;
-        }
-
-        boolean oldEnabled = psc.isServiceEnabled(serviceComponentDefnID);
-        //if a change is not being made to the enabled value, this whole method
-        //will be essentially bypassed
-        if (enabled != oldEnabled){
-            BasicProductServiceConfig basicPSC = (BasicProductServiceConfig) verifyTargetClass(psc,BasicProductServiceConfig.class);
-			basicPSC.setServiceEnabled(serviceComponentDefnID, enabled);
-
-        } //end if enabled!= oldEnabled
- }
-
     public static Configuration addHostComponent(Configuration t, Host host) {
 		if (host == null) {
 			return t;
@@ -207,17 +207,17 @@
      * ProductServiceConfiguration (and removed from any PSC it previously
      * belonged to).
      */
-    public static ProductServiceConfig addServiceComponentDefn(ProductServiceConfig psc, ServiceComponentDefnID serviceComponentDefnID){
-    	Assertion.isNotNull(psc);
-    	Assertion.isNotNull(serviceComponentDefnID);
+//    public static ProductServiceConfig addServiceComponentDefn(ProductServiceConfig psc, ServiceComponentDefnID serviceComponentDefnID){
+//    	Assertion.isNotNull(psc);
+//    	Assertion.isNotNull(serviceComponentDefnID);
+//
+//        BasicProductServiceConfig basicPSC = (BasicProductServiceConfig) verifyTargetClass(psc,BasicProductServiceConfig.class);
+//        basicPSC.addServiceComponentDefnID(serviceComponentDefnID);
+//
+//        return basicPSC;
+//    }
 
-        BasicProductServiceConfig basicPSC = (BasicProductServiceConfig) verifyTargetClass(psc,BasicProductServiceConfig.class);
-        basicPSC.addServiceComponentDefnID(serviceComponentDefnID);
 
-        return basicPSC;
-    }
-
-
     public static Configuration addComponentDefn( Configuration t, ComponentDefn defn) {
         BasicConfiguration target = (BasicConfiguration) verifyTargetClass(t,BasicConfiguration.class);
         target.addComponentDefn(defn);
@@ -259,15 +259,15 @@
         return target;
     }
     
-    public static ProductServiceConfig resetServices(ProductServiceConfig psc) {
-        Assertion.isNotNull(psc);
-        
-        BasicProductServiceConfig basicPSC = (BasicProductServiceConfig) verifyTargetClass(psc,BasicProductServiceConfig.class);
-        basicPSC.resetServices();
+//    public static ProductServiceConfig resetServices(ProductServiceConfig psc) {
+//        Assertion.isNotNull(psc);
+//        
+//        BasicProductServiceConfig basicPSC = (BasicProductServiceConfig) verifyTargetClass(psc,BasicProductServiceConfig.class);
+//        basicPSC.resetServices();
+//
+//        return basicPSC;
+//    }
 
-        return basicPSC;
-    }
-
     
 
 
@@ -330,16 +330,16 @@
 
         BasicConfiguration basicConfig = (BasicConfiguration) verifyTargetClass(configuration,BasicConfiguration.class);
 
-        if (targetID instanceof ProductServiceConfigID) {
-
-            if (ProductServiceConfigID.ALL_STANDARD_PSC_NAMES.contains(targetID.getName())){
-                throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0070));
-            }
-
-            basicConfig.removeComponentObject( targetID);
-        } else {
+//        if (targetID instanceof ProductServiceConfigID) {
+//
+//            if (ProductServiceConfigID.ALL_STANDARD_PSC_NAMES.contains(targetID.getName())){
+//                throw new IllegalArgumentException(CommonPlugin.Util.getString(ErrorMessageKeys.CONFIG_ERR_0070));
+//            }
+//
+//            basicConfig.removeComponentObject( targetID);
+//        } else {
         	basicConfig.removeComponentObject( targetID);
-        }
+ //       }
 
         return basicConfig;
     }

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationVisitor.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationVisitor.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationVisitor.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -36,28 +36,5 @@
     
     abstract void visitComponent(ComponentType compType);
     
-  
-//    abstract void visitConfiguration(Configuration configuration);
-//    
-//    abstract void visitConfigurationInfo(ConfigurationInfo info);
-//    
-//    abstract void visitVMComponentDefn(VMComponentDefn defn);
-//    
-//    abstract void visitDeployedComponent(DeployedComponent deployedComponent);
-//    
-//    abstract void visitServiceComponentDefn(ServiceComponentDefn defn);
-//    
-//    abstract void visitConnectorComponent(ConnectorBinding connector);
-//    
-//    abstract void visitResourceDescriptor(ResourceDescriptor descriptor);
-//    
-//    
-//    abstract void visitProductServiceConfig(ProductServiceConfig config);  
-//    
-//    abstract void visitHost(Host host);   
-//    
-//    abstract void visitComponentType(ComponentType compType);    
-//     
-      
 }
     

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -70,21 +70,21 @@
             * This is the class that represents the ProductServiceConfig Element which contains
             * all of the XML elements that represent a ProductServiceConfig object.
             */
-            public static class ProductServiceConfig {
-            
-                /**
-                * This is the name of the ProductServiceConfig Element.
-                */
-                public static final String ELEMENT = "PSC"; //$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 class ProductServiceConfig {
+//            
+//                /**
+//                * This is the name of the ProductServiceConfig Element.
+//                */
+//                public static final String ELEMENT = "PSC"; //$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{
+//                }
+//            }
 
             
             /**
@@ -152,7 +152,7 @@
                 */
                 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 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$
                 }
@@ -388,50 +388,50 @@
      * This is the class that represents the ProductServiceConfigs Element which contains
      * all of the XML elements that represent a ProductServiceConfigs object.
      */
-     public static class ProductServiceConfigs {
-     
-         /**
-         * This is the name of the ProductServiceConfigs Element.
-         */
-         public static final String ELEMENT = "ProductServiceConfigs"; //$NON-NLS-1$
+//     public static class ProductServiceConfigs {
+//     
+//         /**
+//         * This is the name of the ProductServiceConfigs Element.
+//         */
+//         public static final String ELEMENT = "ProductServiceConfigs"; //$NON-NLS-1$
+//         
+//         
+//         /**
+//         * This is the class that represents the ProductServiceConfig Element which contains
+//         * all of the XML elements that represent a ProductServiceConfig object.
+//         */
+//         public static class ProductServiceConfig {
+//
+//             
+//             /**
+//             * This is the name of the ProductServiceConfig Element.
+//             */
+//             public static final String ELEMENT = "PSC"; //$NON-NLS-1$
+//
+//             public static class Attributes extends ComponentObject.Attributes{
+//             }
+//             /**
+//             * 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 Service {
+//                     
+//                         /**
+//                         * This is the name of the ServiceComponentDefn Element.
+//                         */
+//                         public static final String ELEMENT = "Service"; //$NON-NLS-1$
+//                     
+//                         public static class Attributes extends ComponentObject.Attributes{
+//                             public static final String IS_ENABLED = "IsEnabled"; //$NON-NLS-1$
+//                         }
+//                     }                 
+//
+//         }
+//     }
+//  
          
-         
-         /**
-         * This is the class that represents the ProductServiceConfig Element which contains
-         * all of the XML elements that represent a ProductServiceConfig object.
-         */
-         public static class ProductServiceConfig {
-
-             
-             /**
-             * This is the name of the ProductServiceConfig Element.
-             */
-             public static final String ELEMENT = "PSC"; //$NON-NLS-1$
-
-             public static class Attributes extends ComponentObject.Attributes{
-             }
-             /**
-             * 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 Service {
-                     
-                         /**
-                         * This is the name of the ServiceComponentDefn Element.
-                         */
-                         public static final String ELEMENT = "Service"; //$NON-NLS-1$
-                     
-                         public static class Attributes extends ComponentObject.Attributes{
-                             public static final String IS_ENABLED = "IsEnabled"; //$NON-NLS-1$
-                         }
-                     }                 
-
-         }
-     }
-  
-         
      /**
       * This is the class that represents the ProductServiceConfigs Element which contains
       * all of the XML elements that represent a ProductServiceConfigs object.
@@ -689,18 +689,18 @@
     * 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$
-        }
-    }
+//    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$
+//        }
+//    }
             
         
     /**

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -52,19 +52,17 @@
 import com.metamatrix.common.config.api.DeployedComponent;
 import com.metamatrix.common.config.api.Host;
 import com.metamatrix.common.config.api.HostID;
-import com.metamatrix.common.config.api.ProductServiceConfig;
-import com.metamatrix.common.config.api.ProductServiceConfigID;
-import com.metamatrix.common.config.api.ProductType;
-import com.metamatrix.common.config.api.ProductTypeID;
 import com.metamatrix.common.config.api.ResourceDescriptor;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
 import com.metamatrix.common.config.api.ServiceComponentDefnID;
 import com.metamatrix.common.config.api.SharedResource;
 import com.metamatrix.common.config.api.VMComponentDefn;
 import com.metamatrix.common.config.api.VMComponentDefnID;
+import com.metamatrix.common.config.api.exceptions.InvalidConfigurationException;
 import com.metamatrix.common.config.model.BasicComponentObject;
 import com.metamatrix.common.config.model.BasicComponentType;
 import com.metamatrix.common.config.model.BasicConfigurationObjectEditor;
+import com.metamatrix.common.config.model.BasicUtil;
 import com.metamatrix.common.config.model.BasicVMComponentDefn;
 import com.metamatrix.common.config.util.ConfigurationPropertyNames;
 import com.metamatrix.common.config.util.InvalidConfigurationElementException;
@@ -1428,19 +1426,25 @@
         String monitorable = element.getAttributeValue(XMLConfig_42_ElementNames.ComponentTypes.ComponentType.Attributes.MONITORABLE);
         String description = element.getAttributeValue(XMLConfig_42_ElementNames.ComponentTypes.ComponentType.Attributes.DESCRIPTION);
 
+
+
+        // convert them into their proper data types
+        int typeCode = Integer.parseInt(componentTypeCode);
+        
+        if (! BasicUtil.isValdComponentTypeCode(typeCode)) {
+        	throw new RuntimeException("File error2, invalid component type code " + componentTypeCode + " for " + name + " super " + superType);
+        }
+        
         // we will use the passed in name unless it is null...
         if (name == null) {
             name = element.getAttributeValue(XMLConfig_42_ElementNames.ComponentTypes.ComponentType.Attributes.NAME);
         }
 
-        // convert them into their proper data types
-        int typeCode = Integer.parseInt(componentTypeCode);
-
         ComponentTypeID parentTypeID = null;
         ComponentTypeID superTypeID = null;
 
         if (parentType != null && parentType.length() > 0) {
-           parentTypeID = new ProductTypeID(parentType);
+           parentTypeID = new ComponentTypeID(parentType);
         }
 
         if (superType !=null && superType.length() > 0) {

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ImportExportUtility.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ImportExportUtility.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ImportExportUtility.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -48,9 +48,6 @@
 import com.metamatrix.common.config.api.DeployedComponent;
 import com.metamatrix.common.config.api.Host;
 import com.metamatrix.common.config.api.HostID;
-//import com.metamatrix.common.config.api.ProductServiceConfig;
-//import com.metamatrix.common.config.api.ProductServiceConfigID;
-//import com.metamatrix.common.config.api.ProductType;
 import com.metamatrix.common.config.api.ResourceDescriptor;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
 import com.metamatrix.common.config.api.SharedResource;

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_Visitor.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_Visitor.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_Visitor.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -35,8 +35,6 @@
 import com.metamatrix.common.config.api.ConnectorBinding;
 import com.metamatrix.common.config.api.DeployedComponent;
 import com.metamatrix.common.config.api.Host;
-import com.metamatrix.common.config.api.ProductServiceConfig;
-import com.metamatrix.common.config.api.ProductType;
 import com.metamatrix.common.config.api.ResourceDescriptor;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
 import com.metamatrix.common.config.api.SharedResource;

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_Base_ImportExportUtility.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -49,8 +49,6 @@
 import com.metamatrix.common.config.api.ConnectorBinding;
 import com.metamatrix.common.config.api.DeployedComponent;
 import com.metamatrix.common.config.api.Host;
-//import com.metamatrix.common.config.api.ProductServiceConfig;
-//import com.metamatrix.common.config.api.ProductType;
 import com.metamatrix.common.config.api.ResourceDescriptor;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
 import com.metamatrix.common.config.api.SharedResource;
@@ -98,26 +96,26 @@
     * of lists from the segregateConfigurationObjects method.
     */
     static final int CONFIGURATIONS_INDEX = 0;
-    static final int PRODUCT_TYPES_INDEX = 1;
+//    static final int PRODUCT_TYPES_INDEX = 1;
     static final int HOSTS_INDEX = 2;
     static final int DEPLOYED_COMPONENTS_INDEX = 3;
     static final int SERVICE_COMPONENT_DEFNS_INDEX = 4;
     static final int VM_COMPONENT_DEFNS_INDEX = 5;
     static final int COMPONENT_TYPES_INDEX = 6;
-    static final int PRODUCT_SERVICE_CONFIGS_INDEX = 7;
+ //   static final int PRODUCT_SERVICE_CONFIGS_INDEX = 7;
     static final int CONNECTION_POOL_CONFIGS_INDEX = 16;
     static final int RESOURCES_INDEX = 18;
     static final int CONNECTORS_INDEX = 19;
 
 
     static final int CONFIGURATION_IDS_INDEX = 8;
-    static final int PRODUCT_TYPE_IDS_INDEX = 9;
+//    static final int PRODUCT_TYPE_IDS_INDEX = 9;
     static final int HOST_IDS_INDEX = 10;
     static final int DEPLOYED_COMPONENT_IDS_INDEX = 11;
     static final int SERVICE_COMPONENT_DEFN_IDS_INDEX = 12;
     static final int VM_COMPONENT_DEFN_IDS_INDEX = 13;
     static final int COMPONENT_TYPE_IDS_INDEX = 14;
-    static final int PRODUCT_SERVICE_CONFIG_IDS_INDEX = 15;
+//    static final int PRODUCT_SERVICE_CONFIG_IDS_INDEX = 15;
 //    private static final int CONNECTION_POOL_CONFIG_IDS_INDEX = 17;
     static final int CONNECTORS_IDS_INDEX = 20;
 

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -105,36 +105,36 @@
             * This is the class that represents the ProductServiceConfigs Element which contains
             * all of the XML elements that represent a ProductServiceConfigs object.
             */
-            public static class ProductServiceConfigs {
+//            public static class ProductServiceConfigs {
+//            
+//                /**
+//                * This is the name of the ProductServiceConfigs Element.
+//                */
+//                public static final String ELEMENT = Configuration.ELEMENT + DELIMITER + "ProductServiceConfigs"; //$NON-NLS-1$
+//                
+//                /**
+//                * This is the class that represents the ProductServiceConfig Element which contains
+//                * all of the XML elements that represent a ProductServiceConfig object.
+//                */
+//                public static class ProductServiceConfig {
+//                
+//                    /**
+//                    * This is the name of the ProductServiceConfig Element.
+//                    */
+//                    public static final String ELEMENT = "ProductServiceConfig"; //$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 IS_ENABLED = "IsEnabled";                         //$NON-NLS-1$
+//
+//                    }
+//                }
+//            }
             
-                /**
-                * This is the name of the ProductServiceConfigs Element.
-                */
-                public static final String ELEMENT = Configuration.ELEMENT + DELIMITER + "ProductServiceConfigs"; //$NON-NLS-1$
-                
-                /**
-                * This is the class that represents the ProductServiceConfig Element which contains
-                * all of the XML elements that represent a ProductServiceConfig object.
-                */
-                public static class ProductServiceConfig {
-                
-                    /**
-                    * This is the name of the ProductServiceConfig Element.
-                    */
-                    public static final String ELEMENT = "ProductServiceConfig"; //$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 IS_ENABLED = "IsEnabled";                         //$NON-NLS-1$
-
-                    }
-                }
-            }
-            
             /**
             * This is the class that represents the ServiceComponentDefns Element which contains
             * all of the XML elements that represent a ServiceComponentDefns object.
@@ -228,7 +228,7 @@
                     */
                     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 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$
                     }
@@ -280,22 +280,22 @@
             * 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{
+//            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 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.
@@ -729,18 +729,18 @@
     * 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$
-        }
-    }
+//    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$
+//        }
+//    }
             
         
     

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/RuntimeStateAdminAPI.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/RuntimeStateAdminAPI.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/RuntimeStateAdminAPI.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -33,7 +33,6 @@
 import com.metamatrix.common.config.api.Configuration;
 import com.metamatrix.common.log.LogConfiguration;
 import com.metamatrix.common.queue.WorkerPoolStats;
-import com.metamatrix.platform.admin.api.runtime.PscID;
 import com.metamatrix.platform.admin.api.runtime.SystemState;
 import com.metamatrix.platform.service.api.ServiceID;
 import com.metamatrix.platform.vm.controller.ProcessStatistics;
@@ -239,11 +238,11 @@
      * @throws MetaMatrixComponentException
      *             if an error occurred in communicating with a component.
      */
-    void startPSC(PscID pscID) throws AuthorizationException,
-                              InvalidSessionException,
-                              MetaMatrixComponentException,
-                              MultipleException;
-
+//    void startPSC(PscID pscID) throws AuthorizationException,
+//                              InvalidSessionException,
+//                              MetaMatrixComponentException,
+//                              MultipleException;
+//
     /**
      * Stop up all services in psc, waiting for work to complete.
      * 
@@ -256,10 +255,10 @@
      * @throws MetaMatrixComponentException
      *             if an error occurred in communicating with a component.
      */
-    void stopPSC(PscID pscID) throws AuthorizationException,
-                             InvalidSessionException,
-                             MetaMatrixComponentException,
-                             MultipleException;
+//    void stopPSC(PscID pscID) throws AuthorizationException,
+//                             InvalidSessionException,
+//                             MetaMatrixComponentException,
+//                             MultipleException;
 
     /**
      * Stop up all services in psc now.
@@ -273,10 +272,10 @@
      * @throws MetaMatrixComponentException
      *             if an error occurred in communicating with a component.
      */
-    void stopPSCNow(PscID pscID) throws AuthorizationException,
-                                InvalidSessionException,
-                                MetaMatrixComponentException,
-                                MultipleException;
+//    void stopPSCNow(PscID pscID) throws AuthorizationException,
+//                                InvalidSessionException,
+//                                MetaMatrixComponentException,
+//                                MultipleException;
 
     /**
      * Synchronize running services with runtime configuration.
@@ -404,11 +403,11 @@
      * @throws MetaMatrixComponentException
      * @since 4.2.1
      */
-    PscID getPscIDByName(String hostName,
-                         String processName,
-                         String pscName) throws InvalidSessionException,
-                                        AuthorizationException,
-                                        MetaMatrixComponentException;
+//    PscID getPscIDByName(String hostName,
+//                         String processName,
+//                         String pscName) throws InvalidSessionException,
+//                                        AuthorizationException,
+//                                        MetaMatrixComponentException;
 
     /**
      * Return the ServiceID by Name

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PSCData.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PSCData.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PSCData.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,119 +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.platform.admin.api.runtime;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import com.metamatrix.common.config.api.ProductServiceConfigID;
-
-
-/**
- * This class is a container for ServiceRegistryBinding objects for
- * all the services running in this VM
- */
-public class PSCData extends ComponentData {
-
-    /** Collection of serviceData objects */
-    private Collection services;
-
-    /** defines vm in configuration */
-    private PscID pscID;
-
-    /**
-     * Create a new instance of VMRegistryBinding.
-     *
-     * @param pscID Identifies PSC
-     * @param services Collection of ServiceData objects
-     * @param processName Name of process psc is running on
-     */
-    public PSCData(ProductServiceConfigID pscConfigID, Collection services, String processName) {
-        super(pscConfigID.getName(), false, false);
-        this.pscID = new PscID(pscConfigID, processName);
-        this.services = services;
-
-        // set deployed and registered flags.
-        // since a psc is not a deployable or registerable object
-        // then set based on services in psc
-        boolean deployed = false;
-        boolean registered = false;
-        Iterator iter = services.iterator();
-        while (iter.hasNext()) {
-            ServiceData sd = (ServiceData) iter.next();
-            if (sd.isDeployed()) {
-                deployed = true;
-            }
-            if (sd.isRegistered()) {
-                registered = true;
-            }
-            if (deployed & registered) {
-                break;
-            }
-        }
-        this.deployed = deployed;
-        this.registered = registered;
-    }
-
-    /**
-     * Return a list of all ServiceData objects
-     *
-     * @return List of ServiceData objects
-     */
-    public Collection getServices() {
-
-        return services;
-    }
-
-    public PscID getPscID() {
-        return pscID;
-    }
-
-    public String getProcessName() {
-        return pscID.getProcessName();
-    }
-
-    /**
-     * Returns true if the specified object is semantically equal to this instance.
-     * <p>
-     * @param obj the object that this instance is to be compared to.
-     * @return whether the object is equal to this object.
-     */
-    public boolean equals(Object obj) {
-
-        // Check if instances are identical ...
-        if ( this == obj ) {
-            return true;
-        }
-
-        // Check if object can be compared to this one
-        if ( obj instanceof PSCData ) {
-
-            PSCData that = (PSCData) obj;
-            return pscID.equals(that.getPscID());
-        }
-
-        // Otherwise not comparable ...
-        return false;
-    }
-}
-

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-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/ProcessData.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -23,6 +23,7 @@
 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;
@@ -33,8 +34,8 @@
  */
 public class ProcessData extends ComponentData {
 
-    /** Map of ServiceID to ServiceRegistryBindings */
-    private Collection pscs;
+	   /** Collection of serviceData objects */
+    private Collection services;
 
     /** defines vm in configuration */
     private ComponentDefnID defnID;
@@ -51,20 +52,24 @@
      * @param vmController VMController implementation
      * @param hostName Name of host VM is running on
      */
-    public ProcessData(String hostName, String processName, String port, ComponentDefnID defnID,  Collection pscs,  boolean deployed, boolean registered) {
+    public ProcessData(String hostName, String processName, String port, ComponentDefnID defnID,  Collection services,  boolean deployed, boolean registered) {
         super(processName, deployed, registered);
         this.hostName = hostName;
         this.defnID = defnID;
-        this.pscs = pscs;
+        this.services = services;
         this.port = port;
+        
         computeHashCode();
     }
 
     /**
-     * Return a collection of PSCData objects.
+     * Return a list of all ServiceData objects
+     *
+     * @return List of ServiceData objects
      */
-    public Collection getPSCs() {
-        return pscs;
+    public Collection getServices() {
+
+        return services;
     }
 
 

Deleted: branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PscID.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PscID.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/PscID.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -1,102 +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.platform.admin.api.runtime;
-
-import java.io.Serializable;
-
-import com.metamatrix.common.config.api.ProductServiceConfigID;
-import com.metamatrix.core.util.HashCodeUtil;
-
-
-/**
- * This class is a container for ServiceRegistryBinding objects for
- * all the services running in this VM
- */
-public class PscID implements Serializable {
-
-    /** defines psc in configuration */
-    private ProductServiceConfigID pscConfigID;
-
-    /** Name of process that owns this psc */
-    private String processName;
-
-    private int hashCode;
-
-    /**
-     * Create a new instance of PscID.
-     *
-     * @param pscConfigID Identifies PSC
-     * @param processName Name of process psc is running on
-     */
-    public PscID(ProductServiceConfigID pscConfigID, String processName) {
-        this.pscConfigID = pscConfigID;
-        this.processName = processName;
-        computeHashCode();
-    }
-
-    public ProductServiceConfigID getPscConfigID() {
-        return pscConfigID;
-    }
-
-    public String getProcessName() {
-        return this.processName;
-    }
-
-    private void computeHashCode() {
-        hashCode = pscConfigID.hashCode();
-        hashCode = HashCodeUtil.hashCode(hashCode, processName.hashCode());
-    }
-
-    /**
-     * Returns true if the specified object is semantically equal to this instance.
-     * <p>
-     * @param obj the object that this instance is to be compared to.
-     * @return whether the object is equal to this object.
-     */
-    public boolean equals(Object obj) {
-
-        // Check if instances are identical ...
-        if ( this == obj ) {
-            return true;
-        }
-
-        // Check if object can be compared to this one
-        if ( obj instanceof PscID ) {
-
-            PscID that = (PscID) obj;
-            return ((pscConfigID.equals(that.getPscConfigID())) & (processName.equals(that.getProcessName())));
-        }
-
-        // Otherwise not comparable ...
-        return false;
-    }
-    
-    public String toString() {
-    	StringBuffer result = new StringBuffer();
-    	result.append("PSC:");  //$NON-NLS-1$
-		result.append(pscConfigID.getFullName());
-		result.append(processName);
-		return result.toString(); 
-    }
-}
-

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-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/platform/admin/api/runtime/SystemState.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -86,11 +86,7 @@
              Iterator processes = hData.getProcesses().iterator();
              while (processes.hasNext()) {
                  ProcessData pData = (ProcessData) processes.next();
-                 Iterator pscs = pData.getPSCs().iterator();
-                 while (pscs.hasNext()) {
-                     PSCData pscData = (PSCData) pscs.next();
-                     services.addAll(pscData.getServices());
-                 }
+                 services.addAll(pData.getServices());
              }
          }
          

Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDBDefn.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDBDefn.java	2009-04-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDBDefn.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -33,7 +33,7 @@
 
 import com.metamatrix.common.config.api.ComponentType;
 import com.metamatrix.common.config.api.ConnectorBinding;
-import com.metamatrix.common.config.util.ConfigUtil;
+import com.metamatrix.common.config.model.BasicUtil;
 import com.metamatrix.common.vdb.api.ModelInfo;
 import com.metamatrix.common.vdb.api.VDBDefn;
 import com.metamatrix.common.vdb.api.VDBStream;
@@ -160,7 +160,7 @@
             }
             
             // rename the binding and add it back
-            ConnectorBinding newcb = ConfigUtil.getEditor().createConnectorComponent(cb.getConfigurationID(), cb, newBindingName, cb.getRoutingUUID()); 
+            ConnectorBinding newcb = BasicUtil.getEditor().createConnectorComponent(cb.getConfigurationID(), cb, newBindingName, cb.getRoutingUUID()); 
             addConnectorBinding(newcb);
             
          }

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-09 23:31:26 UTC (rev 744)
+++ branches/remove_psc/common-internal/src/test/java/com/metamatrix/common/config/xml/TestXMLConfigurationImportExportUtility.java	2009-04-10 03:06:06 UTC (rev 745)
@@ -25,18 +25,27 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.Collection;
 import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 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.ConnectorBindingType;
 import com.metamatrix.common.config.api.ExtensionModule;
+import com.metamatrix.common.config.api.VMComponentDefn;
 import com.metamatrix.common.config.model.BasicConfigurationObjectEditor;
 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.util.ByteArrayHelper;
 import com.metamatrix.core.util.FileUtils;
 import com.metamatrix.core.util.UnitTestUtil;
@@ -329,4 +338,40 @@
          // pass   
         }
     }
+    
+    public void testImportExportConfig() throws Exception {
+  
+            String fileToImport = UnitTestUtil.getTestDataPath()+"/config-original.xml"; //$NON-NLS-1$
+            
+            ConfigurationModelContainerAdapter cma = new ConfigurationModelContainerAdapter();
+            
+            ConfigurationModelContainer configModel = cma.readConfigurationModel(fileToImport, Configuration.NEXT_STARTUP_ID);
+ 
+            if (configModel.getHosts().size() != 1) {
+            	fail("Didnt find 1 hosts");
+            }
+            
+            if (configModel.getConfiguration().getVMComponentDefns().size() != 1) {
+            	fail("Didnt find 1 vm");
+            }
+            
+            VMComponentDefn vm = (VMComponentDefn) configModel.getConfiguration().getVMComponentDefns().iterator().next();
+            
+            Collection depsvcs = configModel.getConfiguration().getDeployedServicesForVM(vm);
+            
+            if (depsvcs == null || depsvcs.size() != 6) {
+            	fail("Didnt find 6 deployed services for VM " + vm.getName());
+            }
+            
+            String fileToExport = UnitTestUtil.getTestScratchPath() + ("/exported_config.xml");
+            
+            cma.writeConfigurationModel(fileToExport, configModel, "TestCase");
+            
+            
+            // try reloading what was written to confirm
+            configModel = cma.readConfigurationModel(fileToExport, Configuration.NEXT_STARTUP_ID);
+
+            
+    	
+    }
 }

Added: branches/remove_psc/common-internal/src/test/resources/config-original.xml
===================================================================
--- branches/remove_psc/common-internal/src/test/resources/config-original.xml	                        (rev 0)
+++ branches/remove_psc/common-internal/src/test/resources/config-original.xml	2009-04-10 03:06:06 UTC (rev 745)
@@ -0,0 +1,720 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ConfigurationDocument>
+    <Header>
+        <ApplicationCreatedBy>ConfigurationAdministration</ApplicationCreatedBy>
+        <ApplicationVersionCreatedBy>4.2</ApplicationVersionCreatedBy>
+        <UserCreatedBy>Configuration</UserCreatedBy>
+        <ConfigurationVersion>4.2</ConfigurationVersion>
+        <MetaMatrixSystemVersion>4.2</MetaMatrixSystemVersion>
+        <Time>2004-06-30T12:23:53.919-06:00</Time>
+    </Header>
+    <Configuration Name="Next Startup" ComponentType="Configuration" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+        <Properties>
+            <Property Name="metamatrix.server.metadata.systemURL">extensionjar:System.vdb</Property>
+            <Property Name="metamatrix.server.extensionTypesToCache">JAR File</Property>
+            <Property Name="metamatrix.server.procDebug">false</Property>
+            <Property Name="metamatrix.server.cacheConnectorClassLoaders">true</Property>
+            <Property Name="metamatrix.server.streamingBatchSize">100</Property>
+            <Property Name="metamatrix.server.serviceMonitorInterval">60</Property>
+            <Property Name="metamatrix.session.max.connections">0</Property>
+            <Property Name="metamatrix.session.time.limit">0</Property>
+            <Property Name="metamatrix.session.sessionMonitor.ActivityInterval">5</Property>
+            <Property Name="metamatrix.audit.jdbcTable">AUDITENTRIES</Property>
+            <Property Name="metamatrix.audit.threadTTL">600000</Property>
+            <Property Name="metamatrix.audit.fileFormat">com.metamatrix.platform.security.audit.format.DelimitedAuditMessageFormat</Property>
+            <Property Name="metamatrix.audit.jdbcResourceDelim">;</Property>
+            <Property Name="metamatrix.audit.jdbcDatabase">false</Property>
+            <Property Name="metamatrix.audit.console">false</Property>
+            <Property Name="metamatrix.audit.jdbcMaxContextLength">64</Property>
+            <Property Name="metamatrix.audit.fileAppend">false</Property>
+            <Property Name="metamatrix.audit.enabled">false</Property>
+            <Property Name="metamatrix.audit.consoleFormat">com.metamatrix.platform.security.audit.format.ReadableAuditMessageFormat</Property>
+            <Property Name="metamatrix.audit.jdbcMaxResourceLength">4000</Property>
+            <Property Name="metamatrix.authorization.dataaccess.CheckingEnabled">false</Property>
+            <Property Name="metamatrix.authorization.metabase.CheckingEnabled">false</Property>
+            <Property Name="metamatrix.deployment.platform">standalone</Property>
+            <Property Name="metamatrix.encryption.client">true</Property>
+            <Property Name="metamatrix.encryption.secure.sockets">false</Property>
+            <Property Name="metamatrix.log.consoleFormat">com.metamatrix.common.log.format.ReadableLogMessageFormat</Property>
+            <Property Name="metamatrix.log.console">true</Property>
+            <Property Name="metamatrix.log.jdbcTable">LOGENTRIES</Property>
+            <Property Name="metamatrix.log.jdbcMaxContextLength">64</Property>
+            <Property Name="metamatrix.log.jdbcMaxExceptionLength">4000</Property>
+            <Property Name="metamatrix.log.jdbcMaxLength">2000</Property>
+            <Property Name="metamatrix.log.maxRows">2500</Property>
+            <Property Name="metamatrix.log.size.limit.kbs">1000</Property>
+            <Property Name="metamatrix.log.size.monitor.mins">60</Property>
+            <Property Name="metamatrix.log">4</Property>
+            <Property Name="metamatrix.log.jdbcDatabase.enabled">true</Property>
+            <Property Name="metamatrix.buffer.memoryAvailable">500</Property>
+            <Property Name="metamatrix.buffer.sessionUsePercentage">80</Property>
+            <Property Name="metamatrix.buffer.activeMemoryThreshold">90</Property>
+            <Property Name="metamatrix.buffer.managementInterval">1000</Property>
+            <Property Name="metamatrix.buffer.connectorBatchSize">2000</Property>
+            <Property Name="metamatrix.buffer.processorBatchSize">2000</Property>
+            <Property Name="metamatrix.buffer.maxOpenFiles">10</Property>
+            <Property Name="metamatrix.buffer.maxFileSize">2048</Property>
+            <Property Name="metamatrix.buffer.logStatsInterval">0</Property>
+            <Property Name="metamatrix.transaction.log.storeMMCMD">false</Property>
+            <Property Name="metamatrix.transaction.log.storeSRCCMD">false</Property>
+            <Property Name="vm.starter.maxThreads">5</Property>
+            <Property Name="vm.starter.timetolive">30000</Property>
+        </Properties>
+        <Host Name="localhost" ComponentType="Host" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Process Name="MMProcess" ComponentType="VM" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+                <Properties>
+                    <Property Name="vm.starter.cmd.java_opts">-server -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir=${metamatrix.host.dir}/data/tmp -ms${vm.starter.minHeapSize}m -mx${vm.starter.maxHeapSize}m</Property>
+                    <Property Name="vm.starter.maxHeapSize">1024</Property>
+                    <Property Name="vm.starter.minHeapSize">256</Property>
+                    <Property Name="vm.socketPort">(vm.port)</Property>
+                    <Property Name="vm.maxThreads">64</Property>
+                    <Property Name="vm.timetolive">30000</Property>
+                    <Property Name="vm.minPort">0</Property>
+                    <Property Name="vm.inputBufferSize">102400</Property>
+                    <Property Name="vm.outputBufferSize">102400</Property>
+                    <Property Name="vm.enabled">true</Property>
+                    <Property Name="vm.forced.shutdown.time">30</Property>
+                </Properties>
+                     <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+             </Process>
+        </Host>
+    </Configuration>
+    <Services>
+        <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="ConnectorClass">com.metamatrix.connector.metadata.IndexConnector</Property>
+                <Property Name="ServiceClassName">com.metamatrix.server.connector.service.ConnectorService</Property>
+                <Property Name="metamatrix.service.essentialservice">true</Property>
+                <Property Name="ConnectorMaxThreads">20</Property>
+                <Property Name="ConnectorThreadTTL">120000</Property>
+                <Property Name="MaxResultRows">0</Property>
+                <Property Name="ExceptionOnMaxRows">true</Property>
+                <Property Name="Immutable">true</Property>
+            </Properties>
+        </Service>
+        <Service Name="MembershipService" ComponentType="MembershipService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="security.membership.admin.username">(admin.username)</Property>
+                <Property Name="security.membership.admin.password">(admin.password)</Property>
+                <Property Name="metamatrix.service.essentialservice">true</Property>
+                <Property Name="security.membership.DomainOrder">
+                </Property>
+                <Property Name="ServiceClassName">com.metamatrix.platform.security.membership.service.MembershipServiceImpl</Property>
+            </Properties>
+        </Service>
+        <Service Name="ODBCService" ComponentType="ODBCService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="metamatrix.service.essentialservice">false</Property>
+                <Property Name="ServiceClassName">com.metamatrix.odbc.ODBCServiceImpl</Property>
+                <Property Name="Openrdaloc">odbc/MMODBC.ini</Property>
+                <Property Name="ServerKey">license/oaserverkey.lic</Property>
+            </Properties>
+        </Service>
+        <Service Name="ConfigurationService" ComponentType="ConfigurationService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="metamatrix.service.essentialservice">true</Property>
+                <Property Name="ServiceClassName">com.metamatrix.platform.config.service.ConfigurationServiceImpl</Property>
+            </Properties>
+        </Service>
+        <Service Name="AuthorizationService" ComponentType="AuthorizationService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="metamatrix.service.essentialservice">true</Property>
+                <Property Name="security.authorization.connection.Retries">4</Property>
+                <Property Name="ServiceClassName">com.metamatrix.platform.security.authorization.service.AuthorizationServiceImpl</Property>
+            </Properties>
+        </Service>
+        <Service Name="SessionService" ComponentType="SessionService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="security.session.terminationHandlers">com.metamatrix.server.util.DataServerSessionTerminationHandler</Property>
+                <Property Name="metamatrix.service.essentialservice">true</Property>
+                <Property Name="ServiceClassName">com.metamatrix.platform.security.session.service.SessionServiceImpl</Property>
+            </Properties>
+        </Service>
+        <Service Name="QueryService" ComponentType="QueryService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="metamatrix.service.essentialservice">false</Property>
+                <Property Name="ProcessPoolMaxThreads">64</Property>
+                <Property Name="ProcessPoolThreadTTL">120000</Property>
+                <Property Name="ServiceClassName">com.metamatrix.server.query.service.QueryService</Property>
+                <Property Name="ProcessorTimeslice">2000</Property>
+                <Property Name="MaxCodeTables">50</Property>
+                <Property Name="MaxCodeTableRecords">10000</Property>
+                <Property Name="MinFetchSize">100</Property>
+                <Property Name="MaxFetchSize">20000</Property>
+                <Property Name="ResultSetCacheEnabled">0</Property>
+                <Property Name="ResultSetCacheMaxSize">0</Property>
+                <Property Name="ResultSetCacheMaxAge">0</Property>
+                <Property Name="ResultSetCacheScope">vdb</Property>
+                <Property Name="MaxPlanCacheSize">100</Property>
+            </Properties>
+        </Service>
+    </Services>
+    <ComponentTypes>
+        <ComponentType Name="Service" ComponentTypeCode="1" Deployable="false" Deprecated="false" Monitorable="false" ParentComponentType="VM" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.943-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.943-06:00">
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" Multiplicity="1" IsHidden="true" />
+        </ComponentType>
+        <ComponentType Name="Host" ComponentTypeCode="7" Deployable="true" Deprecated="false" Monitorable="false" ParentComponentType="Configuration" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.950-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.950-06:00">
+        </ComponentType>
+        <ComponentType Name="DeployedComponent" ComponentTypeCode="8" Deployable="false" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.970-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.970-06:00" />
+        <ComponentType Name="VM" ComponentTypeCode="5" Deployable="true" Deprecated="false" Monitorable="false" ParentComponentType="Host" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.944-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.944-06:00">
+            <PropertyDefinition Name="vm.starter.cmd.java_opts" DisplayName="Java Options" ShortDescription="These are the java options passed in before the main class" DefaultValue="-server -Djava.io.tmpdir=${metamatrix.host.dir}/data/tmp -ms${vm.starter.minHeapSize}m -mx${vm.starter.maxHeapSize}m" />
+            <PropertyDefinition Name="vm.enabled" DisplayName="Start Enabled Flag" ShortDescription="The enabled flag allows for disabling the VM from starting without have to remove it from deployment." DefaultValue="true" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="vm.timetolive" DisplayName="Socket Worker Thread Time-To-Live (ms)" ShortDescription="Time-to-live (in milliseconds) for threads used to do work on client requests." DefaultValue="30000" />
+            <PropertyDefinition Name="vm.starter.maxHeapSize" DisplayName="Maximum Heap Size (MB)" ShortDescription="The maximum heap size, in megabytes, to be used for this VM.  If no value is provided for this property, the default property value from the configuration is used; if no value is specified anywhere, no maximum heap size will be set." DefaultValue="1024" IsPreferred="true" />
+            <PropertyDefinition Name="vm.minPort" DisplayName="Min Port Number" ShortDescription="Min port number" DefaultValue="0" />
+            <PropertyDefinition Name="vm.maxThreads" DisplayName="Max Threads" ShortDescription="Maximum socket listener threads." DefaultValue="64" />
+            <PropertyDefinition Name="vm.bind.address" DisplayName="VM Bind Address" ShortDescription="The bind address, when specified determines what address the vm will be bound to." DefaultValue="" IsHidden="true" IsModifiable="false" />
+            <PropertyDefinition Name="vm.starter.minHeapSize" DisplayName="Minimum Heap Size (MB)" ShortDescription="The minimum heap size, in megabytes, to be used for this VM.  If no value is provided for this property, the default property value from the configuration is used; if no value is specified anywhere, no minimum heap size will be set." DefaultValue="256" IsPreferred="true" />
+            <PropertyDefinition Name="vm.inputBufferSize" DisplayName="Socket Input BufferSize" ShortDescription="The size of socket buffer used when reading." DefaultValue="0" Multiplicity="1" PropertyType="Integer" IsConstrainedToAllowedValues="false" />
+            <PropertyDefinition Name="vm.socketPort" DisplayName="Socket Port" ShortDescription="The port number for the process when socket communications are being used " DefaultValue="31000" />
+            <PropertyDefinition Name="vm.forced.shutdown.time" DisplayName="VM Forced Shutdown Time (secs)" ShortDescription="The the number of seconds the VM will wait until it will perform a force shutdown." DefaultValue="30" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="vm.outputBufferSize" DisplayName="Socket Output BufferSize" ShortDescription="The size of the socket buffer used when writing." DefaultValue="0" Multiplicity="1" PropertyType="Integer" IsConstrainedToAllowedValues="false" />
+        </ComponentType>
+        <ComponentType Name="AuthorizationService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.957-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.957-06:00">
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.authorization.service.AuthorizationServiceImpl" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="security.authorization.connection.MaximumAge" DisplayName="Maximum connection time (milliseconds)" ShortDescription="" DefaultValue="600000" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="security.authorization.connection.MaximumConcurrentReaders" DisplayName="Maximum allowed concurrent users" ShortDescription="" DefaultValue="1" PropertyType="Integer" />
+            <PropertyDefinition Name="security.authorization.connection.Retries" DisplayName="Authorization proxy maximum retries" ShortDescription="" DefaultValue="4" Multiplicity="1" PropertyType="Integer" />
+        </ComponentType>
+        <ComponentType Name="SessionService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.955-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.955-06:00">
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="security.session.terminationHandlers" DisplayName="List of TerminationHandler Class Names" ShortDescription="" DefaultValue="com.metamatrix.server.util.DataServerSessionTerminationHandler" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.session.service.SessionServiceImpl" Multiplicity="1" IsHidden="true" />
+        </ComponentType>
+        <ComponentType Name="File Membership Domain Provider" ComponentTypeCode="11" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourceType" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.947-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.947-06:00">
+            <PropertyDefinition Name="activate" DisplayName="Enabled" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="usersFile" DisplayName="Users File" ShortDescription="Location of the properties file containing user name and password entries." Multiplicity="1" />
+            <PropertyDefinition Name="AuthDomainClass" DisplayName="Membership Domain Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.membership.spi.file.FileMembershipDomain" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="groupsFile" DisplayName="Groups File" ShortDescription="Location of the properties file containing group assignments." Multiplicity="1" />
+            <PropertyDefinition Name="checkPassword" DisplayName="Check Password" ShortDescription="Check passwords against the users file." DefaultValue="true" PropertyType="Boolean" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="Miscellaneous Resource Type" ComponentTypeCode="4" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourceType" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.949-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.949-06:00" />
+        <ComponentType Name="QueryService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="Integration Server" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.956-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.957-06:00">
+            <PropertyDefinition Name="MaxCodeTables" DisplayName="Max Code Tables" ShortDescription="Max Number of Code Tables" DefaultValue="50" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="MaxCodeTableRecords" DisplayName="Max Code Table Records" ShortDescription="Max Number of Records Per Code Table" DefaultValue="10000" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age (milliseconds)" ShortDescription="" DefaultValue="0" PropertyType="Long" />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="ProcessPoolMaxThreads" DisplayName="Process Pool Maximum Thread Count" ShortDescription="" DefaultValue="64" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb">
+                <AllowedValue>vdb</AllowedValue>
+                <AllowedValue>session</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false" PropertyType="Boolean" />
+            <PropertyDefinition Name="MinFetchSize" DisplayName="Minimum Fetch Size (rows)" ShortDescription="" DefaultValue="100" PropertyType="Integer" />
+            <PropertyDefinition Name="MaxFetchSize" DisplayName="Maximum Fetch Size (rows)" ShortDescription="" DefaultValue="20000" PropertyType="Integer" />
+            <PropertyDefinition Name="ProcessPoolThreadTTL" DisplayName="Process Pool Thread Time-To-Live (milliseconds)" ShortDescription="" DefaultValue="120000" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="MaxPlanCacheSize" DisplayName="Maximum Plan Cache" ShortDescription="Maximum number of plans in the cache" DefaultValue="100" PropertyType="Integer" />
+            <PropertyDefinition Name="ProcessorTimeslice" DisplayName="Query Processor Timeslice (milliseconds)" ShortDescription="" DefaultValue="2000" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size (megabytes)" ShortDescription="" DefaultValue="0" PropertyType="Integer" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.query.service.QueryService" Multiplicity="1" IsExpert="true" IsHidden="true" />
+        </ComponentType>
+        <ComponentType Name="MembershipService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.958-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.958-06:00">
+            <PropertyDefinition Name="security.membership.DomainOrder" DisplayName="Membership Domain Order" ShortDescription="" DefaultValue="JDBCInternalDomain" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="security.membership.admin.username" DisplayName="Admin Account Username" ShortDescription="" DefaultValue="MetaMatrixAdmin" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.membership.service.MembershipServiceImpl" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="security.membership.security.enabled" DisplayName="Security Enabled" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsHidden="true" />
+            <PropertyDefinition Name="security.membership.admin.password" DisplayName="Admin Account Password" ShortDescription="" Multiplicity="1" IsHidden="true" IsMasked="true" />
+        </ComponentType>
+        <ComponentType Name="ResourceType" ComponentTypeCode="0" Deployable="false" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.948-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.948-06:00" />
+        <ComponentType Name="ODBCService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Integration Server" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.958-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.958-06:00">
+            <PropertyDefinition Name="IntervalToCheckServiceState" DisplayName="ODBC Service Interval Check (secs)" ShortDescription="This property controls the interval for checking for the ODBC service state (seconds)." DefaultValue="120" Multiplicity="1" PropertyType="Integer" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="ServerKey" DisplayName="ODBC Server License File" ShortDescription="The location the ODBC Server license should be found" DefaultValue="license/oaserverkey.lic" Multiplicity="1" IsConstrainedToAllowedValues="false" IsModifiable="false" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.odbc.ODBCServiceImpl" Multiplicity="1" IsHidden="true" IsModifiable="false" />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="Openrdaloc" DisplayName="MMODBC.ini file location" ShortDescription="The location the MMODBC.ini should be found" DefaultValue="odbc/MMODBC.ini" Multiplicity="1" IsConstrainedToAllowedValues="false" IsModifiable="false" />
+        </ComponentType>
+        <ComponentType Name="RuntimeMetadataService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="Integration Server" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.944-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.944-06:00">
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="" Multiplicity="1" />
+            <PropertyDefinition Name="ExceptionOnMaxRows" DisplayName="Exception on Exceeding Max Rows" ShortDescription="Indicates if an Exception should be thrown if the specified value for Maximum Result Rows is exceeded; else no exception and no more than the maximum will be returned" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age (milliseconds)" ShortDescription="" DefaultValue="0" PropertyType="Long" />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb">
+                <AllowedValue>vdb</AllowedValue>
+                <AllowedValue>session</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" Multiplicity="1" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false" PropertyType="Boolean" />
+            <PropertyDefinition Name="ConnectorMaxThreads" DisplayName="Connector Maximum Thread Count" ShortDescription="" DefaultValue="20" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size (megabytes)" ShortDescription="" DefaultValue="0" PropertyType="Integer" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.connector.service.ConnectorService" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="ConnectorThreadTTL" DisplayName="Thread Time to live (milliseconds)" ShortDescription="" DefaultValue="120000" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="MaxResultRows" DisplayName="Maximum Result Rows" ShortDescription="" DefaultValue="0" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="ConfigurationService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.970-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.970-06:00">
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Configuration Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.config.service.ConfigurationServiceImpl" Multiplicity="1" IsHidden="true" />
+        </ComponentType>
+        <ComponentType Name="Connector" ComponentTypeCode="2" Deployable="false" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.916-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.916-06:00">
+            <PropertyDefinition Name="SourceConnectionTestInterval" DisplayName="Data Source Test Connect Interval (seconds)" ShortDescription="How often (in seconds) to create test connections to the underlying datasource to see if it is available." DefaultValue="600" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true" />
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system)" Multiplicity="0..1" IsExpert="true" />
+            <PropertyDefinition Name="ExceptionOnMaxRows" DisplayName="Exception on Exceeding Max Rows" ShortDescription="Indicates if an Exception should be thrown if the specified value for Maximum Result Rows is exceeded; else no exception and no more than the maximum will be returned" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="ServiceMonitoringEnabled" DisplayName="Data Source Monitoring Enabled" ShortDescription="Whether to monitor the underlying data source to see if it is available." DefaultValue="true" Multiplicity="1" PropertyType="Boolean" ISExpert="true" />
+            <PropertyDefinition Name="Immutable" DisplayName="Is Immutable" ShortDescription="True if the source never changes." DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorMaxThreads" DisplayName="Connector Maximum Thread Count" ShortDescription="" DefaultValue="20" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" Multiplicity="1" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.connector.service.ConnectorService" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="MaxResultRows" DisplayName="Maximum Result Rows" ShortDescription="" DefaultValue="10000" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorThreadTTL" DisplayName="Thread Time to live (milliseconds)" ShortDescription="" DefaultValue="120000" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age (milliseconds)" ShortDescription="" DefaultValue="0" PropertyType="Long" IsExpert="true" />
+            <PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb" IsExpert="true">
+                <AllowedValue>vdb</AllowedValue>
+                <AllowedValue>session</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="supportsAndCriteria" DisplayName="supportsAndCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteria" DisplayName="supportsCompareCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteriaEquals" DisplayName="supportsCompareCriteriaEquals" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteriaGreaterThan" DisplayName="supportsCompareCriteriaGreaterThan" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteriaGreaterThanOrEqual" DisplayName="supportsCompareCriteriaGreaterThanOrEqual" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteriaLessThan" DisplayName="supportsCompareCriteriaLessThan" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteriaLessThanOrEqual" DisplayName="supportsCompareCriteriaLessThanOrEqual" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteriaNotEquals" DisplayName="supportsCompareCriteriaNotEquals" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCriteria" DisplayName="supportsCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsInCriteria" DisplayName="supportsInCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsIsNullCriteria" DisplayName="supportsIsNullCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsJoins" DisplayName="supportsJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsLikeCriteria" DisplayName="supportsLikeCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsNotCriteria" DisplayName="supportsNotCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsOrCriteria" DisplayName="supportsOrCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSelectDistinct" DisplayName="supportsSelectDistinct" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSelectLiterals" DisplayName="supportsSelectLiterals" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAliasedGroup" DisplayName="supportsAliasedGroup" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSelfJoins" DisplayName="supportsSelfJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsOuterJoins" DisplayName="supportsOuterJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsFullOuterJoins" DisplayName="supportsFullOuterJoins" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsBetweenCriteria" DisplayName="supportsBetweenCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsLikeCriteriaEscapeCharacter" DisplayName="supportsLikeCriteriaEscapeCharacter" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsInCriteriaSubquery" DisplayName="supportsInCriteriaSubquery" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsExistsCriteria" DisplayName="supportsExistsCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsQuantifiedCompareCriteria" DisplayName="supportsQuantifiedCompareCriteria" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsQuantifiedCompareCriteriaSome" DisplayName="supportsQuantifiedCompareCriteriaSome" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsQuantifiedCompareCriteriaAll" DisplayName="supportsQuantifiedCompareCriteriaAll" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsOrderBy" DisplayName="supportsOrderBy" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregates" DisplayName="supportsAggregates" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesSum" DisplayName="supportsAggregatesSum" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesAvg" DisplayName="supportsAggregatesAvg" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesMin" DisplayName="supportsAggregatesMin" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesMax" DisplayName="supportsAggregatesMax" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesCount" DisplayName="supportsAggregatesCount" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesCountStar" DisplayName="supportsAggregatesCountStar" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesDistinct" DisplayName="supportsAggregatesDistinct" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsScalarSubqueries" DisplayName="supportsScalarSubqueries" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCorrelatedSubqueries" DisplayName="supportsCorrelatedSubqueries" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCaseExpressions" DisplayName="supportsCaseExpressions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSearchedCaseExpressions" DisplayName="supportsSearchedCaseExpressions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsScalarFunctions" DisplayName="supportsScalarFunctions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="getSupportedFunctions" DisplayName="getSupportedFunctions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="string" IsExpert="true" />
+            <PropertyDefinition Name="supportsInlineViews" DisplayName="supportsInlineViews" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsOrderByInInlineViews" DisplayName="supportsOrderByInInlineViews" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsUnionOrderBy" DisplayName="supportsUnionOrderBy" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsUnions" DisplayName="supportsUnions" ShortDescription="" DefaultValue="" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="Configuration" ComponentTypeCode="0" Deployable="true" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.958-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.958-06:00">
+            <PropertyDefinition Name="vm.starter.timetolive" DisplayName="Process TTL (milliseconds)" ShortDescription="Process Time-to-live (TTL) for threads used to start services." DefaultValue="30000" Multiplicity="1" />
+            <PropertyDefinition Name="metamatrix.transaction.log.storeMMCMD" DisplayName="Enable MetaMatrix Command Logging" ShortDescription="Determine whether MetaMatrix command information should be recorded" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.buffer.relative.storageDirectory" DisplayName="Buffer Storage Directory" ShortDescription="The relative path to Host data directory where temporary files are stored." DefaultValue="/buffer" />
+            <PropertyDefinition Name="metamatrix.server.extensionTypesToCache" DisplayName="Types of Extension Modules to Cache" ShortDescription="Types of Extension Module files to cache in memory.  Separate by commas.  Allowed values: (Configuration Model,Function Definition,JAR File,VDB File)" DefaultValue="JAR File" Multiplicity="1" />
+            <PropertyDefinition Name="metamatrix.buffer.processorBatchSize" DisplayName="Processor Batch Size (rows)" ShortDescription="The size of a batch sent within the query processor." DefaultValue="500" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.audit.fileFormat" DisplayName="File Auditing Destination format class" ShortDescription="Driver class name for the JDBC auditing destination" DefaultValue="com.metamatrix.security.audit.format.DelimitedAuditMessageFormat" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.buffer.maxOpenFiles" DisplayName="Max open storage files" ShortDescription="The maximum number of open file descriptors used by buffer management temp storage." DefaultValue="10" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.log.consoleFormat" DisplayName="Format class for console log messages" ShortDescription="The name of the class that is used to format the log messages sent to the console" DefaultValue="com.metamatrix.common.log.format.ReadableLogMessageFormat" IsHidden="true" />
+            <PropertyDefinition Name="metamatrix.audit.contexts" DisplayName="Audit Contexts to Exclude" ShortDescription="The contexts for audit messages that are NOT to be recorded" />
+            <PropertyDefinition Name="metamatrix.log.contexts" DisplayName="Logging Contexts to Exclude" ShortDescription="The contexts for log messages that are NOT to be recorded" IsHidden="true" />
+            <PropertyDefinition Name="metamatrix.encryption.internal.encryptAll" DisplayName="Encrypt All Internal Traffic" ShortDescription="Force the encryption of all internal traffic, not just the traffic to secure services." DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" RequiresRestart="true" />
+            <PropertyDefinition Name="metamatrix.audit.jdbcResourceDelim" DisplayName="JDBC Auditing Destination delimiter for resource names" ShortDescription="The delimiter that is used to separate resource names" DefaultValue="," IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.audit.jdbcMaxResourceLength" DisplayName="JDBC Context Destination maximum length for audit text" ShortDescription="The maximum length of the resource name used in audit messages.  Required if JDBC audit destination is to be used." DefaultValue="4000" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.session.sessionMonitor.ActivityInterval" DisplayName="Session Monitoring Activity (minutes)" ShortDescription="How often sessions will be monitored to check for over-limit sessions and invalidate them." DefaultValue="5" PropertyType="Integer" IsExpert="true" RequiresRestart="all_processes" />
+            <PropertyDefinition Name="metamatrix.audit.jdbcTable" DisplayName="JDBC Auditing Destination table name" ShortDescription="The name of the table that auditing messages are to be written to.  Required if JDBC audit destination is to be used" DefaultValue="LogEntries" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.log.size.monitor.mins" DisplayName="Log File Monitoring Interval (minutes)" ShortDescription="The time interval in minutes the log file size is monitored" DefaultValue="1000" Multiplicity="1" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="metamatrix.log.jdbcMaxContextLength" DisplayName="JDBC Logging Destination maximum length for contexts" ShortDescription="The maximum length of all the disregarded log contexts in total" DefaultValue="64" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.log.jdbcTable" DisplayName="JDBC Logging Destination table name" ShortDescription="The table the logging information to be written to" DefaultValue="LOGENTRIES" />
+            <PropertyDefinition Name="metamatrix.transaction.log.storeSRCCMD" DisplayName="Enable Data Source Command Logging" ShortDescription="Determine whether source command information should be recorded" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.audit.maxThreads" DisplayName="Auditing Maximum Thread Count" ShortDescription="The maximum number of auditing threads allowed" DefaultValue="4" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.log.maxRows" DisplayName="JDBC Logging maximum number of rows returned" ShortDescription="The maximum number of rows returned" DefaultValue="2500" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.encryption.secure.sockets" DisplayName="Secure Sockets Enabled" ShortDescription="Determines whether the Secure Sockets are enabled, configuration is done from the SSL Resource" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" RequiresRestart="true" />
+            <PropertyDefinition Name="metamatrix.encryption.internal.authenticationMode" DisplayName="Internal Authentication Mode" ShortDescription="Sets the internal SSL authentication mode if internal SSL is enabled." DefaultValue="2-way" Multiplicity="1" IsExpert="true" RequiresRestart="true">
+                <AllowedValue>anonymous</AllowedValue>
+                <AllowedValue>1-way</AllowedValue>
+                <AllowedValue>2-way</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="metamatrix.audit.console" DisplayName="Standard-Out Audit Destination" ShortDescription="True if the audit messages are to be sent to standard out for a VM" DefaultValue="false" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.buffer.maxFileSize" DisplayName="Max buffer file size (megabytes)" ShortDescription="The maximum size (in megabytes) that a buffer file is allowed to reach before creating spill files." DefaultValue="2048" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.server.commandLoggerClassname" DisplayName="Command Logger service provider classname" ShortDescription="The fully-qualified classname of the CommandLoggerSPI implementation to be used by Tracking Service." IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.log.jdbcDatabase.enabled" DisplayName="JDBC Logging Destination Enabled" ShortDescription="If enabled, then log to the jdbc destination." DefaultValue="true" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.buffer.managementInterval" DisplayName="Buffer Management Interval (milliseconds)" ShortDescription="The period between checking whether active memory cleanup should occur." DefaultValue="1000" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.encryption.client" DisplayName="Client Side Password Encryption Enabled" ShortDescription="Determines whether the client side jce provider encryption will be performed" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.log" DisplayName="Logging Level" ShortDescription="The level at which logging will occur" DefaultValue="5" Multiplicity="1" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="metamatrix.encryption.internal.secure.sockets" DisplayName="Internal Secure Sockets Enabled" ShortDescription="Enable the use of SSL of RMI and HostController communication." DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" RequiresRestart="true" />
+            <PropertyDefinition Name="metamatrix.audit.fileAppend" DisplayName="File Auditing Destination append" ShortDescription="Determines whether or not the audit destination file will be appended or overwritten" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.audit.file" DisplayName="File Auditing Destination filename" ShortDescription="The name of the file that is the audit message destination.  If blank or not provided, audit messages are not sent to a file destination" />
+            <PropertyDefinition Name="metamatrix.buffer.connectorBatchSize" DisplayName="Connector Batch Size (rows)" ShortDescription="The size of a batch sent between connector and query service." DefaultValue="1000" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.buffer.logStatsInterval" DisplayName="Buffer Log Stat Interval (milliseconds)" ShortDescription="The period between writing buffer management statistics to the log, used primarily for debugging." DefaultValue="0" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.audit.enabled" DisplayName="Auditing Enabled" ShortDescription="Determines whether auditing will be performed" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.authorization.metabase.CheckingEnabled" DisplayName="MetaBase Authorization Enabled" ShortDescription="Determines whether MetaBase authorization (Entitlements) will be checked" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.authorization.dataaccess.CheckingEnabled" DisplayName="Data Access Authorization Enabled" ShortDescription="Determines whether authorization (Entitlements) will be checked" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.encryption.jce.provider" DisplayName="JCE Encryption Provider" ShortDescription="Indicates the jce encryption provider" DefaultValue="org.bouncycastle.jce.provider.BouncyCastleProvider" Multiplicity="1" IsHidden="true" IsModifiable="false" />
+            <PropertyDefinition Name="metamatrix.audit.jdbcMaxContextLength" DisplayName="JDBC Auditing Destination maximum length for contexts" ShortDescription="The maximum length of the list of disregarded audit contexts.  Required if JDBC audit destination is to be used." DefaultValue="64" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.server.cacheConnectorClassLoaders" DisplayName="Cache ClassLoaders for Connectors" ShortDescription="Determine whether to cache ClassLoaders in memory, for connectors that have the same classpath" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="metamatrix.extension.CommonClasspath" DisplayName="Common Extension Classpath" ShortDescription="Semicolon-delimited list of URLs to define extension classpath. This path will be used to load UDFs, connectors, membershipdomain etc.  Extension module URLs are of the form 'extensionjar:jarfilename.jar'" DefaultValue="" Multiplicity="1" />
+            <PropertyDefinition Name="metamatrix.server.serviceMonitorInterval" DisplayName="Connector Data Source Monitoring Interval (seconds)" ShortDescription="How often to ask connectors whether the underlying data source is available.  Note that underlying connector implementation may not ping the actual data source every time it is asked, for performance reasons." DefaultValue="60" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.log.size.limit.kbs" DisplayName="Log File Size Limit (kilobytes)" ShortDescription="Maximum log file size at which it will be swapped." DefaultValue="1000" Multiplicity="1" IsExpert="true" IsHidden="true" />
+            <PropertyDefinition Name="vm.starter.maxThreads" DisplayName="Service Starter Maximum Thread Count" ShortDescription="The maximum number of threads used to start services." DefaultValue="5" Multiplicity="1" />
+            <PropertyDefinition Name="metamatrix.log.jdbcMaxLength" DisplayName="JDBC Logging Destination maximum length for log messages" ShortDescription="The maximum length of the text that is logged" DefaultValue="2000" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.deployment.platform" DisplayName="Platform Type" ShortDescription="This property indicates the type of server platform which the Integration Server is running on" DefaultValue="standalone" Multiplicity="1" IsExpert="true" IsHidden="true" IsModifiable="false" />
+            <PropertyDefinition Name="metamatrix.log.captureSystemErr" DisplayName="Capture standard error to the logs" ShortDescription="True if the standard error is to be captured as log messages" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.log.jdbcMaxExceptionLength" DisplayName="JDBC Logging Destination maximum length for exception text" ShortDescription="The maximum length of the text that is logged as an exception" DefaultValue="4000" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.session.time.limit" DisplayName="Max Session Time Limit (minutes)" ShortDescription="Max connection time limit as a system property, forcibly terminate any connection that exceeds that limit, default would be no limit." DefaultValue="0" PropertyType="Integer" RequiresRestart="all_processes" />
+            <PropertyDefinition Name="metamatrix.server.procDebug" DisplayName="Enable Processor Data Debugging" ShortDescription="Determine whether to dump all data batches to the server log when using OPTION DEBUG" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="metamatrix.buffer.sessionUsePercentage" DisplayName="Session Memory Usage Limit (%)" ShortDescription="The maximum percentage of buffer memory that a may be used by a session." DefaultValue="80" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.buffer.memoryAvailable" DisplayName="Buffer Memory Available (megabytes)" ShortDescription="Amount of memory, in megabytes, to use as buffer management memory in each process." DefaultValue="500" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.audit.threadTTL" DisplayName="Auditing Thread Time-To-Live (TTL) (milliseconds)" ShortDescription="The maximum time (in milliseconds) that a auditing thread is allowed to live" DefaultValue="300000" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.audit.consoleFormat" DisplayName="Standard-Out Audit Destination format class" ShortDescription="The name of the class that is used to format the audit messages sent to the console" DefaultValue="com.metamatrix.security.audit.format.ReadableAuditMessageFormat" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.server.metadata.systemURL" DisplayName="System VDB URL" ShortDescription="The URL identifies the System VDB" DefaultValue="extensionjar:System.vdb" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.session.max.connections" DisplayName="Max Number of Sessions" ShortDescription="Max Number of Sessions allowed to connect to Integration Server (reject any connection requests beyond that limit, default would be no limit)" DefaultValue="0" PropertyType="Integer" RequiresRestart="all_processes" />
+            <PropertyDefinition Name="metamatrix.server.streamingBatchSize" DisplayName="Streaming Batch Size (kilobytes)" ShortDescription="The clob, blob and XML streaming batch size in kilobytes" DefaultValue="100" PropertyType="Integer" />
+            <PropertyDefinition Name="metamatrix.log.captureSystemOut" DisplayName="Capture standard out to the logs" ShortDescription="True if the standard out is to be captured as log messages" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.log.console" DisplayName="Send log messages to standard out" ShortDescription="True if the log messages are to be sent to standard out for a VM" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsHidden="true" />
+            <PropertyDefinition Name="metamatrix.audit.jdbcDatabase" DisplayName="JDBC Auditing Destination Enabled" ShortDescription="If auditing enabled, then record to the jdbc destination." DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="metamatrix.buffer.activeMemoryThreshold" DisplayName="Buffer Active Memory Threshold (%)" ShortDescription="The percentage of buffer management memory that serves as a threshold for active memory management." DefaultValue="90" PropertyType="Integer" />
+        </ComponentType>
+        <ComponentType Name="LDAP Membership Domain Provider" ComponentTypeCode="11" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourceType" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.947-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.947-06:00">
+            <PropertyDefinition Name="users.displayName.attribute" DisplayName="Users DisplayName Attribute" ShortDescription="The attribute(s) that uniquely identifies a user." DefaultValue="uid" IsExpert="true" />
+            <PropertyDefinition Name="users.searchFilter" DisplayName="Users SearchFilter" ShortDescription="The search filter(s) to apply to each users root context." DefaultValue="(objectclass=*)" IsExpert="true" />
+            <PropertyDefinition Name="users.rootContext" DisplayName="Users RootContext" ShortDescription="Specifies the context(s) to use when searching for users." Multiplicity="1" />
+            <PropertyDefinition Name="ldapAdmin.dn" DisplayName="Admin DN" ShortDescription="Bind account DN for group lookup." />
+            <PropertyDefinition Name="users.memberOf.attribute" DisplayName="Users Memberof Attribute" ShortDescription="Attribute(s) that appears on each user that identifies group membership." />
+            <PropertyDefinition Name="groups.displayName.attribute" DisplayName="Groups DisplayName Attribute" ShortDescription="The attribute(s) that uniquely identifies a group." IsExpert="true" />
+            <PropertyDefinition Name="users.searchScope" DisplayName="Users SearchScope" ShortDescription="How far down the directory tree to search each users root context." DefaultValue="SUBTREE_SCOPE" IsExpert="true" />
+            <PropertyDefinition Name="groups.rootContext" DisplayName="Groups RootContext" ShortDescription="Specifies the context(s) to use when searching for groups." Multiplicity="1" />
+            <PropertyDefinition Name="activate" DisplayName="Enabled" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="AuthDomainClass" DisplayName="Membership Domain Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.membership.spi.ldap.LDAPMembershipDomain" Multiplicity="1" IsHidden="true" />
+            <PropertyDefinition Name="groups.searchFilter" DisplayName="Groups SearchFilter" ShortDescription="The search filter(s) to apply to each groups root context." DefaultValue="(objectclass=*)" IsExpert="true" />
+            <PropertyDefinition Name="groups.searchScope" DisplayName="Groups SearchScope" ShortDescription="How far down the directory tree to search each groups root context." DefaultValue="SUBTREE_SCOPE" IsExpert="true" />
+            <PropertyDefinition Name="txnTimeoutInMillis" DisplayName="Txn Timeout(ms)" ShortDescription="Time to wait for LDAP operations to complete." IsExpert="true" />
+            <PropertyDefinition Name="groups.groupMember.attribute" DisplayName="Groups GroupMember Attribute" ShortDescription="The attribute(s) that contains the members of the group." />
+            <PropertyDefinition Name="ldapURL" DisplayName="LDAP URL" ShortDescription="Full LDAP URL" Multiplicity="1" />
+            <PropertyDefinition Name="ldapAdmin.password" DisplayName="Admin Password" ShortDescription="Bind account password for group lookup." IsMasked="true" />
+        </ComponentType>
+        <ComponentType Name="Custom Membership Domain Provider" ComponentTypeCode="11" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourceType" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.947-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.947-06:00">
+            <PropertyDefinition Name="activate" DisplayName="Enabled" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" />
+            <PropertyDefinition Name="AuthDomainClass" DisplayName="Membership Domain Class Name" ShortDescription="Full class name of the Membership Domain." Multiplicity="1" />
+            <PropertyDefinition Name="propertiesFile" DisplayName="Properties File" ShortDescription="Location of the properties file for this Membership Domain." IsExpert="true" />
+        </ComponentType>
+         <ComponentType Name="JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.952-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.952-06:00">
+			<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/>        
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-jdbc-6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true"/>
+            <PropertyDefinition Name="UseBindVariables" DisplayName="Use prepared statements and bind variables" ShortDescription="" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.JDBCConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than Integration Server" IsExpert="true" />
+            <PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue="" IsExpert="true" IsConstrainedToAllowedValues="true">
+            	<AllowedValue>TRANSACTION_READ_UNCOMMITTED</AllowedValue>
+            	<AllowedValue>TRANSACTION_READ_COMMITTED</AllowedValue>
+            	<AllowedValue>TRANSACTION_SERIALIZABLE</AllowedValue>
+            	<AllowedValue>TRANSACTION_NONE</AllowedValue>
+            	<AllowedValue></AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" Multiplicity="0" IsConstrainedToAllowedValues="false" IsMasked="true" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:&lt;protocol&gt;:&lt;url&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.translator.Translator" IsExpert="true" />
+            <PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="Max Values in IN Predicate" ShortDescription="Max number of values in an IN Predicate.  Must be &gt;= 0." DefaultValue="1000" PropertyType="Integer" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" Multiplicity="0" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="Right Trim fixed character types returned as Strings" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />
+            <PropertyDefinition Name="UseCommentsInSourceQuery" DisplayName="Use informational comments in Source Queries" ShortDescription="This will embed /*comment*/ style comment with session/request id in source SQL query for informational purposes" DefaultValue="false" PropertyType="Boolean" IsPreferred="true" IsExpert="true"/>
+            <PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false" Multiplicity="0..1" PropertyType="Boolean" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" />
+            <PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size (megabytes)" ShortDescription="" DefaultValue="0" Multiplicity="0..1" PropertyType="Integer" ValueDelimiter="," IsConstrainedToAllowedValues="true" IsExpert="true" IsHidden="false" IsMasked="false" IsModifiable="true" IsPreferred="false" />
+
+        </ComponentType>
+        
+        <ComponentType Name="Apache Derby Embedded Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.941-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.941-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.apache.derby.jdbc.EmbeddedDataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:derby:&lt;databaseName&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.derby.DerbySQLTranslator" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="Apache Derby Network Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.942-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.942-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.apache.derby.jdbc.ClientDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:derby:&lt;databaseName&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.derby.DerbySQLTranslator" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="MS Access Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.954-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.954-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:Driver={MicroSoft Access Driver (*.mdb)};DBQ=&lt;data-source-name&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.access.AccessSQLTranslator" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="MS Excel Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2006-02-08T11:02:36.029-06:00" CreatedBy="ConfigurationStartup" CreationDate="2006-02-08T11:02:36.029-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:Driver={MicroSoft Excel Driver (*.xls)};DBQ=&lt;filePathToExcelFile&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="MySQL 4 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.938-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.938-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mysql://&lt;host&gt;:3306/&lt;databaseName&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.mysql.MySQLTranslator" IsExpert="true" />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />            
+        </ComponentType>
+        <ComponentType Name="PostgreSQL 8 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.940-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.940-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.postgresql.xa.PGXADataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:postgresql://&lt;host&gt;:5432;DatabaseName=/&lt;databaseName&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.postgresql.PostgreSQLTranslator" IsExpert="true" />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />            
+        </ComponentType>
+        <ComponentType Name="Teiid JDBC 6 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="metamatrixadmin" LastChangedDate="2005-07-26T14:34:20.960-06:00" CreatedBy="metamatrixadmin" CreationDate="2005-07-26T14:34:20.960-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.metamatrix.jdbc.MMDataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:metamatrix:&lt;vdbName&gt;@mm://&lt;host&gt;:&lt;port&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />            
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="JDBC ODBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.953-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.953-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:&lt;data-source-name&gt;[;UID=&lt;xxx&gt; ;PWD=&lt;xxx&gt;]" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="Datadirect DB2 8 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.928-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.928-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.metamatrix.jdbcx.db2.DB2DataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:db2://&lt;host&gt;:50000;DatabaseName=&lt;databasename&gt;;CollectionID=&lt;collectionid&gt;;PackageName=&lt;packagename&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />            
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.db2.DB2SQLTranslator" IsExpert="true" />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="Datadirect Oracle 9 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.923-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.923-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.metamatrix.jdbcx.oracle.OracleDataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:1521;SID=&lt;sid&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />            
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.oracle.OracleSQLTranslator" IsExpert="true" />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="Datadirect SQL Server 2003 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.935-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.935-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.metamatrix.jdbcx.sqlserver.SQLServerDataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sqlserver://&lt;host&gt;:1433;DatabaseName=&lt;databasename&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />            
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.sqlserver.SqlServerSQLTranslator" IsExpert="true" />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="Datadirect Sybase 12 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.930-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.930-06:00">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.metamatrix.jdbcx.sybase.SybaseDataSource" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sybase://&lt;host&gt;:5000;DatabaseName=&lt;databasename&gt;" Multiplicity="1" IsConstrainedToAllowedValues="false" IsPreferred="true" />            
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.sybase.SybaseSQLTranslator" IsExpert="true" />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsConstrainedToAllowedValues="true" IsPreferred="true" />
+            <PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="Max Values in IN Predicate" ShortDescription="Max number of values in an IN Predicate.  Must be &gt;= 0." DefaultValue="250" PropertyType="Integer" IsConstrainedToAllowedValues="false" IsExpert="true" />
+        </ComponentType>                                                                                                          <ComponentType Name="LDAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.946-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.946-06:00">
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/>        
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-ldap-6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true"/>
+            <PropertyDefinition Name="SearchDefaultBaseDN" DisplayName="Default Search Base DN" ShortDescription="Default Base DN for LDAP Searches" IsExpert="true" />
+            <PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval (seconds)" ShortDescription="Set the interval to cleaning the pool" DefaultValue="300" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="LdapAdminUserDN" DisplayName="Ldap Admin User DN" ShortDescription="User DN for the LDAP admin account." DefaultValue="cn=&lt;&gt;,ou=&lt;&gt;,dc=&lt;&gt;" Multiplicity="1" IsPreferred="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.ldap.LDAPConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="LdapMaxCriteria" DisplayName="Ldap Max Criteria" ShortDescription="Maximum number of criteria supported in an LDAP search filter." DefaultValue="1000" Multiplicity="1" />
+            <PropertyDefinition Name="LdapAdminUserPassword" DisplayName="Ldap Admin Password" ShortDescription="Password of the LDAP admin user account." Multiplicity="1" IsMasked="true" IsPreferred="true" />
+            <PropertyDefinition Name="SearchDefaultScope" DisplayName="Default Search Scope" ShortDescription="Default Scope for LDAP Searches" DefaultValue="SUBTREE_SCOPE" Multiplicity="1">
+                <AllowedValue>OBJECT_SCOPE</AllowedValue>
+                <AllowedValue>ONELEVEL_SCOPE</AllowedValue>
+                <AllowedValue>SUBTREE_SCOPE</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="RestrictToObjectClass" DisplayName="Restrict Searches To Named Object Class" ShortDescription="Restrict Searches to objectClass named in the Name field for a table" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="100" Multiplicity="1" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="LdapTxnTimeoutInMillis" DisplayName="Ldap Transaction Timeout (ms)" ShortDescription="Timeout value for LDAP searches. Defaults to TCP timeout value." />
+            <PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time (milliseconds)" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="60000" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="LdapUrl" DisplayName="Ldap URL" ShortDescription="Ldap URL of the server, including port number." DefaultValue="ldap://&lt;ldapServer&gt;:&lt;389&gt;" Multiplicity="1" IsPreferred="true" />
+            <PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time (seconds)" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="300" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Pool Shrinking Enabled" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true" PropertyType="Boolean" IsExpert="true" />
+        </ComponentType>        <ComponentType Name="Loopback Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00">
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/>        
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-loopback-6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true"/>
+            <PropertyDefinition Name="CapabilitiesClass" DisplayName="Capabilities Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackCapabilities" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="WaitTime" DisplayName="Max Random Wait Time" ShortDescription="" DefaultValue="0" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="RowCount" DisplayName="Rows Per Query" ShortDescription="" DefaultValue="1" Multiplicity="1" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+        </ComponentType>        <ComponentType Name="Salesforce Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.916-06:00" CreationDate="2008-10-31T10:26:19.916-06:00">
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/>        
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-salesforce-6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:salesforce-api-6.1.0-SNAPSHOT.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar" Multiplicity="0..1" IsExpert="true"/>
+            <PropertyDefinition Name="username" DisplayName="User Name" ShortDescription="Name value for Salesforce authentication" DefaultValue="" Multiplicity="1" IsPreferred="true" />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.ConnectorState" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.Connector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="InLimit" DisplayName="IN Criteria Limit" ShortDescription="The maximum number of values that can be supplied in an IN criteria" DefaultValue="-1" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="password" DisplayName="Password" ShortDescription="Password value for Salesforce authentication" DefaultValue="" Multiplicity="1" IsMasked="true" IsPreferred="true" />
+            <PropertyDefinition Name="URL" DisplayName="Salesforce URL" ShortDescription="URL for connecting to Salesforce" DefaultValue="" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorCapabilities" DisplayName="Connector Capabilities Class" ShortDescription="The class to use to provide the Connector Capabilities" DefaultValue="com.metamatrix.connector.salesforce.SalesforceCapabilities" IsConstrainedToAllowedValues="false" IsExpert="true" />
+        </ComponentType>        <ComponentType Name="Text File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-10-31T10:26:19.945-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-10-31T10:26:19.945-06:00">
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/>        
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-text-6.1.0-SNAPSHOT.jar;" Multiplicity="0..1" IsExpert="true"/>
+            <PropertyDefinition Name="PartialStartupAllowed" DisplayName="Partial Startup Allowed" ShortDescription="" DefaultValue="true" Multiplicity="1" PropertyType="Boolean" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="DescriptorFile" DisplayName="Text File Descriptor" ShortDescription="" Multiplicity="1" IsPreferred="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.text.TextConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="EnforceColumnCount" DisplayName="Enforce Column Count" ShortDescription="This forces the number of columns in text file to match what was modeled" DefaultValue="false" PropertyType="Boolean" IsConstrainedToAllowedValues="false" />
+            <PropertyDefinition Name="DateResultFormatsDelimiter" DisplayName="Date Result Formats Delimiter" ShortDescription="" IsExpert="true" />
+            <PropertyDefinition Name="DateResultFormats" DisplayName="Date Result Formats" ShortDescription="" IsExpert="true" />
+        </ComponentType>        <ComponentType Name="XML Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00">
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" Multiplicity="0..1" IsPreferred="true"/>        
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:connector_patch.jar;extensionjar:connector-xml-6.1.0-SNAPSHOT.jar;extension:commons-codec-1.2.jar;extension:commons-discovery-0.2.jar;extension:commons-httpclient-3.0.1.jar;extension:xmlsec-1.3.0.jar;extension:axis-1.3.jar;extension:axis-jaxrpc-1.3.jar;extension:axis-saaj-1.2.jar;extension:axis-schema-1.3.jar;extension:commons-discovery-0.2.jar;extension:commons-logging-1.1.jar;extension:jms-1.1.jar;extension:servlet-api-2.5.jar;extension:jaxen-1.1.1.jar;extension:jdom-1.0.jar;extension:log4j-1.2.8.jar;extension:opensaml-1.1b.jar;extension:wsdl4j-1.5.1.jar;extension:wss4j-1.5.0.jar;extension:xalan-2.7.0.jar;extension:xml-apis-1.0.b2.jar" Multiplicity="0..1" IsExpert="true"/>
+        </ComponentType>
+
+        <ComponentType Name="XML File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00">
+            <PropertyDefinition Name="CharacterEncodingScheme" DisplayName="File Encoding Used" ShortDescription="A character-encoding scheme is a mapping between a coded character set and a set of octet (eight-bit byte) sequences. Some samples are UTF-8,ISO-8859-1,UTF-16)" DefaultValue="ISO-8859-1" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xmlsource.XMLSourceConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="ConnectionType" DisplayName="Type Of XML Connection" ShortDescription="Connection type used to get the XML data" DefaultValue="com.metamatrix.connector.xmlsource.file.FileConnection" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="DirectoryLocation" DisplayName="XML File(s) Directory Location" ShortDescription="" DefaultValue="" Multiplicity="1" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="XML SOAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.917-06:00" CreationDate="2008-10-31T10:26:19.917-06:00">
+            <PropertyDefinition Name="AuthPassword" DisplayName="Authentication User Password" ShortDescription="Password value for authentication" DefaultValue="" IsExpert="true" IsMasked="true" IsPreferred="true" />
+            <PropertyDefinition Name="SAMLPropertyFile" DisplayName="SAML Property File (only required when SAML profile used)" ShortDescription="SAML Security property file (saml.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="wsdl" DisplayName="WSDL File (URL)" ShortDescription="URL to Web Service Definition File" DefaultValue="" Multiplicity="1" IsPreferred="true" />
+            <PropertyDefinition Name="AuthUserName" DisplayName="Authentication User Name" ShortDescription="Name value for authentication" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="WSSecurityType" DisplayName="WS-Security Type(UsernameToken, SAML..)" ShortDescription="Type of WS-Security to be used; Combinations of multiple security types can be used with a space in-between. Allowed types are: (UsernameToken, UsernameToken-Digest, SAMLTokenUnsigned, SAMLTokenSigned, Signature, Timestamp, Encrypt)" DefaultValue="" IsPreferred="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xmlsource.XMLSourceConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="EncryptUserName" DisplayName="Encrypt UserName (only if Encrypt profile used)" ShortDescription="The username to be used in the encryption; if blank uses auth username" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="EndPoint" DisplayName="Alternate End Point" ShortDescription="An alternate service endpoint other than one specified in WSDL, to execute the service" DefaultValue="" IsPreferred="true" />
+            <PropertyDefinition Name="SecurityType" DisplayName="WebService Security Used(None, HTTPBasic, WS-Security)" ShortDescription="Type of Authentication to used with the web service; If WS-Secuirty is being used, then WS-Secuirty type must be defined" DefaultValue="None" Multiplicity="1" IsPreferred="true" />
+            <PropertyDefinition Name="CryptoPropertyFile" DisplayName="User Crypto Property File (If SAML or Signature profile used)" ShortDescription="The file defines properties of cryptography;defines the certificates;(crypto.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="ConnectionType" DisplayName="Type Of XML Connection" ShortDescription="Connection type used to get the XML data" DefaultValue="com.metamatrix.connector.xmlsource.soap.SoapConnection" Multiplicity="1" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="EncryptPropertyFile" DisplayName="Encrypt crypto property file (only if Encrypt profile used)" ShortDescription="The file defines properties of cryptography for encryption of the message;(crypto.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="TrustType" DisplayName="Trust Type:(DirectReference or IssuerSerial)" ShortDescription="Only required for Signature and Signed SAML; The issuer-serial method presumes that all trusted users of the service are known to the service and have pre-registered their certificate chains before using the service. The direct-reference method presumes that the service operator trusts all users with certificates issued by a trusted CA." DefaultValue="DirectReference" IsExpert="true" IsPreferred="true" />
+        </ComponentType>
+        <ComponentType Name="XML-Relational File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.918-06:00" CreationDate="2008-10-31T10:26:19.918-06:00">
+            <PropertyDefinition Name="TextExtractionThreshold" DisplayName="Text Extraction Threshold (in kb)" ShortDescription="extract text sections larger than this size to a file where more efficient access as a CLOB can be effected." DefaultValue="128" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="FilePath" DisplayName="File Path" ShortDescription="" Multiplicity="1" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="FileCacheLocation" DisplayName="Location of the File Cache" ShortDescription="" DefaultValue="" />
+            <PropertyDefinition Name="CacheTimeout" DisplayName="Cache Timeout (in seconds)" ShortDescription="" DefaultValue="60" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="SaxFilterProviderClass" DisplayName="XML Filter Provider" ShortDescription="The class the provides extended XML Filters" DefaultValue="com.metamatrix.connector.xml.base.NoExtendedFilters" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.base.XMLConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="MaxFileCacheSize" DisplayName="Max Size of file cache (in kb)" ShortDescription="" DefaultValue="-1" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.file.FileConnectorState" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="LogRequestResponseDocs" DisplayName="Log XML Request and Response Documents" ShortDescription="Write the request and response documents to the log at Info level" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="InputStreamFilterClass" DisplayName="Input Stream Filter Class" ShortDescription="The class to use to preprocess raw XML input stream" DefaultValue="com.metamatrix.connector.xml.base.PluggableInputStreamFilterImpl" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="MaxMemoryCacheSize" DisplayName="Max Size of in-memory cache (in kb)" ShortDescription="" DefaultValue="16384" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="FileName" DisplayName="File Name" ShortDescription="" DefaultValue="" />
+            <PropertyDefinition Name="QueryPreprocessorClass" DisplayName="Query Preprocessor Class" ShortDescription="The class to use to preprocess the IQuery" DefaultValue="com.metamatrix.connector.xml.base.NoQueryPreprocessing" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorCapabilities" DisplayName="Connector Capabilities Class" ShortDescription="The class to use to provide the Connector Capabilities" DefaultValue="com.metamatrix.connector.xml.base.XMLCapabilities" IsConstrainedToAllowedValues="false" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="XML-Relational HTTP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.920-06:00" CreationDate="2008-10-31T10:26:19.921-06:00">
+            <PropertyDefinition Name="TextExtractionThreshold" DisplayName="Text Extraction Threshold (in kb)" ShortDescription="Extract text sections larger than this size to a file where more efficient access as a CLOB can be effected." DefaultValue="128" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="FileCacheLocation" DisplayName="Location of the File Cache" ShortDescription="" DefaultValue="" />
+            <PropertyDefinition Name="CacheTimeout" DisplayName="Cache Timeout (in seconds)" ShortDescription="" DefaultValue="60" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="SaxFilterProviderClass" DisplayName="XML Filter Provider" ShortDescription="The class the provides extended XML Filters" DefaultValue="com.metamatrix.connector.xml.base.NoExtendedFilters" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="XMLParmName" DisplayName="XML Parameter Name" ShortDescription="" />
+            <PropertyDefinition Name="RequestTimeout" DisplayName="Request Timeout (in Milliseconds)" ShortDescription="" DefaultValue="10000" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="MaxFileCacheSize" DisplayName="Max Size of file cache (in kb)" ShortDescription="" DefaultValue="-1" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="Authenticate" DisplayName="Authentication Required" ShortDescription="" DefaultValue="false" Multiplicity="1" PropertyType="Boolean" IsHidden="true" />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.http.HTTPConnectorState" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="HttpBasicAuthPassword" DisplayName="HTTP Basic Authentication Password" ShortDescription="Password value for HTTP basic authentication" DefaultValue="" IsExpert="true" IsMasked="true" />
+            <PropertyDefinition Name="AccessMethod" DisplayName="Access Method" ShortDescription="" DefaultValue="get" Multiplicity="1">
+                <AllowedValue>get</AllowedValue>
+                <AllowedValue>post</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="ProxyUri" DisplayName="Proxy Server URI" ShortDescription="The URI of the proxy server" DefaultValue="" />
+            <PropertyDefinition Name="ExceptionOnIntraQueryCacheExpiration" DisplayName="Exception On Intra-Query Cache Expiration" ShortDescription="Throw an exception when a document expires from the cache between executing different parts of a single query (instead of requesting the document again)" DefaultValue="true" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorCapabilities" DisplayName="Connector Capabilities Class" ShortDescription="The class to use to provide the Connector Capabilities" DefaultValue="com.metamatrix.connector.xml.base.XMLCapabilities" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="HttpBasicAuthUserName" DisplayName="HTTP Basic Authentication Name" ShortDescription="Name value for HTTP basic authentication" DefaultValue="" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.base.XMLConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="Uri" DisplayName="Server URI" ShortDescription="The URI of the HTTP source" Multiplicity="1" />
+            <PropertyDefinition Name="UseHttpBasic" DisplayName="Use HTTP Basic authentication" ShortDescription="Use basic HTTP Authentication" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="LogRequestResponseDocs" DisplayName="Log XML Request and Response Documents" ShortDescription="Write the request and response documents to the log at Info level" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="TrustDeserializerClass" DisplayName="Trust Deserializer Class" ShortDescription="The class to use to process trusted payloads and execution payloads" DefaultValue="com.metamatrix.connector.xml.http.DefaultTrustDeserializer" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="ParameterMethod" DisplayName="Parameter Method" ShortDescription="" DefaultValue="None" Multiplicity="1">
+                <AllowedValue>None</AllowedValue>
+                <AllowedValue>Name/Value</AllowedValue>
+                <AllowedValue>XMLRequest</AllowedValue>
+                <AllowedValue>XMLInQueryString</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="MaxMemoryCacheSize" DisplayName="Max Size of in-memory cache (in kb)" ShortDescription="" DefaultValue="16384" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="InputStreamFilterClass" DisplayName="Input Stream Filter Class" ShortDescription="The class to use to preprocess raw XML input stream" DefaultValue="com.metamatrix.connector.xml.base.PluggableInputStreamFilterImpl" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="HostnameVerifier" DisplayName="Hostname Verifier" ShortDescription="Class implementing javax.net.ssl.HostnameVerifier.  Used to implement a hostname mismatch workaround." IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="QueryPreprocessorClass" DisplayName="Query Preprocessor Class" ShortDescription="The class to use to preprocess the IQuery" DefaultValue="com.metamatrix.connector.xml.base.NoQueryPreprocessing" IsConstrainedToAllowedValues="false" IsExpert="true" />
+        </ComponentType>
+        <ComponentType Name="XML-Relational SOAP Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="XML Connector" ParentComponentType="Connectors" LastChangedDate="2008-10-31T10:26:19.919-06:00" CreationDate="2008-10-31T10:26:19.919-06:00">
+            <PropertyDefinition Name="TextExtractionThreshold" DisplayName="Text Extraction Threshold (in kb)" ShortDescription="Extract text sections larger than this size to a file where more efficient access as a CLOB can be effected." DefaultValue="128" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="AuthPassword" DisplayName="Authentication User Password" ShortDescription="Password value for authentication" DefaultValue="" IsExpert="true" IsMasked="true" IsPreferred="true" />
+            <PropertyDefinition Name="FileCacheLocation" DisplayName="Location of the File Cache" ShortDescription="" DefaultValue="" />
+            <PropertyDefinition Name="SaxFilterProviderClass" DisplayName="XML Filter Provider" ShortDescription="The class the provides extended XML Filters" DefaultValue="com.metamatrix.connector.xml.base.NoExtendedFilters" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="AuthUserName" DisplayName="Authentication User Name" ShortDescription="Name value for authentication" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="CacheTimeout" DisplayName="Cache Timeout (in seconds)" ShortDescription="" DefaultValue="60" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="WSSecurityType" DisplayName="WS-Security Type(UsernameToken, SAML..)" ShortDescription="Type of WS-Security to be used; Combinations of multiple security types can be used with a space in-between. Allowed types are: (UsernameToken, UsernameToken-Digest, SAMLTokenUnsigned, SAMLTokenSigned, Signature, Timestamp, Encrypt)" DefaultValue="" IsPreferred="true" />
+            <PropertyDefinition Name="XMLParmName" DisplayName="XML Parameter Name" ShortDescription="" DefaultValue="" IsHidden="true" IsModifiable="false" />
+            <PropertyDefinition Name="EncryptUserName" DisplayName="Encrypt UserName (only if Encrypt profile used)" ShortDescription="The username to be used in the encryption; if blank uses auth username" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="ExceptionOnSOAPFault" DisplayName="Exception on SOAP Fault" ShortDescription="Throw connector exception when SOAP fault is returned from source." DefaultValue="true" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="MaxFileCacheSize" DisplayName="Max Size of file cache (in kb)" ShortDescription="" DefaultValue="-1" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="RequestTimeout" DisplayName="Request Timeout (in Milliseconds)" ShortDescription="" DefaultValue="10000" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="CryptoPropertyFile" DisplayName="User Crypto Property File (If SAML or Signature profile used)" ShortDescription="The file defines properties of cryptography;defines the certificates;(crypto.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.soap.SOAPConnectorState" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="SOAPAction" DisplayName="SOAP-Action" ShortDescription="Value for SOAP-Action header" DefaultValue="" IsExpert="true" />
+            <PropertyDefinition Name="AccessMethod" DisplayName="Access Method (Get, Post)" ShortDescription="" DefaultValue="post" Multiplicity="1" IsHidden="true" IsModifiable="false">
+                <AllowedValue>get</AllowedValue>
+                <AllowedValue>post</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="ProxyUri" DisplayName="Proxy Server URI" ShortDescription="The URI of the proxy server" DefaultValue="" />
+            <PropertyDefinition Name="EncryptPropertyFile" DisplayName="Encrypt crypto property file (only if Encrypt profile used)" ShortDescription="The file defines properties of cryptography for encryption of the message;(crypto.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="ExceptionOnIntraQueryCacheExpiration" DisplayName="Exception On Intra-Query Cache Expiration" ShortDescription="Throw an exception when a document expires from the cache between executing different parts of a single query (instead of requesting the document again)" DefaultValue="true" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorCapabilities" DisplayName="Connector Capabilities Class" ShortDescription="The class to use to provide the Connector Capabilities" DefaultValue="com.metamatrix.connector.xml.base.XMLCapabilities" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="SAMLPropertyFile" DisplayName="SAML Property File (only required when SAML profile used)" ShortDescription="SAML Security property file (saml.properties)" DefaultValue="" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="Standard" DisplayName="Standard Type" ShortDescription="Standard Built-in Connector Type" DefaultValue="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="EncodingStyle" DisplayName="Encoding Style (RPC - Encoded, RPC - Literal, Document - Literal, Document - Encoded)" ShortDescription="Encoding Style" DefaultValue="Document - Literal" Multiplicity="1">
+                <AllowedValue>RPC - Encoded</AllowedValue>
+                <AllowedValue>RPC - Literal</AllowedValue>
+                <AllowedValue>Document - Literal</AllowedValue>
+                <AllowedValue>Document - Encoded</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.base.XMLConnector" Multiplicity="1" IsExpert="true" />
+            <PropertyDefinition Name="Uri" DisplayName="Server URI" ShortDescription="The URI of the HTTP source" Multiplicity="1" />
+            <PropertyDefinition Name="SecurityType" DisplayName="WebService Security Used(None, HTTPBasic, WS-Security)" ShortDescription="Type of Authentication to used with the web service; If WS-Secuirty is being used, then WS-Secuirty type must be defined" DefaultValue="None" Multiplicity="1" IsPreferred="true" />
+            <PropertyDefinition Name="LogRequestResponseDocs" DisplayName="Log XML Request and Response Documents" ShortDescription="Write the request and response documents to the log at Info level" DefaultValue="false" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="TrustDeserializerClass" DisplayName="Trust Deserializer Class" ShortDescription="The class to use to process trusted payloads and execution payloads" DefaultValue="com.metamatrix.connector.xml.soap.DefaultSoapTrustDeserializer" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="ParameterMethod" DisplayName="Parameter Method (None, Name/Value, XMLRequest, XMLInQueryString)" ShortDescription="" DefaultValue="XMLRequest" Multiplicity="1" IsHidden="true" IsModifiable="false">
+                <AllowedValue>None</AllowedValue>
+                <AllowedValue>Name/Value</AllowedValue>
+                <AllowedValue>XMLRequest</AllowedValue>
+                <AllowedValue>XMLInQueryString</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="InputStreamFilterClass" DisplayName="Input Stream Filter Class" ShortDescription="The class to use to preprocess raw XML input stream" DefaultValue="com.metamatrix.connector.xml.base.PluggableInputStreamFilterImpl" IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="MaxMemoryCacheSize" DisplayName="Max Size of in-memory cache (in kb)" ShortDescription="" DefaultValue="16384" Multiplicity="1" PropertyType="Integer" />
+            <PropertyDefinition Name="HostnameVerifier" DisplayName="Hostname Verifier" ShortDescription="a class implmenting javax.net.ssl.HostnameVerifier.  Used to implement a hostname mismatch workaround." IsConstrainedToAllowedValues="false" IsExpert="true" />
+            <PropertyDefinition Name="TrustType" DisplayName="Trust Type:(DirectReference or IssuerSerial)" ShortDescription="Only required for Signature and Signed SAML; The issuer-serial method presumes that all trusted users of the service are known to the service and have pre-registered their certificate chains before using the service. The direct-reference method presumes that the service operator trusts all users with certificates issued by a trusted CA." DefaultValue="DirectReference" IsExpert="true" IsPreferred="true" />
+            <PropertyDefinition Name="QueryPreprocessorClass" DisplayName="Query Preprocessor Class" ShortDescription="The class to use to preprocess the IQuery" DefaultValue="com.metamatrix.connector.xml.base.NoQueryPreprocessing" IsConstrainedToAllowedValues="false" IsExpert="true" />
+        </ComponentType>
+                        
+    </ComponentTypes>
+    <SharedResources>
+        <Resource Name="JGroups" ComponentType="Miscellaneous Resource Type" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="udp.multicast_supported">true</Property>
+                <Property Name="udp.mcast_messagebus_port">(multicast.port)</Property>
+                <Property Name="udp.mcast_jndi_port">5556</Property>
+                <Property Name="udp.mcast_addr">(multicast.address)</Property>
+                <Property Name="ping.gossip_host">(gossip_host)</Property>
+                <Property Name="ping.gossip_port">5555</Property>
+                <Property Name="metamatrix.cluster.name">(cluster.name)</Property>
+                <Property Name="jgroups.other.channel.settings">MERGE2(min_interval=5000;max_interval=10000):FD_SOCK:VERIFY_SUSPECT(timeout=1500):pbcast.NAKACK(gc_lag=50;retransmit_timeout=300,600,1200,2400,4800):UNICAST(timeout=5000):pbcast.STABLE(desired_avg_gossip=20000):FRAG(frag_size=4096;down_thread=false;up_thread=false):pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=true):pbcast.STATE_TRANSFER
+                </Property>
+            </Properties>
+        </Resource>
+        <Resource Name="SSL" ComponentType="Miscellaneous Resource Type" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="com.metamatrix.ssl.keystoretype">JKS</Property>
+                <Property Name="com.metamatrix.ssl.protocol">SSLv3</Property>
+                <Property Name="com.metamatrix.ssl.keymanagementalgorithm">SunX509</Property>
+            </Properties>
+        </Resource>
+        <Resource Name="XATransactionManager" ComponentType="Miscellaneous Resource Type" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <Properties>
+                <Property Name="metamatrix.xatxnmgr.log_base_dir">txnlog</Property>
+                <Property Name="metamatrix.xatxnmgr.max_timeout">120000</Property>
+                <Property Name="metamatrix.xatxnmgr.max_log_filesize_in_mb">10</Property>
+                <Property Name="metamatrix.xatxnmgr.max_rolled_log_files">100</Property>
+                <Property Name="metamatrix.xatxnmgr.separate_log">true</Property>
+                <Property Name="metamatrix.xatxnmgr.txnstatus_port">0</Property>
+            </Properties>
+        </Resource>
+    </SharedResources>
+</ConfigurationDocument>
\ No newline at end of file


Property changes on: branches/remove_psc/common-internal/src/test/resources/config-original.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain




More information about the teiid-commits mailing list