[teiid-commits] teiid SVN: r1814 - in branches/JCA/connectors/connector-xml/src: main/java/com/metamatrix/connector/xmlsource and 18 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Wed Feb 10 12:56:09 EST 2010


Author: rareddy
Date: 2010-02-10 12:56:08 -0500 (Wed, 10 Feb 2010)
New Revision: 1814

Removed:
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/file/
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/http/
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceManagedConnectionFactory.java
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/file/
   branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/soap/
   branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-file/ra.xml
   branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-http/ra.xml
   branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-soap/ra.xml
   branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-file/ra.xml
   branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-soap/ra.xml
   branches/JCA/connectors/connector-xml/src/main/resources/client-config.wsdd
   branches/JCA/connectors/connector-xml/src/main/resources/com/metamatrix/connector/xml/file/
   branches/JCA/connectors/connector-xml/src/main/resources/com/metamatrix/connector/xml/http/
   branches/JCA/connectors/connector-xml/src/main/resources/com/metamatrix/connector/xml/jms/
   branches/JCA/connectors/connector-xml/src/main/resources/com/metamatrix/connector/xml/soap/
   branches/JCA/connectors/connector-xml/src/main/resources/com/metamatrix/connector/xmlsource/
   branches/JCA/connectors/connector-xml/src/test/java/com/imacination/webservices/distance/Distance_jws/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockHostnameVerifier.java
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestCachingFileConnector.java
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/file/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/http/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/soap/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/file/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/service/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/www/BooksView_Input/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/www/BooksView_Output/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/www/CurrencyExchangeService/
   branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/www/whatsshowing/
   branches/JCA/connectors/connector-xml/src/test/java/metamatrix/com/Books/
   branches/JCA/connectors/connector-xml/src/test/resources/BookCollection.xml
   branches/JCA/connectors/connector-xml/src/test/resources/com/metamatrix/connector/xmlsource/
   branches/JCA/connectors/connector-xml/src/test/resources/documents/File/
   branches/JCA/connectors/connector-xml/src/test/resources/service/
   branches/JCA/connectors/connector-xml/src/test/resources/stockquotes.xml
Log:
TEIID-861

Deleted: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLConnectionFacory.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource;
-
-import java.util.ArrayList;
-
-import org.teiid.connector.api.Connection;
-import org.teiid.connector.api.ConnectorEnvironment;
-import org.teiid.connector.api.ConnectorException;
-
-
-
-/** 
- * This Connection factory which will handle the different connection semantics
- * the supported type will be
- * - File Based XML Document
- * - SOAP Based XML Document
- * - REST Based XML Document
- * 
- */
-public class XMLConnectionFacory {
-	XMLSourceManagedConnectionFactory env;
-
-    
-    public XMLConnectionFacory(ConnectorEnvironment env) {
-        this.env = (XMLSourceManagedConnectionFactory)env;
-    }
-    
-    /**
-     * Create connection to the source 
-     * @param context
-     * @return
-     * @throws ConnectorException
-     */
-    public Connection createConnection() 
-        throws ConnectorException {
-        String connectionTypeClass = env.getConnectionType();
-        ArrayList ctorParams = new  ArrayList();
-        ctorParams.add(this.env);
-        return XMLSourceManagedConnectionFactory.getInstance(XMLSourceConnection.class, connectionTypeClass, ctorParams, null);
-    }
-}

Deleted: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceCapabilities.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource;
-
-import org.teiid.connector.basic.BasicConnectorCapabilities;
-
-/**
- */
-public class XMLSourceCapabilities extends BasicConnectorCapabilities {
-
-	static XMLSourceCapabilities INSTANCE = new XMLSourceCapabilities();
-	
-}

Deleted: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnection.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource;
-
-import org.teiid.connector.api.ConnectorEnvironment;
-import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.basic.BasicConnection;
-
-/**
- * A Base XML Connection to an XML Source
- */
-public abstract class XMLSourceConnection extends BasicConnection {
-
-    protected ConnectorEnvironment env;
-    protected boolean connected = false;
-    
-    /**
-     * Constructor. 
-     * @param env
-     */
-    public XMLSourceConnection(ConnectorEnvironment env) throws ConnectorException {
-        this.env = env;
-    }
-
-    /** 
-     * @see org.teiid.connector.api.Connection#release()
-     */
-    public void close() {            
-        XMLSourcePlugin.logInfo(this.env.getLogger(), "Connection_closed"); //$NON-NLS-1$
-    }
-    
-    /**
-     * Check if the connection is active. 
-     * @return true if active; false otherwise
-     */
-    public abstract boolean isConnected();       
-}

Deleted: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceConnector.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource;
-
-import org.teiid.connector.api.Connection;
-import org.teiid.connector.api.ConnectorEnvironment;
-import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.basic.BasicConnector;
-
-/**
- * XML Source connector
- */
-public class XMLSourceConnector extends BasicConnector {
-
-    private ConnectorEnvironment env;
-    private XMLConnectionFacory connFactory;
-
-    /**
-     * Initialization with environment.
-     */
-
-    @Override
-	public void initialize(ConnectorEnvironment environment) throws ConnectorException {
-        this.env = environment;
-        this.connFactory = new XMLConnectionFacory(this.env);
-        
-        // logging
-        XMLSourcePlugin.logInfo(this.env.getLogger(), "Connector_started"); //$NON-NLS-1$
-    }
-
-    /*
-     * Get a Connection to the XML Source requested.
-     * @see com.metamatrix.data.Connector#getConnection(com.metamatrix.data.SecurityContext)
-     */
-    @Override
-    public Connection getConnection() throws ConnectorException {
-        return this.connFactory.createConnection();
-    }
-
-}

Deleted: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceExecution.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource;
-
-import java.sql.SQLXML;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.xml.transform.Source;
-
-import org.teiid.connector.DataPlugin;
-import org.teiid.connector.api.ConnectorEnvironment;
-import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.api.DataNotAvailableException;
-import org.teiid.connector.api.ProcedureExecution;
-import org.teiid.connector.basic.BasicExecution;
-
-
-
-/** 
- * This is main class which will execute request in the XML Source
- */
-public abstract class XMLSourceExecution extends BasicExecution implements ProcedureExecution {
-
-    // Connector environment
-    protected ConnectorEnvironment env;
-    private boolean returnedResult;
-    protected Source returnValue;
-    
-    /**
-     * ctor 
-     * @param context
-     * @param metadata
-     */
-    public XMLSourceExecution(ConnectorEnvironment env) {
-        this.env = env;
-    }
-    
-    protected SQLXML convertToXMLType(Source value) throws ConnectorException {
-    	if (value == null) {
-    		return null;
-    	}
-    	Object result = env.getTypeFacility().convertToRuntimeType(value);
-    	if (!(result instanceof SQLXML)) {
-    		throw new ConnectorException(DataPlugin.Util.getString("unknown_object_type_to_tranfrom_xml")); //$NON-NLS-1$
-    	}
-    	return (SQLXML)result;
-    }
-
-    @Override
-    public List<?> next() throws ConnectorException, DataNotAvailableException {
-    	if (!returnedResult) {
-    		returnedResult = true;
-    		return Arrays.asList(convertToXMLType(returnValue));
-    	}
-    	return null;
-    }  
-    
-    @Override
-    public List<?> getOutputParameterValues() throws ConnectorException {
-        throw new ConnectorException(XMLSourcePlugin.Util.getString("No_outputs_allowed")); //$NON-NLS-1$
-    }
-
-    /** 
-     * @see org.teiid.connector.api.Execution#close()
-     */
-    public void close() throws ConnectorException {
-        // no-op
-    }
-
-    /** 
-     * @see org.teiid.connector.api.Execution#cancel()
-     */
-    public void cancel() throws ConnectorException {
-        // no-op
-    }
-
-}

Deleted: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceManagedConnectionFactory.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceManagedConnectionFactory.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourceManagedConnectionFactory.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-package com.metamatrix.connector.xmlsource;
-
-import org.teiid.connector.basic.BasicManagedConnectionFactory;
-
-public class XMLSourceManagedConnectionFactory extends BasicManagedConnectionFactory {
-
-	private String connectionType;
-
-	public String getConnectionType() {
-		return this.connectionType;
-	}
-
-	public void setConnectionType(String connectionType) {
-		this.connectionType = connectionType;
-	}
-}

Deleted: branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/java/com/metamatrix/connector/xmlsource/XMLSourcePlugin.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,132 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource;
-
-import java.util.ResourceBundle;
-
-import org.teiid.connector.api.ConnectorLogger;
-
-import com.metamatrix.core.BundleUtil;
-
-/**
- * For logging purposes
- */
-public class XMLSourcePlugin { // extends Plugin {
-
-    /**
-     * The plug-in identifier of this plugin
-     */
-    public static final String PLUGIN_ID = "com.metamatrix.connector.xmlsource" ; //$NON-NLS-1$
-
-	public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,
-	                                                     PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$
-
-
-    
-    /**
-     * Log an error message.
-     * @param message The message
-     */
-    public static void logError(ConnectorLogger logger, String message ) {
-        String msg = Util.getString(message);
-        logger.logError(msg);
-    }
-
-    public static void logError(ConnectorLogger logger, String message, Object[] params) {
-        String msg = Util.getString(message, params);
-        logger.logError(msg);
-    }
-
-    /**
-     * Log an error message with an error, which may allow the stack
-     * trace for the error to be logged, depending on the log configuration.
-     * @param message The message
-     * @param error The error
-     */
-    public static void logError(ConnectorLogger logger, String message, Throwable error ) {
-        String msg = Util.getString(message);
-        logger.logError(msg, error);
-    }
-
-    public static void logError(ConnectorLogger logger, String message, Object[] params, Throwable error) {
-        String msg = Util.getString(message, params);
-        logger.logError(msg, error);
-    }
-
-    /**
-     * Log a warning message.
-     * @param message The message
-     */
-    public static void logWarning(ConnectorLogger logger, String message ) {
-        String msg = Util.getString(message);
-        logger.logWarning(msg);
-    }
-
-    public static void logWarning(ConnectorLogger logger, String message, Object[] params) {
-        String msg = Util.getString(message, params);
-        logger.logWarning(msg);
-    }
-
-    /**
-     * Log an informational message.
-     * @param message The message
-     */
-    public static void logInfo(ConnectorLogger logger, String message ) {
-        String msg = Util.getString(message);
-        logger.logInfo(msg);
-    }
-
-    public static void logInfo(ConnectorLogger logger, String message, Object[] params) {
-        String msg = Util.getString(message, params);
-        logger.logInfo(msg);
-    }
-
-    /**
-     * Log a detail debugging message.
-     * @param message The message
-     */
-    public static void logDetail(ConnectorLogger logger, String message ) {
-        String msg = Util.getString(message);
-        logger.logDetail(msg);
-    }
-
-    public static void logDetail(ConnectorLogger logger, String message, Object[] params) {
-        String msg = Util.getString(message, params);
-        logger.logDetail(msg);
-    }
-
-    /**
-     * Log a trace debugging message.
-     * @param message The message
-     */
-    public static void logTrace(ConnectorLogger logger, String message ) {
-        String msg = Util.getString(message);
-        logger.logTrace(msg);
-    }
-
-    public static void logTrace(ConnectorLogger logger, String message, Object[] params) {
-        String msg = Util.getString(message, params);
-        logger.logTrace(msg);
-    }
-
-}

