[teiid-commits] teiid SVN: r2040 - in trunk/connectors/connector-xml-http/src/main: rar/META-INF and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: jdoyle
Date: 2010-04-08 17:31:35 -0400 (Thu, 08 Apr 2010)
New Revision: 2040

Modified:
   trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/DefaultTrustDeserializer.java
   trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequest.java
   trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequestor.java
   trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml
Log:
Resolving blocking HTTP defects.

Modified: trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/DefaultTrustDeserializer.java
===================================================================
--- trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/DefaultTrustDeserializer.java	2010-04-08 21:30:30 UTC (rev 2039)
+++ trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/DefaultTrustDeserializer.java	2010-04-08 21:31:35 UTC (rev 2040)
@@ -60,6 +60,7 @@
 
 	@Override
 	public void processPayloads() throws Exception {
-		throw new MetaMatrixRuntimeException("A custom trust payload processor needed based on the subject.");
+		// do nothing
+		//throw new MetaMatrixRuntimeException("A custom trust payload processor needed based on the subject.");
 	}
 }

Modified: trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequest.java
===================================================================
--- trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequest.java	2010-04-08 21:30:30 UTC (rev 2039)
+++ trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequest.java	2010-04-08 21:31:35 UTC (rev 2040)
@@ -172,7 +172,7 @@
     		Credentials defCred = new UsernamePasswordCredentials(this.config.getHttpBasicAuthUserName(), this.config.getHttpBasicAuthPassword());
 			client.getState().setCredentials(authScope, defCred);
 		} else {
-			throw new ConnectorException(org.teiid.connector.xml.http.Messages.getString("HTTPExecutor.bad.security.configuration"));
+			//throw new ConnectorException(org.teiid.connector.xml.http.Messages.getString("HTTPExecutor.bad.security.configuration"));
 		}
     }
 
@@ -292,17 +292,15 @@
                 }
             } else if (accessMethod.equals(HTTPConnectorState.GET)){
                 method = requestor.generateMethod(bindingURI);
-                if (pairs == null) {
-                    throw new ConnectorException(
-                            org.teiid.connector.xml.http.Messages
-                                    .getString("HTTPExecutor.parameter.name.required.for.get")); //$NON-NLS-1$
-                }
+                if (pairs != null) {
                 if(null != bindingQueryString){
                     NameValuePair[] bindingPairs = getPairsFromQueryString(xmlDoc, bindingQueryString);
                     pairs = combinePairArrays(pairs, bindingPairs);
                 }
                 addGetValues(pairs, method);
-                attemptConditionalLog("XML Connector Framework: request paramters -\n " + generatePairString(pairs)); //$NON-NLS-1$
+                attemptConditionalLog("XML Connector Framework: request paramters -\n " + generatePairString(pairs)); //$NON-NLS-1$    
+                }
+                
 
             }
             request = method;

Modified: trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequestor.java
===================================================================
--- trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequestor.java	2010-04-08 21:30:30 UTC (rev 2039)
+++ trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/http/HTTPRequestor.java	2010-04-08 21:31:35 UTC (rev 2040)
@@ -116,7 +116,7 @@
         final String cType = "text/xml; charset=utf-8"; //$NON-NLS-1$
 
         final String userAgentHeader = "User-Agent"; //$NON-NLS-1$
-        final String uAgent = "MetaMatrix Server"; //$NON-NLS-1$    	
+        final String uAgent = "Teiid Server"; //$NON-NLS-1$    	
 
         Header contentType = new Header(contentTypeHeader, cType);
         method.addRequestHeader(contentType);

Modified: trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml	2010-04-08 21:30:30 UTC (rev 2039)
+++ trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml	2010-04-08 21:31:35 UTC (rev 2040)
@@ -101,7 +101,7 @@
                 <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>-1</config-property-value>
+                <config-property-value>10000</config-property-value>
             </config-property>
             
             <config-property>