[teiid-commits] teiid SVN: r1840 - in branches/JCA/connectors: connector-xmlsource-soap and 5 other directories.

Author: rareddy Date: 2010-02-18 11:21:36 -0500 (Thu, 18 Feb 2010) New Revision: 1840 Added: branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnector.java Removed: branches/JCA/connectors/connector-xml-common/ branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnection.java Modified: branches/JCA/connectors/connector-xmlsource-soap/pom.xml branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SecurityToken.java branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/ServiceOperation.java branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnection.java branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnector.java branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapManagedConnectionFactory.java branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapProcedureExecution.java branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapRequest.java branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapService.java branches/JCA/connectors/connector-xmlsource-soap/src/main/rar/META-INF/ra.xml branches/JCA/connectors/connector-xmlsource-soap/src/main/resources/org/teiid/connector/xmlsource/i18n.properties branches/JCA/connectors/connector-xmlsource-soap/src/test/java/com/metamatrix/connector/xmlsource/soap/service/StockQuotes.java branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapExecution.java Log: TEIID-861: TEIID-990: Converting to SOAP execution to use JAX-WS; WS-Security is still pending Modified: branches/JCA/connectors/connector-xmlsource-soap/pom.xml =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/pom.xml 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/pom.xml 2010-02-18 16:21:36 UTC (rev 1840) @@ -51,6 +51,12 @@ </dependency> <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.1</version> + </dependency> + + <dependency> <groupId>axis</groupId> <artifactId>axis</artifactId> <version>1.3</version> @@ -60,46 +66,49 @@ <artifactId>commons-logging</artifactId> </exclusion> </exclusions> + <scope>test</scope> </dependency> <dependency> <groupId>apache-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.2</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.0</version> - <scope>provided</scope> + <scope>test</scope> </dependency> <dependency> <groupId>wss4j</groupId> <artifactId>wss4j</artifactId> <version>1.5.0</version> + <scope>test</scope> </dependency> <dependency> <groupId>axis</groupId> <artifactId>axis-saaj</artifactId> <version>1.2</version> + <scope>test</scope> </dependency> <dependency> <groupId>axis</groupId> <artifactId>axis-schema</artifactId> <version>1.3</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>opensaml</groupId> <artifactId>opensaml</artifactId> <version>1.1b</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>apache-xmlsec</groupId> <artifactId>xmlsec</artifactId> <version>1.3.0</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> </dependencies> Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SecurityToken.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SecurityToken.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SecurityToken.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -22,21 +22,8 @@ package org.teiid.connector.xmlsource.soap; -import java.io.IOException; -import java.security.MessageDigest; -import java.util.StringTokenizer; +import javax.xml.ws.Dispatch; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.UnsupportedCallbackException; - -import org.apache.axis.client.Call; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.WSPasswordCallback; -import org.apache.ws.security.handler.WSHandlerConstants; -import org.apache.ws.security.message.token.UsernameToken; -import org.apache.ws.security.util.Base64; -import org.teiid.connector.xmlsource.TrustedPayloadHandler; import org.teiid.connector.xmlsource.XMLSourcePlugin; /** @@ -67,17 +54,19 @@ String username; String password; - public static SecurityToken getSecurityToken(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler) { + public static SecurityToken getSecurityToken(SecurityManagedConnectionFactory env) { + + /* // first find out what type of security we are going to handle String securityType = env.getSecurityType(); if (securityType != null) { // the first two are non-ws-security based; and they can not be nested. if (securityType.equalsIgnoreCase(NONE_PROFILE)) { - return new NoProvider(env, trustedPayloadHandler); + return new NoProvider(env); } else if (securityType.equalsIgnoreCase(HTTP_BASIC_AUTH)) { - return new HTTPBasic(env, trustedPayloadHandler); + return new HTTPBasic(env); } else if (securityType.equalsIgnoreCase(WS_SECURITY)) { @@ -85,7 +74,7 @@ if (wsSecurityType != null && wsSecurityType.length() > 0) { // if this is WS-security then we need to find sub-category of it - WSSecurityToken rootToken = new WSSecurityToken(env, trustedPayloadHandler); + WSSecurityToken rootToken = new WSSecurityToken(env); WSSecurityToken nextToken = rootToken; StringTokenizer st = new StringTokenizer(wsSecurityType); @@ -94,25 +83,25 @@ String authType = st.nextToken(); if (authType.equalsIgnoreCase(USERNAME_TOKEN_PROFILE_CLEAR_TEXT)) { - nextToken = nextToken.setNextToken(new UsernameTokenProfile(env, trustedPayloadHandler, false)); + nextToken = nextToken.setNextToken(new UsernameTokenProfile(env, false)); } else if (authType.equalsIgnoreCase(USERNAME_TOKEN_PROFILE_DIGEST)) { - nextToken = nextToken.setNextToken( new UsernameTokenProfile(env, trustedPayloadHandler, true)); + nextToken = nextToken.setNextToken( new UsernameTokenProfile(env, true)); } else if (authType.equalsIgnoreCase(SAML_TOKEN_UNSIGNED)) { - nextToken = nextToken.setNextToken( new SAMLTokenProfile(env, trustedPayloadHandler, false)); + nextToken = nextToken.setNextToken( new SAMLTokenProfile(env, false)); } else if (authType.equalsIgnoreCase(SAML_TOKEN_SIGNED)) { - nextToken = nextToken.setNextToken( new SAMLTokenProfile(env, trustedPayloadHandler, true)); + nextToken = nextToken.setNextToken( new SAMLTokenProfile(env, true)); } else if (authType.equalsIgnoreCase(SIGNATURE)) { - nextToken = nextToken.setNextToken( new SignatureProfile(env, trustedPayloadHandler)); + nextToken = nextToken.setNextToken( new SignatureProfile(env)); } else if (authType.equalsIgnoreCase(TIMESTAMP)) { - nextToken = nextToken.setNextToken( new TimestampProfile(env, trustedPayloadHandler)); + nextToken = nextToken.setNextToken( new TimestampProfile(env)); } else if (authType.equalsIgnoreCase(ENCRYPT)) { - nextToken = nextToken.setNextToken( new EncryptProfile(env, trustedPayloadHandler)); + nextToken = nextToken.setNextToken( new EncryptProfile(env)); } else { throw new RuntimeException(XMLSourcePlugin.Util.getString("No_such_ws_security_type", new Object[] {authType})); //$NON-NLS-1$ @@ -126,23 +115,13 @@ throw new RuntimeException(XMLSourcePlugin.Util.getString("No_such_auth_type", new Object[] {securityType})); //$NON-NLS-1$ } } - return new NoProvider(env, trustedPayloadHandler); + */ + return new NoProvider(env); } - SecurityToken(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler) { + SecurityToken(SecurityManagedConnectionFactory env) { this.env = env; - if (null != trustedPayloadHandler) { - String tempPassword = trustedPayloadHandler.getPassword(); - String tempUsername = trustedPayloadHandler.getUser(); - if(null != tempPassword && null != tempUsername) { - password = tempPassword; - username = tempUsername; - } else { - setCredentialsFromEnv(); - } - } else { - setCredentialsFromEnv(); - } + setCredentialsFromEnv(); } private void setCredentialsFromEnv() { @@ -172,22 +151,24 @@ throw new RuntimeException(XMLSourcePlugin.Util.getString("no_trust_type_defined")); //$NON-NLS-1$ } - public abstract void handleSecurity(Call stub); + public abstract void handleSecurity(Dispatch stub); } /** * A marker class to differentiate between WS-Security and non - WS-Secuirty like * HTTP Based one */ + +/* class WSSecurityToken extends SecurityToken implements CallbackHandler { WSSecurityToken nextToken; - public WSSecurityToken(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler) { - super(env, trustedPayloadHandler); + public WSSecurityToken(SecurityManagedConnectionFactory env) { + super(env); } @Override - public void handleSecurity(Call call) { + public void handleSecurity(Dispatch call) { addSecurity(call); if (nextToken != null) { this.nextToken.handleSecurity(call); @@ -206,11 +187,11 @@ // this needs to be extended by everybody toadd specific // type of secuirty; should have been abstract but to minimize the code // choose to have empty method. - void addSecurity(Call call) { + void addSecurity(Dispatch call) { // nothing to do. } - void setAction(Call call, String action) { + void setAction(Dispatch call, String action) { String prev = (String)call.getProperty(WSHandlerConstants.ACTION); if (prev == null || prev.length() == 0) { call.setProperty(WSHandlerConstants.ACTION, action); @@ -232,15 +213,17 @@ } } +*/ + /** * defines that there is no security provider */ class NoProvider extends SecurityToken{ - public NoProvider(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler){ - super(env, trustedPayloadHandler); + public NoProvider(SecurityManagedConnectionFactory env){ + super(env); } @Override - public void handleSecurity(Call stub) { + public void handleSecurity(Dispatch stub) { } } @@ -248,29 +231,35 @@ * This uses the HTTP Basic authentication; So the user credentials are sent over * in HTTP Headers. Uses Basic-Relam. */ + +/* class HTTPBasic extends SecurityToken{ - public HTTPBasic(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler){ - super(env, trustedPayloadHandler); + public HTTPBasic(SecurityManagedConnectionFactory env){ + super(env); } @Override - public void handleSecurity(Call stub) { + public void handleSecurity(Dispatch stub) { stub.setUsername(getUsername()); stub.setPassword(getPassword()); this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString( "using_http_basic")); //$NON-NLS-1$ } } +*/ + /** * Timestamp Profile using WSS4J */ + +/* class TimestampProfile extends WSSecurityToken { - public TimestampProfile(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler) { - super(env, trustedPayloadHandler); + public TimestampProfile(SecurityManagedConnectionFactory env) { + super(env); this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString("using_timestamp_profile")); //$NON-NLS-1$ } @Override - public void addSecurity(Call call) { + public void addSecurity(Dispatch call) { setAction(call, WSHandlerConstants.TIMESTAMP); // How long ( in seconds ) message is valid since send. @@ -279,22 +268,25 @@ //properties.setProperty(WSHandlerConstants.TIMESTAMP_PRECISION,"true"); } } +*/ /** * This class uses the WS-Security using standard OASIS Web Services Security * implemented by apache "WSS4J" Implements "Username Token Profile" */ + +/* class UsernameTokenProfile extends WSSecurityToken { boolean encryptedPassword = false; - public UsernameTokenProfile(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler, boolean encryptedPassword){ - super(env, trustedPayloadHandler); + public UsernameTokenProfile(SecurityManagedConnectionFactory env, boolean encryptedPassword){ + super(env); this.encryptedPassword = encryptedPassword; this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString("using_username_profile")); //$NON-NLS-1$ } @Override - public void addSecurity(Call call) { + public void addSecurity(Dispatch call) { setAction(call, WSHandlerConstants.USERNAME_TOKEN); call.setProperty(WSHandlerConstants.USER, getUsername()); if (this.encryptedPassword) { @@ -337,13 +329,13 @@ } class EncryptProfile extends WSSecurityToken { - public EncryptProfile(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler){ - super(env, trustedPayloadHandler); + public EncryptProfile(SecurityManagedConnectionFactory env){ + super(env); this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString("using_encrypt_profile")); //$NON-NLS-1$ } @Override - public void addSecurity(Call call) { + public void addSecurity(Dispatch call) { setAction(call, WSHandlerConstants.ENCRYPT); String user = this.env.getEncryptUserName(); if (user == null || user.length() == 0) { @@ -363,19 +355,21 @@ call.setProperty(WSHandlerConstants.ENC_KEY_ID, "SKIKeyIdentifier"); //$NON-NLS-1$ } } +*/ /** * Digital signature profile using WSS4J - */ + */ +/* class SignatureProfile extends WSSecurityToken { - public SignatureProfile(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler) { - super(env, trustedPayloadHandler); + public SignatureProfile(SecurityManagedConnectionFactory env) { + super(env); this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString("using_signature_profile")); //$NON-NLS-1$ } @Override - public void addSecurity(Call call) { + public void addSecurity(Dispatch call) { setAction(call, WSHandlerConstants.SIGNATURE); call.setProperty(WSHandlerConstants.USER, getUsername()); call.setProperty(WSHandlerConstants.PW_CALLBACK_REF, this); @@ -389,20 +383,23 @@ call.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;STRTransform"); //$NON-NLS-1$ } } +*/ /** * SAML Profile based authentication using WSS4J. */ + +/* class SAMLTokenProfile extends WSSecurityToken { boolean signed = false; - public SAMLTokenProfile(SecurityManagedConnectionFactory env, TrustedPayloadHandler trustedPayloadHandler, boolean signed){ - super(env, trustedPayloadHandler); + public SAMLTokenProfile(SecurityManagedConnectionFactory env, boolean signed){ + super(env); this.signed = signed; } @Override - public void addSecurity(Call call) { + public void addSecurity(Dispatch call) { if (signed) { setAction(call, WSHandlerConstants.SAML_TOKEN_SIGNED); @@ -432,5 +429,7 @@ throw new RuntimeException(XMLSourcePlugin.Util.getString("no_saml_property_file")); //$NON-NLS-1$ } call.setProperty(WSHandlerConstants.SAML_PROP_FILE, samlPropertyFile); - } -} \ No newline at end of file + } + +} + */ \ No newline at end of file Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/ServiceOperation.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/ServiceOperation.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/ServiceOperation.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -22,84 +22,58 @@ package org.teiid.connector.xmlsource.soap; -import java.io.ByteArrayInputStream; -import java.io.InputStream; import java.io.StringReader; -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.Map; -import java.util.Vector; import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.Dispatch; -import org.apache.axis.client.Call; -import org.apache.axis.encoding.ser.ElementDeserializerFactory; -import org.apache.axis.encoding.ser.ElementSerializerFactory; -import org.apache.axis.message.RPCElement; -import org.apache.axis.message.SOAPBodyElement; -import org.apache.axis.utils.XMLUtils; -import org.apache.axis.wsdl.symbolTable.Parameter; -import org.apache.axis.wsdl.symbolTable.Parameters; -import org.apache.axis.wsdl.symbolTable.TypeEntry; import org.teiid.connector.xmlsource.XMLSourcePlugin; -import org.w3c.dom.Element; + /** * Represents the operation of a service */ public class ServiceOperation { private static final String DOCUMENT = "document"; //$NON-NLS-1$ - String name; - Parameters parameters; - Call stub; - String portName; - boolean usesComplexType = false; - String style; - SoapManagedConnectionFactory env; + private String name; + private String portName; + private String style; + private int queryTimeout; + private String endPoint; + private Dispatch<Source> dispatch; + private String targetNamespace; - /** - * ctor - * @param name - * @param parms - */ - ServiceOperation(SoapManagedConnectionFactory env, String name, Parameters parms, String portName, String style) { + ServiceOperation(String name, String portName, String style, Dispatch<Source> dispatch, String targetNamespace) { this.name = name; - this.parameters = parms; this.portName = portName; this.style = style; - this.env = env; - - // check the input parameters types if they are simple or complex - // type; - for (int i = 0; i < this.parameters.list.size(); i++) { - Parameter p = (Parameter) this.parameters.list.get(i); - TypeEntry type = p.getType(); - if (!type.isBaseType()) { - this.usesComplexType = true; - } - } + this.dispatch = dispatch; + this.targetNamespace = targetNamespace; } + + String getName() { + return this.name; + } - /** - * A stub to procedure; for execution. - * @param stub - */ - void setStub(Call stub) { - this.stub = stub; + int getQueryTimeout() { + return this.queryTimeout; } - int getQueryTimeout() { - return this.env.getQueryTimeout(); + void setQueryTimeout(int timeout) { + this.queryTimeout = timeout; } String getEndPoint() { - return this.env.getEndPoint(); + return this.endPoint; } + + void setEndPoint(String endPoint) { + this.endPoint = endPoint; + } /** * is this a doc literal service operation @@ -114,96 +88,32 @@ * @param args - arguments to the service * @return return value; null on void return */ - public Source execute(Object[] args, Map outs) throws ExcutionFailedException { - Object doc = null; - try { - // If there is alternate endpoint use it. - if (getEndPoint() != null && getEndPoint().length() > 0) { - this.stub.setTargetEndpointAddress(getEndPoint()); + public Source execute(Object[] args, SecurityToken token) throws ExcutionFailedException { + if (isDocLiteral()) { + if (args.length != 1) { + throw new ExcutionFailedException(XMLSourcePlugin.Util.getString("wrong_number_params", new Object[] {Integer.valueOf(1), Integer.valueOf(args.length)})); //$NON-NLS-1$ } - - // If query timeout is set use it - if (getQueryTimeout() != -1) { - this.stub.setTimeout(Integer.valueOf(getQueryTimeout())); - } - - // check the param count of the submitted operation, in doc-literal - // there should always be only one input - if (isDocLiteral()) { - if (args.length != 1) { - throw new ExcutionFailedException(XMLSourcePlugin.Util.getString("wrong_number_params", new Object[] {Integer.valueOf(1), Integer.valueOf(args.length)})); //$NON-NLS-1$ - } - } - else { - int requiredParamCount = this.stub.getOperation().getNumInParams(); - if (requiredParamCount != args.length) { - throw new ExcutionFailedException(XMLSourcePlugin.Util.getString("wrong_number_params", new Object[] {Integer.valueOf(requiredParamCount), Integer.valueOf(args.length)})); //$NON-NLS-1$ - } - } + } + else { + throw new ExcutionFailedException(XMLSourcePlugin.Util.getString("support_only_doc_literal")); //$NON-NLS-1$ + } + return this.dispatch.invoke(buildRequest(args)); + } + + Source buildRequest(Object[] args){ + StringBuilder sb = new StringBuilder(); + sb.append("<tns1:").append(this.name); + sb.append(" xmlns:tns1=\"").append(this.targetNamespace).append("\">"); + + for (Object obj:args) { + sb.append(obj.toString()); + } + + sb.append("</tns1:").append(this.name).append(">"); - // set input types - // if we are using complex types, since we do not know how to serialize - // deserilize the objects, we need to pass them as the direct soap body - // elements; this is useful for doc/litral stuff where we do not need to - // put toghether soap envelope. - boolean messageStyleInvoke = false; - if (this.usesComplexType || isDocLiteral()) { - ArrayList bodyElements = new ArrayList(); - for (int i = 0; i < args.length; i++) { - // we may little sofisticated streamer here, but this will work for now. - InputStream element = new ByteArrayInputStream(args[i].toString().getBytes()); - bodyElements.add(new SOAPBodyElement(element)); - } - args = bodyElements.toArray(new Object[bodyElements.size()]); - messageStyleInvoke = true; - } - - // set output type; if it is complex type just use it as element object; - Parameter returnParam = this.parameters.returnParam; - if ( returnParam != null) { - if(!returnParam.getType().isBaseType()) { - this.stub.registerTypeMapping(org.w3c.dom.Element.class, returnParam.getType().getQName(), new ElementSerializerFactory(),new ElementDeserializerFactory()); - } - } - - // invoke the service - doc = this.stub.invoke(args); - Map outputs = this.stub.getOutputParams(); - if(outputs != null) { - outs.putAll(outputs); - } - - // if the sevice is executed with message style, we would get back raw xml - // in out message - if (messageStyleInvoke) { - doc = ((Vector)doc).get(0); - } - - // if the result is an xml element convert into string - if (doc instanceof RPCElement) { - return new DOMSource((RPCElement)doc); - } - else if (doc instanceof Element) { - return new DOMSource((Element)doc); - } - - // if we executed a RPC service, and we received a scalar as output - // then we need to wrap this in the xml type - if (!isDocLiteral() && doc != null && returnParam != null - && returnParam.getType().isBaseType()) { - StringBuffer sb = new StringBuffer(); - sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?><return type=\""); //$NON-NLS-1$ - sb.append(doc.getClass().getName()); - sb.append("\">"); //$NON-NLS-1$ - sb.append(XMLUtils.xmlEncodeString(doc.toString())); - sb.append("</return>"); //$NON-NLS-1$ - return new StreamSource(new StringReader(sb.toString())); - } - - } catch (RemoteException e) { - throw new ExcutionFailedException(e); - } - return null; + System.out.println(sb.toString()); + + return new StreamSource(new StringReader(sb.toString())); } // marker class Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnection.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnection.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnection.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -22,31 +22,6 @@ package org.teiid.connector.xmlsource.soap; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Vector; - -import javax.wsdl.Binding; -import javax.wsdl.BindingOperation; -import javax.wsdl.Operation; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.extensions.soap.SOAPBinding; -import javax.wsdl.extensions.soap.SOAPOperation; -import javax.xml.namespace.QName; -import javax.xml.rpc.ServiceException; - -import org.apache.axis.client.Call; -import org.apache.axis.wsdl.gen.Parser; -import org.apache.axis.wsdl.symbolTable.BindingEntry; -import org.apache.axis.wsdl.symbolTable.Parameters; -import org.apache.axis.wsdl.symbolTable.ServiceEntry; -import org.apache.axis.wsdl.symbolTable.SymTabEntry; -import org.apache.axis.wsdl.symbolTable.SymbolTable; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.api.ProcedureExecution; @@ -57,7 +32,6 @@ import org.teiid.connector.language.IQuery; import org.teiid.connector.language.IQueryCommand; import org.teiid.connector.metadata.runtime.RuntimeMetadata; -import org.teiid.connector.xmlsource.XMLSourcePlugin; import com.metamatrix.connector.xml.IQueryPreprocessor; @@ -68,25 +42,25 @@ */ public class SoapConnection extends BasicConnection { // instance variables - boolean connected = false; - SoapService service = null; // wsdl service - Map operationsMap = new HashMap(); - SecurityToken securityToken = null; + private boolean connected = false; + private SoapService service = null; // wsdl service private SoapManagedConnectionFactory config; + private SecurityToken securityToken; /** * @param env * @throws ConnectorException */ - public SoapConnection(SoapManagedConnectionFactory env) throws ConnectorException { + public SoapConnection(SoapManagedConnectionFactory env, SoapService service, SecurityToken token) throws ConnectorException { this.config = env; - connect(); + this.service = service; + this.securityToken = token; } @Override public ProcedureExecution createProcedureExecution(IProcedure command, ExecutionContext executionContext, RuntimeMetadata metadata) throws ConnectorException { - return new SoapProcedureExecution(command, this.config, metadata, executionContext, this); + return new SoapProcedureExecution(command, this.config, metadata, executionContext, this.service, this.securityToken); } @Override @@ -114,186 +88,5 @@ @Override public void close() { - disconnect(); - } - - void connect() throws ConnectorException { - String wsdl = this.config.getWsdl(); - String portName = this.config.getPortName(); - - // check if WSDL is supplied - if (wsdl == null || wsdl.trim().length() == 0) { - throw new ConnectorException(XMLSourcePlugin.Util.getString("wsdl_not_set")); //$NON-NLS-1$ - } - - try { - this.config.getLogger().logDetail(XMLSourcePlugin.Util.getString("loading_wsdl", new Object[] {wsdl})); //$NON-NLS-1$ - - // first parse the WSDL file - Parser wsdlParser = new Parser(); - wsdlParser.run(wsdl); - - // Find the service from WSDL - Service wsdlService = getService(wsdlParser.getSymbolTable()); - - // WS-Security handler provider - this.securityToken = SecurityToken.getSecurityToken(this.config, null); - - // now create a AXIS based service - this.service = new SoapService(wsdlParser, wsdlService.getQName(), this.securityToken); - Port port = selectPort(wsdlService.getPorts(), portName); - - // find all the available operations - this.operationsMap = buildOperations(wsdlParser.getSymbolTable(), port); - - this.connected = true; - } catch (Exception e) { - throw new ConnectorException(e, XMLSourcePlugin.Util.getString("failed_loading_wsdl", new Object[] {wsdl})); //$NON-NLS-1$ - } - - - } - - /** - * Build a map of available operations in the WSDL - * @param wsdlParser - */ - private Map buildOperations(SymbolTable symbolTable, Port usePort) { - HashMap map = new HashMap(); - Binding binding = usePort.getBinding(); - BindingEntry bEntry = symbolTable.getBindingEntry(binding.getQName()); - - // find out from the soap binding style what type of service is this. - // if the style is document then it is doc-litral - String style = null; - for (Iterator i = binding.getExtensibilityElements().iterator(); i.hasNext();) { - final ExtensibilityElement extElement = (ExtensibilityElement)i.next(); - if (extElement instanceof SOAPBinding) { - style = ((SOAPBinding)extElement).getStyle(); - } - } - - // if the style not found on the binding then look for it on the operation. - if (style == null) { - for(Iterator i = binding.getBindingOperations().iterator(); i.hasNext();) { - BindingOperation operation = (BindingOperation)i.next(); - List extElements = operation.getExtensibilityElements(); - for (final Iterator extIter = extElements.iterator(); extIter.hasNext();) { - final ExtensibilityElement extElement = (ExtensibilityElement)extIter.next(); - if (extElement instanceof SOAPOperation) { - style = ((SOAPOperation)extElement).getStyle(); - } - } // for - } - } - - // now loop through all the available operations and make a note of them - for (Iterator i = bEntry.getOperations().iterator(); i.hasNext();) { - Operation operation = (Operation) i.next(); - - Parameters parameters = bEntry.getParameters(operation); - - // create operation with the available details - ServiceOperation so = new ServiceOperation(this.config, operation.getName(), parameters, usePort.getName(), style); - - // collect all the services available - map.put(operation.getName(), so); - } - - return map; - } - - /** - * disconnect the connection; - */ - void disconnect() { - this.connected = false; - this.operationsMap.clear(); - } - - /** - * Get system table entry from wsdl for given element. - * @return - */ - private Service getService(SymbolTable table) throws ServiceNotFoundException{ - Class serviceClazz = ServiceEntry.class; - HashMap map = table.getHashMap(); - for (Iterator iter = map.values().iterator(); iter.hasNext();) { - Vector v = (Vector) iter.next(); - for (int i = 0; i < v.size(); ++i) { - SymTabEntry tabEntry = (SymTabEntry) v.elementAt(i); - if (serviceClazz.isInstance(tabEntry)) { - ServiceEntry serviceEntry = (ServiceEntry)tabEntry; - return serviceEntry.getService(); - } - } - } - throw new ServiceNotFoundException(); - } - - /** - * Get Port to be used for the - * @param ports - * @param portName - * @return - * @throws Exception - */ - private Port selectPort(Map ports, String portName) throws Exception { - Iterator valueIterator = ports.keySet().iterator(); - while (valueIterator.hasNext()) { - String name = (String) valueIterator.next(); - - if ((portName == null) || (portName.length() == 0)) { - Port port = (Port) ports.get(name); - List list = port.getExtensibilityElements(); - - for (int i = 0; (list != null) && (i < list.size()); i++) { - Object obj = list.get(i); - if (obj instanceof SOAPAddress) { - return port; - } - } - } else if ((name != null) && name.equals(portName)) { - return (Port) ports.get(name); - } - } - return null; - } - - /** - * Find the operation to execute - * @param name - * @return operation if found; exception otherwise - * @throws OperationNotFoundException - */ - public ServiceOperation findOperation(String procedureName) throws OperationNotFoundException{ - - // Check the Operation Name - ServiceOperation operation = (ServiceOperation)operationsMap.get(procedureName); - if (operation == null) { - throw new OperationNotFoundException(procedureName); - } - // now create a stub for the operation and set on the object. - try { - Call call = (Call)service.createCall(QName.valueOf(operation.portName), QName.valueOf(procedureName)); - securityToken.handleSecurity(call); - - // now assign this call to the operation object. - operation.setStub(call); - } catch (ServiceException e) { - throw new OperationNotFoundException(e); - } - return operation; - } - - - // - static class ServiceNotFoundException extends Exception{ - // nothing, just a marker - } - static class OperationNotFoundException extends Exception{ - public OperationNotFoundException(String e) {super(e);} - public OperationNotFoundException(Throwable e) {super(e);} - // nothing, just marker - } + } } Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnector.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnector.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapConnector.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -1,35 +1,88 @@ package org.teiid.connector.xmlsource.soap; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Map; +import java.util.Set; + +import javax.wsdl.Definition; +import javax.wsdl.Service; +import javax.wsdl.WSDLException; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; + import org.teiid.connector.api.Connection; import org.teiid.connector.api.ConnectorCapabilities; import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.api.ConnectorLogger; import org.teiid.connector.basic.BasicConnector; +import org.teiid.connector.xmlsource.XMLSourcePlugin; public class SoapConnector extends BasicConnector { private SoapManagedConnectionFactory config; + private SoapService service = null; @Override public void initialize(ConnectorEnvironment env) throws ConnectorException { super.initialize(env); this.config = (SoapManagedConnectionFactory)env; + + String wsdl = this.config.getWsdl(); + String portName = this.config.getPortName(); + String serviceName = this.config.getServiceName(); + + // check if WSDL is supplied + if (wsdl == null || wsdl.trim().length() == 0) { + throw new ConnectorException(XMLSourcePlugin.Util.getString("wsdl_not_set")); //$NON-NLS-1$ + } + + this.config.getLogger().logDetail(XMLSourcePlugin.Util.getString("loading_wsdl", new Object[] {wsdl})); //$NON-NLS-1$ - ConnectorLogger logger = config.getLogger(); - logger.logInfo("Loaded for SoapConnector"); //$NON-NLS-1$ + this.service = buildServiceStub(wsdl, serviceName, portName); + + this.config.getLogger().logInfo("Loaded for SoapConnector"); //$NON-NLS-1$ } public Connection getConnection() throws ConnectorException { - return new SoapConnection(this.config); + return new SoapConnection(this.config, this.service, SecurityToken.getSecurityToken(this.config)); } @Override - public Class<? extends ConnectorCapabilities> getDefaultCapabilities() { + public Class<? extends ConnectorCapabilities> getDefaultCapabilities() { return SoapSourceCapabilities.class; } + + private SoapService buildServiceStub(String wsdl, String serviceName, String portName) throws ConnectorException { + try { + // first parse the WSDL file + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + Definition wsdlDefinition = wsdlReader.readWSDL(wsdl); + + + Map services = wsdlDefinition.getServices(); + Service wsdlService = (Service)services.values().iterator().next(); + if (serviceName != null) { + Set<String> keys = services.keySet(); + for (String key:keys) { + if (key.equalsIgnoreCase(serviceName)) { + wsdlService = (Service)services.get(key); + } + } + } + return new SoapService(new URL(wsdl), wsdlService, portName, wsdlDefinition.getTargetNamespace()); + } catch (WSDLException e) { + throw new ConnectorException(e, XMLSourcePlugin.Util.getString("failed_loading_wsdl", new Object[] {wsdl})); //$NON-NLS-1$ + } catch (MalformedURLException e) { + throw new ConnectorException(e, XMLSourcePlugin.Util.getString("failed_loading_wsdl", new Object[] {wsdl})); //$NON-NLS-1$ + } + } + + SoapService getService() { + return this.service; + } } Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapManagedConnectionFactory.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapManagedConnectionFactory.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapManagedConnectionFactory.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -146,6 +146,16 @@ this.portName = portName; } + private String serviceName; + + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + private int queryTimeout; public int getQueryTimeout() { Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapProcedureExecution.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapProcedureExecution.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapProcedureExecution.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -46,23 +46,25 @@ public class SoapProcedureExecution extends BasicExecution implements ProcedureExecution { // Connection object. - SoapConnection connection; + SoapService service; RuntimeMetadata metadata = null; ExecutionContext context; private IProcedure procedure; private SoapManagedConnectionFactory env; private boolean returnedResult; private SQLXML returnValue; + private SecurityToken securityToken; /** * @param env */ - public SoapProcedureExecution(IProcedure procedure, SoapManagedConnectionFactory env, RuntimeMetadata metadata, ExecutionContext context, SoapConnection conn) { - this.connection = conn; + public SoapProcedureExecution(IProcedure procedure, SoapManagedConnectionFactory env, RuntimeMetadata metadata, ExecutionContext context, SoapService service, SecurityToken securityToken) { + this.service = service; this.metadata = metadata; this.context = context; this.procedure = procedure; this.env = env; + this.securityToken = securityToken; } /** @@ -70,7 +72,7 @@ */ public void execute() throws ConnectorException { - SoapRequest request = new SoapRequest(this.env, this.connection) { + SoapRequest request = new SoapRequest(this.env, this.service) { @Override protected String getProcedureName() { @@ -97,6 +99,11 @@ } return argsList; } + + @Override + protected SecurityToken getSecurityToken() { + return securityToken; + } }; // execute the request Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapRequest.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapRequest.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapRequest.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -23,9 +23,7 @@ package org.teiid.connector.xmlsource.soap; import java.sql.SQLXML; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.xml.transform.Source; @@ -33,7 +31,7 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.xmlsource.XMLSourcePlugin; import org.teiid.connector.xmlsource.soap.ServiceOperation.ExcutionFailedException; -import org.teiid.connector.xmlsource.soap.SoapConnection.OperationNotFoundException; +import org.teiid.connector.xmlsource.soap.SoapService.OperationNotFoundException; @@ -43,22 +41,23 @@ public abstract class SoapRequest { // Connection object. - private SoapConnection connection; - private Map outputValues = null; private SoapManagedConnectionFactory env; + private SoapService service; /** * @param env */ - public SoapRequest(SoapManagedConnectionFactory env, SoapConnection conn) { - this.connection = conn; + public SoapRequest(SoapManagedConnectionFactory env, SoapService service) { this.env = env; + this.service = service; } protected abstract String getProcedureName(); protected abstract List getInputParameters(); + protected abstract SecurityToken getSecurityToken(); + /** * @see org.teiid.connector.api.ProcedureExecution#execute(org.teiid.connector.language.IProcedure, int) */ @@ -82,21 +81,23 @@ Object[] args = argsList.toArray(new Object[argsList.size()]); try { - ServiceOperation operation = this.connection.findOperation(sourceProcedureName); + ServiceOperation operation = this.service.findOperation(sourceProcedureName); - this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString("service_execute", new Object[] {operation.name})); //$NON-NLS-1$ + this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString("service_execute", new Object[] {operation.getName()})); //$NON-NLS-1$ for (int i = 0; i < args.length; i++) { this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString( "service_params", new Object[] {args[i]})); //$NON-NLS-1$ } - this.outputValues = new HashMap(); - Source returnValue = operation.execute(args, outputValues); + Source returnValue = operation.execute(args, getSecurityToken()); + this.env.getLogger().logDetail(XMLSourcePlugin.Util.getString("xml_contents", new Object[] {returnValue})); //$NON-NLS-1$ + return convertToXMLType(returnValue); + } catch (OperationNotFoundException e) { throw new ConnectorException(e); - } catch(ExcutionFailedException e) { - throw new ConnectorException(e); + } catch (ExcutionFailedException e) { + throw new ConnectorException(e); } } @@ -114,12 +115,4 @@ public List<?> getOutputParameterValues() throws ConnectorException { throw new ConnectorException(XMLSourcePlugin.Util.getString("No_outputs_allowed")); //$NON-NLS-1$ } - - public void close() throws ConnectorException { - // no-op - } - - public void cancel() throws ConnectorException { - // no-op - } } Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapService.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapService.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/java/org/teiid/connector/xmlsource/soap/SoapService.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -22,105 +22,136 @@ package org.teiid.connector.xmlsource.soap; -import java.util.Hashtable; +import java.net.URL; import java.util.Iterator; import java.util.List; +import java.util.Map; +import javax.wsdl.Binding; +import javax.wsdl.BindingOperation; +import javax.wsdl.Operation; +import javax.wsdl.Port; +import javax.wsdl.Service; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.soap.SOAPAddress; +import javax.wsdl.extensions.soap.SOAPBinding; +import javax.wsdl.extensions.soap.SOAPOperation; import javax.xml.namespace.QName; -import javax.xml.rpc.ServiceException; +import javax.xml.transform.Source; +import javax.xml.ws.Dispatch; -import org.apache.axis.AxisEngine; -import org.apache.axis.ConfigurationException; -import org.apache.axis.EngineConfiguration; -import org.apache.axis.Handler; -import org.apache.axis.SimpleChain; -import org.apache.axis.encoding.TypeMappingRegistry; -import org.apache.axis.handlers.soap.SOAPService; -import org.apache.axis.wsdl.gen.Parser; - /** * This is SOAP Service which extends the Axis service call so that we can dynamically * include the handlers into the request and response flows. */ -public class SoapService extends org.apache.axis.client.Service { - SecurityToken securityToken; +public class SoapService { + private URL wsdlLocation; + private Service wsdlService; + private Port port; + private String style; + private String targetnameSpace; - public SoapService(Parser parser, QName serviceName, SecurityToken secToken) throws ServiceException { - super(parser, serviceName); - this.securityToken = secToken; + public SoapService(URL wsdlLocation, Service service, String portName, String namespace) { + this.wsdlService = service; + this.wsdlLocation = wsdlLocation; + this.port = selectPort(service.getPorts(), portName); + this.style = buildStyle(this.port); + this.targetnameSpace = namespace; } - @Override - protected EngineConfiguration getEngineConfiguration() { - EngineConfiguration config = super.getEngineConfiguration(); - return new ClientEngineConfiguration(config); - } - + + public QName getServiceName() { + return this.wsdlService.getQName(); + } + /** - * Engine Configuration class which has the request and response flow handlers + * Get Port to be used for the + * @param ports + * @param portName + * @return + * @throws Exception */ - class ClientEngineConfiguration implements EngineConfiguration{ - EngineConfiguration config = null; - - public ClientEngineConfiguration(EngineConfiguration config) { - this.config = config; + private Port selectPort(Map ports, String portName) { + Iterator valueIterator = ports.keySet().iterator(); + while (valueIterator.hasNext()) { + String name = (String) valueIterator.next(); + + if ((portName == null) || (portName.length() == 0)) { + Port port = (Port) ports.get(name); + List list = port.getExtensibilityElements(); + + for (int i = 0; (list != null) && (i < list.size()); i++) { + Object obj = list.get(i); + if (obj instanceof SOAPAddress) { + return port; + } + } + } else if ((name != null) && name.equals(portName)) { + return (Port) ports.get(name); + } } + return null; + } + + + /** + * Build a map of available operations in the WSDL + * @param wsdlParser + */ + private String buildStyle(Port usePort) { + Binding binding = usePort.getBinding(); - public void configureEngine(AxisEngine engine) throws ConfigurationException { - config.configureEngine(engine); + // find out from the soap binding style what type of service is this. + // if the style is document then it is doc-litral + String style = null; + for (Iterator i = binding.getExtensibilityElements().iterator(); i.hasNext();) { + final ExtensibilityElement extElement = (ExtensibilityElement)i.next(); + if (extElement instanceof SOAPBinding) { + style = ((SOAPBinding)extElement).getStyle(); + } } - public void writeEngineConfig(AxisEngine engine) throws ConfigurationException { - config.writeEngineConfig(engine); - } - - public Handler getHandler(QName name) throws ConfigurationException { - return config.getHandler(name); - } - - public SOAPService getService(QName name) throws ConfigurationException { - return config.getService(name); - } - - public SOAPService getServiceByNamespaceURI(String uri) throws ConfigurationException { - return config.getServiceByNamespaceURI(uri); - } - - public Handler getTransport(QName name) throws ConfigurationException { - return config.getTransport(name); - } - - public TypeMappingRegistry getTypeMappingRegistry() throws ConfigurationException { - return config.getTypeMappingRegistry(); - } - - public Handler getGlobalRequest() throws ConfigurationException { - SimpleChain requestHandler = (SimpleChain)config.getGlobalRequest(); - if (requestHandler == null) { - requestHandler = new SimpleChain(); + // if the style not found on the binding then look for it on the operation. + if (style == null) { + for(Iterator i = binding.getBindingOperations().iterator(); i.hasNext();) { + BindingOperation operation = (BindingOperation)i.next(); + List extElements = operation.getExtensibilityElements(); + for (final Iterator extIter = extElements.iterator(); extIter.hasNext();) { + final ExtensibilityElement extElement = (ExtensibilityElement)extIter.next(); + if (extElement instanceof SOAPOperation) { + style = ((SOAPOperation)extElement).getStyle(); + } + } // for } - // if the se - if (securityToken instanceof WSSecurityToken) { - requestHandler.addHandler(new org.apache.ws.axis.security.WSDoAllSender()); - } - return requestHandler; } - - public Handler getGlobalResponse() throws ConfigurationException { - return config.getGlobalResponse(); - } - - public Hashtable getGlobalOptions() throws ConfigurationException { - return config.getGlobalOptions(); - } - - public Iterator getDeployedServices() throws ConfigurationException { - return config.getDeployedServices(); - } - - public List getRoles() { - return config.getRoles(); - } + return style; + } + + public ServiceOperation findOperation(String name) throws OperationNotFoundException { + Binding binding = this.port.getBinding(); + List<BindingOperation> bindingOperations = binding.getBindingOperations(); + + for (BindingOperation bo:bindingOperations) { + Operation operation = bo.getOperation(); + if (operation.getName().equals(name)) { + return new ServiceOperation(operation.getName(), this.port.getName(), this.style, createDispatch(), this.targetnameSpace); + } + } + throw new OperationNotFoundException(name); } + + private Dispatch<Source> createDispatch() { + // now create a stub for the operation and set on the object. + javax.xml.ws.Service executionService = javax.xml.ws.Service.create(this.wsdlLocation, this.wsdlService.getQName()); + Dispatch<Source> dispatch = executionService.createDispatch(new QName(this.wsdlService.getQName().getNamespaceURI(), this.port.getName(), "teiid"), Source.class, javax.xml.ws.Service.Mode.PAYLOAD); + return dispatch; + } + + static class OperationNotFoundException extends Exception{ + public OperationNotFoundException(String e) {super(e);} + public OperationNotFoundException(Throwable e) {super(e);} + // nothing, just marker + } + } \ No newline at end of file Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/rar/META-INF/ra.xml =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/rar/META-INF/ra.xml 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/rar/META-INF/ra.xml 2010-02-18 16:21:36 UTC (rev 1840) @@ -156,6 +156,12 @@ <config-property-name>PortName</config-property-name> <config-property-type>java.lang.String</config-property-type> </config-property> + + <config-property> + <description>{$display:"Service Name"}</description> + <config-property-name>ServiceName</config-property-name> + <config-property-type>java.lang.String</config-property-type> + </config-property> <config-property> <description>{$display:"Query Timeout"}</description> Modified: branches/JCA/connectors/connector-xmlsource-soap/src/main/resources/org/teiid/connector/xmlsource/i18n.properties =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/main/resources/org/teiid/connector/xmlsource/i18n.properties 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/main/resources/org/teiid/connector/xmlsource/i18n.properties 2010-02-18 16:21:36 UTC (rev 1840) @@ -54,4 +54,5 @@ No_such_auth_type=Requested Authorization support is currently not available:{0}; Or invalid type specified. No_ws_security_type=Ws-Secuirty type selected for web service authentication, however the type of WS-Security being used not specified, Please provide "WSSecurityType" property in the connector binding properties No_such_ws_security_type=The specified WS-Secuity type "{0}" is invalid or not currently supported, please correct the connector binding properties. -XML_file_does_not_UTF8=XML File being read can not be converted to UTF-8 encoding. \ No newline at end of file +XML_file_does_not_UTF8=XML File being read can not be converted to UTF-8 encoding. +support_only_doc_literal=Web service execution only supports DOC-Literal style of web services. \ No newline at end of file Modified: branches/JCA/connectors/connector-xmlsource-soap/src/test/java/com/metamatrix/connector/xmlsource/soap/service/StockQuotes.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/test/java/com/metamatrix/connector/xmlsource/soap/service/StockQuotes.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/test/java/com/metamatrix/connector/xmlsource/soap/service/StockQuotes.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -26,11 +26,18 @@ /** */ public class StockQuotes { - - public String GetQuote(String symbol) throws Exception { - if (symbol.equalsIgnoreCase("msft")) {//$NON-NLS-1$ + + public String GetSymbol(String name) throws Exception { + if (name.equalsIgnoreCase("Redhat")) {//$NON-NLS-1$ + return "<symbol>RHT</symbol>"; //$NON-NLS-1$ + } + throw new Exception("Invalid Symbol"); //$NON-NLS-1$ + } + + public String GetQuote(String foo) throws Exception { + if (foo.equalsIgnoreCase("msft")) {//$NON-NLS-1$ return "<company name=\"Microsoft Corp\">23.23</company>"; //$NON-NLS-1$ } throw new Exception("Invalid Symbol"); //$NON-NLS-1$ - } + } } Deleted: branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnection.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnection.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnection.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -1,82 +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 org.teiid.connector.xmlsource.soap; - -import java.io.File; - -import junit.framework.TestCase; - -import org.mockito.Mockito; -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$ - } -} Copied: branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnector.java (from rev 1826, branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnection.java) =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnector.java (rev 0) +++ branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnector.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.xmlsource.soap; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertTrue; +import static junit.framework.Assert.fail; + +import java.io.File; + +import org.junit.Ignore; +import org.junit.Test; +import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.xmlsource.soap.SoapService.OperationNotFoundException; + +import com.metamatrix.core.util.UnitTestUtil; + +@Ignore +public class TestSoapConnector { + + @Test + public void testNoWSDL() throws Exception { + SoapManagedConnectionFactory env = Mockito.mock(SoapManagedConnectionFactory.class); + Mockito.stub(env.getLogger()).toReturn(Mockito.mock(ConnectorLogger.class)); + + try { + SoapConnector c = new SoapConnector(); + c.initialize(env); + fail("WSDL is not set; must have failed"); //$NON-NLS-1$ + } catch (ConnectorException e) { + //pass + } + } + + @Test + 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()); + + SoapConnector c = new SoapConnector(); + c.initialize(env); + + assertEquals("StockQuotes", c.getService().getServiceName().getLocalPart()); //$NON-NLS-1$ + assertTrue("Operation Not Found", (c.getService().findOperation("GetQuote")!=null)); //$NON-NLS-1$ //$NON-NLS-2$ + try { + c.getService().findOperation("GetQuoteX"); + fail("Operation Should Not have Found"); //$NON-NLS-1$ //$NON-NLS-2$ + } catch(OperationNotFoundException e) { + + } + } +} Property changes on: branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapConnector.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapExecution.java =================================================================== --- branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapExecution.java 2010-02-18 02:45:34 UTC (rev 1839) +++ branches/JCA/connectors/connector-xmlsource-soap/src/test/java/org/teiid/connector/xmlsource/soap/TestSoapExecution.java 2010-02-18 16:21:36 UTC (rev 1840) @@ -33,6 +33,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; +import org.junit.Ignore; import org.mockito.Mockito; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ExecutionContext; @@ -47,9 +48,8 @@ import com.metamatrix.connector.xmlsource.soap.service.WebServiceServer; import com.metamatrix.core.util.UnitTestUtil; - -/** - */ +// All the security needs to redone using JBossWS-Native, until then do not run this class. +@Ignore public class TestSoapExecution extends TestCase { private static WebServiceServer server = null; @@ -69,6 +69,7 @@ } public static void setUpOnce() throws Exception{ + System.setProperty("javax.xml.transform.TransformerFactory", "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"); server = new WebServiceServer(); server.startServer(7001); } @@ -127,7 +128,10 @@ 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:...; //$NON-NLS-1$ + //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:...; //$NON-NLS-1$ + String in = "<symbol>MSFT</symbol>"; //$NON-NLS-1$ + + //String in = "<tns1:GetQuote 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\"><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$ @@ -138,6 +142,20 @@ } } + public void testDocLitralExecution2() throws Exception { + SoapManagedConnectionFactory env = new SoapManagedConnectionFactory(); + env.setLogWriter(Mockito.mock(PrintWriter.class)); + env.setWsdl("http://localhost:8080/teiid-ws/Echo?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:...; //$NON-NLS-1$ + String in = "<arg0>hello</arg0>"; //$NON-NLS-1$ + + //String in = "<tns1:GetQuote 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\"><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("echo", new Object[] {in}, env, expected); //$NON-NLS-1$ + // end of test + } + public void testRPCLitralExecution() throws Exception { server.deployService(UnitTestUtil.getTestDataPath()+"/service/StockQuotes/rpc-literal-deploy.wsdd"); //$NON-NLS-1$ @@ -601,8 +619,10 @@ // utility method to execute a service void executeSOAP(String procName, Object[] args, SoapManagedConnectionFactory env, String expected) throws Exception{ - - SoapConnection conn = new SoapConnection(env); + SoapConnector connector = new SoapConnector(); + connector.initialize(env); + + SoapConnection conn =(SoapConnection) connector.getConnection(); RuntimeMetadata metadata = Mockito.mock(RuntimeMetadata.class); ILanguageFactory fact = env.getLanguageFactory(); List parameters = new ArrayList();