Deleted: branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-file/ra.xml
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-file/ra.xml	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-file/ra.xml	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-           version="1.5">
-
-   <vendor-name>Red Hat Middleware LLC</vendor-name>
-   <eis-type>Teiid XML-Relational File Connector</eis-type>
-   <resourceadapter-version>1.0</resourceadapter-version>
-   <license>
-      <description>
- JBoss, Home of Professional Open Source.
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags. See the copyright.txt file in the
- distribution for a full listing of individual contributors.
-
- This 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 software 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 software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-      </description>
-      <license-required>true</license-required>
-   </license>
-   <resourceadapter>
-      <resourceadapter-class>org.teiid.connector.basic.BasicResourceAdapter</resourceadapter-class>
-
-      <outbound-resourceadapter>
-         <connection-definition>
-            <managedconnectionfactory-class> com.metamatrix.connector.xml.file.FileManagedConnectionFactory</managedconnectionfactory-class>
-
-            <config-property>
-               <description>{$display:"Connector Class",$advanced:"true"}</description>
-               <config-property-name>ConnectorClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xml.base.XMLConnector</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Connector Capabilities",$description:"The class to use to provide the Connector Capabilities",$advanced:"true"}</description>
-               <config-property-name>CapabilitiesClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xml.base.XMLCapabilities</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is Immutable",$description:"Is Immutable, True if the source never changes.",$advanced:"true"}</description>
-               <config-property-name>Immutable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is XA Capable",$description:"True, if this connector supports XA Transactions",$advanced:"true"}</description>
-               <config-property-name>XaCapable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>false</config-property-value>
-            </config-property>            
-
-            <config-property>             
-               <description>{$display:"Exception on Exceeding Max Rows",$description:"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",$advanced:"true"}</description>
-               <config-property-name>ExceptionOnMaxRows</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
-               <description>Maximum Result Rows allowed</description>
-               <config-property-name>MaxResultRows</config-property-name>
-               <config-property-type>java.lang.Integer</config-property-type>
-               <config-property-value>10000</config-property-value>
-            </config-property>
-
-            <!--  XML-Relational File Connector Specific properties -->
-            <config-property>
-                <description>{$display:"File Path",$description:"",$required:"true"}</description>
-                <config-property-name>FilePath</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Enable Document Caching",$description:"",$required:"true"}</description>
-                <config-property-name>CacheEnabled</config-property-name>
-                <config-property-type>java.lang.Boolean</config-property-type>
-                <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"XML Filter Provider",$description:"The class the provides extended XML Filters",$advanced:"true"}</description>
-                <config-property-name>SaxFilterProviderClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.NoExtendedFilters</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Connector State Class",$description:"",$required:"true",$advanced:"true"}</description>
-                <config-property-name>ConnectorStateClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.file.FileConnectorState</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Log XML Request and Response Documents",$description:"Write the request and response documents to the log at Info level",$advanced:"true"}</description>
-                <config-property-name>LogRequestResponseDocs</config-property-name>
-                <config-property-type>java.lang.Boolean</config-property-type>
-                <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Input Stream Filter Class",$description:"The class to use to preprocess raw XML input stream",$advanced:"true"}</description>
-                <config-property-name>InputStreamFilterClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.PluggableInputStreamFilterImpl</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"File Name",$description:""}</description>
-                <config-property-name>FileName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Query Preprocessor Class",$description:"The class to use to preprocess the IQuery",$advanced:"true"}</description>
-                <config-property-name>QueryPreprocessorClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.NoQueryPreprocessing</config-property-value>
-            </config-property>
-            
-            <connectionfactory-interface>org.teiid.connector.api.Connector</connectionfactory-interface>
-            <connectionfactory-impl-class>org.teiid.connector.basic.WrappedConnector</connectionfactory-impl-class>
-            <connection-interface>org.teiid.connector.api.Connection</connection-interface>
-            <connection-impl-class>org.teiid.connector.basic.WrappedConnection</connection-impl-class>
-
-         </connection-definition>
-         
-         <transaction-support>NoTransaction</transaction-support>
-        
-        <authentication-mechanism>
-            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-        </authentication-mechanism>
-        <reauthentication-support>false</reauthentication-support>
-      </outbound-resourceadapter>
-   </resourceadapter>
-</connector>

Deleted: branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-http/ra.xml
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-http/ra.xml	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-http/ra.xml	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-           version="1.5">
-
-   <vendor-name>Red Hat Middleware LLC</vendor-name>
-   <eis-type>Teiid XML-Relational HTTP Connector</eis-type>
-   <resourceadapter-version>1.0</resourceadapter-version>
-   <license>
-      <description>
- JBoss, Home of Professional Open Source.
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags. See the copyright.txt file in the
- distribution for a full listing of individual contributors.
-
- This 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 software 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 software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-      </description>
-      <license-required>true</license-required>
-   </license>
-   <resourceadapter>
-      <resourceadapter-class>org.teiid.connector.basic.BasicResourceAdapter</resourceadapter-class>
-
-      <outbound-resourceadapter>
-         <connection-definition>
-            <managedconnectionfactory-class>com.metamatrix.connector.xml.http.HTTPManagedConnectionFactory</managedconnectionfactory-class>
-
-            <config-property>
-               <description>{$display:"Connector Class",$advanced:"true"}</description>
-               <config-property-name>ConnectorClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xml.base.XMLConnector</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Connector Capabilities",$description:"The class to use to provide the Connector Capabilities",$advanced:"true"}</description>
-               <config-property-name>CapabilitiesClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xml.base.XMLCapabilities</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is Immutable",$description:"Is Immutable, True if the source never changes.",$advanced:"true"}</description>
-               <config-property-name>Immutable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is XA Capable",$description:"True, if this connector supports XA Transactions",$advanced:"true"}</description>
-               <config-property-name>XaCapable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>false</config-property-value>
-            </config-property>            
-
-            <config-property>             
-               <description>{$display:"Exception on Exceeding Max Rows",$description:"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",$advanced:"true"}</description>
-               <config-property-name>ExceptionOnMaxRows</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
-               <config-property-name>MaxResultRows</config-property-name>
-               <config-property-type>java.lang.Integer</config-property-type>
-               <config-property-value>10000</config-property-value>
-            </config-property>
-
-            <!--  XML-Relational HTTP Connector Specific properties -->
-
-            <config-property>
-                <description>{$display:"XML Filter Provider",$description:"The class the provides extended XML Filters",$advanced:"true"}</description>
-                <config-property-name>SaxFilterProviderClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.NoExtendedFilters</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"XML Parameter Name"}</description>
-                <config-property-name>XMLParmName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Request Timeout (in Milliseconds)",$required:"true"}</description>
-                <config-property-name>RequestTimeout</config-property-name>
-                <config-property-type>java.lang.Integer</config-property-type>
-                <config-property-value>10000</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Authentication Required",$editable:"true"}</description>
-                <config-property-name>Authenticate</config-property-name>
-                <config-property-type>java.lang.Boolean</config-property-type>
-                <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Connector State Class",$required:"true",$advanced:"true"}</description>
-                <config-property-name>ConnectorStateClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.http.HTTPConnectorState</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"HTTP Basic Authentication Password",$description:"Password value for HTTP basic authentication",$advanced:"true",$masked:"true"}</description>
-                <description>Password value for HTTP basic authentication</description>
-                <config-property-name>HttpBasicAuthPassword</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Access Method",$description:"",$allowed:["get","post"],$required:"true"}</description>
-                <config-property-name>AccessMethod</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>get</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Proxy Server URI",$description:"The URI of the proxy server"}</description>
-                <config-property-name>ProxyUri</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"HTTP Basic Authentication Name",$description:"Name value for HTTP basic authentication",$advanced:"true"}</description>
-                <config-property-name>HttpBasicAuthUserName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Server URI",$description:"The URI of the HTTP source",$required:"true"}</description>
-                <config-property-name>Uri</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Use HTTP Basic authentication",$description:"Use basic HTTP Authentication",$advanced:"true"}</description>
-                <config-property-name>UseHttpBasic</config-property-name>
-                <config-property-type>java.lang.Boolean</config-property-type>
-                <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Log XML Request and Response Documents",$description:"Write the request and response documents to the log at Info level",$advanced:"true"}</description>
-                <config-property-name>LogRequestResponseDocs</config-property-name>
-                <config-property-type>java.lang.Boolean</config-property-type>
-                <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Trust Deserializer Class",$description:"The class to use to process trusted payloads and execution payloads",$advanced:"true"}</description>
-                <config-property-name>TrustDeserializerClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.http.DefaultTrustDeserializer</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Parameter Method",$description:"",$allowed:["None","Name/Value","XMLRequest","XMLInQueryString",],$required:"true"}</description>
-                <config-property-name>ParameterMethod</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>None</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Input Stream Filter Class",$description:"The class to use to preprocess raw XML input stream",$advanced:"true"}</description>
-                <config-property-name>InputStreamFilterClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.PluggableInputStreamFilterImpl</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Hostname Verifier",$description:"Class implementing javax.net.ssl.HostnameVerifier.  Used to implement a hostname mismatch workaround.",$advanced:"true"}</description>
-                <config-property-name>HostnameVerifier</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Query Preprocessor Class",$description:"The class to use to preprocess the IQuery",$advanced:"true"}</description>
-                <config-property-name>QueryPreprocessorClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.NoQueryPreprocessing</config-property-value>
-            </config-property>                    
-            
-            <connectionfactory-interface>org.teiid.connector.api.Connector</connectionfactory-interface>
-            <connectionfactory-impl-class>org.teiid.connector.basic.WrappedConnector</connectionfactory-impl-class>
-            <connection-interface>org.teiid.connector.api.Connection</connection-interface>
-            <connection-impl-class>org.teiid.connector.basic.WrappedConnection</connection-impl-class>
-
-         </connection-definition>
-         
-         <transaction-support>NoTransaction</transaction-support>
-        
-        <authentication-mechanism>
-            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-        </authentication-mechanism>
-        <reauthentication-support>false</reauthentication-support>
-      </outbound-resourceadapter>
-   </resourceadapter>
-</connector>

