[teiid-commits] teiid SVN: r1118 - in trunk: common-core/src/main/java/com/metamatrix/core/util and 22 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Fri Jul 10 12:41:25 EDT 2009


Author: shawkins
Date: 2009-07-10 12:41:23 -0400 (Fri, 10 Jul 2009)
New Revision: 1118

Added:
   trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCMetdataProcessor.java
   trunk/test-integration/src/test/resources/derby/
   trunk/test-integration/src/test/resources/derby/sample.zip
Removed:
   trunk/common-internal/src/main/java/com/metamatrix/modeler/
   trunk/engine/src/main/java/com/metamatrix/metadata/
   trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_specificType_Integer.expected
Modified:
   trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.java
   trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil.java
   trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java
   trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.java
   trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ColumnSetRecordImpl.java
   trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ConnectorMetadata.java
   trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataConstants.java
   trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataFactory.java
   trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/TableRecordImpl.java
   trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
   trunk/connectors/connector-jdbc/src/main/resources/org/teiid/connector/jdbc/i18n.properties
   trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java
   trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java
   trunk/metadata/src/main/java/org/teiid/connector/metadata/IndexCriteriaBuilder.java
   trunk/metadata/src/main/java/org/teiid/metadata/ConnectorMetadataStore.java
   trunk/metadata/src/main/java/org/teiid/metadata/TransformationMetadata.java
   trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java
   trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
   trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
   trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java
   trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/TestIndexCriteriaBuilder.java
   trunk/pom.xml
   trunk/test-integration/pom.xml
   trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java
   trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java
   trunk/test-integration/src/test/resources/ServerConfig.xml
   trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected
   trunk/test-integration/src/test/resources/partssupplier/expected/TypeInfo.txt
   trunk/test-integration/src/test/resources/vdbless/ConfigurationInfo.def
Log:
TEIID-708 TEIID-713 TEIID-687 TEIID-685 TEIID-684 initial commit of metadata supplied by the jdbc connector.  also expanded the metadatafactory to include most of the remaining source metadata constructs (access patterns, and procedures are still missing).

Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.java
===================================================================
--- trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -14,6 +14,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -1010,6 +1011,14 @@
     	else if (type.isAssignableFrom(List.class)) {
     		return (T)new ArrayList<String>(Arrays.asList(value.split(","))); //$NON-NLS-1$
     	}
+    	else if (type.isArray()) {
+    		String[] values = value.split(","); //$NON-NLS-1$
+    		Object array = Array.newInstance(type.getComponentType(), values.length);
+    		for (int i = 0; i < values.length; i++) {
+				Array.set(array, i, valueOf(values[i], type.getComponentType()));
+			}
+    		return (T)array;
+    	}
     	else if (type == Void.class) {
     		return null;
     	}

Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil.java
===================================================================
--- trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -406,6 +406,10 @@
     	assertTrue(list.contains("foo")); //$NON-NLS-1$
     	assertTrue(list.contains("x")); //$NON-NLS-1$
     	
+    	int[] values = StringUtil.valueOf("1,2,3,4,5", new int[0].getClass()); //$NON-NLS-1$
+    	assertEquals(5, values.length);
+    	assertEquals(5, values[4]);
+    	
     	Map m = StringUtil.valueOf("foo=bar,x=,y=z", Map.class); //$NON-NLS-1$
     	assertEquals(3, m.size());
     	assertEquals(m.get("foo"), "bar"); //$NON-NLS-1$ //$NON-NLS-2$

Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -247,7 +247,9 @@
 		} else {
 			appendManifest(this.def);
 		}
-		this.def.setHasWSDLDefined(this.wsdlAvailable);
+		if (this.def != null) {
+			this.def.setHasWSDLDefined(this.wsdlAvailable);
+		}
 		open = true;
 	}
 	

Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -89,8 +89,12 @@
      */
     public static final int getSQLTypeFromRuntimeType(Class<?> type) {
         return MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(type);
-    }    
+    } 
     
+    public static final String getDataTypeNameFromSQLType(int sqlType) {
+    	return MMJDBCSQLTypeInfo.getTypeName(sqlType);
+    }
+    
     /**
      * Convert the given value to the closest runtime type see {@link RUNTIME_TYPES}
      * @param value

Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ColumnSetRecordImpl.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ColumnSetRecordImpl.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ColumnSetRecordImpl.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -50,11 +50,20 @@
     }
     
     /** 
-     * @see com.metamatrix.modeler.core.metadata.runtime.ColumnSetRecord#getColumnIdEntries()
+     * Retrieves a list of ColumnRecordImpls containing only id and position information (used by System Tables)
      */
     public List<ColumnRecordImpl> getColumnIdEntries() {
-    	if (this.columns != null) {
-    		return this.columns;
+    	if (columns != null) {
+            final List<ColumnRecordImpl> entryRecords = new ArrayList<ColumnRecordImpl>(columns.size());
+            for (int i = 0, n = columns.size(); i < n; i++) {
+            	ColumnRecordImpl columnRecordImpl  = columns.get(i);
+                final int position = i+1;
+                ColumnRecordImpl impl = new ColumnRecordImpl();
+                entryRecords.add( impl );
+                impl.setUUID(columnRecordImpl.getUUID());
+                impl.setPosition(position);
+            }
+            return entryRecords;
     	}
         final List<ColumnRecordImpl> entryRecords = new ArrayList<ColumnRecordImpl>(columnIDs.size());
         for (int i = 0, n = columnIDs.size(); i < n; i++) {

Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ConnectorMetadata.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ConnectorMetadata.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ConnectorMetadata.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -11,6 +11,10 @@
 	
 	Collection<ProcedureRecordImpl> getProcedures();
 	
+	Collection<AnnotationRecordImpl> getAnnotations();
+	
+	Collection<PropertyRecordImpl> getProperties();
+	
 	//costing
 	
 }

Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataConstants.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataConstants.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataConstants.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -257,7 +257,37 @@
                                                     "Nullable",   //$NON-NLS-1$
                                                     "Unknown" }; //$NON-NLS-1$
     }
-    public final static String getNullTypeName(short type) {
+    //Record type Constants
+	public static class RECORD_TYPE {
+	    public final static char MODEL               = 'A';
+	    public final static char TABLE               = 'B';
+	    public final static char RESULT_SET          = 'C';
+	    public final static char JOIN_DESCRIPTOR     = 'D';
+	    public final static char CALLABLE            = 'E';
+	    public final static char CALLABLE_PARAMETER  = 'F';
+	    public final static char COLUMN              = 'G';
+	    public final static char ACCESS_PATTERN      = 'H';        
+	    public final static char UNIQUE_KEY          = 'I';
+	    public final static char FOREIGN_KEY         = 'J';
+	    public final static char PRIMARY_KEY         = 'K';                
+	    public final static char INDEX               = 'L';
+	    public final static char DATATYPE            = 'M';
+	    //public final static char DATATYPE_ELEMENT    = 'N';
+	    //public final static char DATATYPE_FACET      = 'O';
+	    public final static char SELECT_TRANSFORM    = 'P';
+	    public final static char INSERT_TRANSFORM    = 'Q';
+	    public final static char UPDATE_TRANSFORM    = 'R';
+	    public final static char DELETE_TRANSFORM    = 'S';
+	    public final static char PROC_TRANSFORM      = 'T';
+	    public final static char MAPPING_TRANSFORM   = 'U';
+	    public final static char VDB_ARCHIVE         = 'V';
+	    public final static char ANNOTATION          = 'W';
+	    public final static char PROPERTY            = 'X';
+	    public final static char FILE            	 = 'Z';
+	    public final static char RECORD_CONTINUATION = '&';
+	}
+
+	public final static String getNullTypeName(short type) {
         return NULL_TYPES.TYPE_NAMES[type];
     }
 }
\ No newline at end of file

Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataFactory.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataFactory.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/MetadataFactory.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -24,10 +24,13 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
 import org.teiid.connector.DataPlugin;
 import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.metadata.runtime.MetadataConstants.RECORD_TYPE;
 
 import com.metamatrix.core.id.UUIDFactory;
 import com.metamatrix.core.vdb.ModelType;
@@ -40,13 +43,15 @@
 	private ModelRecordImpl model;
 	private Collection<TableRecordImpl> tables = new ArrayList<TableRecordImpl>();
 	private Collection<ProcedureRecordImpl> procedures = new ArrayList<ProcedureRecordImpl>();
+	private Collection<AnnotationRecordImpl> annotations = new ArrayList<AnnotationRecordImpl>();
+	private Collection<PropertyRecordImpl> properties = new ArrayList<PropertyRecordImpl>();
 	
 	public MetadataFactory(String modelName, Map<String, DatatypeRecordImpl> dataTypes) {
 		this.dataTypes = dataTypes;
 		model = new ModelRecordImpl();
 		model.setFullName(modelName);
 		model.setModelType(ModelType.PHYSICAL);
-		model.setRecordType('A');
+		model.setRecordType(RECORD_TYPE.MODEL);
 		model.setPrimaryMetamodelUri("http://www.metamatrix.com/metamodels/Relational"); //$NON-NLS-1$
 		setUUID(model);	
 	}
@@ -55,14 +60,25 @@
 		return model;
 	}
 	
+	@Override
 	public Collection<TableRecordImpl> getTables() {
 		return tables;
 	}
 	
+	@Override
 	public Collection<ProcedureRecordImpl> getProcedures() {
 		return procedures;
 	}
 	
+	@Override
+	public Collection<AnnotationRecordImpl> getAnnotations() {
+		return annotations;
+	}
+	
+	public Collection<PropertyRecordImpl> getProperties() {
+		return properties;
+	}
+	
 	private void setUUID(AbstractMetadataRecord record) {
 		record.setUUID(factory.create().toString());
 	}
@@ -76,10 +92,15 @@
 	public TableRecordImpl addTable(String name) {
 		TableRecordImpl table = new TableRecordImpl();
 		setValuesUsingParent(name, model, table);
-		table.setRecordType('B');
-		table.setCardinality(-1);
+		table.setRecordType(RECORD_TYPE.TABLE);
 		table.setModel(model);
 		table.setTableType(MetadataConstants.TABLE_TYPES.TABLE_TYPE);
+		table.setColumns(new LinkedList<ColumnRecordImpl>());
+		table.setAccessPatterns(new LinkedList<ColumnSetRecordImpl>());
+		table.setIndexes(new LinkedList<ColumnSetRecordImpl>());
+		table.setExtensionProperties(new LinkedList<PropertyRecordImpl>());
+		table.setForiegnKeys(new LinkedList<ForeignKeyRecordImpl>());
+		table.setUniqueKeys(new LinkedList<ColumnSetRecordImpl>());
 		setUUID(table);
 		this.tables.add(table);
 		return table;
@@ -88,10 +109,7 @@
 	public ColumnRecordImpl addColumn(String name, String type, TableRecordImpl table) throws ConnectorException {
 		ColumnRecordImpl column = new ColumnRecordImpl();
 		setValuesUsingParent(name, table, column);
-		column.setRecordType('G');
-		if (table.getColumns() == null) {
-			table.setColumns(new ArrayList<ColumnRecordImpl>());
-		}
+		column.setRecordType(RECORD_TYPE.COLUMN);
 		table.getColumns().add(column);
 		column.setPosition(table.getColumns().size());
 		column.setNullValues(-1);
@@ -111,8 +129,92 @@
 		column.setRuntimeType(datatype.getRuntimeTypeName());
 		column.setSelectable(true);
 		column.setSigned(datatype.isSigned());
+		column.setExtensionProperties(new LinkedList<PropertyRecordImpl>());
 		setUUID(column);
 		return column;
 	}
 	
+	public AnnotationRecordImpl addAnnotation(String annotation, AbstractMetadataRecord record) {
+		AnnotationRecordImpl annotationRecordImpl = new AnnotationRecordImpl();
+		annotationRecordImpl.setRecordType(RECORD_TYPE.ANNOTATION);
+		setUUID(annotationRecordImpl);
+		annotationRecordImpl.setParentUUID(record.getUUID());
+		annotationRecordImpl.setDescription(annotation);
+		record.setAnnotation(annotationRecordImpl);
+		annotations.add(annotationRecordImpl);
+		return annotationRecordImpl;
+	}
+	
+	public ColumnSetRecordImpl addPrimaryKey(String name, List<String> columnNames, TableRecordImpl table) throws ConnectorException {
+		ColumnSetRecordImpl primaryKey = new ColumnSetRecordImpl(MetadataConstants.KEY_TYPES.PRIMARY_KEY);
+		primaryKey.setColumns(new ArrayList<ColumnRecordImpl>(columnNames.size()));
+		primaryKey.setRecordType(RECORD_TYPE.PRIMARY_KEY);
+		setUUID(primaryKey);
+		setValuesUsingParent(name, table, primaryKey);
+		assignColumns(columnNames, table, primaryKey);
+		table.setPrimaryKey(primaryKey);
+		table.setPrimaryKeyID(primaryKey.getUUID());
+		return primaryKey;
+	}
+	
+	public ColumnSetRecordImpl addIndex(String name, boolean nonUnique, List<String> columnNames, TableRecordImpl table) throws ConnectorException {
+		ColumnSetRecordImpl index = new ColumnSetRecordImpl(nonUnique?MetadataConstants.KEY_TYPES.INDEX:MetadataConstants.KEY_TYPES.UNIQUE_KEY);
+		index.setColumns(new ArrayList<ColumnRecordImpl>(columnNames.size()));
+		index.setRecordType(nonUnique?MetadataConstants.RECORD_TYPE.INDEX:MetadataConstants.RECORD_TYPE.UNIQUE_KEY);
+		setUUID(index);
+		setValuesUsingParent(name, table, index);
+		assignColumns(columnNames, table, index);
+		if (nonUnique) {
+			table.getIndexes().add(index);
+		} else {
+			table.getUniqueKeys().add(index);
+		}
+		return index;
+	}
+	
+	public ForeignKeyRecordImpl addForiegnKey(String name, List<String> columnNames, TableRecordImpl pkTable, TableRecordImpl table) throws ConnectorException {
+		ForeignKeyRecordImpl foreignKey = new ForeignKeyRecordImpl();
+		foreignKey.setColumns(new ArrayList<ColumnRecordImpl>(columnNames.size()));
+		foreignKey.setRecordType(RECORD_TYPE.FOREIGN_KEY);
+		setUUID(foreignKey);
+		setValuesUsingParent(name, table, foreignKey);
+		foreignKey.setPrimaryKey(pkTable.getPrimaryKey());
+		foreignKey.setUniqueKeyID(pkTable.getPrimaryKeyID());
+		assignColumns(columnNames, table, foreignKey);
+		table.getForeignKeys().add(foreignKey);
+		return foreignKey;
+	}
+	
+	public PropertyRecordImpl addExtensionProperty(String name, String value, AbstractMetadataRecord record) {
+		PropertyRecordImpl property = new PropertyRecordImpl();
+		property.setRecordType(RECORD_TYPE.PROPERTY);
+		setUUID(property);
+		setValuesUsingParent(name, record, property);
+		property.setPropertyName(name);
+		property.setPropertyValue(value);
+		properties.add(property);
+		if (record.getExtensionProperties() == null) {
+			record.setExtensionProperties(new LinkedList<PropertyRecordImpl>());
+		}
+		record.getExtensionProperties().add(property);
+		return property;
+	}
+
+	private void assignColumns(List<String> columnNames, TableRecordImpl table,
+			ColumnSetRecordImpl columns) throws ConnectorException {
+		for (String columnName : columnNames) {
+			boolean match = false;
+			for (ColumnRecordImpl column : table.getColumns()) {
+				if (column.getName().equals(columnName)) {
+					match = true;
+					columns.getColumns().add(column);
+					break;
+				}
+			}
+			if (!match) {
+				throw new ConnectorException("No column found with name " + columnName);
+			}
+		}
+	}
+		
 }

Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/TableRecordImpl.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/TableRecordImpl.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/TableRecordImpl.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -29,7 +29,7 @@
  */
 public class TableRecordImpl extends ColumnSetRecordImpl {
 
-    private int cardinality;
+    private int cardinality = -1;
     private int tableType;
     private String primaryKeyID;
     private String materializedTableID;

Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -42,10 +42,12 @@
 import org.teiid.connector.api.ConnectorPropertyNames;
 import org.teiid.connector.api.ExecutionContext;
 import org.teiid.connector.api.MappedUserIdentity;
+import org.teiid.connector.api.MetadataProvider;
 import org.teiid.connector.api.SingleIdentity;
 import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
 import org.teiid.connector.basic.BasicConnector;
 import org.teiid.connector.jdbc.translator.Translator;
+import org.teiid.connector.metadata.runtime.MetadataFactory;
 import org.teiid.connector.xa.api.TransactionContext;
 import org.teiid.connector.xa.api.XAConnection;
 import org.teiid.connector.xa.api.XAConnector;
@@ -58,7 +60,7 @@
  * JDBC implementation of Connector interface.
  */
 @ConnectionPooling
-public class JDBCConnector extends BasicConnector implements XAConnector {
+public class JDBCConnector extends BasicConnector implements XAConnector, MetadataProvider {
 	
     public static final String INVALID_AUTHORIZATION_SPECIFICATION_NO_SUBCLASS = "28000"; //$NON-NLS-1$
 
@@ -159,22 +161,23 @@
 		 * attempt to deregister drivers that may have been implicitly registered
 		 * with the driver manager
 		 */
-        Enumeration drivers = DriverManager.getDrivers();
+		boolean usingCustomClassLoader = PropertiesUtils.getBooleanProperty(this.environment.getProperties(), ConnectorPropertyNames.USING_CUSTOM_CLASSLOADER, false);
 
-        String driverClassname = this.environment.getProperties().getProperty(JDBCPropertyNames.CONNECTION_SOURCE_CLASS);
-        boolean usingCustomClassLoader = PropertiesUtils.getBooleanProperty(this.environment.getProperties(), ConnectorPropertyNames.USING_CUSTOM_CLASSLOADER, false);
+		if (!usingCustomClassLoader) {
+			return;
+		}
+		
+		Enumeration drivers = DriverManager.getDrivers();
 
         while(drivers.hasMoreElements()){
         	Driver tempdriver = (Driver)drivers.nextElement();
-            if(tempdriver.getClass().getClassLoader() != this.getClass().getClassLoader()) {
+            if(tempdriver.getClass().getClassLoader() != Thread.currentThread().getContextClassLoader()) {
             	continue;
             }
-            if(usingCustomClassLoader || tempdriver.getClass().getName().equals(driverClassname)) {
-                try {
-                    DriverManager.deregisterDriver(tempdriver);
-                } catch (Throwable e) {
-                    this.environment.getLogger().logError(e.getMessage());
-                }
+            try {
+                DriverManager.deregisterDriver(tempdriver);
+            } catch (Throwable e) {
+                this.environment.getLogger().logError(e.getMessage());
             }
         }
                 
@@ -334,5 +337,36 @@
 		    sqlConn.setTransactionIsolation(getDefaultTransactionIsolationLevel());
 		}
 	}
+	
+	@Override
+	public void getConnectorMetadata(MetadataFactory metadataFactory)
+			throws ConnectorException {
+		java.sql.Connection conn = null;
+		javax.sql.XAConnection xaConn = null;
+		try {
+			if (ds != null) {
+				conn = ds.getConnection();
+			} else {
+				xaConn = xaDs.getXAConnection();
+				conn = xaConn.getConnection();
+			}
+			JDBCMetdataProcessor metadataProcessor = new JDBCMetdataProcessor();
+			PropertiesUtils.setBeanProperties(metadataProcessor, this.environment.getProperties(), "importer"); //$NON-NLS-1$
+			metadataProcessor.getConnectorMetadata(conn, metadataFactory);
+		} catch (SQLException e) {
+			throw new ConnectorException(e);
+		} finally {
+			try {
+				if (conn != null) {
+					conn.close();
+				}
+				if (xaConn != null) {
+					xaConn.close();
+				}
+			} catch (SQLException e) {
+				
+			}
+		}
+	}
         
 }

Added: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCMetdataProcessor.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCMetdataProcessor.java	                        (rev 0)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCMetdataProcessor.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -0,0 +1,298 @@
+/*
+ * 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 org.teiid.connector.jdbc;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.TypeFacility;
+import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
+import org.teiid.connector.metadata.runtime.ColumnRecordImpl;
+import org.teiid.connector.metadata.runtime.MetadataFactory;
+import org.teiid.connector.metadata.runtime.TableRecordImpl;
+
+public class JDBCMetdataProcessor {
+	
+	private static class TableInfo {
+		private String catalog;
+		private String schema;
+		private String name;
+		private TableRecordImpl table;
+		
+		public TableInfo(String catalog, String schema, String name, TableRecordImpl table) {
+			this.catalog = catalog;
+			this.schema = schema;
+			this.name = name;
+			this.table = table;
+		}
+	}
+	
+	private String catalog;
+	private String schemaPattern;
+	private String tableNamePattern;
+	private String procedureNamePattern;
+	private String[] tableTypes;
+	
+	private boolean useFullSchemaName = true;
+	private boolean importKeys = true;
+	private boolean importIndexes = true;
+	private boolean importApproximateIndexes = true;
+	private boolean importProcedures = true;
+	
+	public void getConnectorMetadata(Connection conn, MetadataFactory metadataFactory)
+			throws SQLException, ConnectorException {
+		
+		//- retrieve tables
+		DatabaseMetaData metadata = conn.getMetaData();
+		ResultSet tables = metadata.getTables(catalog, schemaPattern, tableNamePattern, tableTypes);
+		Map<String, TableInfo> tableMap = new HashMap<String, TableInfo>();
+		while (tables.next()) {
+			String tableCatalog = tables.getString(1);
+			String tableSchema = tables.getString(2);
+			String tableName = tables.getString(3);
+			String fullName = getTableName(tableCatalog, tableSchema, tableName);
+			TableRecordImpl table = metadataFactory.addTable(useFullSchemaName?fullName:tableName);
+			table.setNameInSource(fullName);
+			table.setSupportsUpdate(true);
+			String remarks = tables.getString(5);
+			if (remarks != null) {
+				metadataFactory.addAnnotation(remarks, table);
+			}
+			tableMap.put(fullName, new TableInfo(tableCatalog, tableSchema, tableName, table));
+		}
+		tables.close();
+		
+		getColumns(metadataFactory, metadata, tableMap);
+		
+		if (importKeys) {
+			getPrimaryKeys(metadataFactory, metadata, tableMap);
+			
+			getForeignKeys(metadataFactory, metadata, tableMap);
+		}
+		
+		if (importIndexes) {
+			getIndexes(metadataFactory, metadata, tableMap);
+		}
+		
+		if (importProcedures) {
+			/*ResultSet procedures = metadata.getProcedures(catalog, schemaPattern, procedureNamePattern);
+			
+			procedures.close();*/
+		}
+	}
+
+	private void getColumns(MetadataFactory metadataFactory,
+			DatabaseMetaData metadata, Map<String, TableInfo> tableMap)
+			throws SQLException, ConnectorException {
+		ResultSet columns = metadata.getColumns(catalog, schemaPattern, tableNamePattern, null);
+		while (columns.next()) {
+			String tableCatalog = columns.getString(1);
+			String tableSchema = columns.getString(2);
+			String tableName = columns.getString(3);
+			String fullTableName = getTableName(tableCatalog, tableSchema, tableName);
+			TableInfo tableInfo = tableMap.get(fullTableName);
+			if (tableInfo == null) {
+				continue;
+			}
+			String columnName = columns.getString(4);
+			int type = columns.getInt(5);
+			//note that the resultset is already ordered by position, so we can rely on just adding columns in order
+			ColumnRecordImpl column = metadataFactory.addColumn(columnName, TypeFacility.getDataTypeNameFromSQLType(type), tableInfo.table);
+			column.setNativeType(columns.getString(6));
+			column.setRadix(columns.getInt(10));
+			column.setNullType(columns.getInt(11));
+			String remarks = columns.getString(12);
+			if (remarks != null) {
+				metadataFactory.addAnnotation(remarks, column);
+			}
+			column.setCharOctetLength(columns.getInt(16));
+		}
+		columns.close();
+	}
+
+	private static void getPrimaryKeys(MetadataFactory metadataFactory,
+			DatabaseMetaData metadata, Map<String, TableInfo> tableMap)
+			throws SQLException, ConnectorException {
+		for (TableInfo tableInfo : tableMap.values()) {
+			ResultSet pks = metadata.getPrimaryKeys(tableInfo.catalog, tableInfo.schema, tableInfo.name);
+			TreeMap<Short, String> keyColumns = null;
+			String pkName = null;
+			while (pks.next()) {
+				String columnName = pks.getString(4);
+				short seqNum = pks.getShort(5);
+				if (keyColumns == null) {
+					keyColumns = new TreeMap<Short, String>();
+				}
+				keyColumns.put(seqNum, columnName);
+				if (pkName == null) {
+					pkName = pks.getString(6);
+					if (pkName == null) {
+						pkName = "PK_" + tableInfo.table.getName().toUpperCase(); //$NON-NLS-1$
+					}
+				}
+			}
+			if (keyColumns != null) {
+				metadataFactory.addPrimaryKey(pkName, new ArrayList<String>(keyColumns.values()), tableInfo.table);
+			}
+			pks.close();
+		}
+	}
+	
+	private static void getForeignKeys(MetadataFactory metadataFactory,
+			DatabaseMetaData metadata, Map<String, TableInfo> tableMap) throws SQLException, ConnectorException {
+		for (TableInfo tableInfo : tableMap.values()) {
+			ResultSet fks = metadata.getImportedKeys(tableInfo.catalog, tableInfo.schema, tableInfo.name);
+			TreeMap<Short, String> keyColumns = null;
+			String fkName = null;
+			TableInfo pkTable = null;
+			short savedSeqNum = Short.MAX_VALUE;
+			while (fks.next()) {
+				String columnName = fks.getString(8);
+				short seqNum = fks.getShort(9);
+				if (seqNum <= savedSeqNum) {
+					if (keyColumns != null) {
+						metadataFactory.addForiegnKey(fkName, new ArrayList<String>(keyColumns.values()), pkTable.table, tableInfo.table);
+					}
+					keyColumns = new TreeMap<Short, String>();
+					fkName = null;
+				}
+				savedSeqNum = seqNum;
+				keyColumns.put(seqNum, columnName);
+				if (fkName == null) {
+					String tableCatalog = fks.getString(1);
+					String tableSchema = fks.getString(2);
+					String tableName = fks.getString(3);
+					String fullTableName = getTableName(tableCatalog, tableSchema, tableName);
+					pkTable = tableMap.get(fullTableName);
+					if (pkTable == null) {
+						throw new ConnectorException(JDBCPlugin.Util.getString("JDBCMetadataProcessor.cannot_find_primary", fullTableName)); //$NON-NLS-1$
+					}
+					fkName = fks.getString(12);
+					if (fkName == null) {
+						fkName = "FK_" + tableInfo.table.getName().toUpperCase(); //$NON-NLS-1$
+					}
+				} 
+			}
+			if (keyColumns != null) {
+				metadataFactory.addForiegnKey(fkName, new ArrayList<String>(keyColumns.values()), pkTable.table, tableInfo.table);
+			}
+			fks.close();
+		}
+	}
+
+	private void getIndexes(MetadataFactory metadataFactory,
+			DatabaseMetaData metadata, Map<String, TableInfo> tableMap) throws SQLException, ConnectorException {
+		for (TableInfo tableInfo : tableMap.values()) {
+			ResultSet indexInfo = metadata.getIndexInfo(tableInfo.catalog, tableInfo.schema, tableInfo.name, false, importApproximateIndexes);
+			TreeMap<Short, String> indexColumns = null;
+			String indexName = null;
+			short savedOrdinalPosition = Short.MAX_VALUE;
+			boolean nonUnique = false;
+			while (indexInfo.next()) {
+				short type = indexInfo.getShort(7);
+				if (type == DatabaseMetaData.tableIndexStatistic) {
+					tableInfo.table.setCardinality(indexInfo.getInt(11));
+					continue;
+				}
+				short ordinalPosition = indexInfo.getShort(8);
+				if (ordinalPosition <= savedOrdinalPosition) {
+					if (indexColumns != null) {
+						metadataFactory.addIndex(indexName, nonUnique, new ArrayList<String>(indexColumns.values()), tableInfo.table);
+					}
+					indexColumns = new TreeMap<Short, String>();
+					indexName = null;
+				}
+				savedOrdinalPosition = ordinalPosition;
+				String columnName = indexInfo.getString(9);
+				nonUnique = indexInfo.getBoolean(4);
+				indexColumns.put(ordinalPosition, columnName);
+				if (indexName == null) {
+					indexName = indexInfo.getString(6);
+					if (indexName == null) {
+						indexName = "NDX_" + tableInfo.table.getName().toUpperCase(); //$NON-NLS-1$
+					}
+				}
+			}
+			if (indexColumns != null) {
+				metadataFactory.addIndex(indexName, nonUnique, new ArrayList<String>(indexColumns.values()), tableInfo.table);
+			}
+			indexInfo.close();
+		}
+	}
+
+	private static String getTableName(String tableCatalog, String tableSchema,
+			String tableName) {
+		String fullName = tableName;
+		if (tableSchema != null && tableSchema.length() > 0) {
+			fullName = tableSchema + AbstractMetadataRecord.NAME_DELIM_CHAR + fullName;
+		}
+		if (tableCatalog != null && tableCatalog.length() > 0) {
+			fullName = tableCatalog + AbstractMetadataRecord.NAME_DELIM_CHAR + fullName;
+		}
+		return fullName;
+	}
+		
+	public void setCatalog(String catalog) {
+		this.catalog = catalog;
+	}
+
+	public void setSchemaPattern(String schemaPattern) {
+		this.schemaPattern = schemaPattern;
+	}
+
+	public void setTableNamePattern(String tableNamePattern) {
+		this.tableNamePattern = tableNamePattern;
+	}
+
+	public void setTableTypes(String[] tableTypes) {
+		this.tableTypes = tableTypes;
+	}
+
+	public void setUseFullSchemaName(boolean useFullSchemaName) {
+		this.useFullSchemaName = useFullSchemaName;
+	}
+
+	public void setProcedureNamePattern(String procedureNamePattern) {
+		this.procedureNamePattern = procedureNamePattern;
+	}
+	
+	public void setImportIndexes(boolean importIndexes) {
+		this.importIndexes = importIndexes;
+	}
+	
+	public void setImportKeys(boolean importKeys) {
+		this.importKeys = importKeys;
+	}
+	
+	public void setImportProcedures(boolean importProcedures) {
+		this.importProcedures = importProcedures;
+	}
+
+}


Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCMetdataProcessor.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/connectors/connector-jdbc/src/main/resources/org/teiid/connector/jdbc/i18n.properties
===================================================================
--- trunk/connectors/connector-jdbc/src/main/resources/org/teiid/connector/jdbc/i18n.properties	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connectors/connector-jdbc/src/main/resources/org/teiid/connector/jdbc/i18n.properties	2009-07-10 16:41:23 UTC (rev 1118)
@@ -71,3 +71,5 @@
 JDBCUserIdentityConnectionFactory.Connection_property_missing=Required connection property "{0}" missing for system "{1}".
 
 BasicResultsTranslator.Couldn__t_parse_property=Could not parse property: {0}
