[teiid-commits] teiid SVN: r4250 - in trunk: build/kits/jboss-as7/standalone/configuration and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-07-20 13:43:12 -0400 (Fri, 20 Jul 2012)
New Revision: 4250

Modified:
   trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli
   trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
   trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
Log:
TEIID-2108 one more change related to the ssl mode

Modified: trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli
===================================================================
--- trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli	2012-07-20 17:06:31 UTC (rev 4249)
+++ trunk/build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli	2012-07-20 17:43:12 UTC (rev 4250)
@@ -18,7 +18,7 @@
 
 /profile=ha/subsystem=teiid:add(async-thread-pool=teiid-async, distributed-cache-jgroups-stack=udp, resultset-cache-infinispan-container=teiid-cache, policy-decider-module=org.jboss.teiid)
 /profile=ha/subsystem=teiid/transport=embedded:add()
-/profile=ha/subsystem=teiid/transport=jdbc:add(protocol=teiid, socket-binding=teiid-jdbc, ssl-mode=login, authentication-security-domain=teiid-security)
+/profile=ha/subsystem=teiid/transport=jdbc:add(protocol=teiid, socket-binding=teiid-jdbc, authentication-security-domain=teiid-security)
 /profile=ha/subsystem=teiid/transport=odbc:add(protocol=pg, socket-binding=teiid-odbc, authentication-security-domain=teiid-security) 
 
 /profile=ha/subsystem=teiid/translator=jdbc-simple:add(module=org.jboss.teiid.translator.jdbc)

Modified: trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml
===================================================================
--- trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml	2012-07-20 17:06:31 UTC (rev 4249)
+++ trunk/build/kits/jboss-as7/standalone/configuration/standalone-teiid.xml	2012-07-20 17:43:12 UTC (rev 4250)
@@ -272,7 +272,6 @@
             
             <transport name="embedded"/>
             <transport name="jdbc" protocol="teiid" socket-binding="teiid-jdbc">
-                <ssl mode="login"/>
                 <authentication security-domain="teiid-security"/>
             </transport>
             <transport name="odbc" protocol="pg" socket-binding="teiid-odbc">

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java	2012-07-20 17:06:31 UTC (rev 4249)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java	2012-07-20 17:43:12 UTC (rev 4250)
@@ -242,7 +242,6 @@
     	}		   
     	
     	SSLConfiguration ssl = new SSLConfiguration();
-    	ssl.setMode(SSLConfiguration.DISABLED);
 
     	if (Element.SSL_MODE_ATTRIBUTE.isDefined(node)) {
     		ssl.setMode(Element.SSL_MODE_ATTRIBUTE.asString(node));