Deleted: branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-soap/ra.xml
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-soap/ra.xml	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xml-soap/ra.xml	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-           version="1.5">
-
-   <vendor-name>Red Hat Middleware LLC</vendor-name>
-   <eis-type>Teiid XML-Relational SOAP Connector</eis-type>
-   <resourceadapter-version>1.0</resourceadapter-version>
-   <license>
-      <description>
- JBoss, Home of Professional Open Source.
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags. See the copyright.txt file in the
- distribution for a full listing of individual contributors.
-
- This 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 software 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 software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-      </description>
-      <license-required>true</license-required>
-   </license>
-   <resourceadapter>
-      <resourceadapter-class>org.teiid.connector.basic.BasicResourceAdapter</resourceadapter-class>
-
-      <outbound-resourceadapter>
-         <connection-definition>
-            <managedconnectionfactory-class>com.metamatrix.connector.xml.soap.SOAPManagedConnectionFactory</managedconnectionfactory-class>
-
-            <config-property>
-               <description>{$display:"Connector Class",$advanced:"true"}</description>
-               <config-property-name>ConnectorClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xml.base.XMLConnector</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Connector Capabilities",$description:"The class to use to provide the Connector Capabilities",$advanced:"true"}</description>
-               <config-property-name>CapabilitiesClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xml.base.XMLCapabilities</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is Immutable",$description:"Is Immutable, True if the source never changes.",$advanced:"true"}</description>
-               <config-property-name>Immutable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is XA Capable",$description:"True, if this connector supports XA Transactions",$advanced:"true"}</description>
-               <config-property-name>XaCapable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>false</config-property-value>
-            </config-property>            
-
-            <config-property>             
-               <description>{$display:"Exception on Exceeding Max Rows",$description:"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",$advanced:"true"}</description>
-               <config-property-name>ExceptionOnMaxRows</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
-               <config-property-name>MaxResultRows</config-property-name>
-               <config-property-type>java.lang.Integer</config-property-type>
-               <config-property-value>10000</config-property-value>
-            </config-property>
-
-            <!--  XML-Relational SOAP Connector Specific properties -->
-            <config-property>
-                <description>{$display:"Authentication User Password",$description:"Password value for authentication",$advanced:"true",$masked:"true"}</description>
-                <config-property-name>AuthPassword</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"XML Filter Provider",$description:"The class the provides extended XML Filters",$advanced:"true"}</description>
-                <config-property-name>SaxFilterProviderClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.NoExtendedFilters</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Authentication User Name",$description:"Name value for authentication",$advanced:"true"}</description>
-                <config-property-name>AuthUserName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"WS-Security Type(UsernameToken, SAML..)",$description:"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)"}</description>
-                <config-property-name>WSSecurityType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"XML Parameter Name",$editable:"false"}</description>
-                <config-property-name>XMLParmName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Encrypt UserName (only if Encrypt profile used)",$description:"The username to be used in the encryption; if blank uses auth username",$advanced:"true"}</description>
-                <config-property-name>EncryptUserName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Exception on SOAP Fault",$description:"Throw connector exception when SOAP fault is returned from source.",$advanced:"true"}</description>
-                <description>Throw connector exception when SOAP fault is returned from source.</description>
-                <config-property-name>ExceptionOnSOAPFault</config-property-name>
-                <config-property-type>java.lang.Boolean</config-property-type>
-                <config-property-value>true</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Request Timeout (in Milliseconds)",$required:"true"}</description>
-                <config-property-name>RequestTimeout</config-property-name>
-                <config-property-type>java.lang.Integer</config-property-type>
-                <config-property-value>10000</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"User Crypto Property File (If SAML or Signature profile used)",$description:"The file defines properties of cryptography;defines the certificates;(crypto.properties)",$advanced:"true"}</description>
-                <config-property-name>CryptoPropertyFile</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Connector State Class",$description:"",$required:"true",$advanced:"true"}</description>
-                <config-property-name>ConnectorStateClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.soap.SOAPConnectorState</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"SOAP-Action",$description:"Value for SOAP-Action header",$advanced:"true"}</description>
-                <config-property-name>SOAPAction</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Access Method (Get, Post)",$description:"",$allowed:["get","post"],$editable:"false"}</description>
-                <config-property-name>AccessMethod</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>post</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Proxy Server URI",$description:"The URI of the proxy server"}</description>
-                <config-property-name>ProxyUri</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Encrypt crypto property file (only if Encrypt profile used)",$description:"The file defines properties of cryptography for encryption of the message;(crypto.properties)",$advanced:"true"}</description>
-                <config-property-name>EncryptPropertyFile</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-                       
-            <config-property>
-                <description>{$display:"SAML Property File (only required when SAML profile used)",$description:"SAML Security property file (saml.properties)",$advanced:"true"}</description>
-                <config-property-name>SAMLPropertyFile</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Encoding Style (RPC - Encoded, RPC - Literal, Document - Literal, Document - Encoded)",$description:"Encoding Style",$allowed:["RPC - Encoded","RPC - Literal","Document - Literal","Document - Encoded"],$required:"true"}</description>
-                <config-property-name>EncodingStyle</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>Document - Literal</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Server URI",$description:"The URI of the HTTP source",$required:"true"}</description>
-                <config-property-name>Uri</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"WebService Security Used(None, HTTPBasic, WS-Security)",$description:"Type of Authentication to used with the web service; If WS-Secuirty is being used, then WS-Secuirty type must be defined",$required:"true"}</description>
-                <config-property-name>SecurityType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>None</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Log XML Request and Response Documents",$description:"Write the request and response documents to the log at Info level",$advanced:"true"}</description>
-                <config-property-name>LogRequestResponseDocs</config-property-name>
-                <config-property-type>java.lang.Boolean</config-property-type>
-                <config-property-value>false</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Trust Deserializer Class",$description:"The class to use to process trusted payloads and execution payloads",$advanced:"true"}</description>
-                <config-property-name>TrustDeserializerClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.soap.DefaultSoapTrustDeserializer</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Parameter Method (None, Name/Value, XMLRequest, XMLInQueryString)",$description:"",$allowed:["None","Name/Value","XMLRequest","XMLInQueryString"],$editable:"false"}</description>
-                <config-property-name>ParameterMethod</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>XMLRequest</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Input Stream Filter Class",$description:"The class to use to preprocess raw XML input stream",$advanced:"true"}</description>
-                <config-property-name>InputStreamFilterClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.PluggableInputStreamFilterImpl</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Hostname Verifier",$description:"a class implmenting javax.net.ssl.HostnameVerifier.  Used to implement a hostname mismatch workaround.",$advanced:"true"}</description>
-                <config-property-name>HostnameVerifier</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Trust Type:(DirectReference or IssuerSerial)",$description:"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.",$advanced:"true"}</description>
-                <config-property-name>TrustType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>DirectReference</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Query Preprocessor Class",$description:"The class to use to preprocess the IQuery",$advanced:"true"}</description>
-                <config-property-name>QueryPreprocessorClass</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xml.base.NoQueryPreprocessing</config-property-value>
-            </config-property>
-            
-            <connectionfactory-interface>org.teiid.connector.api.Connector</connectionfactory-interface>
-            <connectionfactory-impl-class>org.teiid.connector.basic.WrappedConnector</connectionfactory-impl-class>
-            <connection-interface>org.teiid.connector.api.Connection</connection-interface>
-            <connection-impl-class>org.teiid.connector.basic.WrappedConnection</connection-impl-class>
-
-         </connection-definition>
-         
-         <transaction-support>NoTransaction</transaction-support>
-        
-        <authentication-mechanism>
-            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-        </authentication-mechanism>
-        <reauthentication-support>false</reauthentication-support>
-      </outbound-resourceadapter>
-   </resourceadapter>
-</connector>

Deleted: branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-file/ra.xml
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-file/ra.xml	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-file/ra.xml	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-           version="1.5">
-
-   <vendor-name>Red Hat Middleware LLC</vendor-name>
-   <eis-type>Teiid XML File Connector</eis-type>
-   <resourceadapter-version>1.0</resourceadapter-version>
-   <license>
-      <description>
- JBoss, Home of Professional Open Source.
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags. See the copyright.txt file in the
- distribution for a full listing of individual contributors.
-
- This 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 software 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 software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-      </description>
-      <license-required>true</license-required>
-   </license>
-   <resourceadapter>
-      <resourceadapter-class>org.teiid.connector.basic.BasicResourceAdapter</resourceadapter-class>
-
-      <outbound-resourceadapter>
-         <connection-definition>
-            <managedconnectionfactory-class>com.metamatrix.connector.xmlsource.soap.SoapManagedConnectionFactory</managedconnectionfactory-class>
-
-            <config-property>
-               <description>{$display:"Connector Class",$advanced:"true"}</description>
-               <config-property-name>ConnectorClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xmlsource.XMLSourceConnector</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Connector Capabilities",$description:"The class to use to provide the Connector Capabilities",$advanced:"true"}</description>
-               <config-property-name>CapabilitiesClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xmlsource.XMLSourceCapabilities</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is Immutable",$description:"Is Immutable, True if the source never changes.",$advanced:"true"}</description>
-               <config-property-name>Immutable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is XA Capable",$description:"True, if this connector supports XA Transactions",$advanced:"true"}</description>
-               <config-property-name>XaCapable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>false</config-property-value>
-            </config-property>            
-
-            <config-property>             
-               <description>{$display:"Exception on Exceeding Max Rows",$description:"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",$advanced:"true"}</description>
-               <config-property-name>ExceptionOnMaxRows</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
-               <config-property-name>MaxResultRows</config-property-name>
-               <config-property-type>java.lang.Integer</config-property-type>
-               <config-property-value>10000</config-property-value>
-            </config-property>
-
-            <!--  XML File Connector Specific properties -->
-            <config-property>
-                <description>{$display:"File Encoding Used",$description:"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)"}</description>
-                <config-property-name>CharacterEncodingScheme</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>ISO-8859-1</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Type Of XML Connection",$description:"Connection type used to get the XML data",$required:"true",$advanced:"true"}</description>
-                <config-property-name>ConnectionType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xmlsource.file.FileConnection</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"XML File(s) Directory Location",$description:"",$required:"true"}</description>
-                <config-property-name>DirectoryLocation</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <connectionfactory-interface>org.teiid.connector.api.Connector</connectionfactory-interface>
-            <connectionfactory-impl-class>org.teiid.connector.basic.WrappedConnector</connectionfactory-impl-class>
-            <connection-interface>org.teiid.connector.api.Connection</connection-interface>
-            <connection-impl-class>org.teiid.connector.basic.WrappedConnection</connection-impl-class>
-
-         </connection-definition>
-         
-         <transaction-support>NoTransaction</transaction-support>
-        
-        <authentication-mechanism>
-            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-        </authentication-mechanism>
-        <reauthentication-support>false</reauthentication-support>
-      </outbound-resourceadapter>
-   </resourceadapter>
-</connector>