+
+JDBCMetadataProcessor.cannot_find_primary=Cannot find primary key table {0}

Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java
===================================================================
--- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/text/TextConnector.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -379,6 +379,7 @@
 				String type = typeNames == null?TypeFacility.RUNTIME_NAMES.STRING:typeNames[i].trim().toLowerCase();
 				ColumnRecordImpl column = metadataFactory.addColumn(columnNames[i].trim(), type, table);
 				column.setNameInSource(String.valueOf(i));
+				column.setNativeType(TypeFacility.RUNTIME_NAMES.STRING);
 			}
 		}
 	}

Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java
===================================================================
--- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/text/TestTextConnector.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -78,6 +78,7 @@
         assertEquals("SummitData.SUMMITDATA", group.getFullName()); //$NON-NLS-1$
         assertEquals(14, group.getColumns().size());
         assertNotNull(group.getUUID());
+        assertEquals("string", group.getColumns().get(0).getNativeType()); //$NON-NLS-1$
     }
 
 

Modified: trunk/metadata/src/main/java/org/teiid/connector/metadata/IndexCriteriaBuilder.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/connector/metadata/IndexCriteriaBuilder.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/main/java/org/teiid/connector/metadata/IndexCriteriaBuilder.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -28,6 +28,7 @@
 
 import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
 import org.teiid.connector.metadata.runtime.DatatypeRecordImpl;
+import org.teiid.connector.metadata.runtime.MetadataConstants;
 import org.teiid.connector.metadata.runtime.PropertyRecordImpl;
 import org.teiid.metadata.index.IndexConstants;
 import org.teiid.metadata.index.SimpleIndexUtil;
@@ -223,7 +224,7 @@
             String recordTypeCriteria = getValueInCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.RECORD_TYPE_FIELD);
             // if its a model or vdb record only criteria possible is on Name
             if(recordTypeCriteria != null &&
-                (recordTypeCriteria.equalsIgnoreCase(StringUtil.Constants.EMPTY_STRING+IndexConstants.RECORD_TYPE.MODEL))) {
+                (recordTypeCriteria.equalsIgnoreCase(StringUtil.Constants.EMPTY_STRING+MetadataConstants.RECORD_TYPE.MODEL))) {
                 appendCriteriaValue(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, sb);
             } else {
                 String modelNameCriteria = getValueInCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.MODEL_NAME_FIELD);

Modified: trunk/metadata/src/main/java/org/teiid/metadata/ConnectorMetadataStore.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/ConnectorMetadataStore.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/main/java/org/teiid/metadata/ConnectorMetadataStore.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -33,6 +33,7 @@
 import org.teiid.connector.metadata.runtime.ColumnRecordImpl;
 import org.teiid.connector.metadata.runtime.ColumnSetRecordImpl;
 import org.teiid.connector.metadata.runtime.ConnectorMetadata;
+import org.teiid.connector.metadata.runtime.MetadataConstants;
 import org.teiid.connector.metadata.runtime.PropertyRecordImpl;
 import org.teiid.connector.metadata.runtime.TableRecordImpl;
 import org.teiid.metadata.index.IndexConstants;
@@ -93,7 +94,6 @@
 	public StoredProcedureInfo getStoredProcedureInfoForProcedure(
 			String fullyQualifiedProcedureName)
 			throws MetaMatrixComponentException, QueryMetadataException {
-		// TODO Auto-generated method stub
 		return null;
 	}
 	
@@ -113,32 +113,29 @@
 	private Collection<? extends AbstractMetadataRecord> getRecordsByType(
 			char recordType) {
 		switch (recordType) {
-		case IndexConstants.RECORD_TYPE.CALLABLE:
+		case MetadataConstants.RECORD_TYPE.CALLABLE:
 			return metadata.getProcedures();
-		case IndexConstants.RECORD_TYPE.CALLABLE_PARAMETER:
+		case MetadataConstants.RECORD_TYPE.CALLABLE_PARAMETER:
+			//TODO
 			return Collections.emptyList();
-		case IndexConstants.RECORD_TYPE.RESULT_SET:
+		case MetadataConstants.RECORD_TYPE.RESULT_SET:
+			//TODO
 			return Collections.emptyList();
-			
-		case IndexConstants.RECORD_TYPE.ACCESS_PATTERN: {
+		case MetadataConstants.RECORD_TYPE.ACCESS_PATTERN: {
 			Collection<ColumnSetRecordImpl> results = new ArrayList<ColumnSetRecordImpl>();
 			for (TableRecordImpl table : metadata.getTables()) {
-				if (table.getAccessPatterns() != null) {
-					results.addAll(table.getAccessPatterns());
-				}
+				results.addAll(table.getAccessPatterns());
 			}
 			return results;
 		}
-		case IndexConstants.RECORD_TYPE.UNIQUE_KEY: {
+		case MetadataConstants.RECORD_TYPE.UNIQUE_KEY: {
 			Collection<ColumnSetRecordImpl> results = new ArrayList<ColumnSetRecordImpl>();
 			for (TableRecordImpl table : metadata.getTables()) {
-				if (table.getUniqueKeys() != null) {
-					results.addAll(table.getUniqueKeys());
-				}
+				results.addAll(table.getUniqueKeys());
 			}
 			return results;
 		}
-		case IndexConstants.RECORD_TYPE.PRIMARY_KEY: {
+		case MetadataConstants.RECORD_TYPE.PRIMARY_KEY: {
 			Collection<ColumnSetRecordImpl> results = new ArrayList<ColumnSetRecordImpl>();
 			for (TableRecordImpl table : metadata.getTables()) {
 				if (table.getPrimaryKey() != null) {
@@ -147,38 +144,38 @@
 			}
 			return results;
 		}
-		case IndexConstants.RECORD_TYPE.FOREIGN_KEY: {
+		case MetadataConstants.RECORD_TYPE.FOREIGN_KEY: {
 			Collection<ColumnSetRecordImpl> results = new ArrayList<ColumnSetRecordImpl>();
 			for (TableRecordImpl table : metadata.getTables()) {
-				if (table.getForeignKeys() != null) {
-					results.addAll(table.getForeignKeys());
-				}
+				results.addAll(table.getForeignKeys());
 			}
 			return results;
 		}
-		case IndexConstants.RECORD_TYPE.INDEX: {
+		case MetadataConstants.RECORD_TYPE.INDEX: {
 			Collection<ColumnSetRecordImpl> results = new ArrayList<ColumnSetRecordImpl>();
 			for (TableRecordImpl table : metadata.getTables()) {
-				if (table.getIndexes() != null) {
-					results.addAll(table.getIndexes());
-				}
+				results.addAll(table.getIndexes());
 			}
 			return results;
 		}
-		case IndexConstants.RECORD_TYPE.MODEL:
+		case MetadataConstants.RECORD_TYPE.MODEL:
 			return Arrays.asList(metadata.getModel());
-		case IndexConstants.RECORD_TYPE.TABLE:
+		case MetadataConstants.RECORD_TYPE.TABLE:
 			return metadata.getTables();
-		case IndexConstants.RECORD_TYPE.COLUMN: {
+		case MetadataConstants.RECORD_TYPE.COLUMN: {
 			Collection<ColumnRecordImpl> results = new ArrayList<ColumnRecordImpl>();
 			for (TableRecordImpl table : metadata.getTables()) {
-				if (table.getColumns() != null) {
-					results.addAll(table.getColumns());
-				}
+				results.addAll(table.getColumns());
 			}
 			return results;
 		}
+		case MetadataConstants.RECORD_TYPE.ANNOTATION: {
+			return metadata.getAnnotations();
 		}
+		case MetadataConstants.RECORD_TYPE.PROPERTY: {
+			return metadata.getProperties();
+		}
+		}
 		return Collections.emptyList();
 	}
 
@@ -187,26 +184,28 @@
 			String pattern, boolean isPrefix,
 			boolean isCaseSensitive) throws MetaMatrixCoreException {
 		if (indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.COLUMNS_INDEX)) {
-			return getRecordsByType(IndexConstants.RECORD_TYPE.COLUMN);
+			return getRecordsByType(MetadataConstants.RECORD_TYPE.COLUMN);
 		} else if (indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.KEYS_INDEX)) {
 			List<AbstractMetadataRecord> result = new ArrayList<AbstractMetadataRecord>();
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.ACCESS_PATTERN));
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.UNIQUE_KEY));
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.PRIMARY_KEY));
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.FOREIGN_KEY));
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.INDEX));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.ACCESS_PATTERN));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.UNIQUE_KEY));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.PRIMARY_KEY));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.FOREIGN_KEY));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.INDEX));
 			return result;
 		} else if (indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.MODELS_INDEX)) {
-			return getRecordsByType(IndexConstants.RECORD_TYPE.MODEL);
+			return getRecordsByType(MetadataConstants.RECORD_TYPE.MODEL);
 		} else if (indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.PROCEDURES_INDEX)) {
 			List<AbstractMetadataRecord> result = new ArrayList<AbstractMetadataRecord>();
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.CALLABLE));
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.CALLABLE_PARAMETER));
-			result.addAll(getRecordsByType(IndexConstants.RECORD_TYPE.RESULT_SET));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.CALLABLE));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.CALLABLE_PARAMETER));
+			result.addAll(getRecordsByType(MetadataConstants.RECORD_TYPE.RESULT_SET));
 			return result;
 		} else if (indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.TABLES_INDEX)) {
-			return getRecordsByType(IndexConstants.RECORD_TYPE.TABLE);
-		} 
+			return getRecordsByType(MetadataConstants.RECORD_TYPE.TABLE);
+		} else if (indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.ANNOTATION_INDEX)) {
+			return getRecordsByType(MetadataConstants.RECORD_TYPE.ANNOTATION);
+		}
 		return Collections.emptyList();
 	}
 	

Modified: trunk/metadata/src/main/java/org/teiid/metadata/TransformationMetadata.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/TransformationMetadata.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/main/java/org/teiid/metadata/TransformationMetadata.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -25,6 +25,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -531,7 +532,7 @@
     	ArgCheck.isInstanceOf(TableRecordImpl.class, groupID);
     	TableRecordImpl tableRecordImpl = (TableRecordImpl)groupID;
     	if (tableRecordImpl.getPrimaryKey() != null) {
-	    	LinkedList<ColumnSetRecordImpl> result = new LinkedList<ColumnSetRecordImpl>(tableRecordImpl.getUniqueKeys());
+	    	ArrayList<ColumnSetRecordImpl> result = new ArrayList<ColumnSetRecordImpl>(tableRecordImpl.getUniqueKeys());
 	    	result.add(tableRecordImpl.getPrimaryKey());
 	    	return result;
     	}
@@ -655,7 +656,7 @@
             // get the transform record for this group            
             TransformationRecordImpl transformRecord = null;
 			// Query the index files
-			Collection results = getMetadataStore().findMetadataRecords(IndexConstants.RECORD_TYPE.MAPPING_TRANSFORM,groupName,false);
+			Collection results = getMetadataStore().findMetadataRecords(MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM,groupName,false);
 			int resultSize = results.size();
 			if(resultSize == 1) {
 				// get the columnset record for this result            
@@ -732,7 +733,7 @@
 		TransformationRecordImpl transformRecord = null;
 
 		// Query the index files
-		Collection results = getMetadataStore().findMetadataRecords(IndexConstants.RECORD_TYPE.MAPPING_TRANSFORM,groupName,false);
+		Collection results = getMetadataStore().findMetadataRecords(MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM,groupName,false);
 		int resultSize = results.size();
 		if(resultSize == 1) {
 			// get the columnset record for this result            

Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -22,6 +22,8 @@
 
 package org.teiid.metadata.index;
 
+import org.teiid.connector.metadata.runtime.MetadataConstants;
+
 /**
  * IndexConstants
  */
@@ -72,37 +74,7 @@
         }
     }
 