Deleted: branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-soap/ra.xml
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-soap/ra.xml	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/rar/META-INF/xmlsource-soap/ra.xml	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-           http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-           version="1.5">
-
-   <vendor-name>Red Hat Middleware LLC</vendor-name>
-   <eis-type>Teiid XML SOAP Connector</eis-type>
-   <resourceadapter-version>1.0</resourceadapter-version>
-   <license>
-      <description>
- JBoss, Home of Professional Open Source.
- Copyright 2006, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags. See the copyright.txt file in the
- distribution for a full listing of individual contributors.
-
- This 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 software 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 software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-      </description>
-      <license-required>true</license-required>
-   </license>
-   <resourceadapter>
-      <resourceadapter-class>org.teiid.connector.basic.BasicResourceAdapter</resourceadapter-class>
-
-      <outbound-resourceadapter>
-         <connection-definition>
-            <managedconnectionfactory-class>com.metamatrix.connector.xmlsource.file.FileManagedConnectionFactory</managedconnectionfactory-class>
-
-            <config-property>
-               <description>{$display:"Connector Class",$advanced:"true"}</description>
-               <config-property-name>ConnectorClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xmlsource.XMLSourceConnector</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Connector Capabilities",$description:"The class to use to provide the Connector Capabilities",$advanced:"true"}</description>
-               <config-property-name>CapabilitiesClass</config-property-name>
-               <config-property-type>java.lang.String</config-property-type>
-               <config-property-value>com.metamatrix.connector.xmlsource.XMLSourceCapabilities</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is Immutable",$description:"Is Immutable, True if the source never changes.",$advanced:"true"}</description>
-               <config-property-name>Immutable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-            
-            <config-property>
-               <description>{$display:"Is XA Capable",$description:"True, if this connector supports XA Transactions",$advanced:"true"}</description>
-               <config-property-name>XaCapable</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>false</config-property-value>
-            </config-property>            
-
-            <config-property>             
-               <description>{$display:"Exception on Exceeding Max Rows",$description:"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",$advanced:"true"}</description>
-               <config-property-name>ExceptionOnMaxRows</config-property-name>
-               <config-property-type>java.lang.Boolean</config-property-type>
-               <config-property-value>true</config-property-value>
-            </config-property>
-
-            <config-property>
-               <description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
-               <config-property-name>MaxResultRows</config-property-name>
-               <config-property-type>java.lang.Integer</config-property-type>
-               <config-property-value>10000</config-property-value>
-            </config-property>
-
-            <!--  XML Source SOAP Connector Specific properties -->
-            <config-property>
-                <description>{$display:"Authentication User Password",$description:"Password value for authentication",$advanced:"true",$masked:"true"}</description>
-                <config-property-name>AuthPassword</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"SAML Property File (only required when SAML profile used)",$description:"SAML Security property file (saml.properties)",$advanced:"true"}</description>
-                <config-property-name>SAMLPropertyFile</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"WSDL File (URL)",$description:"URL to Web Service Definition File",$required:"true"}</description>
-                <config-property-name>wsdl</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Authentication User Name",$description:"Name value for authentication",$advanced:"true"}</description>
-                <config-property-name>AuthUserName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"WS-Security Type(UsernameToken, SAML..)",$description:"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)"}</description>
-                <config-property-name>WSSecurityType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Encrypt UserName (only if Encrypt profile used)",$description:"The username to be used in the encryption; if blank uses auth username",$advanced:"true"}</description>
-                <config-property-name>EncryptUserName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Alternate End Point",$description:"An alternate service endpoint other than one specified in WSDL, to execute the service"}</description>
-                <config-property-name>EndPoint</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"WebService Security Used(None, HTTPBasic, WS-Security)",$description:"Type of Authentication to used with the web service; If WS-Secuirty is being used, then WS-Secuirty type must be defined",$required:"true"}</description>
-                <config-property-name>SecurityType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>None</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"User Crypto Property File (If SAML or Signature profile used)",$description:"The file defines properties of cryptography;defines the certificates;(crypto.properties)",$advanced:"true"}</description>
-                <config-property-name>CryptoPropertyFile</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Type Of XML Connection",$description:"Connection type used to get the XML data",$required:"true",$advanced:"true"}</description>
-                <config-property-name>ConnectionType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>com.metamatrix.connector.xmlsource.soap.SoapConnection</config-property-value>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Encrypt crypto property file (only if Encrypt profile used)",$description:"The file defines properties of cryptography for encryption of the message;(crypto.properties)",$advanced:"true"}</description>
-                <config-property-name>EncryptPropertyFile</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-            
-            <config-property>
-                <description>{$display:"Trust Type:(DirectReference or IssuerSerial)",$description:"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.",$advanced:"true"}</description>
-                <config-property-name>TrustType</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-                <config-property-value>DirectReference</config-property-value>
-            </config-property>
-                    
-            <config-property>
-                <description>{$display:"Port Name"}</description>
-                <config-property-name>PortName</config-property-name>
-                <config-property-type>java.lang.String</config-property-type>
-            </config-property>
-
-            <config-property>
-                <description>{$display:"Query Timeout"}</description>
-                <config-property-name>QueryTimeout</config-property-name>
-                <config-property-type>java.lang.Integer</config-property-type>
-                <config-property-value>-1</config-property-value>
-            </config-property>
-            
-            <connectionfactory-interface>org.teiid.connector.api.Connector</connectionfactory-interface>
-            <connectionfactory-impl-class>org.teiid.connector.basic.WrappedConnector</connectionfactory-impl-class>
-            <connection-interface>org.teiid.connector.api.Connection</connection-interface>
-            <connection-impl-class>org.teiid.connector.basic.WrappedConnection</connection-impl-class>
-
-         </connection-definition>
-         
-         <transaction-support>NoTransaction</transaction-support>
-        
-        <authentication-mechanism>
-            <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-            <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-        </authentication-mechanism>
-        <reauthentication-support>false</reauthentication-support>
-      </outbound-resourceadapter>
-   </resourceadapter>
-</connector>

Deleted: branches/JCA/connectors/connector-xml/src/main/resources/client-config.wsdd
===================================================================
--- branches/JCA/connectors/connector-xml/src/main/resources/client-config.wsdd	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/main/resources/client-config.wsdd	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment name="defaultClientConfig"
-            xmlns="http://xml.apache.org/axis/wsdd/"
-            xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
-            
-	<globalConfiguration>
-		<parameter name="disablePrettyXML" value="true"/>
-		<parameter name="enableNamespacePrefixOptimization" value="false"/>
-	</globalConfiguration>
-
-
-	 <transport name="http" pivot="java:org.apache.axis.transport.http.HTTPSender"/>
-	 <transport name="local" pivot="java:org.apache.axis.transport.local.LocalSender"/>
-	 <transport name="java" pivot="java:org.apache.axis.transport.java.JavaSender"/>
-	 
-</deployment>
-

Deleted: branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockHostnameVerifier.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockHostnameVerifier.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/MockHostnameVerifier.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xml;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
-
-public class MockHostnameVerifier implements HostnameVerifier {
-
-	public boolean verify(String arg0, SSLSession arg1) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}

Deleted: branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestCachingFileConnector.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestCachingFileConnector.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/TestCachingFileConnector.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,44 +0,0 @@
-package com.metamatrix.connector.xml;
-
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.mockito.Mockito;
-import org.teiid.connector.api.Connector;
-import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.api.ExecutionContext;
-
-import com.metamatrix.cdk.api.ConnectorHost;
-import com.metamatrix.connector.xml.base.ProxyObjectFactory;
-import com.metamatrix.connector.xml.base.XMLConnector;
-import com.metamatrix.connector.xml.file.FileManagedConnectionFactory;
-
-public class TestCachingFileConnector extends TestCase {
-
-	Connector connector;
-	ConnectorHost host;
-	
-	@Override
-	public void setUp() throws Exception {
-		connector = new XMLConnector();
-		FileManagedConnectionFactory env = ProxyObjectFactory.getDefaultFileProps();
-		env.setFileName("purchaseOrdersShort.xml");
-		
-		String vdbPath = ProxyObjectFactory.getDocumentsFolder() + "/File/purchase_orders.vdb";
-		host = new ConnectorHost(connector, env, vdbPath);
-
-		ExecutionContext context = Mockito.mock(ExecutionContext.class);
-		host.setExecutionContext(context);
-	}
-	
-	public void testSelect() {
-		try {
-			List result = host.executeCommand("SELECT * FROM po_list.ITEM");
-			assertEquals(2, result.size());
-		} catch (ConnectorException e) {
-			fail(e.getMessage());
-		}
-	}
-}

Deleted: branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xml/base/TestXMLConnector.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,167 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xml.base;
-
-import java.io.File;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.teiid.connector.api.ConnectorEnvironment;
-import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.api.ExecutionContext;
-
-import com.metamatrix.common.util.PropertiesUtils;
-import com.metamatrix.connector.xml.XMLConnectorState;
-import com.metamatrix.connector.xml.file.FileConnectorState;
-import com.metamatrix.connector.xml.file.FileManagedConnectionFactory;
-
-
-public class TestXMLConnector extends TestCase {
-    
-    private ConnectorEnvironment m_env;
-    private ExecutionContext m_secCtx;
-    
-	public TestXMLConnector() {
-		super();
-	}
-
-	/**
-	 * @param arg0
-	 */
-	public TestXMLConnector(String arg0) {
-		super(arg0);
-	}
-    
-    @Override
-	public void setUp() {        
-        m_env = ProxyObjectFactory.getDefaultTestConnectorEnvironment();                
-        
-        m_secCtx = ProxyObjectFactory.getDefaultSecurityContext();        
-    }
-        
-    public void testInitMethod() {
-        XMLConnector connector = new XMLConnector();          
-        try {        
-        	connector.initialize(m_env);
-            assertNotNull("state is null", connector.getState());
-            assertNotNull("Logger is null", connector.getLogger());
-        } catch (ConnectorException ex) {
-        	ex.printStackTrace();
-            fail(ex.getMessage());         
-        }
-        
-    }
-    
-    public void testStart() throws Exception {
-        XMLConnector connector = new XMLConnector();
-         connector.initialize(m_env);
-    }
-    
-    public void testStop() {
-     XMLConnector connector = new XMLConnector();
-     
-     try {
-      connector.initialize(m_env);
-      
-     } catch (ConnectorException ex) {
-      ex.printStackTrace();
-      fail(ex.getMessage());
-     }
-     assertNotNull(connector);
-     connector.stop();
-    }
-    
-    
-    public void testGetConnection() {
-    	XMLConnector connector = new XMLConnector();
-                        
-        try {
-         connector.initialize(m_env);
-         XMLConnectionImpl conn = (XMLConnectionImpl) connector.getConnection();
-         assertNotNull("XMLConnectionImpl is null", conn);
-         
-         // is the connector ref set?
-         assertEquals(connector, conn.getConnector());
-         
-        } catch (ConnectorException ex) {
-            ex.printStackTrace();
-            fail(ex.getMessage());
-        }
-    } 
-    
-    
-    public void testUnsetState() {
-        XMLConnector connector = new XMLConnector();
-        
-        try {
-            XMLConnectionImpl conn = (XMLConnectionImpl) connector.getConnection();
-            fail("connector created a connection with unset state");           
-        } catch (ConnectorException e) {
-            
-        }       
-    }
-    
-    public void testInitializeFailure() {
-    	XMLConnector connector = new XMLConnector();
-    	try {
-    		Properties testFileProps = new Properties(); 
-            testFileProps.put(XMLConnectorStateImpl.CACHE_ENABLED, Boolean.TRUE);
-            testFileProps.setProperty(XMLConnectorState.STATE_CLASS_PROP, "sure.to.Fail");
-            
-            testFileProps.put(FileConnectorState.FILE_NAME, "state_college.xml");
-            String localPath = "test/documents";
-            String ccPath = "checkout/XMLConnectorFramework/" + localPath;
-            if (new File(localPath).exists()) {
-            	testFileProps.put(FileConnectorState.DIRECTORY_PATH, localPath);
-            } else {
-            	if (new File(ccPath).exists()) {
-            		testFileProps.put(FileConnectorState.DIRECTORY_PATH, ccPath);
-            	} else {
-            		testFileProps.put(FileConnectorState.DIRECTORY_PATH, "");
-            	}
-            }
-    	    
-    	    FileManagedConnectionFactory env = new FileManagedConnectionFactory();
-    	    PropertiesUtils.setBeanProperties(env, testFileProps, null);
-    		connector.initialize(env);
-    		fail("connector should have failed on get state");
-    	} catch (ConnectorException e) {
-    		assertTrue(true);
-    	}
-    }
-    
-    public void testLoggingInit() {
-        XMLConnector connector = new XMLConnector();
-        
-        try {
-            connector.initialize(m_env);
-            assertNotNull(connector.getLogger());
-            connector.getLogger().logInfo("Logger is properly initialized");
-        } catch (ConnectorException ex) {
-            ex.printStackTrace();
-            fail(ex.getMessage());            
-        }
-        
-    }
-}

Deleted: branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapConnection.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource.soap;
-
-import java.io.File;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.mockito.Mockito;
-import org.teiid.connector.api.ConnectorEnvironment;
-import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.api.ConnectorLogger;
-
-import com.metamatrix.core.util.UnitTestUtil;
-
-
-/** 
- */
-public class TestSoapConnection extends TestCase{
-    
-    public void testNoWSDL() throws Exception {
-        SoapManagedConnectionFactory env = Mockito.mock(SoapManagedConnectionFactory.class);
-        Mockito.stub(env.getLogger()).toReturn(Mockito.mock(ConnectorLogger.class));
-
-        try {
-            new SoapConnection(env);
-            fail("WSDL is not set; must have failed"); //$NON-NLS-1$
-        } catch (ConnectorException e) {
-            //pass
-        }
-    }
-
-    public void testWSDLLoad() throws Exception {
-        File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/stockquotes.xml"); //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = Mockito.mock(SoapManagedConnectionFactory.class);
-        Mockito.stub(env.getLogger()).toReturn(Mockito.mock(ConnectorLogger.class));
-        Mockito.stub(env.getWsdl()).toReturn(wsdlFile.toURL().toString());
-        
-        SoapConnection conn = new SoapConnection(env);
-        assertTrue(conn.isConnected());
-        assertEquals("StockQuotes", conn.service.getServiceName().getLocalPart()); //$NON-NLS-1$
-        assertTrue("Operation Not Found", conn.operationsMap.containsKey("GetQuote")); //$NON-NLS-1$ //$NON-NLS-2$
-        assertFalse("Operation Should Not have Found", conn.operationsMap.containsKey("GetQuoteX")); //$NON-NLS-1$ //$NON-NLS-2$
-        assertEquals(4, conn.operationsMap.size());            
-        
-        // release connection
-        conn.close();
-        assertFalse(conn.isConnected());
-    }
-    
-    public void testFindOperation() throws Exception {
-        File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/stockquotes.xml"); //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = Mockito.mock(SoapManagedConnectionFactory.class);
-        Mockito.stub(env.getLogger()).toReturn(Mockito.mock(ConnectorLogger.class));
-        Mockito.stub(env.getWsdl()).toReturn(wsdlFile.toURL().toString());
-        
-        SoapConnection conn = new SoapConnection(env);
-        ServiceOperation operation = conn.findOperation("GetQuote"); //$NON-NLS-1$
-        assertNotNull("failed to find the operation", operation); //$NON-NLS-1$
-    }    
-}