-    //Record type Constants
-    public static class RECORD_TYPE {
-        public final static char MODEL               = 'A';
-        public final static char TABLE               = 'B';
-        public final static char RESULT_SET          = 'C';
-        public final static char JOIN_DESCRIPTOR     = 'D';
-        public final static char CALLABLE            = 'E';
-        public final static char CALLABLE_PARAMETER  = 'F';
-        public final static char COLUMN              = 'G';
-        public final static char ACCESS_PATTERN      = 'H';        
-        public final static char UNIQUE_KEY          = 'I';
-        public final static char FOREIGN_KEY         = 'J';
-        public final static char PRIMARY_KEY         = 'K';                
-        public final static char INDEX               = 'L';
-        public final static char DATATYPE            = 'M';
-        //public final static char DATATYPE_ELEMENT    = 'N';
-        //public final static char DATATYPE_FACET      = 'O';
-        public final static char SELECT_TRANSFORM    = 'P';
-        public final static char INSERT_TRANSFORM    = 'Q';
-        public final static char UPDATE_TRANSFORM    = 'R';
-        public final static char DELETE_TRANSFORM    = 'S';
-        public final static char PROC_TRANSFORM      = 'T';
-        public final static char MAPPING_TRANSFORM   = 'U';
-        public final static char VDB_ARCHIVE         = 'V';
-        public final static char ANNOTATION          = 'W';
-        public final static char PROPERTY            = 'X';
-        public final static char FILE            	 = 'Z';
-        public final static char RECORD_CONTINUATION = '&';
-    }
-
-	//Search Record type Constants
+    //Search Record type Constants
 	public static class SEARCH_RECORD_TYPE {
 		public final static char RESOURCE       	= 'A';
 		public final static char MODEL_IMPORT       = 'B';
@@ -130,32 +102,32 @@
 	};
 
     public static final char[] RECORD_TYPES = new char[]{
-        RECORD_TYPE.MODEL,
-        RECORD_TYPE.TABLE,
-        RECORD_TYPE.RESULT_SET,
-        RECORD_TYPE.JOIN_DESCRIPTOR,
-        RECORD_TYPE.CALLABLE,
-        RECORD_TYPE.CALLABLE_PARAMETER,
-        RECORD_TYPE.COLUMN,
-        RECORD_TYPE.ACCESS_PATTERN,
-        RECORD_TYPE.UNIQUE_KEY,
-        RECORD_TYPE.FOREIGN_KEY,
-        RECORD_TYPE.PRIMARY_KEY,
-        RECORD_TYPE.INDEX,
-        RECORD_TYPE.DATATYPE,
+        MetadataConstants.RECORD_TYPE.MODEL,
+        MetadataConstants.RECORD_TYPE.TABLE,
+        MetadataConstants.RECORD_TYPE.RESULT_SET,
+        MetadataConstants.RECORD_TYPE.JOIN_DESCRIPTOR,
+        MetadataConstants.RECORD_TYPE.CALLABLE,
+        MetadataConstants.RECORD_TYPE.CALLABLE_PARAMETER,
+        MetadataConstants.RECORD_TYPE.COLUMN,
+        MetadataConstants.RECORD_TYPE.ACCESS_PATTERN,
+        MetadataConstants.RECORD_TYPE.UNIQUE_KEY,
+        MetadataConstants.RECORD_TYPE.FOREIGN_KEY,
+        MetadataConstants.RECORD_TYPE.PRIMARY_KEY,
+        MetadataConstants.RECORD_TYPE.INDEX,
+        MetadataConstants.RECORD_TYPE.DATATYPE,
         //RECORD_TYPE.DATATYPE_ELEMENT,
         //RECORD_TYPE.DATATYPE_FACET,
-        RECORD_TYPE.SELECT_TRANSFORM,
-        RECORD_TYPE.INSERT_TRANSFORM,
-        RECORD_TYPE.UPDATE_TRANSFORM,
-        RECORD_TYPE.DELETE_TRANSFORM,
-        RECORD_TYPE.PROC_TRANSFORM,
-        RECORD_TYPE.MAPPING_TRANSFORM,
-        RECORD_TYPE.VDB_ARCHIVE,
-        RECORD_TYPE.ANNOTATION,
-        RECORD_TYPE.PROPERTY,
-        RECORD_TYPE.FILE,
-		RECORD_TYPE.RECORD_CONTINUATION
+        MetadataConstants.RECORD_TYPE.SELECT_TRANSFORM,
+        MetadataConstants.RECORD_TYPE.INSERT_TRANSFORM,
+        MetadataConstants.RECORD_TYPE.UPDATE_TRANSFORM,
+        MetadataConstants.RECORD_TYPE.DELETE_TRANSFORM,
+        MetadataConstants.RECORD_TYPE.PROC_TRANSFORM,
+        MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM,
+        MetadataConstants.RECORD_TYPE.VDB_ARCHIVE,
+        MetadataConstants.RECORD_TYPE.ANNOTATION,
+        MetadataConstants.RECORD_TYPE.PROPERTY,
+        MetadataConstants.RECORD_TYPE.FILE,
+		MetadataConstants.RECORD_TYPE.RECORD_CONTINUATION
     };
 
     public static class RECORD_STRING {

Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -89,7 +89,7 @@
     public Collection<String> getModelNames() {
     	Collection<ModelRecordImpl> records;
 		try {
-			records = findMetadataRecords(IndexConstants.RECORD_TYPE.MODEL, null, false);
+			records = findMetadataRecords(MetadataConstants.RECORD_TYPE.MODEL, null, false);
 		} catch (MetaMatrixComponentException e) {
 			throw new MetaMatrixRuntimeException(e);
 		}
@@ -102,14 +102,14 @@
     
     @Override
     public TableRecordImpl findGroup(String groupName) throws QueryMetadataException, MetaMatrixComponentException {
-        TableRecordImpl tableRecord = (TableRecordImpl)getRecordByType(groupName, IndexConstants.RECORD_TYPE.TABLE);
-    	List<ColumnRecordImpl> columns = new ArrayList<ColumnRecordImpl>(findChildRecords(tableRecord, IndexConstants.RECORD_TYPE.COLUMN, true));
+        TableRecordImpl tableRecord = (TableRecordImpl)getRecordByType(groupName, MetadataConstants.RECORD_TYPE.TABLE);
+    	List<ColumnRecordImpl> columns = new ArrayList<ColumnRecordImpl>(findChildRecords(tableRecord, MetadataConstants.RECORD_TYPE.COLUMN, true));
         for (ColumnRecordImpl columnRecordImpl : columns) {
     		columnRecordImpl.setDatatype(getDatatypeCache().get(columnRecordImpl.getDatatypeUUID()));
 		}
         Collections.sort(columns);
         tableRecord.setColumns(columns);
-        tableRecord.setAccessPatterns(findChildRecords(tableRecord, IndexConstants.RECORD_TYPE.ACCESS_PATTERN, true));
+        tableRecord.setAccessPatterns(findChildRecords(tableRecord, MetadataConstants.RECORD_TYPE.ACCESS_PATTERN, true));
         Map<String, ColumnRecordImpl> uuidColumnMap = new HashMap<String, ColumnRecordImpl>();
         for (ColumnRecordImpl columnRecordImpl : columns) {
 			uuidColumnMap.put(columnRecordImpl.getUUID(), columnRecordImpl);
@@ -117,44 +117,44 @@
         for (ColumnSetRecordImpl columnSetRecordImpl : tableRecord.getAccessPatterns()) {
 			loadColumnSetRecords(columnSetRecordImpl, uuidColumnMap);
 		}
-        tableRecord.setForiegnKeys(findChildRecords(tableRecord, IndexConstants.RECORD_TYPE.FOREIGN_KEY, true));
+        tableRecord.setForiegnKeys(findChildRecords(tableRecord, MetadataConstants.RECORD_TYPE.FOREIGN_KEY, true));
         for (ForeignKeyRecordImpl foreignKeyRecord : tableRecord.getForeignKeys()) {
-        	(foreignKeyRecord).setPrimaryKey((ColumnSetRecordImpl)this.getRecordByType(foreignKeyRecord.getUniqueKeyID(), IndexConstants.RECORD_TYPE.PRIMARY_KEY));
+        	(foreignKeyRecord).setPrimaryKey((ColumnSetRecordImpl)this.getRecordByType(foreignKeyRecord.getUniqueKeyID(), MetadataConstants.RECORD_TYPE.PRIMARY_KEY));
         	loadColumnSetRecords(foreignKeyRecord, uuidColumnMap);
 		}
-        tableRecord.setUniqueKeys(findChildRecords(tableRecord, IndexConstants.RECORD_TYPE.UNIQUE_KEY, true));
+        tableRecord.setUniqueKeys(findChildRecords(tableRecord, MetadataConstants.RECORD_TYPE.UNIQUE_KEY, true));
         for (ColumnSetRecordImpl columnSetRecordImpl : tableRecord.getUniqueKeys()) {
 			loadColumnSetRecords(columnSetRecordImpl, uuidColumnMap);
 		}
         if (tableRecord.getPrimaryKeyID() != null) {
-        	ColumnSetRecordImpl primaryKey = (ColumnSetRecordImpl)getRecordByType(tableRecord.getPrimaryKeyID(), IndexConstants.RECORD_TYPE.PRIMARY_KEY);
+        	ColumnSetRecordImpl primaryKey = (ColumnSetRecordImpl)getRecordByType(tableRecord.getPrimaryKeyID(), MetadataConstants.RECORD_TYPE.PRIMARY_KEY);
         	loadColumnSetRecords(primaryKey, uuidColumnMap);
         	tableRecord.setPrimaryKey(primaryKey);
         }
-        tableRecord.setModel((ModelRecordImpl)getRecordByType(tableRecord.getModelName(), IndexConstants.RECORD_TYPE.MODEL));
+        tableRecord.setModel((ModelRecordImpl)getRecordByType(tableRecord.getModelName(), MetadataConstants.RECORD_TYPE.MODEL));
         if (tableRecord.isVirtual()) {
-        	TransformationRecordImpl update = (TransformationRecordImpl)getRecordByType(groupName, IndexConstants.RECORD_TYPE.UPDATE_TRANSFORM,false);
+        	TransformationRecordImpl update = (TransformationRecordImpl)getRecordByType(groupName, MetadataConstants.RECORD_TYPE.UPDATE_TRANSFORM,false);
 	        if (update != null) {
 	        	tableRecord.setUpdatePlan(update.getTransformation());
 	        }
-	        TransformationRecordImpl insert = (TransformationRecordImpl)getRecordByType(groupName, IndexConstants.RECORD_TYPE.INSERT_TRANSFORM,false);
+	        TransformationRecordImpl insert = (TransformationRecordImpl)getRecordByType(groupName, MetadataConstants.RECORD_TYPE.INSERT_TRANSFORM,false);
 	        if (insert != null) {
 	        	tableRecord.setInsertPlan(insert.getTransformation());
 	        }
-	        TransformationRecordImpl delete = (TransformationRecordImpl)getRecordByType(groupName, IndexConstants.RECORD_TYPE.DELETE_TRANSFORM,false);
+	        TransformationRecordImpl delete = (TransformationRecordImpl)getRecordByType(groupName, MetadataConstants.RECORD_TYPE.DELETE_TRANSFORM,false);
 	        if (delete != null) {
 	        	tableRecord.setDeletePlan(delete.getTransformation());
 	        }
-	        TransformationRecordImpl select = (TransformationRecordImpl)getRecordByType(groupName, IndexConstants.RECORD_TYPE.SELECT_TRANSFORM,false);
+	        TransformationRecordImpl select = (TransformationRecordImpl)getRecordByType(groupName, MetadataConstants.RECORD_TYPE.SELECT_TRANSFORM,false);
 	        // this group may be an xml document            
 	        if(select == null) {
-		        select = (TransformationRecordImpl)getRecordByType(groupName, IndexConstants.RECORD_TYPE.MAPPING_TRANSFORM,false);
+		        select = (TransformationRecordImpl)getRecordByType(groupName, MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM,false);
 	        }
 	        tableRecord.setSelectTransformation(select);
         }
         if (tableRecord.isMaterialized()) {
-        	tableRecord.setMaterializedStageTableName(getRecordByType(tableRecord.getMaterializedStageTableID(), IndexConstants.RECORD_TYPE.TABLE).getFullName());
-        	tableRecord.setMaterializedTableName(getRecordByType(tableRecord.getMaterializedTableID(), IndexConstants.RECORD_TYPE.TABLE).getFullName());
+        	tableRecord.setMaterializedStageTableName(getRecordByType(tableRecord.getMaterializedStageTableID(), MetadataConstants.RECORD_TYPE.TABLE).getFullName());
+        	tableRecord.setMaterializedTableName(getRecordByType(tableRecord.getMaterializedTableID(), MetadataConstants.RECORD_TYPE.TABLE).getFullName());
         }
         return tableRecord;
     }
@@ -162,7 +162,7 @@
 	private Map<String, DatatypeRecordImpl> getDatatypeCache() throws MetaMatrixComponentException {
 		if (this.datatypeCache == null) {
 			this.datatypeCache = new HashMap<String, DatatypeRecordImpl>();
-			Collection<DatatypeRecordImpl> dataTypes = findMetadataRecords(IndexConstants.RECORD_TYPE.DATATYPE, null, false);
+			Collection<DatatypeRecordImpl> dataTypes = findMetadataRecords(MetadataConstants.RECORD_TYPE.DATATYPE, null, false);
 			for (DatatypeRecordImpl datatypeRecordImpl : dataTypes) {
 				datatypeCache.put(datatypeRecordImpl.getUUID(), datatypeRecordImpl);
 			}
@@ -176,7 +176,7 @@
     
     @Override
     public ColumnRecordImpl findElement(String fullName) throws QueryMetadataException, MetaMatrixComponentException {
-        ColumnRecordImpl columnRecord = (ColumnRecordImpl)getRecordByType(fullName, IndexConstants.RECORD_TYPE.COLUMN);
+        ColumnRecordImpl columnRecord = (ColumnRecordImpl)getRecordByType(fullName, MetadataConstants.RECORD_TYPE.COLUMN);
     	columnRecord.setDatatype(getDatatypeCache().get(columnRecord.getDatatypeUUID()));
         return columnRecord;
     }
@@ -185,7 +185,7 @@
     public Collection<String> getGroupsForPartialName(String partialGroupName)
     		throws MetaMatrixComponentException, QueryMetadataException {
         // Query the index files
-		Collection<String> tableRecords = findMetadataRecords(IndexConstants.RECORD_TYPE.TABLE,partialGroupName,true);
+		Collection<String> tableRecords = findMetadataRecords(MetadataConstants.RECORD_TYPE.TABLE,partialGroupName,true);
 
 		// Extract the fully qualified names to return
 		final Collection tableNames = new ArrayList(tableRecords.size());
@@ -226,7 +226,7 @@
     public StoredProcedureInfo getStoredProcedureInfoForProcedure(final String fullyQualifiedProcedureName)
         throws MetaMatrixComponentException, QueryMetadataException {
 
-    	ProcedureRecordImpl procRecord = (ProcedureRecordImpl) getRecordByType(fullyQualifiedProcedureName, IndexConstants.RECORD_TYPE.CALLABLE); 
+    	ProcedureRecordImpl procRecord = (ProcedureRecordImpl) getRecordByType(fullyQualifiedProcedureName, MetadataConstants.RECORD_TYPE.CALLABLE); 
 
         String procedureFullName = procRecord.getFullName();
 
@@ -236,20 +236,20 @@
         procInfo.setProcedureID(procRecord);
 
         // modelID for the procedure
-        AbstractMetadataRecord modelRecord = getRecordByType(procRecord.getModelName(), IndexConstants.RECORD_TYPE.MODEL);
+        AbstractMetadataRecord modelRecord = getRecordByType(procRecord.getModelName(), MetadataConstants.RECORD_TYPE.MODEL);
         procInfo.setModelID(modelRecord);
 
         // get the parameter metadata info
         for(Iterator paramIter = procRecord.getParameterIDs().iterator();paramIter.hasNext();) {
             String paramID = (String) paramIter.next();
-            ProcedureParameterRecordImpl paramRecord = (ProcedureParameterRecordImpl) this.getRecordByType(paramID, IndexConstants.RECORD_TYPE.CALLABLE_PARAMETER);
+            ProcedureParameterRecordImpl paramRecord = (ProcedureParameterRecordImpl) this.getRecordByType(paramID, MetadataConstants.RECORD_TYPE.CALLABLE_PARAMETER);
             String runtimeType = paramRecord.getRuntimeType();
             int direction = this.convertParamRecordTypeToStoredProcedureType(paramRecord.getType());
             // create a parameter and add it to the procedure object
             SPParameter spParam = new SPParameter(paramRecord.getPosition(), direction, paramRecord.getFullName());
             spParam.setMetadataID(paramRecord);
             if (paramRecord.getDatatypeUUID() != null) {
-            	paramRecord.setDatatype((DatatypeRecordImpl)getRecordByType(paramRecord.getDatatypeUUID(), IndexConstants.RECORD_TYPE.DATATYPE));
+            	paramRecord.setDatatype((DatatypeRecordImpl)getRecordByType(paramRecord.getDatatypeUUID(), MetadataConstants.RECORD_TYPE.DATATYPE));
             }
             spParam.setClassType(DataTypeManager.getDataTypeClass(runtimeType));
             procInfo.addParameter(spParam);
@@ -259,7 +259,7 @@
         String resultID = procRecord.getResultSetID();
         if(resultID != null) {
             try {
-                ColumnSetRecordImpl resultRecord = (ColumnSetRecordImpl) this.getRecordByType(resultID, IndexConstants.RECORD_TYPE.RESULT_SET);
+                ColumnSetRecordImpl resultRecord = (ColumnSetRecordImpl) this.getRecordByType(resultID, MetadataConstants.RECORD_TYPE.RESULT_SET);
                 // resultSet is the last parameter in the procedure
                 int lastParamIndex = procInfo.getParameters().size() + 1;
                 SPParameter param = new SPParameter(lastParamIndex, SPParameter.RESULT_SET, resultRecord.getFullName());
@@ -283,7 +283,7 @@
 
         // if this is a virtual procedure get the procedure plan
         if(procRecord.isVirtual()) {
-    		TransformationRecordImpl transformRecord = (TransformationRecordImpl)getRecordByType(procedureFullName, IndexConstants.RECORD_TYPE.PROC_TRANSFORM, false);
+    		TransformationRecordImpl transformRecord = (TransformationRecordImpl)getRecordByType(procedureFullName, MetadataConstants.RECORD_TYPE.PROC_TRANSFORM, false);
     		if(transformRecord != null) {
                 QueryNode queryNode = new QueryNode(procedureFullName, transformRecord.getTransformation()); 
                 procInfo.setQueryPlan(queryNode);
@@ -318,7 +318,7 @@
 	@Override
 	public Collection getXMLTempGroups(TableRecordImpl table) throws MetaMatrixComponentException {
 		// Query the index files
-		final Collection results = findChildRecords(table, IndexConstants.RECORD_TYPE.TABLE, false);
+		final Collection results = findChildRecords(table, MetadataConstants.RECORD_TYPE.TABLE, false);
         Collection tempGroups = new HashSet(results.size());
         for(Iterator resultIter = results.iterator();resultIter.hasNext();) {
             TableRecordImpl record = (TableRecordImpl) resultIter.next();
@@ -403,9 +403,9 @@
     public Collection<PropertyRecordImpl> getExtensionProperties(AbstractMetadataRecord metadataRecord) throws MetaMatrixComponentException {
 		// find the entities properties records
 		String uuid = metadataRecord.getUUID();
-		String prefixString  = getUUIDPrefixPattern(IndexConstants.RECORD_TYPE.PROPERTY, uuid);
+		String prefixString  = getUUIDPrefixPattern(MetadataConstants.RECORD_TYPE.PROPERTY, uuid);
 
-		IEntryResult[] results = queryIndex(IndexConstants.RECORD_TYPE.PROPERTY, prefixString.toCharArray(), true, true, true);
+		IEntryResult[] results = queryIndex(MetadataConstants.RECORD_TYPE.PROPERTY, prefixString.toCharArray(), true, true, true);
 		
 		return RecordFactory.getMetadataRecord(results);
     }
@@ -506,7 +506,7 @@
 		// Query based on UUID
 		if (StringUtil.startsWithIgnoreCase(entityName,UUID.PROTOCOL)) {
             String patternString = null;
-            if (recordType == IndexConstants.RECORD_TYPE.DATATYPE) {
+            if (recordType == MetadataConstants.RECORD_TYPE.DATATYPE) {
                 patternString = getDatatypeUUIDMatchPattern(entityName);
             } else {
                 patternString = getUUIDMatchPattern(recordType,entityName);
@@ -544,7 +544,7 @@
         }
         // construct the pattern string
         String patternStr = "" //$NON-NLS-1$
-                          + IndexConstants.RECORD_TYPE.DATATYPE            //recordType
+                          + MetadataConstants.RECORD_TYPE.DATATYPE            //recordType
                           + IndexConstants.RECORD_STRING.RECORD_DELIMITER
                           + IndexConstants.RECORD_STRING.MATCH_CHAR        //datatypeID 
                           + IndexConstants.RECORD_STRING.RECORD_DELIMITER

Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -170,28 +170,28 @@
             return null;
         }
         switch (record[0]) {
-            case IndexConstants.RECORD_TYPE.MODEL: return createModelRecord(record);
-            case IndexConstants.RECORD_TYPE.TABLE: return createTableRecord(record);
-            case IndexConstants.RECORD_TYPE.JOIN_DESCRIPTOR: return null;
-            case IndexConstants.RECORD_TYPE.CALLABLE: return createProcedureRecord(record);
-            case IndexConstants.RECORD_TYPE.CALLABLE_PARAMETER: return createProcedureParameterRecord(record);
-            case IndexConstants.RECORD_TYPE.COLUMN: return createColumnRecord(record);
-            case IndexConstants.RECORD_TYPE.ACCESS_PATTERN:
-            case IndexConstants.RECORD_TYPE.INDEX:
-            case IndexConstants.RECORD_TYPE.RESULT_SET: 
-            case IndexConstants.RECORD_TYPE.UNIQUE_KEY:
-            case IndexConstants.RECORD_TYPE.PRIMARY_KEY: return createColumnSetRecord(record);
-            case IndexConstants.RECORD_TYPE.FOREIGN_KEY: return createForeignKeyRecord(record);
-            case IndexConstants.RECORD_TYPE.DATATYPE: return createDatatypeRecord(record);
-            case IndexConstants.RECORD_TYPE.SELECT_TRANSFORM:
-            case IndexConstants.RECORD_TYPE.INSERT_TRANSFORM:
-            case IndexConstants.RECORD_TYPE.UPDATE_TRANSFORM:
-            case IndexConstants.RECORD_TYPE.DELETE_TRANSFORM:
-            case IndexConstants.RECORD_TYPE.MAPPING_TRANSFORM:
-            case IndexConstants.RECORD_TYPE.PROC_TRANSFORM: return createTransformationRecord(record);
-            case IndexConstants.RECORD_TYPE.ANNOTATION: return createAnnotationRecord(record);
-            case IndexConstants.RECORD_TYPE.PROPERTY: return createPropertyRecord(record);
-            case IndexConstants.RECORD_TYPE.FILE: return createFileRecord(record);
+            case MetadataConstants.RECORD_TYPE.MODEL: return createModelRecord(record);
+            case MetadataConstants.RECORD_TYPE.TABLE: return createTableRecord(record);
+            case MetadataConstants.RECORD_TYPE.JOIN_DESCRIPTOR: return null;
+            case MetadataConstants.RECORD_TYPE.CALLABLE: return createProcedureRecord(record);
+            case MetadataConstants.RECORD_TYPE.CALLABLE_PARAMETER: return createProcedureParameterRecord(record);
+            case MetadataConstants.RECORD_TYPE.COLUMN: return createColumnRecord(record);
+            case MetadataConstants.RECORD_TYPE.ACCESS_PATTERN:
+            case MetadataConstants.RECORD_TYPE.INDEX:
+            case MetadataConstants.RECORD_TYPE.RESULT_SET: 
+            case MetadataConstants.RECORD_TYPE.UNIQUE_KEY:
+            case MetadataConstants.RECORD_TYPE.PRIMARY_KEY: return createColumnSetRecord(record);
+            case MetadataConstants.RECORD_TYPE.FOREIGN_KEY: return createForeignKeyRecord(record);
+            case MetadataConstants.RECORD_TYPE.DATATYPE: return createDatatypeRecord(record);
+            case MetadataConstants.RECORD_TYPE.SELECT_TRANSFORM:
+            case MetadataConstants.RECORD_TYPE.INSERT_TRANSFORM:
+            case MetadataConstants.RECORD_TYPE.UPDATE_TRANSFORM:
+            case MetadataConstants.RECORD_TYPE.DELETE_TRANSFORM:
+            case MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM:
+            case MetadataConstants.RECORD_TYPE.PROC_TRANSFORM: return createTransformationRecord(record);
+            case MetadataConstants.RECORD_TYPE.ANNOTATION: return createAnnotationRecord(record);
+            case MetadataConstants.RECORD_TYPE.PROPERTY: return createPropertyRecord(record);
+            case MetadataConstants.RECORD_TYPE.FILE: return createFileRecord(record);
             default:
                 throw new IllegalArgumentException("Invalid record type for creating MetadataRecord "+record[0]); //$NON-NLS-1$
         }
@@ -223,7 +223,7 @@
 
         // If the IEntryResult is not continued on another record, return the original
         char[] baseResult = result.getWord();
-        if (baseResult.length < blockSize || baseResult[blockSize-1] != IndexConstants.RECORD_TYPE.RECORD_CONTINUATION) {
+        if (baseResult.length < blockSize || baseResult[blockSize-1] != MetadataConstants.RECORD_TYPE.RECORD_CONTINUATION) {
             return result;
         }
 
@@ -410,12 +410,12 @@
     
     protected static String getTransformTypeForRecordType(final char recordType) {
         switch (recordType) {
-            case IndexConstants.RECORD_TYPE.SELECT_TRANSFORM: return TransformationRecordImpl.Types.SELECT;
-            case IndexConstants.RECORD_TYPE.INSERT_TRANSFORM: return TransformationRecordImpl.Types.INSERT;
-            case IndexConstants.RECORD_TYPE.UPDATE_TRANSFORM: return TransformationRecordImpl.Types.UPDATE;
-            case IndexConstants.RECORD_TYPE.DELETE_TRANSFORM: return TransformationRecordImpl.Types.DELETE;
-            case IndexConstants.RECORD_TYPE.PROC_TRANSFORM: return TransformationRecordImpl.Types.PROCEDURE;
-            case IndexConstants.RECORD_TYPE.MAPPING_TRANSFORM: return TransformationRecordImpl.Types.MAPPING;
+            case MetadataConstants.RECORD_TYPE.SELECT_TRANSFORM: return TransformationRecordImpl.Types.SELECT;
+            case MetadataConstants.RECORD_TYPE.INSERT_TRANSFORM: return TransformationRecordImpl.Types.INSERT;
+            case MetadataConstants.RECORD_TYPE.UPDATE_TRANSFORM: return TransformationRecordImpl.Types.UPDATE;
+            case MetadataConstants.RECORD_TYPE.DELETE_TRANSFORM: return TransformationRecordImpl.Types.DELETE;
+            case MetadataConstants.RECORD_TYPE.PROC_TRANSFORM: return TransformationRecordImpl.Types.PROCEDURE;
+            case MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM: return TransformationRecordImpl.Types.MAPPING;
             default:
                 throw new IllegalArgumentException("Invalid record type, for key " + recordType); //$NON-NLS-1$
         }
@@ -423,12 +423,12 @@
     
     protected static short getKeyTypeForRecordType(final char recordType) {
         switch (recordType) {
-            case IndexConstants.RECORD_TYPE.UNIQUE_KEY: return MetadataConstants.KEY_TYPES.UNIQUE_KEY;
-            case IndexConstants.RECORD_TYPE.INDEX: return MetadataConstants.KEY_TYPES.INDEX;
-            case IndexConstants.RECORD_TYPE.ACCESS_PATTERN: return MetadataConstants.KEY_TYPES.ACCESS_PATTERN;
-            case IndexConstants.RECORD_TYPE.PRIMARY_KEY: return MetadataConstants.KEY_TYPES.PRIMARY_KEY;
-            case IndexConstants.RECORD_TYPE.FOREIGN_KEY: return MetadataConstants.KEY_TYPES.FOREIGN_KEY;
-            case IndexConstants.RECORD_TYPE.RESULT_SET : return -1;
+            case MetadataConstants.RECORD_TYPE.UNIQUE_KEY: return MetadataConstants.KEY_TYPES.UNIQUE_KEY;
+            case MetadataConstants.RECORD_TYPE.INDEX: return MetadataConstants.KEY_TYPES.INDEX;
+            case MetadataConstants.RECORD_TYPE.ACCESS_PATTERN: return MetadataConstants.KEY_TYPES.ACCESS_PATTERN;
+            case MetadataConstants.RECORD_TYPE.PRIMARY_KEY: return MetadataConstants.KEY_TYPES.PRIMARY_KEY;
+            case MetadataConstants.RECORD_TYPE.FOREIGN_KEY: return MetadataConstants.KEY_TYPES.FOREIGN_KEY;
+            case MetadataConstants.RECORD_TYPE.RESULT_SET : return -1;
             default:
                 throw new IllegalArgumentException("Invalid record type, for key" + recordType); //$NON-NLS-1$
         }
@@ -599,7 +599,7 @@
         List uuids = getIDs((String)tokens.get(tokenIndex++), indexVersion);
         columnSet.setColumnIDs(uuids);
 
-        if (record[0] == IndexConstants.RECORD_TYPE.UNIQUE_KEY || record[0] == IndexConstants.RECORD_TYPE.PRIMARY_KEY) {
+        if (record[0] == MetadataConstants.RECORD_TYPE.UNIQUE_KEY || record[0] == MetadataConstants.RECORD_TYPE.PRIMARY_KEY) {
         	//read the values from the index to update the tokenindex, but we don't actually use them.
         	getIDs((String)tokens.get(tokenIndex++), indexVersion);
         }

Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -30,6 +30,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.teiid.connector.metadata.runtime.MetadataConstants;
 import org.teiid.core.index.IEntryResult;
 import org.teiid.internal.core.index.BlocksIndexInput;
 import org.teiid.internal.core.index.Index;
@@ -246,7 +247,7 @@
                     	// filter out any continuation records, they should already appended
                     	// to index record thet is continued
 						IEntryResult result = partialResults[j];
-						if(result != null && result.getWord()[0] != IndexConstants.RECORD_TYPE.RECORD_CONTINUATION) {
+						if(result != null && result.getWord()[0] != MetadataConstants.RECORD_TYPE.RECORD_CONTINUATION) {
 	                        queryResult.add(partialResults[j]);
 						}
                     }
@@ -325,7 +326,7 @@
                                 char[] recordWord = partialResults[j].getWord();
                                 // filter out any continuation records, they should already appended
                                 // to index record thet is continued
-                                if(recordWord[0] != IndexConstants.RECORD_TYPE.RECORD_CONTINUATION) {                            
+                                if(recordWord[0] != MetadataConstants.RECORD_TYPE.RECORD_CONTINUATION) {                            
                                     if (!isPrefix) {
                                         // filter results that do not match after tokenizing the record
                                         if(entryMatches(recordWord,pattern,IndexConstants.RECORD_STRING.RECORD_DELIMITER) ) {
@@ -371,13 +372,13 @@
             char[] word = partialResult.getWord();
 
             // If this IEntryResult is not continued on another record then skip to the next result
-            if (word.length < blockSize || word[blockSize-1] != IndexConstants.RECORD_TYPE.RECORD_CONTINUATION) {
+            if (word.length < blockSize || word[blockSize-1] != MetadataConstants.RECORD_TYPE.RECORD_CONTINUATION) {
                 continue;
             }
             // Extract the UUID from the IEntryResult to use when creating the prefix string
             String objectID = RecordFactory.extractUUIDString(partialResult);
             String patternStr = "" //$NON-NLS-1$
-                              + IndexConstants.RECORD_TYPE.RECORD_CONTINUATION
+                              + MetadataConstants.RECORD_TYPE.RECORD_CONTINUATION
                               + word[0]
                               + IndexConstants.RECORD_STRING.RECORD_DELIMITER
                               + objectID
@@ -492,31 +493,31 @@
      */
     public static String getIndexFileNameForRecordType(final char recordType) {
         switch (recordType) {
-  	      case IndexConstants.RECORD_TYPE.COLUMN: return IndexConstants.INDEX_NAME.COLUMNS_INDEX;
-		  case IndexConstants.RECORD_TYPE.TABLE: return IndexConstants.INDEX_NAME.TABLES_INDEX;
-          case IndexConstants.RECORD_TYPE.MODEL: return IndexConstants.INDEX_NAME.MODELS_INDEX;
-          case IndexConstants.RECORD_TYPE.CALLABLE:
-          case IndexConstants.RECORD_TYPE.CALLABLE_PARAMETER:
-		  case IndexConstants.RECORD_TYPE.RESULT_SET: return IndexConstants.INDEX_NAME.PROCEDURES_INDEX;
-          case IndexConstants.RECORD_TYPE.INDEX:
-          case IndexConstants.RECORD_TYPE.ACCESS_PATTERN:           
-          case IndexConstants.RECORD_TYPE.PRIMARY_KEY:
-          case IndexConstants.RECORD_TYPE.FOREIGN_KEY:
-		  case IndexConstants.RECORD_TYPE.UNIQUE_KEY:  return IndexConstants.INDEX_NAME.KEYS_INDEX;
-          case IndexConstants.RECORD_TYPE.SELECT_TRANSFORM: return IndexConstants.INDEX_NAME.SELECT_TRANSFORM_INDEX;
-          case IndexConstants.RECORD_TYPE.INSERT_TRANSFORM: return IndexConstants.INDEX_NAME.INSERT_TRANSFORM_INDEX;
-          case IndexConstants.RECORD_TYPE.UPDATE_TRANSFORM: return IndexConstants.INDEX_NAME.UPDATE_TRANSFORM_INDEX;
-          case IndexConstants.RECORD_TYPE.DELETE_TRANSFORM: return IndexConstants.INDEX_NAME.DELETE_TRANSFORM_INDEX;
-          case IndexConstants.RECORD_TYPE.PROC_TRANSFORM: return IndexConstants.INDEX_NAME.PROC_TRANSFORM_INDEX;
-          case IndexConstants.RECORD_TYPE.MAPPING_TRANSFORM: return IndexConstants.INDEX_NAME.MAPPING_TRANSFORM_INDEX;
-          case IndexConstants.RECORD_TYPE.DATATYPE: return IndexConstants.INDEX_NAME.DATATYPES_INDEX;
+  	      case MetadataConstants.RECORD_TYPE.COLUMN: return IndexConstants.INDEX_NAME.COLUMNS_INDEX;
+		  case MetadataConstants.RECORD_TYPE.TABLE: return IndexConstants.INDEX_NAME.TABLES_INDEX;
+          case MetadataConstants.RECORD_TYPE.MODEL: return IndexConstants.INDEX_NAME.MODELS_INDEX;
+          case MetadataConstants.RECORD_TYPE.CALLABLE:
+          case MetadataConstants.RECORD_TYPE.CALLABLE_PARAMETER:
+		  case MetadataConstants.RECORD_TYPE.RESULT_SET: return IndexConstants.INDEX_NAME.PROCEDURES_INDEX;
+          case MetadataConstants.RECORD_TYPE.INDEX:
+          case MetadataConstants.RECORD_TYPE.ACCESS_PATTERN:           
+          case MetadataConstants.RECORD_TYPE.PRIMARY_KEY:
+          case MetadataConstants.RECORD_TYPE.FOREIGN_KEY:
+		  case MetadataConstants.RECORD_TYPE.UNIQUE_KEY:  return IndexConstants.INDEX_NAME.KEYS_INDEX;
+          case MetadataConstants.RECORD_TYPE.SELECT_TRANSFORM: return IndexConstants.INDEX_NAME.SELECT_TRANSFORM_INDEX;
+          case MetadataConstants.RECORD_TYPE.INSERT_TRANSFORM: return IndexConstants.INDEX_NAME.INSERT_TRANSFORM_INDEX;
+          case MetadataConstants.RECORD_TYPE.UPDATE_TRANSFORM: return IndexConstants.INDEX_NAME.UPDATE_TRANSFORM_INDEX;
+          case MetadataConstants.RECORD_TYPE.DELETE_TRANSFORM: return IndexConstants.INDEX_NAME.DELETE_TRANSFORM_INDEX;
+          case MetadataConstants.RECORD_TYPE.PROC_TRANSFORM: return IndexConstants.INDEX_NAME.PROC_TRANSFORM_INDEX;
+          case MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM: return IndexConstants.INDEX_NAME.MAPPING_TRANSFORM_INDEX;
+          case MetadataConstants.RECORD_TYPE.DATATYPE: return IndexConstants.INDEX_NAME.DATATYPES_INDEX;
           //case IndexConstants.RECORD_TYPE.DATATYPE_ELEMENT:
           //case IndexConstants.RECORD_TYPE.DATATYPE_FACET:
-          case IndexConstants.RECORD_TYPE.VDB_ARCHIVE: return IndexConstants.INDEX_NAME.VDBS_INDEX;
-          case IndexConstants.RECORD_TYPE.ANNOTATION: return IndexConstants.INDEX_NAME.ANNOTATION_INDEX;
-          case IndexConstants.RECORD_TYPE.PROPERTY: return IndexConstants.INDEX_NAME.PROPERTIES_INDEX;
+          case MetadataConstants.RECORD_TYPE.VDB_ARCHIVE: return IndexConstants.INDEX_NAME.VDBS_INDEX;
+          case MetadataConstants.RECORD_TYPE.ANNOTATION: return IndexConstants.INDEX_NAME.ANNOTATION_INDEX;
+          case MetadataConstants.RECORD_TYPE.PROPERTY: return IndexConstants.INDEX_NAME.PROPERTIES_INDEX;
 		  //case IndexConstants.RECORD_TYPE.JOIN_DESCRIPTOR: return null;
-		  case IndexConstants.RECORD_TYPE.FILE: return IndexConstants.INDEX_NAME.FILES_INDEX;
+		  case MetadataConstants.RECORD_TYPE.FILE: return IndexConstants.INDEX_NAME.FILES_INDEX;
         }
         throw new IllegalArgumentException("Unkown record type " + recordType);
     }
@@ -530,33 +531,33 @@
     public static String getRecordTypeForIndexFileName(final String indexName) {
         char recordType;
         if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.COLUMNS_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.COLUMN;
+            recordType = MetadataConstants.RECORD_TYPE.COLUMN;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.TABLES_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.TABLE;
+            recordType = MetadataConstants.RECORD_TYPE.TABLE;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.MODELS_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.MODEL;
+            recordType = MetadataConstants.RECORD_TYPE.MODEL;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.DATATYPES_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.DATATYPE;
+            recordType = MetadataConstants.RECORD_TYPE.DATATYPE;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.VDBS_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.VDB_ARCHIVE;
+            recordType = MetadataConstants.RECORD_TYPE.VDB_ARCHIVE;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.ANNOTATION_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.ANNOTATION;
+            recordType = MetadataConstants.RECORD_TYPE.ANNOTATION;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.PROPERTIES_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.PROPERTY;
+            recordType = MetadataConstants.RECORD_TYPE.PROPERTY;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.SELECT_TRANSFORM_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.SELECT_TRANSFORM;
+            recordType = MetadataConstants.RECORD_TYPE.SELECT_TRANSFORM;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.INSERT_TRANSFORM_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.INSERT_TRANSFORM;
+            recordType = MetadataConstants.RECORD_TYPE.INSERT_TRANSFORM;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.UPDATE_TRANSFORM_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.UPDATE_TRANSFORM;
+            recordType = MetadataConstants.RECORD_TYPE.UPDATE_TRANSFORM;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.DELETE_TRANSFORM_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.DELETE_TRANSFORM;
+            recordType = MetadataConstants.RECORD_TYPE.DELETE_TRANSFORM;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.PROC_TRANSFORM_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.PROC_TRANSFORM;
+            recordType = MetadataConstants.RECORD_TYPE.PROC_TRANSFORM;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.MAPPING_TRANSFORM_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.MAPPING_TRANSFORM;
+            recordType = MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM;
         } else if(indexName.equalsIgnoreCase(IndexConstants.INDEX_NAME.FILES_INDEX)) {
-            recordType = IndexConstants.RECORD_TYPE.FILE;
+            recordType = MetadataConstants.RECORD_TYPE.FILE;
         } else {
             return null;
         }

Modified: trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/TestIndexCriteriaBuilder.java
===================================================================
--- trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/TestIndexCriteriaBuilder.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/TestIndexCriteriaBuilder.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -29,6 +29,7 @@
 import org.teiid.connector.metadata.MetadataLiteralCriteria;
 import org.teiid.connector.metadata.runtime.AbstractMetadataRecord;
 import org.teiid.connector.metadata.runtime.DatatypeRecordImpl;
+import org.teiid.connector.metadata.runtime.MetadataConstants;
 import org.teiid.connector.metadata.runtime.PropertyRecordImpl;
 import org.teiid.metadata.index.IndexConstants;
 
@@ -62,7 +63,7 @@
         Map criteria = new HashMap();
         helpAddToCriteria(criteria, DatatypeRecordImpl.MetadataFieldNames.DATA_TYPE_UUID, "dataTypeUUID"); //$NON-NLS-1$
         String matchPrefix = IndexCriteriaBuilder.getMatchPrefix(IndexConstants.INDEX_NAME.DATATYPES_INDEX, criteria);
-        String expectedPrefix = ""+IndexConstants.RECORD_TYPE.DATATYPE+//$NON-NLS-1$
+        String expectedPrefix = ""+MetadataConstants.RECORD_TYPE.DATATYPE+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"datatypeuuid"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER;
 
@@ -100,7 +101,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.DATATYPES_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.DATATYPE+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.DATATYPE+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"dataTypeUUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"baseTypeUUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"Name"+ //$NON-NLS-1$
@@ -122,7 +123,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.DATATYPES_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.DATATYPE+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.DATATYPE+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"baseTypeUUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"Name"+ //$NON-NLS-1$
@@ -142,7 +143,7 @@
         helpAddToCriteria(criteria, PropertyRecordImpl.MetadataFieldNames.PROPERTY_VALUE_FIELD, "propValue"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         String matchPrefix = IndexCriteriaBuilder.getMatchPrefix(IndexConstants.INDEX_NAME.PROPERTIES_INDEX, criteria);
-        String expectedPrefix = ""+IndexConstants.RECORD_TYPE.PROPERTY+//$NON-NLS-1$
+        String expectedPrefix = ""+MetadataConstants.RECORD_TYPE.PROPERTY+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"uuid"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER;
 
@@ -182,7 +183,7 @@
         helpAddToCriteria(criteria, PropertyRecordImpl.MetadataFieldNames.PROPERTY_VALUE_FIELD, "propValue"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.PROPERTIES_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.PROPERTY+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.PROPERTY+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"propName"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"propValue"+ //$NON-NLS-1$
@@ -196,7 +197,7 @@
         helpAddToCriteria(criteria, PropertyRecordImpl.MetadataFieldNames.PROPERTY_NAME_FIELD, "propName"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.PROPERTIES_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.PROPERTY+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.PROPERTY+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"propName"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
@@ -211,7 +212,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPrefix = IndexCriteriaBuilder.getMatchPrefix(IndexConstants.INDEX_NAME.MODELS_INDEX, criteria);
-        String expectedPrefix = ""+IndexConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
+        String expectedPrefix = ""+MetadataConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"NAME"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER;
 
@@ -253,7 +254,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.MODELS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"MyModel"+ //$NON-NLS-1$
@@ -271,7 +272,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "MyModel"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.MODELS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"MyModel"+ //$NON-NLS-1$
@@ -289,7 +290,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "MyModel"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.MODELS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.MODEL+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"MyModel"+ //$NON-NLS-1$
@@ -309,7 +310,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPrefix = IndexCriteriaBuilder.getMatchPrefix(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPrefix = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPrefix = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"MYMODEL.NAME"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER;
 
@@ -361,7 +362,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"MyModel.Name"+ //$NON-NLS-1$
@@ -381,7 +382,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"MyModel.*.Name"+ //$NON-NLS-1$
@@ -401,7 +402,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*.Name"+ //$NON-NLS-1$
@@ -421,7 +422,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         //helpAddToCriteria(criteria, MetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"MyModel.*"+ //$NON-NLS-1$
@@ -441,7 +442,7 @@
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.UUID_FIELD, "UUID"); //$NON-NLS-1$
         //helpAddToCriteria(criteria, MetadataRecord.MetadataFieldNames.NAME_FIELD, "Name"); //$NON-NLS-1$
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"UUID"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
@@ -455,7 +456,7 @@
     public void testNoCriteriaPrefix() {
         Map criteria = new HashMap();
         String matchPattern = IndexCriteriaBuilder.getMatchPrefix(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER;
         assertEquals(matchPattern, expectedPattern);        
     }
@@ -463,7 +464,7 @@
     public void testNoCriteriaPattern() {
         Map criteria = new HashMap();
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"; //$NON-NLS-1$
         assertEquals(matchPattern, expectedPattern);        
     }
@@ -472,7 +473,7 @@
         Map criteria = new HashMap();
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.FULL_NAME_FIELD, null);
         String matchPattern = IndexCriteriaBuilder.getMatchPrefix(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+IndexConstants.RECORD_STRING.SPACE+
         IndexConstants.RECORD_STRING.RECORD_DELIMITER;
         assertEquals(matchPattern, expectedPattern);        
@@ -482,7 +483,7 @@
         Map criteria = new HashMap();
         helpAddToCriteria(criteria, AbstractMetadataRecord.MetadataFieldNames.FULL_NAME_FIELD, null);
         String matchPattern = IndexCriteriaBuilder.getMatchPattern(IndexConstants.INDEX_NAME.COLUMNS_INDEX, criteria);
-        String expectedPattern = ""+IndexConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
+        String expectedPattern = ""+MetadataConstants.RECORD_TYPE.COLUMN+//$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+"*"+ //$NON-NLS-1$
         IndexConstants.RECORD_STRING.RECORD_DELIMITER+IndexConstants.RECORD_STRING.SPACE+

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/pom.xml	2009-07-10 16:41:23 UTC (rev 1118)
@@ -218,7 +218,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.3</version>
+			<version>1.5</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

Modified: trunk/test-integration/pom.xml
===================================================================
--- trunk/test-integration/pom.xml	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/pom.xml	2009-07-10 16:41:23 UTC (rev 1118)
@@ -60,8 +60,8 @@
 			<artifactId>teiid-engine</artifactId>
 			<type>test-jar</type>
 		</dependency>
-    
-    <!-- internal dependencies that are only used by integration testing -->
+
+		<!-- internal dependencies that are only used by integration testing -->
 		<dependency>
 			<groupId>org.jboss.teiid</groupId>
 			<artifactId>teiid-embedded</artifactId>
@@ -100,5 +100,13 @@
 			<type>test-jar</type>
 			<version>${project.version}</version>
 		</dependency>
+
+		<!-- external dependencies -->
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.2.1.6</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file

Modified: trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseMetaData.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -1050,26 +1050,6 @@
             closeResultSetTestStreams();
         }
     }
-
-    /** test with integer type */
-    @Test
-    public void testGetTypeInfo_specificType_Integer() throws Exception {
-        initResultSetStreams("testGetTypeInfo_specificType_Integer"); //$NON-NLS-1$
-        ResultSet rs = null;
-        try {
-            DatabaseMetaData dbmd = conn.getMetaData();
-            rs = dbmd.getTypeInfo();
-            ResultSetUtil.printResultSet(rs, MAX_COL_WIDTH, true, stream);
-            assertEquals("Actual data did not match expected", //$NON-NLS-1$
-                         Collections.EMPTY_LIST,
-                         ResultSetUtil.getUnequalLines(stream));
-        } finally { 
-            if(rs != null) {
-                rs.close();    
-            }
-            closeResultSetTestStreams();
-        }
-    }
     
     @Test
     public void testGetUDTs() throws Exception{

Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java
===================================================================
--- trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestVDBLessExecution.java	2009-07-10 16:41:23 UTC (rev 1118)
@@ -48,16 +48,40 @@
     	});
     }
     
+    @Test public void testExecution1() {
+    	getConnection(VDB, DQP_PROP_FILE);
+    	executeAndAssertResults("select * from Example, Smalla where notional = intkey", new String[] { //$NON-NLS-1$
+    			"TRADEID[string]    NOTIONAL[integer]    INTKEY[integer]    STRINGKEY[string]    INTNUM[integer]    STRINGNUM[string]    FLOATNUM[float]    LONGNUM[long]    DOUBLENUM[double]    BYTENUM[short]    DATEVALUE[date]    TIMEVALUE[time]    TIMESTAMPVALUE[timestamp]    BOOLEANVALUE[short]    CHARVALUE[char]    SHORTVALUE[short]    BIGINTEGERVALUE[long]    BIGDECIMALVALUE[bigdecimal]    OBJECTVALUE[string]", //$NON-NLS-1$
+                "x    1    1    1    -23    null    -23.0    -23    -23.0    -127    2000-01-02    01:00:00    2000-01-01 00:00:01.0    1    0    -32767    -23    -23    -23", //$NON-NLS-1$
+                "y    2    2    2    -22    -22    null    -22    -22.0    -126    2000-01-03    02:00:00    2000-01-01 00:00:02.0    0    1    -32766    -22    -22    -22", //$NON-NLS-1$
+    	});
+    }
+    
     @Test public void testDatabaseMetaDataTables() throws Exception {
     	Connection conn = getConnection(VDB, DQP_PROP_FILE);
     	DatabaseMetaData metadata = conn.getMetaData();
-    	this.internalResultSet = metadata.getTables(null, null, "%", new String[] {"TABLE"}); //$NON-NLS-1$ //$NON-NLS-2$
+    	this.internalResultSet = metadata.getTables(null, null, "SummitData%", new String[] {"TABLE"}); //$NON-NLS-1$ //$NON-NLS-2$
     	assertResults(new String[] {
     			"TABLE_CAT[string]    TABLE_SCHEM[string]    TABLE_NAME[string]    TABLE_TYPE[string]    REMARKS[string]    TYPE_CAT[string]    TYPE_SCHEM[string]    TYPE_NAME[string]    SELF_REFERENCING_COL_NAME[string]    REF_GENERATION[string]    ISPHYSICAL[boolean]", //$NON-NLS-1$
     			"null    VDBLess    SummitData.EXAMPLE    TABLE    null    null    null    null    null    null    true" //$NON-NLS-1$
     	});
     }
     
+    /**
+     * Ensures that system tables are still visible
+     */
+    @Test public void testDatabaseMetaDataTables1() throws Exception {
+    	Connection conn = getConnection(VDB, DQP_PROP_FILE);
+    	DatabaseMetaData metadata = conn.getMetaData();
+    	this.internalResultSet = metadata.getTables(null, null, "%ElementProperties", null); //$NON-NLS-1$
+    	assertResults(new String[] {
+    			"TABLE_CAT[string]    TABLE_SCHEM[string]    TABLE_NAME[string]    TABLE_TYPE[string]    REMARKS[string]    TYPE_CAT[string]    TYPE_SCHEM[string]    TYPE_NAME[string]    SELF_REFERENCING_COL_NAME[string]    REF_GENERATION[string]    ISPHYSICAL[boolean]", //$NON-NLS-1$
+    			"null    VDBLess    System.DataTypeElementProperties    SYSTEM TABLE    null    null    null    null    null    null    false", //$NON-NLS-1$
+    			"null    VDBLess    System.ElementProperties    SYSTEM TABLE    null    null    null    null    null    null    false" //$NON-NLS-1$
+
+    	});
+    }
+    
     @Test public void testDatabaseMetaDataColumns() throws Exception {
     	Connection conn = getConnection(VDB, DQP_PROP_FILE);
     	DatabaseMetaData metadata = conn.getMetaData();
@@ -68,5 +92,101 @@
     			"null    VDBLess    SummitData.EXAMPLE    NOTIONAL    4    integer    10    null    0    0    0    null    null    null    null    0    2    YES" //$NON-NLS-1$
     	});
     }
+    
+    @Test public void testDatabaseMetaDataColumns1() throws Exception {
+    	Connection conn = getConnection(VDB, DQP_PROP_FILE);
+    	DatabaseMetaData metadata = conn.getMetaData();
+    	this.internalResultSet = metadata.getColumns(null, null, "%smalla", "%"); //$NON-NLS-1$ //$NON-NLS-2$
+    	assertResults(new String[] {
+    		   "TABLE_CAT[string]    TABLE_SCHEM[string]    TABLE_NAME[string]    COLUMN_NAME[string]    DATA_TYPE[short]    TYPE_NAME[string]    COLUMN_SIZE[integer]    BUFFER_LENGTH[string]    DECIMAL_DIGITS[integer]    NUM_PREC_RADIX[integer]    NULLABLE[integer]    REMARKS[string]    COLUMN_DEF[string]    SQL_DATA_TYPE[string]    SQL_DATETIME_SUB[string]    CHAR_OCTET_LENGTH[integer]    ORDINAL_POSITION[integer]    IS_NULLABLE[string]", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    INTKEY    4    integer    10    null    0    10    0    null    null    null    null    0    1    YES", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    STRINGKEY    12    string    4000    null    0    0    0    null    null    null    null    20    2    YES", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    INTNUM    4    integer    10    null    0    10    1    null    null    null    null    0    3    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    STRINGNUM    12    string    4000    null    0    0    1    null    null    null    null    20    4    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    FLOATNUM    7    float    20    null    0    2    1    null    null    null    null    0    5    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    LONGNUM    -5    long    19    null    0    10    1    null    null    null    null    0    6    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    DOUBLENUM    8    double    20    null    0    2    1    null    null    null    null    0    7    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    BYTENUM    5    short    5    null    0    10    1    null    null    null    null    0    8    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    DATEVALUE    91    date    10    null    0    10    1    null    null    null    null    0    9    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    TIMEVALUE    92    time    8    null    0    10    1    null    null    null    null    0    10    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    TIMESTAMPVALUE    93    timestamp    29    null    0    10    1    null    null    null    null    0    11    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    BOOLEANVALUE    5    short    5    null    0    10    1    null    null    null    null    0    12    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    CHARVALUE    1    char    1    null    0    0    1    null    null    null    null    2    13    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    SHORTVALUE    5    short    5    null    0    10    1    null    null    null    null    0    14    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    BIGINTEGERVALUE    -5    long    19    null    0    10    1    null    null    null    null    0    15    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    BIGDECIMALVALUE    2    bigdecimal    20    null    0    10    1    null    null    null    null    0    16    NO", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLA    OBJECTVALUE    12    string    4000    null    0    0    1    null    null    null    null    4096    17    NO" //$NON-NLS-1$
+    	});
+    }
+    
+    @Test public void testDatabaseMetaDataPrimaryKeys() throws Exception {
+    	Connection conn = getConnection(VDB, DQP_PROP_FILE);
+    	DatabaseMetaData metadata = conn.getMetaData();
+    	//note - the use of null for the table name is a little against spec
+    	this.internalResultSet = metadata.getPrimaryKeys(null, null, null);
+    	assertResults(new String[] {
+    	       "TABLE_CAT[string]    TABLE_SCHEM[string]    TABLE_NAME[string]    COLUMN_NAME[string]    KEY_SEQ[short]    PK_NAME[string]", //$NON-NLS-1$
+    	       "null    VDBLess    Derby.FLIGHTS    FLIGHT_ID    1    SQL090709161814150", //$NON-NLS-1$
+    	       "null    VDBLess    Derby.FLTAVAIL    FLIGHT_ID    1    FLTAVAIL_PK", //$NON-NLS-1$
+    		   "null    VDBLess    Derby.SMALLA    INTKEY    1    SQL060110103634070", //$NON-NLS-1$
+			   "null    VDBLess    Derby.SMALLB    INTKEY    1    SQL060110103635170", //$NON-NLS-1$
+			   "null    VDBLess    Derby.FLIGHTS    SEGMENT_NUMBER    2    SQL090709161814150", //$NON-NLS-1$
+			   "null    VDBLess    Derby.FLTAVAIL    SEGMENT_NUMBER    2    FLTAVAIL_PK", //$NON-NLS-1$
+    	});
+    }
+    
+    @Test public void testDatabaseMetaDataExportedKeys() throws Exception {
+    	Connection conn = getConnection(VDB, DQP_PROP_FILE);
+    	DatabaseMetaData metadata = conn.getMetaData();
+    	this.internalResultSet = metadata.getExportedKeys(null, "VDBLess", "Derby.FLIGHTS"); //$NON-NLS-1$ //$NON-NLS-2$
+    	assertResults(new String[] {
+    			"PKTABLE_CAT[string]    PKTABLE_SCHEM[string]    PKTABLE_NAME[string]    PKCOLUMN_NAME[string]    FKTABLE_CAT[string]    FKTABLE_SCHEM[string]    FKTABLE_NAME[string]    FKCOLUMN_NAME[string]    KEY_SEQ[short]    UPDATE_RULE[integer]    DELETE_RULE[integer]    FK_NAME[string]    PK_NAME[string]    DEFERRABILITY[integer]", //$NON-NLS-1$
+                "null    VDBLess    Derby.FLIGHTS    FLIGHT_ID    null    VDBLess    Derby.FLTAVAIL    FLIGHT_ID    1    3    3    FLTS_FK    SQL090709161814150    5", //$NON-NLS-1$
+    			"null    VDBLess    Derby.FLIGHTS    SEGMENT_NUMBER    null    VDBLess    Derby.FLTAVAIL    SEGMENT_NUMBER    2    3    3    FLTS_FK    SQL090709161814150    5" //$NON-NLS-1$
+    	});
+    }
+    
+    @Test public void testDatabaseMetaDataImportedKeys() throws Exception {
+    	Connection conn = getConnection(VDB, DQP_PROP_FILE);
+    	DatabaseMetaData metadata = conn.getMetaData();
+    	this.internalResultSet = metadata.getImportedKeys(null, "VDBLess", "Derby.FLTAVAIL"); //$NON-NLS-1$ //$NON-NLS-2$
+    	assertResults(new String[] {
+    			"PKTABLE_CAT[string]    PKTABLE_SCHEM[string]    PKTABLE_NAME[string]    PKCOLUMN_NAME[string]    FKTABLE_CAT[string]    FKTABLE_SCHEM[string]    FKTABLE_NAME[string]    FKCOLUMN_NAME[string]    KEY_SEQ[short]    UPDATE_RULE[integer]    DELETE_RULE[integer]    FK_NAME[string]    PK_NAME[string]    DEFERRABILITY[integer]", //$NON-NLS-1$
+    			"null    VDBLess    Derby.FLIGHTS    FLIGHT_ID    null    VDBLess    Derby.FLTAVAIL    FLIGHT_ID    1    3    3    FLTS_FK    SQL090709161814150    5", //$NON-NLS-1$
+    			"null    VDBLess    Derby.FLIGHTS    SEGMENT_NUMBER    null    VDBLess    Derby.FLTAVAIL    SEGMENT_NUMBER    2    3    3    FLTS_FK    SQL090709161814150    5" //$NON-NLS-1$
+    	});
+    	this.internalResultSet = metadata.getImportedKeys(null, null, "Derby.SMALLBRIDGE"); //$NON-NLS-1$
+    	assertResults(new String[] {
+    			"PKTABLE_CAT[string]    PKTABLE_SCHEM[string]    PKTABLE_NAME[string]    PKCOLUMN_NAME[string]    FKTABLE_CAT[string]    FKTABLE_SCHEM[string]    FKTABLE_NAME[string]    FKCOLUMN_NAME[string]    KEY_SEQ[short]    UPDATE_RULE[integer]    DELETE_RULE[integer]    FK_NAME[string]    PK_NAME[string]    DEFERRABILITY[integer]", //$NON-NLS-1$
+                "null    VDBLess    Derby.SMALLA    INTKEY    null    VDBLess    Derby.SMALLBRIDGE    AKEY    1    3    3    SMLA_FK    SQL060110103634070    5", //$NON-NLS-1$
+                "null    VDBLess    Derby.SMALLB    INTKEY    null    VDBLess    Derby.SMALLBRIDGE    BKEY    1    3    3    SMLB_FK    SQL060110103635170    5", //$NON-NLS-1$
+    	});
+    }
+    
+    @Test public void testDatabaseMetaDataIndexInfo() throws Exception {
+    	Connection conn = getConnection(VDB, DQP_PROP_FILE);
+    	DatabaseMetaData metadata = conn.getMetaData();
+    	//note - the use of null for the table name is a little against spec
+    	this.internalResultSet = metadata.getIndexInfo(null, null, null, false, true);
+    	assertResults(new String[] {
+    			"TABLE_CAT[string]    TABLE_SCHEM[string]    TABLE_NAME[string]    NON_UNIQUE[boolean]    INDEX_QUALIFIER[string]    INDEX_NAME[string]    TYPE[integer]    ORDINAL_POSITION[short]    COLUMN_NAME[string]    ASC_OR_DESC[string]    CARDINALITY[integer]    PAGES[integer]    FILTER_CONDITION[string]", //$NON-NLS-1$
+				"null    VDBLess    Derby.FLIGHTS    false    null    ORIGINDEX    0    1    ORIG_AIRPORT    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.FLTAVAIL    false    null    SQL090709161840271    0    1    FLIGHT_ID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.FLTAVAIL    false    null    SQL090709161840271    0    2    SEGMENT_NUMBER    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SMALLBRIDGE    false    null    SQL090710102514590    0    1    AKEY    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SMALLBRIDGE    false    null    SQL090710102514591    0    1    BKEY    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSCOLUMNS    false    null    SYSCOLUMNS_INDEX2    0    1    COLUMNDEFAULTID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSCONGLOMERATES    false    null    SYSCONGLOMERATES_INDEX1    0    1    CONGLOMERATEID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSCONGLOMERATES    false    null    SYSCONGLOMERATES_INDEX3    0    1    TABLEID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSCONSTRAINTS    false    null    SYSCONSTRAINTS_INDEX3    0    1    TABLEID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSDEPENDS    false    null    SYSDEPENDS_INDEX1    0    1    DEPENDENTID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSDEPENDS    false    null    SYSDEPENDS_INDEX2    0    1    PROVIDERID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSFOREIGNKEYS    false    null    SYSFOREIGNKEYS_INDEX2    0    1    KEYCONSTRAINTID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSSTATISTICS    false    null    SYSSTATISTICS_INDEX1    0    1    TABLEID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSSTATISTICS    false    null    SYSSTATISTICS_INDEX1    0    2    REFERENCEID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSTRIGGERS    false    null    SYSTRIGGERS_INDEX3    0    1    TABLEID    null    0    1    null", //$NON-NLS-1$
+				"null    VDBLess    Derby.SYSTRIGGERS    false    null    SYSTRIGGERS_INDEX3    0    2    CREATIONTIMESTAMP    null    0    1    null", //$NON-NLS-1$
+    	});
+    }
         
 }

Modified: trunk/test-integration/src/test/resources/ServerConfig.xml
===================================================================
--- trunk/test-integration/src/test/resources/ServerConfig.xml	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/src/test/resources/ServerConfig.xml	2009-07-10 16:41:23 UTC (rev 1118)
@@ -1,2366 +1,460 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
-
 <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.firewall.address"></Property>
-      <Property Name="metamatrix.firewall.rmiport"></Property>
-      <Property Name="metamatrix.firewall.address.enabled">false</Property>      
-      <Property Name="metamatrix.message.bus.type">(vm.message.bus)</Property>    
-      <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.maxThreads">1</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">(mm.deployment)</Property>
-      <Property Name="metamatrix.encryption.client">true</Property>
-      <Property Name="metamatrix.encryption.jce.provider">(jce.provider)</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.threadTTL">600000</Property>
-      <Property Name="metamatrix.log.jdbcMaxExceptionLength">4000</Property>
-      <Property Name="metamatrix.log.jdbcMaxLength">2000</Property>
-      <Property Name="metamatrix.log.maxThreads">1</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.activeMemoryThreshold">90</Property>
-      <Property Name="metamatrix.buffer.managementInterval">1000</Property>
-      <Property Name="metamatrix.buffer.connectorBatchSize">1000</Property>
-      <Property Name="metamatrix.buffer.processorBatchSize">500</Property>
-      <Property Name="metamatrix.buffer.relative.storageDirectory">(buffer.dir)</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.storeTXN">false</Property>
-      <Property Name="metamatrix.transaction.log.storeMMCMD">false</Property>
-      <Property Name="metamatrix.transaction.log.storeSRCCMD">false</Property>
-      <Property Name="vm.starter.maxHeapSize">1024</Property>
-      <Property Name="vm.starter.minHeapSize">256</Property>
-      <Property Name="vm.starter.maxThreads">1</Property>
-      <Property Name="vm.starter.timetolive">30000</Property>
-      <Property Name="vm.starter.command">(vm.starter.command)</Property>
-    </Properties>
-    <Host Name="(host.name)" ComponentType="Host" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
-      <Properties>
-        <Property Name="hostControllerPortNumber">(host.controller.port)</Property>
-        <Property Name="metamatrix.installationDir">(install.directory)</Property>
-		<Property Name="metamatrix.log.dir">(host.log.dir)</Property>
-		<Property Name="metamatrix.data.dir">(host.data.dir)</Property>	        
-		<Property Name="metamatrix.system.dir">(system.dir)</Property>	        
-		<Property Name="metamatrix.host.dir">(host.dir)</Property>	        
-      </Properties>
-      <Process Name="MetaMatrixProcess" ComponentType="VM" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
-        <Properties>
-          <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>
-        <PSC Name="PlatformStandard" ComponentType="Platform" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
-          <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" />
-         </PSC>
-        <PSC Name="QueryEngine" ComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-          <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-          <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-        </PSC>
-      </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" DisplayName="Connector Maximum Thread Count">20</Property>
-        <Property Name="ConnectorThreadTTL">120000</Property>
-        <Property Name="MaxResultRows">0</Property>
-        <Property Name="ExceptionOnMaxRows">true</Property>
-        <Property Name="ConnectorClassPath">extensionjar:metadataconn.jar</Property>
-      </Properties>
-    </Service>
-    <Service Name="MembershipService" ComponentType="MembershipService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties>
-        <Property Name="security.membership.connection.JDBCInternalDomain.SupportsUpdates">true</Property>
-        <Property Name="security.membership.connection.JDBCInternalDomain.GroupHome">GroupView</Property>
-        <Property Name="metamatrix.service.essentialservice">true</Property>
-        <Property Name="security.membership.DomainOrder">JDBCInternalDomain</Property>
-        <Property Name="ServiceClassName">com.metamatrix.platform.security.membership.service.MembershipServiceImpl</Property>
-        <Property Name="security.membership.connection.JDBCInternalDomain.UserHome">UserView</Property>
-        <Property Name="security.membership.connection.JDBCInternalDomain.Retries">4</Property>
-        <Property Name="security.membership.connection.LDAPDomain.Retries">4</Property>
-        <Property Name="security.membership.connection.LDAPDomain.Factory">com.metamatrix.platform.security.membership.spi.ldap.LDAPMembershipSourceFactory</Property>
-        <Property Name="security.membership.connection.LDAPDomain.Driver">com.sun.jndi.ldap.LdapCtxFactory</Property>
-        <Property Name="security.membership.connection.LDAPDomain.LDAP_GroupByAttribute">false</Property>
-        <Property Name="security.membership.connection.LDAPDomain.LDAP_GroupByHierarchical">true</Property>
-        <Property Name="security.membership.connection.LDAPDomain.LDAP_GroupAttribute">cn</Property>
-        <Property Name="security.membership.connection.LDAPDomain.LDAP_MembershipAttribute">uniquemember</Property>
-        <Property Name="security.membership.connection.LDAPDomain.LDAP_UserAttribute">uid</Property>
-        <Property Name="security.membership.connection.LDAPDomain.SupportsUpdates">false</Property>
-        <Property Name="security.membership.connection.LDAPDomain.MaximumAge">600000</Property>
-        <Property Name="security.membership.connection.LDAPDomain.MaximumConcurrentReaders">10</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.ini.loc)</Property>
-        <Property Name="ServerKey">(odbc.license.key)</Property>
-        <Property Name="WaitForProcessEnd">5000</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>
-        <Property Name="security.session.connection.Retries">4</Property>
-        <Property Name="security.session.clientMonitor.enabled">true</Property>
-		<Property Name="security.session.clientMonitor.PingInterval">5</Property>        
-		<Property Name="security.session.clientMonitor.ActivityInterval">20</Property>        		
-		<Property Name="security.session.clientMonitor.ExpireInterval">30</Property>        
-      </Properties>
-    </Service>
-    <Service Name="QueryService" ComponentType="QueryService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties>
-        <Property Name="metamatrix.service.essentialservice">true</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>
-  <ProductTypes>
-    <ProductType Name="MetaMatrix Server" ComponentTypeCode="3" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="Product" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <ComponentTypeID Name="RuntimeMetadataService"/>
-      <ComponentTypeID Name="ODBCService"/>
-    </ProductType>
-    <ProductType Name="Platform" ComponentTypeCode="3" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="Product" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <ComponentTypeID Name="MembershipService"/>
-      <ComponentTypeID Name="ConfigurationService"/>
-      <ComponentTypeID Name="SessionService"/>
-    </ProductType>
-    <ProductType Name="Connectors" ComponentTypeCode="3" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="Product" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <ComponentTypeID Name="Oracle ANSI JDBC Connector"/>
-      <ComponentTypeID Name="Oracle ANSI JDBC XA Connector"/>
-      <ComponentTypeID Name="Oracle 8 JDBC Connector"/>
-      <ComponentTypeID Name="Oracle 8 JDBC XA Connector"/>
-      <ComponentTypeID Name="DB2 JDBC Connector"/>
-      <ComponentTypeID Name="DB2 JDBC XA Connector"/>
-      <ComponentTypeID Name="Sybase ANSI JDBC Connector"/>
-      <ComponentTypeID Name="Sybase ANSI JDBC XA Connector"/>
-      <ComponentTypeID Name="Sybase 11 JDBC Connector"/>
-      <ComponentTypeID Name="Sybase 11 JDBC XA Connector"/>
-      <ComponentTypeID Name="SQL Server JDBC Connector"/>
-      <ComponentTypeID Name="SQL Server JDBC XA Connector"/>
-      <ComponentTypeID Name="Informix JDBC Connector"/>
-      <ComponentTypeID Name="JDBC Connector"/>
-      <ComponentTypeID Name="MS Access Connector"/>
-      <ComponentTypeID Name="JDBC ODBC Connector"/>
-      <ComponentTypeID Name="Text File Connector"/>
-    </ProductType>
-  </ProductTypes>
-  <ProductServiceConfigs>
-    <PSC Name="PlatformStandard" ComponentType="Platform" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties/>
-      <Service Name="ConfigurationService" IsEnabled="true"/>
-      <Service Name="AuthorizationService" IsEnabled="true"/>
-      <Service Name="MembershipService" IsEnabled="true"/>
-      <Service Name="SessionService" IsEnabled="true"/>
-    </PSC>
-    <PSC Name="QueryEngine" ComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties/>
-      <Service Name="QueryService" IsEnabled="true"/>
-      <Service Name="RuntimeMetadataService" IsEnabled="true"/>
-    </PSC>
-    <PSC Name="MetaMatrixServerFull" ComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties/>
-      <Service Name="QueryService" IsEnabled="true"/>
-      <Service Name="RuntimeMetadataService" IsEnabled="true"/>
-      <Service Name="ODBCService" IsEnabled="false"/>
-    </PSC>
-    <PSC Name="ODBCService" ComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties/>
-      <Service Name="ODBCService" IsEnabled="false"/>
-    </PSC>
-  </ProductServiceConfigs>
-	<ComponentTypes>
-		<ComponentType Name="IndexingService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="MetaBase Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false" IsModifiable="false" />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.metamodels.db.model.service.IndexingService" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="StatementWorkerKeepAlive" DisplayName="DBMS Statement Worker Time-To-Live (TTL)" ShortDescription="The maximum time (in milliseconds) that a thread is allowed to live" DefaultValue="300000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ModelWorkerKeepAlive" DisplayName="Model Queue WorkerTime-To-Live (TTL)" ShortDescription="The maximum time (in milliseconds) that a thread is allowed to live" DefaultValue="300000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="StatementWorkerPoolSize" DisplayName="DBMS Statement Worker Pool Size" ShortDescription="Set the maximum number of workers which should be available in the pool" DefaultValue="5"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ModelWorkerPoolSize" DisplayName="Model Queue Worker Pool Size" ShortDescription="Set the maximum number of workers which should be available in the pool" DefaultValue="5"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-						<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="StatementBatchingSize" DisplayName="Statement Batching Size" ShortDescription="The batch size which SQL statements will be submitted in if the Repository JDBC driver supports batching." DefaultValue="200"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Oracle ANSI JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.oracle.OracleDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:1521;SID=&lt;sid&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Pool Shrinking Enabled" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.OracleCapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.OracleSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.OracleResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.OracleSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>			
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Oracle ANSI JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="user" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="DataSource Class" ShortDescription="" DefaultValue="com.metamatrix.jdbcx.oracle.OracleDataSource" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.JDBCXAConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:1521;SID=&lt;sid&gt;;databasename=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Pool Shrinking Enabled" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.oracle.OracleXACapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.OracleSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.OracleResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.oracle.OracleSingleIdentityDSConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="spyAttributes" DisplayName="Spy attributes" ShortDescription="The attribute string for internal debugging."  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-            </ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>			
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Oracle 8 JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.oracle.OracleDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:1521;SID=&lt;sid&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Pool Shrinking Enabled" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8Capabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8ResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.OracleSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Oracle 8 JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" > 
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="user" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="DataSource Class" ShortDescription="" DefaultValue="com.metamatrix.jdbcx.oracle.OracleDataSource" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.JDBCXAConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:1521;SID=&lt;sid&gt;;databasename=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Pool Shrinking Enabled" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.oracle.OracleXACapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8ResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.oracle.OracleSingleIdentityDSConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="spyAttributes" DisplayName="Spy attributes" ShortDescription="The attribute string for internal debugging."  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-            </ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="DB2 JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.db2.DB2Driver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:db2://&lt;host&gt;:&lt;port&gt;;DatabaseName=&lt;databasename&gt;;CollectionID=&lt;collectionid&gt;;PackageName=&lt;packagename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.db2.DB2Capabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.db2.DB2SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.db2.DB2ResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.db2.DB2SingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="DB2 JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="user" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="DataSource Class" ShortDescription="" DefaultValue="com.metamatrix.jdbcx.db2.DB2DataSource" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.JDBCXAConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:db2://&lt;host&gt;:&lt;port&gt;;DatabaseName=&lt;databasename&gt;;CollectionID=&lt;collectionid&gt;;PackageName=&lt;packagename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.db2.DB2XACapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.db2.DB2SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.db2.DB2ResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.db2.DB2SingleIdentityDSConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="spyAttributes" DisplayName="Spy attributes" ShortDescription="The attribute string for internal debugging."  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-            </ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Sybase ANSI JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.sybase.SybaseDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sybase://&lt;host&gt;:&lt;port5000&gt;;DatabaseName=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.SybaseCapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.SybaseSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.SybaseResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.SybaseSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Sybase ANSI JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="user" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="DataSource Class" ShortDescription="" DefaultValue="com.metamatrix.jdbcx.sybase.SybaseDataSource" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.JDBCXAConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sybase://&lt;host&gt;:&lt;port5000&gt;;DatabaseName=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.sybase.SybaseXACapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.SybaseSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.SybaseResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.sybase.SybaseSingleIdentityDSConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="spyAttributes" DisplayName="Spy attributes" ShortDescription="The attribute string for internal debugging."  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-            </ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Sybase 11 JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.sybase.SybaseDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sybase://&lt;host&gt;:&lt;port5000&gt;;DatabaseName=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.Sybase11Capabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.Sybase11SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.Sybase11ResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.SybaseSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>			
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Sybase 11 JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="user" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="DataSource Class" ShortDescription="" DefaultValue="com.metamatrix.jdbcx.sybase.SybaseDataSource" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.JDBCXAConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sybase://&lt;host&gt;:&lt;port5000&gt;;DatabaseName=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.sybase.Sybase11XACapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.Sybase11SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sybase.Sybase11ResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.sybase.SybaseSingleIdentityDSConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="spyAttributes" DisplayName="Spy attributes" ShortDescription="The attribute string for internal debugging."  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-            </ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="SQL Server JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.sqlserver.SQLServerDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sqlserver://&lt;host&gt;:1433;DatabaseName=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sqlserver.SqlServerCapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sqlserver.SqlServerSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sqlserver.SqlServerResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sqlserver.SqlServerSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="SQL Server JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="user" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="DataSource Class" ShortDescription="" DefaultValue="com.metamatrix.jdbcx.sqlserver.SQLServerDataSource" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.JDBCXAConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sqlserver://&lt;host&gt;:1433;DatabaseName=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.sqlserver.SqlServerXACapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sqlserver.SqlServerSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.sqlserver.SqlServerResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.xa.sqlserver.SqlServerSingleIdentityDSConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="spyAttributes" DisplayName="Spy attributes" ShortDescription="The attribute string for internal debugging."  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-            </ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Informix JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.informix.InformixDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:informix://&lt;host&gt;:&lt;port&gt;;DatabaseName=&lt;databasename&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.infomix.InfomixCapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.infomix.InfomixSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.infomix.InfomixResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.infomix.InfomixSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Connector" ComponentTypeCode="2" Deployable="false" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.connector.service.ConnectorService" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorMaxThreads" DisplayName="Connector Maximum Thread Count" ShortDescription="" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorThreadTTL" DisplayName="Thread Time to live (ms)" ShortDescription="" DefaultValue="120000" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxResultRows" DisplayName="Maximum Result Rows" ShortDescription="" DefaultValue="10000" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceMonitoringEnabled" DisplayName="Data Source Monitoring Enabled" ShortDescription="Whether to monitor the underlying data source to see if it is available." DefaultValue="true" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>					
-			<ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="com.metamatrix.data.pool.test_connect_interval" DisplayName="Pool 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" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>				
-		</ComponentType>
-        <ComponentType Name="DesignTimeCatalog JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.connector.service.ConnectorService" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorMaxThreads" DisplayName="Connector Maximum Thread Count" ShortDescription="" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorThreadTTL" DisplayName="Thread Time to live" ShortDescription="" DefaultValue="120000" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxResultRows" DisplayName="Maximum Result Rows" ShortDescription="" DefaultValue="0" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8ResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8Capabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.oracle.Oracle8SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="com.metamatrix.jdbc.oracle.OracleDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Pool Shrinking Enabled" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:MJjdbc.jar;extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:1521;SID=&lt;sid&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"   />
-            </ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
+    <Header>
+        <ApplicationCreatedBy>Teiid</ApplicationCreatedBy>
+        <ApplicationVersionCreatedBy>6.0</ApplicationVersionCreatedBy>
+        <UserCreatedBy>Configuration</UserCreatedBy>
+        <ConfigurationVersion>6.0</ConfigurationVersion>
+        <MetaMatrixSystemVersion>6.0</MetaMatrixSystemVersion>
+        <Time>2009-03-20T12:23:53.919-06:00</Time>
+    </Header>
+    <Configuration Name="Next Startup" ComponentType="Configuration" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+        <Properties />
+    </Configuration>
+    <Services>
+        <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" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" PropertyType="String" IsModifiable="false" IsMasked="false"   />
+            <PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the Integration Server" DefaultValue="false" PropertyType="Boolean" IsModifable="false" IsMasked="false"   />
         </ComponentType>
-		<ComponentType Name="RuntimeMetadataService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.connector.service.ConnectorService" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorMaxThreads" DisplayName="Connector Maximum Thread Count" ShortDescription="" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorThreadTTL" DisplayName="Thread Time to live" ShortDescription="" DefaultValue="120000" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxResultRows" DisplayName="Maximum Result Rows" ShortDescription="" DefaultValue="0" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" DefaultValue="extensionjar:metadataconn.jar" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Service" ComponentTypeCode="1" Deployable="false" Deprecated="false" Monitorable="false" ParentComponentType="VM" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="VM" ComponentTypeCode="0" Deployable="true" Deprecated="false" Monitorable="false" ParentComponentType="Host" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >       
-            <ComponentTypeDefn Deprecated="false">
-                <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." IsRequired="true" PropertyType="Boolean" DefaultValue="true"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn> 
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="vm.forced.shutdown.time" DisplayName="Default VM Forced Shutdown Time (secs)" ShortDescription="The the number of seconds the VM will wait until it will perform a force shutdown." DefaultValue="30"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>		                    
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="LogFile" DisplayName="Process Log File" ShortDescription="The process log file that can be found in the log directory of the installed host." IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false" IsModifiable="false"  />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <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 maxium heap size will be set." DefaultValue="256"  PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="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 mimium heap size will be set." DefaultValue="256"  PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="vm.socketPort" DisplayName="Socket Port" ShortDescription="The port number for the process when socket communications are being used " DefaultValue="31000"  PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="vm.minPort" DisplayName="Min Port Number" ShortDescription="Min port number" DefaultValue="0"  PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <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"  PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="vm.maxThreads" DisplayName="Max Threads" ShortDescription="Maximum socket listener threads." DefaultValue="64"  PropertyType="String"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="vm.inputBufferSize" DisplayName="Socket Input BufferSize" ShortDescription="The size of socket buffer used when reading." DefaultValue="102400" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="vm.outputBufferSize" DisplayName="Socket Output BufferSize" ShortDescription="The size of the socket buffer used when writing." DefaultValue="102400" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>              
-		</ComponentType>
-		<ComponentType Name="Text File Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DateResultFormats" DisplayName="Date Result Formats" ShortDescription=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.text.TextConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DescriptorFile" DisplayName="Text File Descriptor" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DateResultFormatsDelimiter" DisplayName="Date Result Formats Delimiter" ShortDescription=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" DefaultValue="extensionjar:textconn.jar" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Loopback Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="WaitTime" DisplayName="Max Random Wait Time" DefaultValue="0" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="RowCount" DisplayName="Rows Per Query" DefaultValue="1" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CapabilitiesClass" DisplayName="Capabilities Class" DefaultValue="" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" DefaultValue="extensionjar:loopbackconn.jar;extensionjar:jdbcconn.jar" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
- 		<ComponentType Name="Product" ComponentTypeCode="0" Deployable="false" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-		<ComponentType Name="ResourceType" ComponentTypeCode="0" Deployable="false" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-		<ComponentType Name="Miscellaneous Resource Type" ComponentTypeCode="4" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourceType" ParentComponentType="" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-		<ComponentType Name="AppServerPoolType" ComponentTypeCode="4" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourceType" ParentComponentType="" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.class.name" DisplayName="Name of Class that manages a specific Pool" ShortDescription="The class name for the implementation of the Connection Pool" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.adapter.class.name" DisplayName="Connection Adapter Class Name" ShortDescription="The class name for the implementation of the Connection Adapter" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="ResourcePoolType" ComponentTypeCode="4" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourceType" ParentComponentType="" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.minimum.size" DisplayName="Min Pool Size" ShortDescription="The minimum number of connections in the pool" DefaultValue="1" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.maximum.size" DisplayName="Max Pool Size" ShortDescription="The maximum number of connections in the pool" DefaultValue="5" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.shrink.period" DisplayName="Shrink Period" ShortDescription="The interval at which the pool will try to remove unneeded connections" DefaultValue="300000" IsRequired="true" PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.allow.shrinking" DisplayName="Enable Shrinking" ShortDescription="Controls if shrinking is performed on the pool" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.shrink.increment" DisplayName="Shrink Increment" ShortDescription="Indicates the maximum number of connections that will be removed at one time" DefaultValue="0" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.liveandused.time" DisplayName="Live and Unused Time" ShortDescription="The interval for which a connection has not been used and should be considered for removal" DefaultValue="600000" IsRequired="true" PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.wait.time" DisplayName="Connection Wait Time" ShortDescription="Indicates how long a request for a connection will wait before timing out" DefaultValue="30000" IsRequired="true" PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.extend.maximum.pool.size.mode" DisplayName="Enable Extend Mode" ShortDescription="Enables the connection pool size to grow beyond the maximum pool size setting" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.extend.maximum.pool.size.percent" DisplayName="Extend Pool Percent" ShortDescription="The percentage the connection pool will grow beyond the maximum pool size" DefaultValue="100" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.pool.class.name" DisplayName="Connection Pool Class Name" ShortDescription="The class name for the implementation of the Connection Pool" DefaultValue="com.metamatrix.common.pooling.impl.BasicResourcePool" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="pooling.resource.adapter.class.name" DisplayName="Connection Adapter Class Name" ShortDescription="The class name for the implementation of the Connection Adapter" DefaultValue="com.metamatrix.common.pooling.jdbc.JDBCConnectionResourceAdapter" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="JDBC Resource Type" ComponentTypeCode="4" Deployable="false" Deprecated="false" Monitorable="false" SuperComponentType="ResourcePoolType" ParentComponentType="" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.common.pooling.jdbc.Driver" DisplayName="Database Driver" ShortDescription="JDBC Driver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.common.pooling.jdbc.Protocol" DisplayName="Database Protocol" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.common.pooling.jdbc.User" DisplayName="Database User Name" ShortDescription="User Name" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.common.pooling.jdbc.Database" DisplayName="Database URL" ShortDescription="Database URL" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.common.pooling.jdbc.Password" DisplayName="Database Password" ShortDescription="Database Password" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.common.pooling.jdbc.autocommit" DisplayName="Autocommit" ShortDescription="Set connection autocommit" IsRequired="true" PropertyType="Boolean" DefaultValue="false"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-            <ComponentTypeDefn Deprecated="false">
-                <PropertyDefinition Name="sqlTracing" DisplayName="SQL Tracing" ShortDescription="Set sql tracing on" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"   />
-            </ComponentTypeDefn>			
-		</ComponentType>
-		<ComponentType Name="Host" ComponentTypeCode="0" Deployable="true" Deprecated="false" Monitorable="false" ParentComponentType="Configuration" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="hostControllerPortNumber" DisplayName="HostController Port Number" ShortDescription="The host controller port number" DefaultValue="15001" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.installationDir" DisplayName="Installation Directory" ShortDescription="The phyiscal location of the MetaMatrix installation" DefaultValue=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.dir" DisplayName="Log Directory" ShortDescription="The phyiscal location of the Host log files" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.data.dir" DisplayName="Data Directory" ShortDescription="The phyiscal location of the internal MetaMatrix dynamic data" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.system.dir" DisplayName="System Directory" ShortDescription="The System directory is where files are shared across all hosts in this installation" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.host.dir" DisplayName="Host Directory" ShortDescription="The Host directory is where host specific files are located." DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>						      
+        <ComponentType Name="QueryService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="Integration Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+        </ComponentType>
+        <ComponentType Name="Configuration" ComponentTypeCode="0" Deployable="true" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+        </ComponentType>
+        <!-- 
+             *************************************************************************************
+                  Connector Type (This section gets filled by build process at kit building time)
+             ************************************************************************************* 
+         -->
+        <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" IsRequired="true" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription=""   />
+            <PropertyDefinition Name="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system)"  IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="UsePostDelegation" DisplayName="Use Separate Classloader" ShortDescription="Set to true to indicate that the connector classpath and connector type classpath entries should be loaded by a connector specific post-delegation class loader." PropertyType="Boolean" IsRequired="true" IsExpert="true" DefaultValue="false"/>
+            <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" IsRequired="true" 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" IsRequired="true" PropertyType="Boolean" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="ServiceMonitoringEnabled" DisplayName="Data Source Monitoring Enabled" ShortDescription="Whether to monitor the underlying data source to see if it is available." DefaultValue="true" IsRequired="true" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="Immutable" DisplayName="Is Immutable" ShortDescription="True if the source never changes." DefaultValue="false" IsRequired="true" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorMaxConnections" DisplayName="Maximum Concurrent Connections" ShortDescription="" DefaultValue="20" IsRequired="true" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" IsRequired="true" IsExpert="true" IsModifiable="false" />
+            <PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.connector.service.ConnectorService" IsRequired="true" IsModifiable="false" />
+            <PropertyDefinition Name="MaxResultRows" DisplayName="Maximum Result Rows" ShortDescription="" DefaultValue="10000" IsRequired="true" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="SynchWorkers" DisplayName="Synchronous Workers" ShortDescription="Whether worker threads will be bound to connections. Asynch connectors should set this value to false." DefaultValue="true" IsRequired="true" PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"   />
+            <PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size (megabytes)" ShortDescription="" DefaultValue="20" PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age (milliseconds)" ShortDescription="" DefaultValue="3600000" 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="IsXA" DisplayName="Is XA" ShortDescription="Set to true if this is an XA Connector" DefaultValue="false" IsRequired="true" PropertyType="Boolean" IsExpert="true"  IsMasked="false"  />
+            <PropertyDefinition Name="ConnectionPoolEnabled" DisplayName="Connection Pool Enabled" ShortDescription="Enable the use of connection pooling with this connector." DefaultValue="true" IsRequired="true" PropertyType="Boolean" IsExpert="true"  IsMasked="false"  />
+            <PropertyDefinition Name="UseCredentialMap" DisplayName="Requires Credential Map" ShortDescription="Set to true if this connector requires credentials to be passed via a credential map." DefaultValue="false" IsRequired="true" PropertyType="Boolean" IsExpert="true"  IsMasked="false"  />
+            <PropertyDefinition Name="AdminConnectionsAllowed" DisplayName="Admin Connections Allowed" ShortDescription="Whether admin connections without an execution context are allowed." DefaultValue="true" IsRequired="true" PropertyType="Boolean" IsExpert="true"  IsMasked="false"  />
+            <PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
+            <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="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
+            <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="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
+            <PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval (seconds)" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
+            <PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
+            <PropertyDefinition Name="supportsCompareCriteriaEquals" DisplayName="supportsCompareCriteriaEquals" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCompareCriteriaOrdered" DisplayName="supportsCompareCriteriaOrdered" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsInCriteria" DisplayName="supportsInCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="getMaxInCriteriaSize" DisplayName="getMaxInCriteriaSize" ShortDescription=""   PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="supportsIsNullCriteria" DisplayName="supportsIsNullCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsLikeCriteria" DisplayName="supportsLikeCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsLikeCriteriaEscapeCharacter" DisplayName="supportsLikeCriteriaEscapeCharacter" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsNotCriteria" DisplayName="supportsNotCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsOrCriteria" DisplayName="supportsOrCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsBetweenCriteria" DisplayName="supportsBetweenCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSelectDistinct" DisplayName="supportsSelectDistinct" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSelectExpression" DisplayName="supportsSelectExpression" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsInnerJoins" DisplayName="supportsInnerJoins" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAliasedGroup" DisplayName="supportsAliasedGroup" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSelfJoins" DisplayName="supportsSelfJoins" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsOuterJoins" DisplayName="supportsOuterJoins" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsFullOuterJoins" DisplayName="supportsFullOuterJoins" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="getMaxFromGroups" DisplayName="getMaxFromGroups" ShortDescription=""   PropertyType="Integer" IsExpert="true" />
+            <PropertyDefinition Name="getSupportedJoinCriteria" DisplayName="getSupportedJoinCriteria" ShortDescription=""   PropertyType="String" IsExpert="true" >
+            	<AllowedValue>ANY</AllowedValue>
+            	<AllowedValue>THETA</AllowedValue>
+                <AllowedValue>EQUI</AllowedValue>
+                <AllowedValue>KEY</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="supportsOrderBy" DisplayName="supportsOrderBy" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsGroupBy" DisplayName="supportsGroupBy" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsFunctionsInGroupBy" DisplayName="supportsFunctionsInGroupBy" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsHaving" DisplayName="supportsHaving" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesSum" DisplayName="supportsAggregatesSum" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesAvg" DisplayName="supportsAggregatesAvg" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesMin" DisplayName="supportsAggregatesMin" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesMax" DisplayName="supportsAggregatesMax" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesCount" DisplayName="supportsAggregatesCount" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesCountStar" DisplayName="supportsAggregatesCountStar" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsAggregatesDistinct" DisplayName="supportsAggregatesDistinct" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsInCriteriaSubquery" DisplayName="supportsInCriteriaSubquery" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsExistsCriteria" DisplayName="supportsExistsCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsQuantifiedCompareCriteriaSome" DisplayName="supportsQuantifiedCompareCriteriaSome" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsQuantifiedCompareCriteriaAll" DisplayName="supportsQuantifiedCompareCriteriaAll" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsScalarSubqueries" DisplayName="supportsScalarSubqueries" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCorrelatedSubqueries" DisplayName="supportsCorrelatedSubqueries" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsCaseExpressions" DisplayName="supportsCaseExpressions" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSearchedCaseExpressions" DisplayName="supportsSearchedCaseExpressions" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="getSupportedFunctions" DisplayName="getSupportedFunctions" ShortDescription=""   PropertyType="string" IsExpert="true" />
+            <PropertyDefinition Name="supportsInlineViews" DisplayName="supportsInlineViews" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsSetQueryOrderBy" DisplayName="supportsSetQueryOrderBy" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsUnions" DisplayName="supportsUnions" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsIntersect" DisplayName="supportsIntersect" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsExcept" DisplayName="supportsExcept" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="requiresCriteria" DisplayName="requiresCriteria" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="useAnsiJoin" DisplayName="useAnsiJoin" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsBatchedUpdates" DisplayName="supportsBatchedUpdates" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsBulkUpdate" DisplayName="supportsBulkUpdate" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsInsertWithQueryExpression" DisplayName="supportsInsertWithQueryExpression" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsRowLimit" DisplayName="supportsRowLimit" ShortDescription=""   PropertyType="Boolean" IsExpert="true" />
+            <PropertyDefinition Name="supportsRowOffset" DisplayName="supportsRowOffset" ShortDescription=""   PropertyType="Boolean" 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="User" DisplayName="User Name" ShortDescription=""    />
+            <PropertyDefinition Name="Password" DisplayName="Password" ShortDescription=""   IsMasked="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;"  IsModifiable="false" />
+			<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" IsRequired="true" 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"  IsExpert="true" >
+            	<AllowedValue>TRANSACTION_READ_UNCOMMITTED</AllowedValue>
+            	<AllowedValue>TRANSACTION_READ_COMMITTED</AllowedValue>
+            	<AllowedValue>TRANSACTION_SERIALIZABLE</AllowedValue>
+            	<AllowedValue>TRANSACTION_NONE</AllowedValue>
+            </PropertyDefinition>
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.translator.Translator" IsExpert="true" />
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" IsRequired="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="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"  IsExpert="true"/>
+        </ComponentType>
+        <ComponentType Name="Oracle Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="oracle.jdbc.driver.OracleDriver" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:oracle:thin:@&lt;host&gt;:1521:&lt;sid&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.oracle.OracleSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="Oracle XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="oracle.jdbc.xa.client.OracleXADataSource" IsRequired="true"   />        
+			<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:oracle:thin:@&lt;host&gt;:1521:&lt;sid&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+			<PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.oracle.OracleSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   />
+        </ComponentType>
+        <ComponentType Name="DB2 Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.ibm.db2.jcc.DB2Driver" IsRequired="true"   />        
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:db2://&lt;server&gt;:50000/&lt;db-name&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.db2.DB2SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="DB2 XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.ibm.db2.jcc.DB2XADataSource" IsRequired="true"   />        
+            <PropertyDefinition Name="PortNumber" DisplayName="Port Number" DefaultValue="50000" ShortDescription="" IsRequired="true" PropertyType="Integer"    IsMasked="false"   />
+			<PropertyDefinition Name="ServerName" DisplayName="Server Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="DatabaseName" DisplayName="Database Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="DriverType" DisplayName="Driver Type" ShortDescription="" DefaultValue="4" IsRequired="true" PropertyType="Integer"    IsMasked="false"   />
+			<PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.db2.DB2SQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />            
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   />
+        </ComponentType>
+        <ComponentType Name="SQL Server Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.microsoft.sqlserver.jdbc.SQLServerDriver" IsRequired="true"   />        
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:sqlserver://&lt;host&gt;:1433;databaseName=&lt;db-name&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.sqlserver.SqlServerSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="SQL Server XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.microsoft.sqlserver.jdbc.SQLServerXADataSource" IsRequired="true"   />        
+            <PropertyDefinition Name="PortNumber" DisplayName="Port Number" DefaultValue="1433" ShortDescription="" IsRequired="true" PropertyType="Integer"    IsMasked="false"   />
+			<PropertyDefinition Name="ServerName" DisplayName="Server Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="DatabaseName" DisplayName="Database Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+			<PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.sqlserver.SqlServerSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   />
+        </ComponentType>
+        <ComponentType Name="MySQL JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.mysql.jdbc.Driver" IsRequired="true"   />        
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mysql://&lt;host&gt;:3306/&lt;databaseName&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.mysql.MySQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="MySQL 5 JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.mysql.jdbc.Driver" IsRequired="true"   />        
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mysql://&lt;host&gt;:3306/&lt;databaseName&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.mysql.MySQL5Translator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="MySQL JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource" IsRequired="true"   />        
+            <PropertyDefinition Name="PortNumber" DisplayName="Port Number" DefaultValue="3306" ShortDescription="" IsRequired="true" PropertyType="Integer"    IsMasked="false"   />
+			<PropertyDefinition Name="ServerName" DisplayName="Server Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="DatabaseName" DisplayName="Database Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+			<PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.mysql.MySQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />            
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   />
+        </ComponentType>
+        <ComponentType Name="MySQL 5 JDBC XA Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource" IsRequired="true"   />        
+            <PropertyDefinition Name="PortNumber" DisplayName="Port Number" DefaultValue="3306" ShortDescription="" IsRequired="true" PropertyType="Integer"    IsMasked="false"   />
+			<PropertyDefinition Name="ServerName" DisplayName="Server Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="DatabaseName" DisplayName="Database Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+			<PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.mysql.MySQL5Translator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />            
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   />
+        </ComponentType>
+        <ComponentType Name="PostgreSQL JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.postgresql.Driver" IsRequired="true"   />        
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:postgresql://&lt;host&gt;:5432/&lt;databaseName&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.postgresql.PostgreSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="PostgreSQL XA JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.postgresql.xa.PGXADataSource" IsRequired="true"   />        
+            <PropertyDefinition Name="PortNumber" DisplayName="Port Number" DefaultValue="5432" ShortDescription="" IsRequired="true" PropertyType="Integer"    IsMasked="false"   />
+			<PropertyDefinition Name="ServerName" DisplayName="Server Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="DatabaseName" DisplayName="Database Name" ShortDescription="" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+			<PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.postgresql.PostgreSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />            
+            <PropertyDefinition Name="IsXA" DisplayName="Is XA" ShortDescription="Is XA" DefaultValue="true" IsRequired="true" PropertyType="Boolean"   />
+        </ComponentType>
+        <ComponentType Name="Apache Derby Embedded Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.apache.derby.jdbc.EmbeddedDriver" IsRequired="true"   />        
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:derby:&lt;databaseName&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.derby.DerbySQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="Apache Derby Network Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="org.apache.derby.jdbc.ClientDriver" IsRequired="true"   />        
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:derby://localhost:1527/&lt;path/to/db&gt;" IsRequired="true" PropertyType="String"    IsMasked="false"   />
+            <PropertyDefinition Name="ExtensionTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="org.teiid.connector.jdbc.derby.DerbySQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"   />
+        </ComponentType>
+        <ComponentType Name="Teiid 6 JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="com.metamatrix.jdbc.MMDriver" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:metamatrix:&lt;vdbName&gt;@mm://&lt;host&gt;:&lt;port&gt;" IsRequired="true"   />            
+        </ComponentType>
+        <ComponentType Name="JDBC ODBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:&lt;data-source-name&gt;[;UID=&lt;xxx&gt; ;PWD=&lt;xxx&gt;]" IsRequired="true"   />
+        </ComponentType>
+        <ComponentType Name="MS Access Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="JDBC Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+            <PropertyDefinition Name="ConnectionSource" DisplayName="Connection Source Class" ShortDescription="Driver, DataSource, or XADataSource class name" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:Driver={MicroSoft Access Driver (*.mdb)};DBQ=&lt;data-source-name&gt;" IsRequired="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" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:Driver={MicroSoft Excel Driver (*.xls)};DBQ=&lt;filePathToExcelFile&gt;" IsRequired="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" IsRequired="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;" IsRequired="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" IsRequired="true" PropertyType="Boolean"   />
+        </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" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:oracle://&lt;host&gt;:1521;SID=&lt;sid&gt;" IsRequired="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" IsRequired="true" PropertyType="Boolean"   />
+        </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" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sqlserver://&lt;host&gt;:1433;DatabaseName=&lt;databasename&gt;" IsRequired="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" IsRequired="true" PropertyType="Boolean"   />
+        </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" IsRequired="true"   />
+            <PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:mmx:sybase://&lt;host&gt;:5000;DatabaseName=&lt;databasename&gt;" IsRequired="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" IsRequired="true" PropertyType="Boolean"   />
+            <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"  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="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;" IsModifiable="false" />
+			<PropertyDefinition Name="SearchDefaultBaseDN" DisplayName="Default Search Base DN" ShortDescription="Default Base DN for LDAP Searches" 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;" IsRequired="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" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="LdapAdminUserPassword" DisplayName="Ldap Admin Password" ShortDescription="Password of the LDAP admin user account." IsRequired="true" IsMasked="true"  />
+            <PropertyDefinition Name="SearchDefaultScope" DisplayName="Default Search Scope" ShortDescription="Default Scope for LDAP Searches" DefaultValue="SUBTREE_SCOPE" IsRequired="true">
+                <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="LdapTxnTimeoutInMillis" DisplayName="Ldap Transaction Timeout (ms)" ShortDescription="Timeout value for LDAP searches. Defaults to TCP timeout value." />
+            <PropertyDefinition Name="LdapUrl" DisplayName="Ldap URL" ShortDescription="Ldap URL of the server, including port number." DefaultValue="ldap://&lt;ldapServer&gt;:&lt;389&gt;" IsRequired="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="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;" IsModifiable="false" />
+            <PropertyDefinition Name="CapabilitiesClass" DisplayName="Capabilities Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackCapabilities" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="WaitTime" DisplayName="Max Random Wait Time" ShortDescription="" DefaultValue="0" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.loopback.LoopbackConnector" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="RowCount" DisplayName="Rows Per Query" ShortDescription="" DefaultValue="1" IsRequired="true" IsExpert="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="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:commons-codec-1.2.jar;extensionjar:commons-discovery-0.2.jar;extensionjar:commons-httpclient-3.0.1.jar;extensionjar:xmlsec-1.3.0.jar;extensionjar:axis-1.3.jar;extensionjar:axis-jaxrpc-1.3.jar;extensionjar:axis-saaj-1.2.jar;extensionjar:axis-schema-1.3.jar;extensionjar:commons-discovery-0.2.jar;extensionjar:commons-logging-1.1.jar;extensionjar:jms-1.1.jar;extensionjar:servlet-api-2.5.jar;extensionjar:jaxen-1.1.1.jar;extensionjar:jdom-1.0.jar;extensionjar:log4j-1.2.8.jar;extensionjar:opensaml-1.1b.jar;extensionjar:salesforce-api-6.1.0-SNAPSHOT.jar;extensionjar:wsdl4j-1.5.1.jar;extensionjar:wss4j-1.5.0.jar;extensionjar:xalan-2.7.0.jar;extensionjar:xml-apis-1.0.b2.jar" IsModifiable="false" />
+            <PropertyDefinition Name="UsePostDelegation" DisplayName="Use Separate Classloader" ShortDescription="Set to true to indicate that the connector classpath and connector type classpath entries should be loaded by a connector specific post-delegation class loader." PropertyType="Boolean" IsRequired="true" IsExpert="true" DefaultValue="true"/>
+            <PropertyDefinition Name="username" DisplayName="User Name" ShortDescription="Name value for Salesforce authentication" DefaultValue="" IsRequired="true"  />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.ConnectorState" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.salesforce.Connector" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="password" DisplayName="Password" ShortDescription="Password value for Salesforce authentication" DefaultValue="" IsRequired="true" IsMasked="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"  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="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;" IsModifiable="false" />
+            <PropertyDefinition Name="PartialStartupAllowed" DisplayName="Partial Startup Allowed" ShortDescription="" DefaultValue="true" IsRequired="true" PropertyType="Boolean" IsExpert="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="" IsRequired="true"  />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.text.TextConnector" IsRequired="true" 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"  />
+            <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="ConnectorTypeClassPath" DisplayName="Connector Type Class Path" ShortDescription="Connector Type classpath (defined by system, do not modify)" DefaultValue="extensionjar:commons-codec-1.2.jar;extensionjar:commons-discovery-0.2.jar;extensionjar:commons-httpclient-3.0.1.jar;extensionjar:xmlsec-1.3.0.jar;extensionjar:axis-1.3.jar;extensionjar:axis-jaxrpc-1.3.jar;extensionjar:axis-saaj-1.2.jar;extensionjar:axis-schema-1.3.jar;extensionjar:commons-discovery-0.2.jar;extensionjar:commons-logging-1.1.jar;extensionjar:jms-1.1.jar;extensionjar:servlet-api-2.5.jar;extensionjar:jaxen-1.1.1.jar;extensionjar:jdom-1.0.jar;extensionjar:log4j-1.2.8.jar;extensionjar:opensaml-1.1b.jar;extensionjar:wsdl4j-1.5.1.jar;extensionjar:wss4j-1.5.0.jar;extensionjar:xalan-2.7.0.jar;extensionjar:xml-apis-1.0.b2.jar" IsModifiable="false"/>
+            <PropertyDefinition Name="UsePostDelegation" DisplayName="Use Separate Classloader" ShortDescription="Set to true to indicate that the connector classpath and connector type classpath entries should be loaded by a connector specific post-delegation class loader." PropertyType="Boolean" IsRequired="true" IsExpert="true" DefaultValue="true"/>
+        </ComponentType>
 
-		</ComponentType>
-		<ComponentType Name="JDBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" > 
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:&lt;protocol&gt;:&lt;url&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCCapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="JDBC ODBC Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:&lt;data-source-name&gt;[&lt;attribute-name&gt;=&lt;attribute-value&gt;]*" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCCapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="MS Access Connector" ComponentTypeCode="2" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Connector" ParentComponentType="Connectors" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxSQLLength" DisplayName="Max SQL String Length" ShortDescription="" DefaultValue="16384"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="User" DisplayName="User Name" ShortDescription=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Driver" DisplayName="Driver Class" ShortDescription="" DefaultValue="sun.jdbc.odbc.JdbcOdbcDriver" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCConnector" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="URL" DisplayName="JDBC URL" ShortDescription="" DefaultValue="jdbc:odbc:Driver={MicroSoft Access Driver (*.mdb)};DBQ=&lt;data-source-name&gt;" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Password" DisplayName="Password" ShortDescription=""  PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="SetCriteriaBatchSize" DisplayName="SetCriteria Batch Size" ShortDescription="Max number of values in a SetCriteria before batching into multiple queries.  A value &lt;= 0 indicates batching is OFF." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TrimStrings" DisplayName="Trim string flag" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="TransactionIsolationLevel" DisplayName="Transaction Isolation Level" ShortDescription="Set the data source transaction isolation level" DefaultValue=""  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ConnectorClassPath" DisplayName="Class Path" ShortDescription="" DefaultValue="extensionjar:jdbcconn.jar" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections" DisplayName="Pool Maximum Connections" ShortDescription="Set the maximum number of connections for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.max_connections_for_each_id" DisplayName="Pool Maximum Connections for Each ID" ShortDescription="Set the maximum number of connections for each connector ID for the connection pool" DefaultValue="20" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.live_and_unused_time" DisplayName="Pool Connection Idle Time" ShortDescription="Set the idle time of the connection before it should be closed if pool shrinking is enabled" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.wait_for_source_time" DisplayName="Pool Connection Waiting Time" ShortDescription="Set the time to wait if the connection is not available" DefaultValue="120000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.cleaning_interval" DisplayName="Pool cleaning Interval" ShortDescription="Set the interval to cleaning the pool" DefaultValue="60"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="com.metamatrix.data.pool.enable_shrinking" DisplayName="Enable Pool Shrinking" ShortDescription="Set whether to enable the pool shrinking" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionCapabilityClass" DisplayName="Extension Capability Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.access.AccessCapabilities"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionSQLTranslationClass" DisplayName="Extension SQL Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.access.AccessSQLTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionResultsTranslationClass" DisplayName="Extension Results Translation Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ExtensionConnectionFactoryClass" DisplayName="Extension Connection Factory Class" ShortDescription="" DefaultValue="com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="DatabaseTimeZone" DisplayName="Database time zone" ShortDescription="Time zone of the database, if different than MetaMatrix Server"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="SessionService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.connection.Retries" DisplayName="Session proxy maximum retries" ShortDescription="" DefaultValue="4" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.session.service.SessionServiceImpl" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.terminationHandlers" DisplayName="List of TerminationHandler Class Names" ShortDescription="" DefaultValue="com.metamatrix.server.util.DataServerSessionTerminationHandler" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.oldsessionreaper.activityinterval" DisplayName="Session cleanup thread activity interval (hours)" ShortDescription="The amount of time between old non-active session cleanup (in hours)" DefaultValue="1"  PropertyType="Long"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.oldsessionreaper.oldsessionTTL" DisplayName="Non-active session Time To Live (hours)" ShortDescription="The amount of time old non-active sessions are allowed to remain in the session table (in hours)" DefaultValue="10"  PropertyType="Long"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CachePolicyFactory" DisplayName="Session Cache Policy Factory" ShortDescription="" DefaultValue="com.metamatrix.common.cache.mru.MRUObjectCachePolicyFactory"  PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheMaximumAge" DisplayName="Session Cache Object Maximum Age" ShortDescription="The duration of a session in the session cache (in milliseconds)" DefaultValue="86400000"  PropertyType="Long"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheHelper" DisplayName="Session Cache Helper" ShortDescription="" DefaultValue="com.metamatrix.common.cache.mru.AgeMRUCacheHelper"  PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheMaximumCapacity" DisplayName="Session Cache Maximum Capacity" ShortDescription="" DefaultValue="5000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheEventPolicyName" DisplayName="Session Cache Event Policy Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.session.service.SessionCacheEventPolicy" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheEventFactoryName" DisplayName="Session Cache Event Factory Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.session.service.SessionCacheEventFactory" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheResourceRecaptureMode" DisplayName="Session Cache Resource Recapture Mode" ShortDescription="" DefaultValue="SeparateThread"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheResourceRecaptureInterval" DisplayName="Session Cache Resource Recapture Interval" ShortDescription="" DefaultValue=""  PropertyType="Integer"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheResourceRecaptureFraction" DisplayName="Session Cache Resource Recapture Fraction" ShortDescription="" DefaultValue=""  PropertyType="Float"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheStatsLogInterval" DisplayName="Session Cache Statistics Log Interval" ShortDescription="" DefaultValue=""  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheResourceRecaptureIntervalIncrement" DisplayName="Session Cache Resource Recapture Interval Increment" ShortDescription="" DefaultValue=""  PropertyType="Float"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheResourceRecaptureIntervalRate" DisplayName="Session Cache Resource Recapture Interval Rate" ShortDescription="" DefaultValue=""  PropertyType="Integer"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheResourceRecaptureIntervalCeiling" DisplayName="Session Cache Resource Recapture Interval Ceiling" ShortDescription="" DefaultValue=""  PropertyType="Integer"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="CacheResourceRecaptureIntervalDecrement" DisplayName="Session Cache Resource Recapture Interval Decrement" ShortDescription="" DefaultValue=""  PropertyType="Float"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.clientMonitor.enabled" DisplayName="Client Monitoring Enabled [Requires Bounce]" ShortDescription="Should the server monitor client session activity?  [Requires a bounce or restart of the server to take effect.]" DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.clientMonitor.PingInterval" DisplayName="Client Session Ping Interval (Mins) [Requires Bounce]" ShortDescription="The interval of time, in minutes, the client session is scheduled to ping the server to indicate this session is still valid.  When the session is validated, its TTL perior starts over.  [Requires a bounce or restart of the server to take effect.]" DefaultValue="5"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.clientMonitor.ActivityInterval" DisplayName="Client Monitoring Activity (Mins) [Requires Bounce]" ShortDescription="How often client sessions will be monintored to check for expired sessions and invalidate them.  [Requires a bounce or restart of the server to take effect.]" DefaultValue="3"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.session.clientMonitor.ExpireInterval" DisplayName="Client Session TTL (Mins) [Requires Bounce]" ShortDescription="The client session time-to-live period, in minutes, indicates how long a client session will remain valid without being validated with a ping.  If no ping is recieved from the session within this period, it's session will become invalid and considered expired.  [Requires a bounce or restart of the server to take effect.]" DefaultValue="5"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>			
-		</ComponentType>
-		<ComponentType Name="QueryService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="true" SuperComponentType="Service" ParentComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ProcessPoolMaxThreads" DisplayName="Process Pool Maximum Thread Count" ShortDescription="" DefaultValue="64" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxFetchSize" DisplayName="Maximum Fetch Size" ShortDescription="" DefaultValue="20000"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MinFetchSize" DisplayName="Minimum Fetch Size" ShortDescription="" DefaultValue="100"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ProcessPoolThreadTTL" DisplayName="Process Pool Thread Time-To-Live" ShortDescription="" DefaultValue="120000" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.server.query.service.QueryService" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ProcessorTimeslice" DisplayName="Query Processor Timeslice" ShortDescription="" DefaultValue="2000" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxCodeTables" DisplayName="Max Code Tables" ShortDescription="Max Number of Code Tables" DefaultValue="50" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxCodeTableRecords" DisplayName="Max Code Table Records" ShortDescription="Max Number of Records Per Code Table" DefaultValue="10000" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheEnabled" DisplayName="ResultSet Cache Enabled" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxSize" DisplayName="ResultSet Cache Maximum Size" ShortDescription="" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheMaxAge" DisplayName="ResultSet Cache Maximum Age" ShortDescription="" DefaultValue="0"  PropertyType="Long"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ResultSetCacheScope" DisplayName="ResultSet Cache Scope" ShortDescription="" DefaultValue="vdb"  PropertyType="String"   IsExpert="false"  IsMasked="false"  >
-				  	<AllowedValue>vdb</AllowedValue>
-					<AllowedValue>session</AllowedValue>
-				</PropertyDefinition>
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="MaxPlanCacheSize" DisplayName="Maximum Plan Cache" ShortDescription="" DefaultValue="100"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="AuthorizationService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.authorization.service.AuthorizationServiceImpl" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.authorization.connection.MaximumAge" DisplayName="Maximum connection time" ShortDescription="" DefaultValue="600000"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.authorization.connection.Retries" DisplayName="Authorization proxy maximum retries" ShortDescription="" DefaultValue="4" IsRequired="true" PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.authorization.connection.MaximumConcurrentReaders" DisplayName="Maximum allowed concurrent users" ShortDescription="" DefaultValue="1"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="DirectoryService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="MetaBase Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.metadata.directory.connection.MaximumAge" DisplayName="Maximum Age" ShortDescription="" DefaultValue="600000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.metadata.directory.connection.MaximumConcurrentReaders" DisplayName="Maximum Concurrent Readers" ShortDescription="" DefaultValue="1"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.metabase.internal.platform.DirectoryServiceImpl" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="ODBCService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="MetaMatrix Server" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.odbc.ODBCServiceImpl" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false" IsModifiable="false" />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="Openrdaloc" DisplayName="MMODBC.ini file location" ShortDescription="The location the MMODBC.ini should be found" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false" IsModifiable="false" />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServerKey" DisplayName="ODBC Server License File" ShortDescription="The location the ODBC Server license should be found" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false" IsModifiable="false" />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="WaitForProcessEnd" DisplayName="Wait for Process End (milliseconds)" ShortDescription="This property controls how long the Service implementation will wait to see if the ODBC Server will terminate in an error condition." DefaultValue="5000" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="MembershipService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.MaximumAge" DisplayName="Maximum LDAP connection time" ShortDescription="" DefaultValue="600000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.JDBCInternalDomain.UserHome" DisplayName="Account location" ShortDescription="" DefaultValue="UserView" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.LDAP_GroupAttribute" DisplayName="LDAP group attribute name" ShortDescription="" DefaultValue="cn"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.LDAP_GroupByHierarchical" DisplayName="Group groups hierarchically (by dn)" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.LDAP_UserAttribute" DisplayName="LDAP user attribute name" ShortDescription="" DefaultValue="uid"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.JDBCInternalDomain.Factory" DisplayName="Membership Service Internal JDBC SPI Factory" ShortDescription="" DefaultValue="com.metamatrix.platform.security.membership.spi.jdbc.JDBCMembershipSourceFactory" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.MaximumConcurrentReaders" DisplayName="Maximum allowed LDAP concurrent users" ShortDescription="" DefaultValue="10"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.JDBCInternalDomain.MaximumConcurrentReaders" DisplayName="Maximum allowed JDBC concurrent users" ShortDescription="" DefaultValue="1"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.UserHome" DisplayName="User account location (dn)" ShortDescription=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.GroupHome" DisplayName="LDAP group location (dn)" ShortDescription=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.LDAP_GroupByAttribute" DisplayName="Group groups by attribute (by uniquemember attribute)" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.jdbcdomain" DisplayName="JDBC Domain" ShortDescription="" DefaultValue="JDBCInternalDomain" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.Password" DisplayName="External LDAP Membership data store principal's password" ShortDescription=""  PropertyType="String"   IsExpert="false"  IsMasked="true"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.Principal" DisplayName="External LDAP Membership data store principal (dn)" ShortDescription=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.security.membership.service.MembershipServiceImpl" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.Database" DisplayName="External LDAP Membership URL" ShortDescription=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.SupportsUpdates" DisplayName="LDAP Domain Supports Updates" ShortDescription="" DefaultValue="false"  PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.Driver" DisplayName="External LDAP Connection Driver" ShortDescription="" DefaultValue="com.sun.jndi.ldap.LdapCtxFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.Retries" DisplayName="External LDAP Membership proxy maximum retries" ShortDescription="" DefaultValue="4"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.LDAP_MembershipAttribute" DisplayName="LDAP group membership attribute name" ShortDescription="" DefaultValue="uniquemember"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.JDBCInternalDomain.SupportsUpdates" DisplayName="JDBC Domain Supports Updates" ShortDescription="" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.JDBCInternalDomain.MaximumAge" DisplayName="Maximum JDBC connection time" ShortDescription="" DefaultValue="600000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.JDBCInternalDomain.Retries" DisplayName="Membership proxy maximum retries" ShortDescription="" DefaultValue="4" IsRequired="true" PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.DomainOrder" DisplayName="Membership Domain Order" ShortDescription="" DefaultValue="JDBCInternalDomain" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.LDAPDomain.Factory" DisplayName="Membership Service External LDAP SPI Factory" ShortDescription="" DefaultValue="com.metamatrix.platform.security.membership.spi.ldap.LDAPMembershipSourceFactory"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="security.membership.connection.JDBCInternalDomain.GroupHome" DisplayName="JDBC group location" ShortDescription="" DefaultValue="GroupView" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="Configuration" ComponentTypeCode="0" Deployable="true" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.firewall.address" DisplayName="Firewall IP/Hostname Address" ShortDescription="The IP address or Hostname for the firewall to redirect to MetaMatrix Server" DefaultValue=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.firewall.rmiport" DisplayName="Firewall RMI Port Address" ShortDescription="The RMI port used for firewall access to the MetaMatrix Server" DefaultValue=""  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>			
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.firewall.address.enabled" DisplayName="Firewall enabled indicator" ShortDescription="Enable when a firewall is used to redirect to the MetaMatrix Service" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>			
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.server.metadata.systemURL" DisplayName="System VDB URL" ShortDescription="The URL identifies the System VDB" DefaultValue="extensionjar:System.vdb" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.session.max.connections" DisplayName="Max Number of Sessions" ShortDescription="Max Number of Sessions allowed to connect to MetaMatrix Server (reject any connection requests beyond that limit, default would be no limit) [Requires Bounce]" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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. [Requires Bounce]" DefaultValue="0"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.session.sessionMonitor.ActivityInterval" DisplayName="Session Monitoring Activity (Mins)" ShortDescription="How often sessions will be monintored to check for over-limit sessions and invalidate them.  [Requires a bounce or restart of the server to take effect.]" DefaultValue="5"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.server.streamingBatchSize" DisplayName="Streaming Batch Size" ShortDescription="The clob, blob and XML streaming batch size in Kb" DefaultValue="100"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.server.UDFClasspath" DisplayName="User Defined Functions Classpath" ShortDescription="Semicolon-delimited list of URLs to search for User Defined Functions classes in.  Extension module URLs are of the form 'extensionjar:jarfilename.jar'" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.audit.enabled" DisplayName="Auditing Enabled" ShortDescription="Determines whether auditing will be performed" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.encryption.jce.provider" DisplayName="JCE Encryption Provider" ShortDescription="Indicates the jce encryption provider" DefaultValue="org.bouncycastle.jce.provider.BouncyCastleProvider" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false" IsModifiable="false" />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.audit.jdbcDatabase" DisplayName="JDBC Destination Enabled" ShortDescription="If auditing enabled, then record to the jdbc destination." DefaultValue="false"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.threadTTL" DisplayName="Logging Thread Time-To-Live (TTL)" ShortDescription="The maximum time (in milliseconds) that a thread is allowed to live" DefaultValue="300000"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log" DisplayName="Logging Level" ShortDescription="The level at which logging will occur" DefaultValue="5" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.size.limit.kbs" DisplayName="Log File Size Limit (kbs)" ShortDescription="Max. log file size (kbs) at which it will be swapped." DefaultValue="1000" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.size.monitor.mins" DisplayName="Log File Monitoring Interval (mins)" ShortDescription="The time interval in minutes the log file size is monitored" DefaultValue="1000" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.jdbcDatabase.enabled" DisplayName="Log JDBC Destination Enabled" ShortDescription="If enabled, then log to the jdbc destination." DefaultValue="true"  PropertyType="Boolean"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>			
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="vm.starter.maxHeapSize" DisplayName="Default VM Maximum Heap Size (in megabytes)" ShortDescription="The default maximum heap size to be used when starting a VMController.  This value may be overridden by each VM; however, if no value is provided for this property or for the corresponding property in the VM configuration, no maximum heap size will be set." DefaultValue="256"  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.contexts" DisplayName="Logging Contexts to Exclude" ShortDescription="The contexts for log messages that are NOT to be recorded"  PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.audit.contexts" DisplayName="Audit Contexts to Exclude" ShortDescription="The contexts for audit messages that are NOT to be recorded"  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="vm.starter.command" DisplayName="MetaMatrix VMController Starter Command" ShortDescription="Command that is used to start the VMController" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.maxThreads" DisplayName="Logging Maximum Thread Count" ShortDescription="The maximum number of logging threads allowed" DefaultValue="4"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.authorization.dataaccess.CheckingEnabled" DisplayName="Data Access Authorization Enabled" ShortDescription="Determines whether authorization (Entitlements) will be checked" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.authorization.metabase.CheckingEnabled" DisplayName="MetaBase Authorization Enabled" ShortDescription="Determines whether MetaBase authorization (Entitlements) will be checked" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.log.jdbcTable" DisplayName="JDBC Logging Destination table name" ShortDescription="The table the logging information to be written to" DefaultValue="LogEntries"  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.audit.threadTTL" DisplayName="Auditing Thread Time-To-Live (TTL)" ShortDescription="The maximum time (in milliseconds) that a auditing thread is allowed to live" DefaultValue="300000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="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"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.audit.maxThreads" DisplayName="Auditing Maximum Thread Count" ShortDescription="The maximum number of auditing threads allowed" DefaultValue="4"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.audit.jdbcResourceDelim" DisplayName="JDBC Auditing Destination delimiter for resource names" ShortDescription="The delimiter that is used to separate resource names" DefaultValue=","  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="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"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.deployment.platform" DisplayName="EJB Platform Type" ShortDescription="This property indicates the EJB server platform which the MetaMatrix Server is running on" DefaultValue="" IsRequired="true" PropertyType="String"   IsExpert="true" IsHidden="true" IsMasked="false" IsModifiable="false" />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  PropertyType="String"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="vm.starter.minHeapSize" DisplayName="Default VM Minimum Heap Size (in megabytes)" ShortDescription="The default minimum heap size to be used when starting a VMController.  This value may be overridden by each VM; however, if no value is provided for this property or for the corresponding property in the VM configuration, no minimum heap size will be set." DefaultValue="256"  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.buffer.memoryAvailable" DisplayName="Buffer Memory Available" ShortDescription="Amount of memory, in megabytes, to use as buffer management memory in each process." DefaultValue="500"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.buffer.managementInterval" DisplayName="Buffer Management Interval" ShortDescription="The period between checking whether active memory cleanup should occur." DefaultValue="1000"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.buffer.connectorBatchSize" DisplayName="Connector Batch Size" ShortDescription="The size of a batch sent between connector and query service." DefaultValue="1000"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.buffer.processorBatchSize" DisplayName="Processor Batch Size" ShortDescription="The size of a batch sent within the query processor." DefaultValue="500"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"  PropertyType="String"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.buffer.maxFileSize" DisplayName="Max buffer file size (Megs)" ShortDescription="The maximum size (in Megabytes) that a buffer file is allowed to reach before creating spill files." DefaultValue="2048"  PropertyType="Integer"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.buffer.logStatsInterval" DisplayName="Buffer Log Stat Interval" ShortDescription="The period between writing buffer management statistics to the log, used primarily for debugging." DefaultValue="0"  PropertyType="Integer"   IsExpert="true"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.transaction.log.storeTXN" DisplayName="Enable Transaction Recording" ShortDescription="Determine whether transaction should be recorded" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.transaction.log.storeMMCMD" DisplayName="Enable MetaMatrix Command Logging" ShortDescription="Determine whether MetaMatrix command information should be recorded" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.transaction.log.storeSRCCMD" DisplayName="Enable Data Source Command Logging" ShortDescription="Determine whether source command information should be recorded" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<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" IsRequired="true" PropertyType="Boolean"   IsExpert="false"  IsMasked="false"  />
-			</ComponentTypeDefn>	
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.message.bus.type" DisplayName="Messaging Bus Type" ShortDescription="Indicates the type of message bus protocol to use" DefaultValue="jgroups.message.bus" IsRequired="true" PropertyType="String"   IsExpert="true"  IsMasked="false" IsModifiable="false" />
-			</ComponentTypeDefn>								
-		</ComponentType>
-		<ComponentType Name="ConfigurationService" ComponentTypeCode="1" Deployable="true" Deprecated="false" Monitorable="false" SuperComponentType="Service" ParentComponentType="Platform" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="metamatrix.service.essentialservice" DisplayName="Essential Service" ShortDescription="Indicates if the service is essential to operation of the MetaMatrix Server" DefaultValue="false" IsRequired="true" PropertyType="Boolean"   IsExpert="true" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-			<ComponentTypeDefn Deprecated="false">
-				<PropertyDefinition Name="ServiceClassName" DisplayName="Configuration Service Class Name" ShortDescription="" DefaultValue="com.metamatrix.platform.config.service.ConfigurationServiceImpl" IsRequired="true" PropertyType="String"   IsExpert="false" IsHidden="true" IsMasked="false"  />
-			</ComponentTypeDefn>
-		</ComponentType>
-		<ComponentType Name="DeployedComponent" ComponentTypeCode="0" Deployable="false" Deprecated="false" Monitorable="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup"  />
-	</ComponentTypes>
-  <SharedResources>
-     <Resource Name="WebServices" ComponentType="Miscellaneous Resource Type" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties>
-        <Property Name="metamatrix.webserver.host">(webhost.name)</Property>
-        <Property Name="metamatrix.webserver.port">(webhost.port)</Property>
-      </Properties>
-    </Resource>
-    <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">5555</Property>
-		<Property Name="udp.mcast_jndi_port">5556</Property>
-        <Property Name="udp.mcast_addr">(multicast.port)</Property>
-        <Property Name="ping.gossip_host">localhost</Property>
-        <Property Name="ping.gossip_port">5555</Property>
-        <Property Name="metamatrix.cluster.name">(cluster.name)</Property>
-      </Properties>
-    </Resource>
-    <Resource Name="SSL" ComponentType="Miscellaneous Resource Type" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" >
-      <Properties>
-		<Property Name="com.metamatrix.ssl.keystore.filename">mmdemo.keystore</Property>
-		<Property Name="com.metamatrix.ssl.keystore.Password">pDYafqm77aWAxLwWXBbQarXNbxiYijgOqw8RFnfYFEa32JWrGwhnXSLqC/az+vQX9V/03C4K97LmDylEXT7wpKk/wYBKn8eP/t22jbnkYbrmCCB9PSIVLHutzCWleuRViOX+3mMCPmWvYc3QbDEsecWJszwolTwLnP3yasrjynI=</Property>
-		<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.naming.factory.initial">(xa.contextfactory)</Property>
-			<Property Name="metamatrix.xatxnmgr.log_base_dir">(xa.logdir)</Property>
-			<Property Name="metamatrix.xatxnmgr.client_demarcation">true</Property>
-			<Property Name="metamatrix.xatxnmgr.trust_client_tm">false</Property>
-			<Property Name="metamatrix.xatxnmgr.serial_jta_transactions">false</Property>
-			<Property Name="metamatrix.xatxnmgr.checkpoint_interval">500</Property>
-			<Property Name="metamatrix.xatxnmgr.max_actives">50</Property>
-			<Property Name="metamatrix.xatxnmgr.max_timeout">120000</Property>
-		</Properties>
-	</Resource>	   
-  </SharedResources>
-</ConfigurationDocument>
+        <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" IsRequired="true" 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" IsRequired="true" 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="" IsRequired="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"  />
+            <PropertyDefinition Name="SAMLPropertyFile" DisplayName="SAML Property File (only required when SAML profile used)" ShortDescription="SAML Security property file (saml.properties)" DefaultValue="" IsExpert="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="" IsRequired="true"  />
+            <PropertyDefinition Name="AuthUserName" DisplayName="Authentication User Name" ShortDescription="Name value for authentication" DefaultValue="" IsExpert="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=""  />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xmlsource.XMLSourceConnector" IsRequired="true" 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"  />
+            <PropertyDefinition Name="EndPoint" DisplayName="Alternate End Point" ShortDescription="An alternate service endpoint other than one specified in WSDL, to execute the service" DefaultValue=""  />
+            <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" IsRequired="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"  />
+            <PropertyDefinition Name="ConnectionType" DisplayName="Type Of XML Connection" ShortDescription="Connection type used to get the XML data" DefaultValue="com.metamatrix.connector.xmlsource.soap.SoapConnection" IsRequired="true" IsExpert="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"  />
+            <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"  />
+        </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="" IsRequired="true" />
+            <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" IsRequired="true" PropertyType="Integer" />
+            <PropertyDefinition Name="SaxFilterProviderClass" DisplayName="XML Filter Provider" ShortDescription="The class the provides extended XML Filters" DefaultValue="com.metamatrix.connector.xml.base.NoExtendedFilters"  IsExpert="true" />
+            <PropertyDefinition Name="ConnectorClass" DisplayName="Connector Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.base.XMLConnector" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="MaxFileCacheSize" DisplayName="Max Size of file cache (in kb)" ShortDescription="" DefaultValue="-1" IsRequired="true" PropertyType="Integer" />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.file.FileConnectorState" IsRequired="true" 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"  IsExpert="true" />
+            <PropertyDefinition Name="MaxMemoryCacheSize" DisplayName="Max Size of in-memory cache (in kb)" ShortDescription="" DefaultValue="16384" IsRequired="true" 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"  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"  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" IsRequired="true" PropertyType="Integer" />
+            <PropertyDefinition Name="SaxFilterProviderClass" DisplayName="XML Filter Provider" ShortDescription="The class the provides extended XML Filters" DefaultValue="com.metamatrix.connector.xml.base.NoExtendedFilters"  IsExpert="true" />
+            <PropertyDefinition Name="XMLParmName" DisplayName="XML Parameter Name" ShortDescription="" />
+            <PropertyDefinition Name="RequestTimeout" DisplayName="Request Timeout (in Milliseconds)" ShortDescription="" DefaultValue="10000" IsRequired="true" PropertyType="Integer" />
+            <PropertyDefinition Name="MaxFileCacheSize" DisplayName="Max Size of file cache (in kb)" ShortDescription="" DefaultValue="-1" IsRequired="true" PropertyType="Integer" />
+            <PropertyDefinition Name="Authenticate" DisplayName="Authentication Required" ShortDescription="" DefaultValue="false" PropertyType="Boolean" IsModifiable="true" />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.http.HTTPConnectorState" IsRequired="true" 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" IsRequired="true">
+                <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"  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" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="Uri" DisplayName="Server URI" ShortDescription="The URI of the HTTP source" IsRequired="true" />
+            <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"  IsExpert="true" />
+            <PropertyDefinition Name="ParameterMethod" DisplayName="Parameter Method" ShortDescription="" DefaultValue="None" IsRequired="true">
+                <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" IsRequired="true" 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"  IsExpert="true" />
+            <PropertyDefinition Name="HostnameVerifier" DisplayName="Hostname Verifier" ShortDescription="Class implementing javax.net.ssl.HostnameVerifier.  Used to implement a hostname mismatch workaround."  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"  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"  />
+            <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"  IsExpert="true" />
+            <PropertyDefinition Name="AuthUserName" DisplayName="Authentication User Name" ShortDescription="Name value for authentication" DefaultValue="" IsExpert="true"  />
+            <PropertyDefinition Name="CacheTimeout" DisplayName="Cache Timeout (in seconds)" ShortDescription="" DefaultValue="60" IsRequired="true" 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=""  />
+            <PropertyDefinition Name="XMLParmName" DisplayName="XML Parameter Name" ShortDescription="" DefaultValue="" 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"  />
+            <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" IsRequired="true" PropertyType="Integer" />
+            <PropertyDefinition Name="RequestTimeout" DisplayName="Request Timeout (in Milliseconds)" ShortDescription="" DefaultValue="10000" IsRequired="true" 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"  />
+            <PropertyDefinition Name="ConnectorStateClass" DisplayName="Connector State Class" ShortDescription="" DefaultValue="com.metamatrix.connector.xml.soap.SOAPConnectorState" IsRequired="true" 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" 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"  />
+            <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"  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"  />
+            <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" IsRequired="true">
+                <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" IsRequired="true" IsExpert="true" />
+            <PropertyDefinition Name="Uri" DisplayName="Server URI" ShortDescription="The URI of the HTTP source" IsRequired="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" IsRequired="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"  IsExpert="true" />
+            <PropertyDefinition Name="ParameterMethod" DisplayName="Parameter Method (None, Name/Value, XMLRequest, XMLInQueryString)" ShortDescription="" DefaultValue="XMLRequest" 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"  IsExpert="true" />
+            <PropertyDefinition Name="MaxMemoryCacheSize" DisplayName="Max Size of in-memory cache (in kb)" ShortDescription="" DefaultValue="16384" IsRequired="true" PropertyType="Integer" />
+            <PropertyDefinition Name="HostnameVerifier" DisplayName="Hostname Verifier" ShortDescription="a class implmenting javax.net.ssl.HostnameVerifier.  Used to implement a hostname mismatch workaround."  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"  />
+            <PropertyDefinition Name="QueryPreprocessorClass" DisplayName="Query Preprocessor Class" ShortDescription="The class to use to preprocess the IQuery" DefaultValue="com.metamatrix.connector.xml.base.NoQueryPreprocessing"  IsExpert="true" />
+        </ComponentType>
+        
+    </ComponentTypes>
+</ConfigurationDocument>
\ No newline at end of file

Modified: trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected
===================================================================
--- trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected	2009-07-10 16:41:23 UTC (rev 1118)
@@ -11,7 +11,7 @@
 float                                                              7            20           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           float                                                              0              255            <null>         <null>            10            
 double                                                             8            20           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           double                                                             0              255            <null>         <null>            10            
 string                                                             12           4000         '                                                                  '                                                                  <null>                                                             1         false           3           true                true              false           string                                                             0              255            <null>         <null>            0             
-xml                                                                2000         2147483647   <null>                                                             <null>                                                             <null>                                                             1         false           3           true                true              false           xml                                                                0              255            <null>         <null>            0             
+xml                                                                2009         2147483647   <null>                                                             <null>                                                             <null>                                                             1         false           3           true                true              false           xml                                                                0              255            <null>         <null>            0             
 date                                                               91           10           {d'                                                                }                                                                  <null>                                                             1         false           3           true                true              false           date                                                               0              255            <null>         <null>            0             
 time                                                               92           8            {t'                                                                }                                                                  <null>                                                             1         false           3           true                true              false           time                                                               0              255            <null>         <null>            0             
 timestamp                                                          93           29           {ts'                                                               }                                                                  <null>                                                             1         false           3           true                true              false           timestamp                                                          0              255            <null>         <null>            0             

Deleted: trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_specificType_Integer.expected
===================================================================
--- trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_specificType_Integer.expected	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_specificType_Integer.expected	2009-07-10 16:41:23 UTC (rev 1118)
@@ -1,40 +0,0 @@
-string                                                             integer      integer      string                                                             string                                                             string                                                             short     boolean         short       boolean             boolean           boolean         string                                                             short          short          integer        integer           integer       
-TYPE_NAME                                                          DATA_TYPE    PRECISION    LITERAL_PREFIX                                                     LITERAL_SUFFIX                                                     CREATE_PARAMS                                                      NULLABLE  CASE_SENSITIVE  SEARCHABLE  UNSIGNED_ATTRIBUTE  FIXED_PREC_SCALE  AUTO_INCREMENT  LOCAL_TYPE_NAME                                                    MINIMUM_SCALE  MAXIMUM_SCALE  SQL_DATA_TYPE  SQL_DATETIME_SUB  NUM_PREC_RADIX
-boolean                                                            -7           1            {b'                                                                }                                                                  <null>                                                             1         false           3           true                true              false           boolean                                                            0              255            <null>         <null>            0             
-byte                                                               -6           3            <null>                                                             <null>                                                             <null>                                                             1         false           3           true                true              false           byte                                                               0              255            <null>         <null>            0             
-long                                                               -5           19           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           long                                                               0              255            <null>         <null>            10            
-char                                                               1            1            '                                                                  '                                                                  <null>                                                             1         false           3           true                true              false           char                                                               0              255            <null>         <null>            0             
-bigdecimal                                                         2            20           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               true              false           bigdecimal                                                         0              255            <null>         <null>            10            
-biginteger                                                         2            19           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           biginteger                                                         0              255            <null>         <null>            10            
-integer                                                            4            10           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           integer                                                            0              255            <null>         <null>            10            
-short                                                              5            5            <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           short                                                              0              255            <null>         <null>            10            
-float                                                              7            20           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           float                                                              0              255            <null>         <null>            10            
-double                                                             8            20           <null>                                                             <null>                                                             <null>                                                             1         false           3           false               false             false           double                                                             0              255            <null>         <null>            10            
-string                                                             12           4000         '                                                                  '                                                                  <null>                                                             1         false           3           true                true              false           string                                                             0              255            <null>         <null>            0             
-xml                                                                2000         2147483647   <null>                                                             <null>                                                             <null>                                                             1         false           3           true                true              false           xml                                                                0              255            <null>         <null>            0             
-date                                                               91           10           {d'                                                                }                                                                  <null>                                                             1         false           3           true                true              false           date                                                               0              255            <null>         <null>            0             
-time                                                               92           8            {t'                                                                }                                                                  <null>                                                             1         false           3           true                true              false           time                                                               0              255            <null>         <null>            0             
-timestamp                                                          93           29           {ts'                                                               }                                                                  <null>                                                             1         false           3           true                true              false           timestamp                                                          0              255            <null>         <null>            0             
-object                                                             2000         2147483647   <null>                                                             <null>                                                             <null>                                                             1         false           3           true                true              false           object                                                             0              255            <null>         <null>            0             
-blob                                                               2004         2147483647   <null>                                                             <null>                                                             <null>                                                             1         false           3           true                true              false           blob                                                               0              255            <null>         <null>            0             
-clob                                                               2005         2147483647   <null>                                                             <null>                                                             <null>                                                             1         false           3           true                true              false           clob                                                               0              255            <null>         <null>            0             
-Row Count : 18
-getColumnName       getColumnType  getCatalogName  getColumnClassName  getColumnLabel  getColumnTypeName  getSchemaName  getTableName      getColumnDisplaySize  getPrecision  getScale  isAutoIncrement  isCaseSensitive  isCurrency  isDefinitelyWritable  isNullable  isReadOnly  isSearchable  isSigned  isWritable  
-TYPE_NAME           12             <null>          java.lang.String    <null>          string             QT_Ora9DS      System.DataTypes  4000                  4000          0         false            false            false       false                 0           true        true          false     false       
-DATA_TYPE           4              <null>          java.lang.Integer   <null>          integer            QT_Ora9DS      System.DataTypes  11                    10            0         false            false            false       true                  1           false       true          true      true        
-PRECISION           4              <null>          java.lang.Integer   <null>          integer            QT_Ora9DS      System.DataTypes  11                    10            0         false            false            false       true                  1           false       true          true      true        
-LITERAL_PREFIX      12             <null>          java.lang.String    <null>          string             QT_Ora9DS      System.DataTypes  4000                  4000          0         false            false            false       true                  1           false       true          true      true        
-LITERAL_SUFFIX      12             <null>          java.lang.String    <null>          string             QT_Ora9DS      System.DataTypes  4000                  4000          0         false            false            false       true                  1           false       true          true      true        
-CREATE_PARAMS       12             <null>          java.lang.String    <null>          string             QT_Ora9DS      System.DataTypes  4000                  4000          0         false            false            false       true                  1           false       true          true      true        
-NULLABLE            5              <null>          java.lang.Short     <null>          short              QT_Ora9DS      System.DataTypes  6                     5             0         false            false            false       true                  1           false       true          true      true        
-CASE_SENSITIVE      -7             <null>          java.lang.Boolean   <null>          boolean            QT_Ora9DS      System.DataTypes  5                     1             0         false            true             false       false                 0           true        true          false     false       
-SEARCHABLE          5              <null>          java.lang.Short     <null>          short              QT_Ora9DS      System.DataTypes  6                     5             0         false            false            false       true                  1           false       true          true      true        
-UNSIGNED_ATTRIBUTE  -7             <null>          java.lang.Boolean   <null>          boolean            QT_Ora9DS      System.DataTypes  5                     1             0         false            false            false       true                  1           false       true          true      true        
-FIXED_PREC_SCALE    -7             <null>          java.lang.Boolean   <null>          boolean            QT_Ora9DS      System.DataTypes  5                     1             0         false            false            false       true                  1           false       true          true      true        
-AUTO_INCREMENT      -7             <null>          java.lang.Boolean   <null>          boolean            QT_Ora9DS      System.DataTypes  5                     1             0         false            true             false       false                 0           true        true          true      false       
-LOCAL_TYPE_NAME     12             <null>          java.lang.String    <null>          string             QT_Ora9DS      System.DataTypes  4000                  4000          0         false            false            false       false                 0           true        true          false     false       
-MINIMUM_SCALE       5              <null>          java.lang.Short     <null>          short              QT_Ora9DS      System.DataTypes  6                     5             0         false            false            false       true                  1           false       true          true      true        
-MAXIMUM_SCALE       5              <null>          java.lang.Short     <null>          short              QT_Ora9DS      System.DataTypes  6                     5             0         false            false            false       true                  1           false       true          true      true        
-SQL_DATA_TYPE       4              <null>          java.lang.Integer   <null>          integer            QT_Ora9DS      System.DataTypes  11                    10            0         false            false            false       true                  1           false       true          true      true        
-SQL_DATETIME_SUB    4              <null>          java.lang.Integer   <null>          integer            QT_Ora9DS      System.DataTypes  11                    10            0         false            false            false       true                  1           false       true          true      true        
-NUM_PREC_RADIX      4              <null>          java.lang.Integer   <null>          integer            QT_Ora9DS      System.DataTypes  11                    10            0         false            false            false       false                 1           true        true          false     false       

Added: trunk/test-integration/src/test/resources/derby/sample.zip
===================================================================
(Binary files differ)


Property changes on: trunk/test-integration/src/test/resources/derby/sample.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/test-integration/src/test/resources/partssupplier/expected/TypeInfo.txt
===================================================================
--- trunk/test-integration/src/test/resources/partssupplier/expected/TypeInfo.txt	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/src/test/resources/partssupplier/expected/TypeInfo.txt	2009-07-10 16:41:23 UTC (rev 1118)
@@ -10,7 +10,7 @@
 float	7	20	null	null	null	1	false	3	false	false	false	float	0	255	null	null	10
 double	8	20	null	null	null	1	false	3	false	false	false	double	0	255	null	null	10
 string	12	4000	'	'	null	1	false	3	true	true	false	string	0	255	null	null	0
-xml	2000	2147483647	null	null	null	1	false	3	true	true	false	xml	0	255	null	null	0
+xml	2009	2147483647	null	null	null	1	false	3	true	true	false	xml	0	255	null	null	0
 date	91	10	{d'	}	null	1	false	3	true	true	false	date	0	255	null	null	0
 time	92	8	{t'	}	null	1	false	3	true	true	false	time	0	255	null	null	0
 timestamp	93	29	{ts'	}	null	1	false	3	true	true	false	timestamp	0	255	null	null	0

Modified: trunk/test-integration/src/test/resources/vdbless/ConfigurationInfo.def
===================================================================
--- trunk/test-integration/src/test/resources/vdbless/ConfigurationInfo.def	2009-07-10 16:15:38 UTC (rev 1117)
+++ trunk/test-integration/src/test/resources/vdbless/ConfigurationInfo.def	2009-07-10 16:41:23 UTC (rev 1118)
@@ -2,7 +2,7 @@
 <VDB>
     <VDBInfo>
         <Property Name="Name" Value="VDBLess" />
-        <Property Name="Version" Value="4" />
+        <Property Name="Version" Value="3" />
         <Property Name="UseConnectorMetadata" Value="true" />
     </VDBInfo>
     <Model>
@@ -11,6 +11,12 @@
             <Connector Name="Text Connector" />
         </ConnectorBindings>
     </Model>
+    <Model>
+        <Property Name="Name" Value="Derby" />
+        <ConnectorBindings>
+            <Connector Name="Derby Connector" />
+        </ConnectorBindings>
+    </Model>
     <ConnectorBindings>
         <Connector Name="Text Connector" ComponentType="Text File Connector">
             <Properties>
@@ -18,6 +24,15 @@
                 <Property Name="DescriptorFile">src/test/resources/vdbless/TextDescriptor.txt</Property>
             </Properties>
         </Connector>
+        <Connector Name="Derby Connector" ComponentType="Apache Derby Embedded Connector">
+            <Properties>
+                <Property Name="Immutable">true</Property>
+                <Property Name="URL">jdbc:derby:jar:(src/test/resources/derby/sample.zip)bqt</Property>
+                
+                <!-- import settings -->
+                <Property Name="importer.useFullSchemaName">false</Property>
+            </Properties>
+        </Connector>
     </ConnectorBindings>
 </VDB>
 




More information about the teiid-commits mailing list