Deleted: branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java
===================================================================
--- branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/test/java/com/metamatrix/connector/xmlsource/soap/TestSoapExecution.java	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,638 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership.  Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.connector.xmlsource.soap;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.sql.SQLXML;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.mockito.Mockito;
-import org.teiid.connector.api.ExecutionContext;
-import org.teiid.connector.api.ProcedureExecution;
-import org.teiid.connector.language.ILanguageFactory;
-import org.teiid.connector.language.IParameter;
-import org.teiid.connector.language.IProcedure;
-import org.teiid.connector.language.IParameter.Direction;
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-
-import com.metamatrix.connector.xmlsource.file.TestFileExecution;
-import com.metamatrix.connector.xmlsource.soap.service.WebServiceServer;
-import com.metamatrix.core.util.UnitTestUtil;
-
-
-/** 
- */
-public class TestSoapExecution extends TestCase {
-	private static WebServiceServer server = null;
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTestSuite(TestSoapExecution.class);
-        return new TestSetup(suite){
-            @Override
-			protected void setUp() throws Exception{
-            	TestSoapExecution.setUpOnce();
-            }
-            @Override
-			protected void tearDown() throws Exception{
-            	TestSoapExecution.tearDownOnce();
-            }
-        };
-	}	
-	
-	public static void setUpOnce() throws Exception{
-        server = new WebServiceServer();
-        server.startServer(7001);		
-	}
-	
-	public static void tearDownOnce() throws Exception {
-		server.stopServer();
-	}
-	
-	
-    public void defer_testExternalWSDLExecution_getMovies() throws Exception {        
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setWsdl("http://www.ignyte.com/webservices/ignyte.whatsshowing.webservice/moviefunctions.asmx?wsdl");
-
-        String in = "<tns:GetTheatersAndMovies xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:tns=\"http://www.ignyte.com/whatsshowing\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"><tns:zipCode>63011</tns:zipCode> <tns:radius>7</tns:radius> </tns:GetTheatersAndMovies>"; //$NON-NLS-1$
-        executeSOAP("GetTheatersAndMovies", new Object[] {in}, env, null); //$NON-NLS-1$ 
-    }    
-    
-    public void defer_testExternalWSDLExecution_getRate() throws Exception {        
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setWsdl("http://www.xmethods.net/sd/2001/CurrencyExchangeService.wsdl");
-
-        String out = "<return type=\"java.lang.Float\">1.0</return>"; //$NON-NLS-1$
-        executeSOAP("getRate", new Object[] {"USA", "USA"}, env, out); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$        
-    }     
-    
-    public void testWithNoSourceName() throws Exception {
-        
-        File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/stockquotes.xml"); //$NON-NLS-1$
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setWsdl(wsdlFile.toURL().toString());
-        try {
-            executeSOAP("", new Object[] {"MSFT"}, env, null); //$NON-NLS-1$ //$NON-NLS-2$
-            fail("must have failed since we did not provide a name in source property to execute"); //$NON-NLS-1$
-        }catch(Exception e) {            
-        }
-    }
-    
-    public void defer_testExternalWithSuppliedPortType() throws Exception {
-        
-        File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/stockquotes.xml"); //$NON-NLS-1$
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setWsdl(wsdlFile.toURL().toString());
-        env.setPortName("StockQuotesSoap12");
-        
-        executeSOAP("GetQuote", new Object[] {"MSFT"}, env, null); //$NON-NLS-1$ //$NON-NLS-2$        
-    }    
-    
-    public void testDocLitralExecution() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/doc-literal-deploy.wsdd"); //$NON-NLS-1$
-        
-        try {
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl("http://localhost:7001/axis/services/StockQuotes?wsdl");
-            String in = "<tns1:symbol xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:tns1=\"http://service.soap.xmlsource.connector.metamatrix.com\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">MSFT</tns1:symbol>"; //$NON-NLS-1$
-            
-            String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><symbolReturn xmlns=\"http://service.soap.xmlsource.connector.metamatrix.com\">&lt;company name=\"Microsoft Corp\"&gt;23.23&lt;/company&gt;</symbolReturn>"; //$NON-NLS-1$
-            executeSOAP("GetQuote", new Object[] {in}, env, expected); //$NON-NLS-1$ 
-            // end of test
-        }
-        finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }
-    
-    public void testRPCLitralExecution() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/rpc-literal-deploy.wsdd"); //$NON-NLS-1$
-        
-        try {
-            // now write the test
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl("http://localhost:7001/axis/services/StockQuotes?wsdl");
-                                      
-            String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><return type=\"java.lang.String\">&lt;company name=\"Microsoft Corp\"&gt;23.23&lt;/company&gt;</return>";//$NON-NLS-1$            
-            executeSOAP("GetQuote", new Object[] {"MSFT"}, env, expected); //$NON-NLS-1$ //$NON-NLS-2$                
-            // end of test
-        }
-        finally {           
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }    
-    
-    public void testRPCEncodedExecution() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/rpc-encoded-deploy.wsdd"); //$NON-NLS-1$
-
-        try {
-            // now write the test
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl("http://localhost:7001/axis/services/StockQuotes?wsdl");
-
-            String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><return type=\"java.lang.String\">&lt;company name=\"Microsoft Corp\"&gt;23.23&lt;/company&gt;</return>"; //$NON-NLS-1$
-            executeSOAP("GetQuote", new Object[] {"MSFT"}, env, expected); //$NON-NLS-1$ //$NON-NLS-2$                
-            // end of test
-        } 
-        finally {            
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    } 
-    
-    public void testAlternateEndpoint() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/distance/deploy.wsdd"); //$NON-NLS-1$
-
-        try {
-            // now write the test
-            File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/service/distance/Distance.xml"); //$NON-NLS-1$
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl(wsdlFile.toURL().toString());
-            env.setEndPoint("http://localhost:7001/axis/services/Distance");
-                                          
-            String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><return type=\"java.lang.String\">IL</return>"; //$NON-NLS-1$
-            executeSOAP("getState", new Object[] {"63011"}, env, expected); //$NON-NLS-1$ //$NON-NLS-2$                
-            // end of test
-        }
-        finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }
-    
-    public void testDocLitralWithIncudedComplexTypes() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/movies/deploy.wsdd"); //$NON-NLS-1$
-
-        try {
-            // now write the test
-            File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/service/movies/movies.wsdl"); //$NON-NLS-1$
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl(wsdlFile.toURL().toString());
-    
-            String in = "<tns:GetTheatersAndMovies xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:tns=\"http://www.metamatrix.com/whatsshowing\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"><tns:zipCode>63011</tns:zipCode> <tns:radius>7</tns:radius> </tns:GetTheatersAndMovies>"; //$NON-NLS-1$                                      
-            String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><GetTheatersAndMoviesResponse xmlns=\"http://www.metamatrix.com/whatsshowing\"><GetTheatersAndMoviesReturn><GetTheatersAndMoviesReturn><Name>AMC Chesterfield 14</Name><Address>3rd Floor Chesterfield Mall, Chesterfield, MO</Address><Movies><Movie><Rating>PG</Rating><Name>Barnyard: The Original Party Animals</Name><RunningTime>1 hr 30 mins</RunningTime><ShowTimes>12:10pm | 2:25pm | 4:45pm | 7:10pm | 9:30pm</ShowTimes></Movie><Movie><Rating>G</Rating><Name>Cars</Name><RunningTime>1 hr 30 mins</RunningTime><ShowTimes>1 hr 57 mins</ShowTimes></Movie></Movies></GetTheatersAndMoviesReturn></GetTheatersAndMoviesReturn></GetTheatersAndMoviesResponse>"; //$NON-NLS-1$
-            executeSOAP("GetTheatersAndMovies", new Object[] {in}, env, expected); //$NON-NLS-1$ 
-            // end of test
-        }
-        finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/movies/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }    
-    
-    public void testDocLitralWithIncudedComplexTypes_wrong_input() throws Exception{
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/movies/deploy.wsdd"); //$NON-NLS-1$
-
-        try {
-            // now write the test
-            File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/service/movies/movies.wsdl"); //$NON-NLS-1$
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl(wsdlFile.toURL().toString());
-                                                      
-            executeSOAP("getTheatersAndMovies", new Object[] {"63011", "7"}, env, null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            fail("must have failed, since this is doc-litral and we need to supply xml fragment as input"); //$NON-NLS-1$
-            // end of test
-        } catch(Exception e) {
-            // pass
-        }        
-        finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/movies/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }     
-    
-    public void testWrongParamCount() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/distance/deploy.wsdd"); //$NON-NLS-1$
-        try {
-            // now write the test
-            File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/service/distance/Distance.xml"); //$NON-NLS-1$
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl(wsdlFile.toURL().toString());
-            env.setEndPoint("http://localhost:7001/axis/services/Distance");
-    
-            try {
-                String expected = "IL"; //$NON-NLS-1$
-                executeSOAP("getState", new Object[] {"63011", "63011"}, env, expected); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                fail("must have failed to execute, as we suuplied more input parameters than expected"); //$NON-NLS-1$
-            }catch(Exception e) {
-                
-            }
-            // end of test
-        } finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }
-    
-    // dimension designer based.
-    public void defer_testDocLitralWithExternalComplexType() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/books/deploy.wsdd"); //$NON-NLS-1$
-
-        try {
-            // now write the test
-            File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/service/books/Books.wsdl"); //$NON-NLS-1$
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl(wsdlFile.toURL().toString());
-                                          
-            String in = "<s0:AuthorBooks_Input xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:s0=\"http://www.metamatrix.com/BooksView_Input\"> <ID>1</ID> </s0:AuthorBooks_Input>"; //$NON-NLS-1$
-            String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Books_Output xmlns=\"http://www.metamatrix.com/BooksView_Output\"><item xmlns=\"\"><FIRSTNAME>Elfriede</FIRSTNAME><LASTNAME>Dustin</LASTNAME><TITLE>Automated Software Testing</TITLE><ID>1</ID></item></Books_Output>"; //$NON-NLS-1$
-            executeSOAP("getBooks", new Object[] {in}, env, expected); //$NON-NLS-1$ 
-            // end of test
-        } finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/books/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }    
-    
-    public void testRPCEncoded() throws Exception {
-        server.deployService(UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/deploy.wsdd"); //$NON-NLS-1$
-
-        try {
-            // now write the test
-            File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/CurrencyExchangeService.wsdl"); //$NON-NLS-1$
-            SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-            env.setLogWriter(Mockito.mock(PrintWriter.class));
-            env.setWsdl(wsdlFile.toURL().toString());
-            
-            String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><return type=\"java.lang.Float\">1.0</return>"; //$NON-NLS-1$
-            executeSOAP("getRate", new Object[] {"USA", "INDIA"}, env, expected); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$                
-            // end of test
-        } finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }     
-    
-    public void testUserNameProfile_clear_text_Pass() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/username_clear_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.USERNAME_TOKEN_PROFILE_CLEAR_TEXT);
-        env.setAuthUserName("foo");
-        env.setAuthPassword("foopassword");
-        
-        helpTestSecurity(true, wsddFile, env);
-    }
-
-    public void testUserNameProfile_clear_text_fail() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/username_clear_deploy.wsdd"; //$NON-NLS-1$
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.USERNAME_TOKEN_PROFILE_CLEAR_TEXT);
-        env.setAuthUserName("foo");
-        helpTestSecurity(false, wsddFile, env);
-    }
-    
-    // this one uses the nounce (the random number) and Timestamp to deter the attack 
-    public void testUserNameProfile_digest_text_Pass() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/username_digest_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.USERNAME_TOKEN_PROFILE_DIGEST);
-        env.setAuthUserName("foo");
-        env.setAuthPassword("foopassword");
-        
-        helpTestSecurity(true, wsddFile, env);
-    }
-
-    public void testUserNameProfile_digest_text_fail() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/username_digest_deploy.wsdd"; //$NON-NLS-1$
-        
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.USERNAME_TOKEN_PROFILE_DIGEST);
-        env.setAuthUserName("foo");
-        env.setAuthPassword("badpass");
-        
-        helpTestSecurity(false, wsddFile, env);
-    }
-
-    // TODO: Needs this to be hooked to a Http proxy to sniff the header out
-    public void testHttpBasicAuth() throws Exception {
-        //        System.setProperty("http.proxyHost","myproxy" ); //$NON-NLS-1$ //$NON-NLS-2$
-        //        System.setProperty("http.proxyPort", "8080" ); //$NON-NLS-1$ //$NON-NLS-2$        
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/httpbasic_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.HTTP_BASIC_AUTH);
-        env.setAuthUserName("foo");
-        env.setAuthPassword("foopassword");
-
-        helpTestSecurity(true, wsddFile, env);
-    }
-
-    public void testWSSecurityTypeMissing() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/timestamp_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-
-        helpTestSecurity(false, wsddFile, env);
-    }
-    
-    public void testWrongWSSecurityType() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/timestamp_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType("UnKnown");
-        
-        helpTestSecurity(false, wsddFile, env);
-    }    
-    
-    public void testTimestampProfile() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/timestamp_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.TIMESTAMP);
-        
-        helpTestSecurity(true, wsddFile, env);
-    }
-    
-    public void defer_testEncryptProfile() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/encrypt_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.ENCRYPT);
-        env.setEncryptPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        env.setAuthUserName("client");
-        env.setEncryptUserName("server");
-        
-        helpTestSecurity(true, wsddFile,  env);
-    }      
-    
-    /**
-     * Running of the SAML and Encryption examples need keystore generated the below used
-     * Look here for mew details: http://www.churchillobjects.com/c/11201e.html
-     * The below is script to generate client and server side certificates
-     * self cert/not trusted
-        keytool -genkey -alias client -keystore client_ks.jks -keypass clientpassword -storepass keystorepassword -keyalg RSA -dname "cn=metamatrix"
-        keytool -genkey -alias server -keystore server_ks.jks -keypass serverpassword -storepass keystorepassword -keyalg RSA -dname "cn=metamatrix"
-        
-        keytool -selfcert -alias server -keystore server_ks.jks -keypass serverpassword -storepass keystorepassword
-        keytool -selfcert -alias client -keystore client_ks.jks -keypass clientpassword -storepass keystorepassword
-        
-        keytool -export -alias client -keystore client_ks.jks -storepass keystorepassword -file client.cert
-        keytool -export -alias server -keystore server_ks.jks -storepass keystorepassword -file server.cert
-        keytool -import -alias client -file client.cert -keystore server_ks.jks -storepass keystorepassword
-        keytool -import -alias server -file server.cert -keystore client_ks.jks -storepass keystorepassword
-        
-        keytool -list -keystore client_ks.jks -storepass keystorepassword
-        keytool -list -keystore server_ks.jks -storepass keystorepassword        
-     */
-    // this is sender vouches
-    public void testSAMLToken_unsigned_sendervouches() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/saml_unsigned_deploy.wsdd"; //$NON-NLS-1$
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.SAML_TOKEN_UNSIGNED);
-        env.setSAMLPropertyFile("com/metamatrix/connector/xmlsource/soap/saml_unsigned_prop.properties");
-        
-        helpTestSecurity(true, wsddFile, env);
-    }
-
-    public void testSAMLToken_unsigned_keyHolder() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/saml_unsigned_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.SAML_TOKEN_UNSIGNED);
-        env.setSAMLPropertyFile("com/metamatrix/connector/xmlsource/soap/saml_unsigned_keyholder.properties");
-        env.setAuthUserName("client");
-        env.setAuthPassword("clientpassword");
-        
-        helpTestSecurity(false, wsddFile, env);
-    }
-    
-    /**
-     * Service defined as saml unsigned; we make with out any; must fail 
-     */
-    public void testSAMLToken_unsigned_fail() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/saml_unsigned_deploy.wsdd"; //$NON-NLS-1$
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        // having lack of crendentials like test before; this will fail
-        helpTestSecurity(false, wsddFile, env);
-    } 
-        
-    /**
-     * With Signature profile it seems like the names/password in the crypto.properties
-     * file does not matter for client and server except for the keystore password. But
-     * it must have the below alias name and its password for private key for encryption
-     * in the client side.
-     * 
-     * In server side crypto.properties must point to a cert with (can be only) public key matching 
-     * the client side to work.
-     * 
-     * this type should work with both trusted certificates; and of certificates with public
-     * key embedded with each other
-     */
-    public void testSignature_DirectReferece() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/signature_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.SIGNATURE);
-        env.setAuthUserName("client");
-        env.setAuthPassword("clientpassword");
-        env.setTrustType(SecurityToken.DIRECT_REFERENCE);
-        env.setCryptoPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        
-        helpTestSecurity(true, wsddFile,  env);
-    }     
-    
-    // This will not work with trusted; this will only work with the certificates which are
-    // installed in the both sides. with each other's public keys
-    public void testSignature_IssueSerial_NonTrusted() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/signature_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.SIGNATURE);
-        env.setAuthUserName("client");
-        env.setAuthPassword("clientpassword");
-        env.setTrustType(SecurityToken.ISSUER_SERIAL);
-        env.setCryptoPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        
-        helpTestSecurity(true, wsddFile,  env);
-    }     
-    
-    public void testSignature_IssueSerial_Trusted() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/signature_trusted_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.SIGNATURE);
-        env.setAuthUserName("client");
-        env.setAuthPassword("clientpassword");
-        env.setTrustType(SecurityToken.ISSUER_SERIAL);
-        env.setCryptoPropertyFile("com/metamatrix/connector/xmlsource/soap/client_trusted_crypto.properties");
-
-        helpTestSecurity(false, wsddFile,  env);
-    }     
-    
-    /**
-     * This nees to pass; but failing for some reason 
-     */       
-    public void testSAMLToken_Signed_SenderVouches() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/saml_signed_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.SAML_TOKEN_SIGNED);
-        env.setAuthUserName("client");
-        env.setAuthPassword("clientpassword");
-        env.setTrustType(SecurityToken.DIRECT_REFERENCE);
-        env.setCryptoPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        env.setSAMLPropertyFile("com/metamatrix/connector/xmlsource/soap/saml_signed_sendervouches.properties");
-        
-        helpTestSecurity(false, wsddFile,  env);
-    }    
-         
-    
-    // Worked with both self cert and trusted certificates
-    public void testSAMLToken_Signed_KeyHolder_directRef() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/saml_signed_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.TIMESTAMP + " " + SecurityToken.SAML_TOKEN_SIGNED);
-        env.setAuthUserName("client");
-        env.setAuthPassword("clientpassword");
-        env.setTrustType(SecurityToken.DIRECT_REFERENCE);
-        env.setCryptoPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        env.setSAMLPropertyFile("com/metamatrix/connector/xmlsource/soap/saml_signed_keyholder.properties");
-        env.setCryptoPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        
-        helpTestSecurity(true, wsddFile,  env);
-    }    
-    
-    public void defer_testMultiple_sig_time_username() throws Exception {
-        String wsddFile = UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/multiple_deploy.wsdd"; //$NON-NLS-1$
-
-        SoapManagedConnectionFactory env = new SoapManagedConnectionFactory();
-        env.setLogWriter(Mockito.mock(PrintWriter.class));
-        env.setSecurityType(SecurityToken.WS_SECURITY);
-        env.setWSSecurityType(SecurityToken.USERNAME_TOKEN_PROFILE_CLEAR_TEXT+ " " +SecurityToken.SIGNATURE+ " " +SecurityToken.ENCRYPT + " " + SecurityToken.TIMESTAMP);
-        env.setAuthUserName("client");
-        env.setAuthPassword("clientpassword");
-        env.setTrustType(SecurityToken.DIRECT_REFERENCE);
-        env.setCryptoPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        env.setEncryptPropertyFile("com/metamatrix/connector/xmlsource/soap/client_crypto.properties");
-        env.setEncryptUserName("server;");
-
-        helpTestSecurity(true, wsddFile,  env);
-    }     
-    
-    void helpTestSecurity(boolean passScenario, String serverWsddFile, SoapManagedConnectionFactory env) throws Exception {
-        server.deployService(serverWsddFile); 
-
-        try {
-            try {
-                // now write the test
-                File wsdlFile = new File(UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/CurrencyExchangeService.wsdl"); //$NON-NLS-1$
-                env.setWsdl(wsdlFile.toURL().toString());
-                
-                String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><return type=\"java.lang.Float\">1.0</return>";//$NON-NLS-1$
-                executeSOAP("getRate", new Object[] {"USA", "INDIA"}, env, expected); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                if (!passScenario) fail("The SOAP Request Must have failed; but passed"); //$NON-NLS-1$
-                // end of test
-            } catch (Exception e) {
-                if (passScenario) fail("The SOAP Request Must have passed; but failed"); //$NON-NLS-1$                
-            }
-        } finally {        
-            server.undeployService(UnitTestUtil.getTestDataPath()+"/service/CurrencyExchange/undeploy.wsdd"); //$NON-NLS-1$
-        }
-    }     
-    
-    
-    // utility method to execute a service
-    void executeSOAP(String procName, Object[] args, SoapManagedConnectionFactory env, String expected) throws Exception{
-
-        SoapConnection conn = new SoapConnection(env);
-        RuntimeMetadata metadata = Mockito.mock(RuntimeMetadata.class);
-        ILanguageFactory fact = env.getLanguageFactory();
-        List parameters = new ArrayList();
-        if (args != null && args.length > 0) {
-            for (int i = 0; i < args.length; i++) {
-                IParameter param = fact.createParameter(i+1, Direction.IN, args[i], args[i].getClass(), null);           
-                parameters.add(param);
-            }
-        }
-        IProcedure procedure = fact.createProcedure("AnyNAME", parameters, TestFileExecution.createMockProcedureMetadata(procName)); //$NON-NLS-1$
-
-        ProcedureExecution exec = (ProcedureExecution)conn.createExecution(procedure, Mockito.mock(ExecutionContext.class), metadata); //$NON-NLS-1$ //$NON-NLS-2$
-        exec.execute();
-        
-        List result = exec.next();
-        assertNotNull(result);
-        assertNull(exec.next());
-        try {
-            exec.getOutputParameterValues();
-            fail("should have thrown error in returning a return"); //$NON-NLS-1$            
-        }catch(Exception e) {            
-        }
-
-        // get the result set
-        SQLXML xml = (SQLXML)result.get(0);
-        assertNotNull(xml);
-        String xmlString = xml.getString();
-        if (expected != null) {
-            assertEquals(expected, xmlString); 
-        }
-        // System.out.println(xmlString);
-    }
-    
-}

Deleted: branches/JCA/connectors/connector-xml/src/test/resources/BookCollection.xml
===================================================================
--- branches/JCA/connectors/connector-xml/src/test/resources/BookCollection.xml	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/test/resources/BookCollection.xml	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,543 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><Books:bookCollection xmlns:Books="http://www.metamatrix.com/XMLSchema/DataSets/Books">
-<!--
-
-    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.
-
--->
-
-   <book isbn="0-7356-0877-7">
-      <title>After the Gold Rush</title>
-      <subtitle>Creating a True Profession of Software Engineering</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>McConnell</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Microsoft Press</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-55615-484-4">
-      <title>Code Complete</title>
-      <subtitle>A Practical Handbook of Software Construction</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>McConnell</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Microsoft Press</publisher>
-         <publishDate>1993</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-556-15900-5">
-      <title>Rapid Development</title>
-      <subtitle>Taming Wild Software Schedules</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>McConnell</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Microsoft Press</publisher>
-         <publishDate>1996</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-7356-0631-5">
-      <title>Software Requirements</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Wiegers</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Microsoft Press</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-57231-621-7">
-      <title>Software Project Survival Guide</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>McConnell</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Microsoft Press</publisher>
-         <publishDate>1998</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-43287-0">
-      <title>Automated Software Testing</title>
-      <subtitle>Introduction, Management, and Performance</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Dustin</author>
-         <author>Rashka</author>
-         <author>Paul</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-31000-7">
-      <title>Inside Java 2 Security</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Gong</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="020130998X">
-      <title>The Unified Modeling Language Reference Manual</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Rumbaugh</author>
-         <author>Jacobson</author>
-         <author>Booch</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>1998</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-70225-8">
-      <title>Writing Effective Use Cases</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Cockburn</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>2001</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0201877562">
-      <title>Software Testing in the Real World</title>
-      <subtitle>Improving the Process</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Kit</author>
-         <author>Finzi</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>1995</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-43336-2">
-      <title>SQL Queries for Mere Mortals</title>
-      <subtitle>A Hands-on Guide to Data Manipulation in SQL</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Hernandez</author>
-         <author>Viescas</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-65758-9">
-      <title>LDAP Programming with Java</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Weltman</author>
-         <author>Dahbura</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-44787-8">
-      <title>The Practical SQL Handbook</title>
-      <subtitle>Using Structured Query Language</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Bowman</author>
-         <author>Emerson</author>
-         <author>Darnovsky</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>1996</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-10088-6">
-      <title>Compilers</title>
-      <subtitle>Principles, Techniques, and Tools</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Aho</author>
-         <author>Sethi</author>
-         <author>Ullman</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>1985</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-201-31009-0">
-      <title>Concurrent Programming in Java</title>
-      <subtitle>Design Principles and Patterns</subtitle>
-      <edition>2</edition>
-      <authors>
-         <author>Lea</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Addison-Wesley</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-471-98710-7">
-      <title>Concurrency State Models &amp; Java Programs</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Kramer</author>
-         <author>Magee</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Wiley</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-471355232">
-      <title>Building and Managing the Meta Data Repository</title>
-      <subtitle>A Full Life-Cycle Guide</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Marco</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Wiley</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-7897-2271-2">
-      <title>Complete Idiot's Guide to Project Management with Microsoft Project 2000</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Black</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Que</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-932633-33-1">
-      <title>Creating a Software Engineering Culture</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Wiegers</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Dorset House Publishing</publisher>
-         <publishDate>1996</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-932633-43-9">
-      <title>Peopleware</title>
-      <subtitle>Productive Projects and Teams</subtitle>
-      <edition>2</edition>
-      <authors>
-         <author>DeMarco</author>
-         <author>Lister</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Dorset House Publishing</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1558605150">
-      <title>Database Design for Smarties</title>
-      <subtitle>Using UML for Data Modeling</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Muller</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Morgan Kaufman</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-558-60190-2">
-      <title>Transaction Processing</title>
-      <subtitle>Concepts and Techniques</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Gray</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Morgan Kaufman</publisher>
-         <publishDate>1992</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-55860-415-4">
-      <title>Principles of Transaction Processing</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Bernstein</author>
-         <author>Newcomer</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Morgan Kaufman</publisher>
-         <publishDate>1997</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1558605231">
-      <title>Readings in Database Systems</title>
-      <subtitle/>
-      <edition>3</edition>
-      <authors>
-         <author>Stonebraker</author>
-         <author>Hellerstein</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Morgan Kaufman</publisher>
-         <publishDate>1998</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-13-239856-7">
-      <title>How to Run Successful Projects II</title>
-      <subtitle/>
-      <edition>2</edition>
-      <authors>
-         <author>O'Connell</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Prentice Hall</publisher>
-         <publishDate>1996</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-13-014714-1">
-      <title>The XML Handbook</title>
-      <subtitle/>
-      <edition>2</edition>
-      <authors>
-         <author>Goldfarb</author>
-         <author>Prescod</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Prentice Hall</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0130273635">
-      <title>Thinking in Java</title>
-      <subtitle/>
-      <edition>2</edition>
-      <authors>
-         <author>Eckel</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Prentice Hall</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="130402648">
-      <title>Database System Implementation</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Ullman</author>
-         <author>Garcia-Molina</author>
-         <author>Widom</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Prentice Hall</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-596-00016-2">
-      <title>Java and XML</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>McLaughlin</author>
-         <author>Loukides</author>
-      </authors>
-      <publishingInformation>
-         <publisher>O'Reilly</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-56592-487-8">
-      <title>Java in a Nutshell</title>
-      <subtitle/>
-      <edition>3</edition>
-      <authors>
-         <author>Flanagan</author>
-      </authors>
-      <publishingInformation>
-         <publisher>O'Reilly</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-56592-483-5">
-      <title>Java Enterprise in a Nutshell</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Flanagan</author>
-      </authors>
-      <publishingInformation>
-         <publisher>O'Reilly</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-672-31602-1">
-      <title>Java Security Handbook</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Jaworski</author>
-         <author>Perrone</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Sams</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-672-31983-7">
-      <title>Software Testing</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Patton</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Sams</publisher>
-         <publishDate>2001</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-861002-77-7">
-      <title>Professional Java Server Programming</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Ayers</author>
-         <author>Bergsten</author>
-         <author>Diamond</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Wrox</publisher>
-         <publishDate>1999</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-861-00506-7">
-      <title>XSLT Programmer's Reference</title>
-      <subtitle/>
-      <edition>2</edition>
-      <authors>
-         <author>Kay</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Wrox</publisher>
-         <publishDate>2001</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-861-00312-9">
-      <title>XSLT Programmer's Reference</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Kay</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Wrox</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-818-68300-7">
-      <title>The Software Project Manager's Handbook</title>
-      <subtitle>Principles that Work</subtitle>
-      <edition>1</edition>
-      <authors>
-         <author>Phillips</author>
-      </authors>
-      <publishingInformation>
-         <publisher>IEEE Computer Society</publisher>
-         <publishDate>1998</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-884777-84-8">
-      <title>Swing</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Robinson</author>
-         <author>Vorobiev</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Manning</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-893115-10-0">
-      <title>Taming Java Threads</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Holub</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Apress</publisher>
-         <publishDate>2000</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="1-57870-070-1">
-      <title>Understanding and Deploying LDAP Directory Services</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Howes</author>
-         <author>Smith</author>
-         <author>Good</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Macmillan</publisher>
-         <publishDate>1990</publishDate>
-      </publishingInformation>
-   </book>
-   <book isbn="0-7821-1148-3">
-      <title>SQL Instant Reference</title>
-      <subtitle/>
-      <edition>1</edition>
-      <authors>
-         <author>Gruber</author>
-      </authors>
-      <publishingInformation>
-         <publisher>Sybex</publisher>
-         <publishDate>1993</publishDate>
-      </publishingInformation>
-   </book>
-</Books:bookCollection>
\ No newline at end of file

Deleted: branches/JCA/connectors/connector-xml/src/test/resources/stockquotes.xml
===================================================================
--- branches/JCA/connectors/connector-xml/src/test/resources/stockquotes.xml	2010-02-10 17:25:58 UTC (rev 1813)
+++ branches/JCA/connectors/connector-xml/src/test/resources/stockquotes.xml	2010-02-10 17:56:08 UTC (rev 1814)
@@ -1,411 +0,0 @@
-<?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.
-
--->
-
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://ws.invesbot.com/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="http://ws.invesbot.com/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://ws.invesbot.com/">
-      <s:element name="GetQuotes">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="symbols" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetQuotesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetQuotesResult">
-              <s:complexType mixed="true">
-                <s:sequence>
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetQuote">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="symbol" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetQuoteResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetQuoteResult">
-              <s:complexType mixed="true">
-                <s:sequence>
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetMarketIndex">
-        <s:complexType />
-      </s:element>
-      <s:element name="GetMarketIndexResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetMarketIndexResult">
-              <s:complexType mixed="true">
-                <s:sequence>
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetECNQuotes">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="symbols" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="GetECNQuotesResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="GetECNQuotesResult">
-              <s:complexType mixed="true">
-                <s:sequence>
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="GetQuotesSoapIn">
-    <wsdl:part name="parameters" element="tns:GetQuotes" />
-  </wsdl:message>
-  <wsdl:message name="GetQuotesSoapOut">
-    <wsdl:part name="parameters" element="tns:GetQuotesResponse" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteSoapIn">
-    <wsdl:part name="parameters" element="tns:GetQuote" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteSoapOut">
-    <wsdl:part name="parameters" element="tns:GetQuoteResponse" />
-  </wsdl:message>
-  <wsdl:message name="GetMarketIndexSoapIn">
-    <wsdl:part name="parameters" element="tns:GetMarketIndex" />
-  </wsdl:message>
-  <wsdl:message name="GetMarketIndexSoapOut">
-    <wsdl:part name="parameters" element="tns:GetMarketIndexResponse" />
-  </wsdl:message>
-  <wsdl:message name="GetECNQuotesSoapIn">
-    <wsdl:part name="parameters" element="tns:GetECNQuotes" />
-  </wsdl:message>
-  <wsdl:message name="GetECNQuotesSoapOut">
-    <wsdl:part name="parameters" element="tns:GetECNQuotesResponse" />
-  </wsdl:message>
-  <wsdl:message name="GetQuotesHttpGetIn">
-    <wsdl:part name="symbols" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetQuotesHttpGetOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpGetIn">
-    <wsdl:part name="symbol" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpGetOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:message name="GetMarketIndexHttpGetIn" />
-  <wsdl:message name="GetMarketIndexHttpGetOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:message name="GetECNQuotesHttpGetIn">
-    <wsdl:part name="symbols" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetECNQuotesHttpGetOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:message name="GetQuotesHttpPostIn">
-    <wsdl:part name="symbols" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetQuotesHttpPostOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpPostIn">
-    <wsdl:part name="symbol" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetQuoteHttpPostOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:message name="GetMarketIndexHttpPostIn" />
-  <wsdl:message name="GetMarketIndexHttpPostOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:message name="GetECNQuotesHttpPostIn">
-    <wsdl:part name="symbols" type="s:string" />
-  </wsdl:message>
-  <wsdl:message name="GetECNQuotesHttpPostOut">
-    <wsdl:part name="Body" />
-  </wsdl:message>
-  <wsdl:portType name="StockQuotesSoap">
-    <wsdl:operation name="GetQuotes">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter symbols, seperated by space, Quotes delayed in 20 minutes.</wsdl:documentation>
-      <wsdl:input message="tns:GetQuotesSoapIn" />
-      <wsdl:output message="tns:GetQuotesSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetQuote">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter one symbol, quote delayed in 20 minutes.</wsdl:documentation>
-      <wsdl:input message="tns:GetQuoteSoapIn" />
-      <wsdl:output message="tns:GetQuoteSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetMarketIndex">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Get Dow, Nasdaq, S&amp;P500 index.</wsdl:documentation>
-      <wsdl:input message="tns:GetMarketIndexSoapIn" />
-      <wsdl:output message="tns:GetMarketIndexSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetECNQuotes">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter symbols, seperated by space, Real-Time ECN quote.</wsdl:documentation>
-      <wsdl:input message="tns:GetECNQuotesSoapIn" />
-      <wsdl:output message="tns:GetECNQuotesSoapOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="StockQuotesHttpGet">
-    <wsdl:operation name="GetQuotes">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter symbols, seperated by space, Quotes delayed in 20 minutes.</wsdl:documentation>
-      <wsdl:input message="tns:GetQuotesHttpGetIn" />
-      <wsdl:output message="tns:GetQuotesHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetQuote">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter one symbol, quote delayed in 20 minutes.</wsdl:documentation>
-      <wsdl:input message="tns:GetQuoteHttpGetIn" />
-      <wsdl:output message="tns:GetQuoteHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetMarketIndex">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Get Dow, Nasdaq, S&amp;P500 index.</wsdl:documentation>
-      <wsdl:input message="tns:GetMarketIndexHttpGetIn" />
-      <wsdl:output message="tns:GetMarketIndexHttpGetOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetECNQuotes">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter symbols, seperated by space, Real-Time ECN quote.</wsdl:documentation>
-      <wsdl:input message="tns:GetECNQuotesHttpGetIn" />
-      <wsdl:output message="tns:GetECNQuotesHttpGetOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="StockQuotesHttpPost">
-    <wsdl:operation name="GetQuotes">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter symbols, seperated by space, Quotes delayed in 20 minutes.</wsdl:documentation>
-      <wsdl:input message="tns:GetQuotesHttpPostIn" />
-      <wsdl:output message="tns:GetQuotesHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetQuote">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter one symbol, quote delayed in 20 minutes.</wsdl:documentation>
-      <wsdl:input message="tns:GetQuoteHttpPostIn" />
-      <wsdl:output message="tns:GetQuoteHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetMarketIndex">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Get Dow, Nasdaq, S&amp;P500 index.</wsdl:documentation>
-      <wsdl:input message="tns:GetMarketIndexHttpPostIn" />
-      <wsdl:output message="tns:GetMarketIndexHttpPostOut" />
-    </wsdl:operation>
-    <wsdl:operation name="GetECNQuotes">
-      <wsdl:documentation xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">Enter symbols, seperated by space, Real-Time ECN quote.</wsdl:documentation>
-      <wsdl:input message="tns:GetECNQuotesHttpPostIn" />
-      <wsdl:output message="tns:GetECNQuotesHttpPostOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="StockQuotesSoap" type="tns:StockQuotesSoap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="GetQuotes">
-      <soap:operation soapAction="http://ws.invesbot.com/GetQuotes" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetQuote">
-      <soap:operation soapAction="http://ws.invesbot.com/GetQuote" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetMarketIndex">
-      <soap:operation soapAction="http://ws.invesbot.com/GetMarketIndex" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetECNQuotes">
-      <soap:operation soapAction="http://ws.invesbot.com/GetECNQuotes" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="StockQuotesSoap12" type="tns:StockQuotesSoap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="GetQuotes">
-      <soap12:operation soapAction="http://ws.invesbot.com/GetQuotes" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetQuote">
-      <soap12:operation soapAction="http://ws.invesbot.com/GetQuote" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetMarketIndex">
-      <soap12:operation soapAction="http://ws.invesbot.com/GetMarketIndex" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetECNQuotes">
-      <soap12:operation soapAction="http://ws.invesbot.com/GetECNQuotes" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="StockQuotesHttpGet" type="tns:StockQuotesHttpGet">
-    <http:binding verb="GET" />
-    <wsdl:operation name="GetQuotes">
-      <http:operation location="/GetQuotes" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetQuote">
-      <http:operation location="/GetQuote" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetMarketIndex">
-      <http:operation location="/GetMarketIndex" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetECNQuotes">
-      <http:operation location="/GetECNQuotes" />
-      <wsdl:input>
-        <http:urlEncoded />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="StockQuotesHttpPost" type="tns:StockQuotesHttpPost">
-    <http:binding verb="POST" />
-    <wsdl:operation name="GetQuotes">
-      <http:operation location="/GetQuotes" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetQuote">
-      <http:operation location="/GetQuote" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetMarketIndex">
-      <http:operation location="/GetMarketIndex" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="GetECNQuotes">
-      <http:operation location="/GetECNQuotes" />
-      <wsdl:input>
-        <mime:content type="application/x-www-form-urlencoded" />
-      </wsdl:input>
-      <wsdl:output>
-        <mime:content part="Body" type="text/xml" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="StockQuotes">
-    <wsdl:port name="StockQuotesSoap" binding="tns:StockQuotesSoap">
-      <soap:address location="http://ws.invesbot.com/stockquotes.asmx" />      
-    </wsdl:port>
-    <wsdl:port name="StockQuotesSoap12" binding="tns:StockQuotesSoap12">
-      <soap12:address location="http://ws.invesbot.com/stockquotes.asmx" />
-    </wsdl:port>
-    <wsdl:port name="StockQuotesHttpGet" binding="tns:StockQuotesHttpGet">
-      <http:address location="http://ws.invesbot.com/stockquotes.asmx" />
-    </wsdl:port>
-    <wsdl:port name="StockQuotesHttpPost" binding="tns:StockQuotesHttpPost">
-      <http:address location="http://ws.invesbot.com/stockquotes.asmx" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file



More information about the teiid-commits mailing list