Author: shawkins Date: 2012-07-20 15:20:16 -0400 (Fri, 20 Jul 2012) New Revision: 4252 Modified: trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java trunk/jboss-integration/src/test/resources/teiid-transport-config.txt Log: TEIID-2108 correcting the other ssl defaults Modified: trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd =================================================================== --- trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2012-07-20 17:59:38 UTC (rev 4251) +++ trunk/jboss-integration/src/main/resources/schema/jboss-teiid.xsd 2012-07-20 19:20:16 UTC (rev 4252) @@ -338,13 +338,13 @@ </xs:complexType> </xs:element> </xs:sequence> - <xs:attribute name="mode" default="disabled"> + <xs:attribute name="mode" default="login"> <xs:annotation> <xs:documentation>can be one of disabled, login, or enabled disabled = no transport or message level security will be used login = only the login traffic will be encrypted at a message level using 128 bit AES with an ephemerial DH key exchange. - No other config values are needed in this mode + No other config values are needed in this mode; and it only applies to the JDBC transport enabled = traffic will be secured using this configuration</xs:documentation> </xs:annotation> <xs:simpleType> @@ -355,7 +355,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="authentication-mode" default="anonymous"> + <xs:attribute name="authentication-mode" default="1-way"> <xs:annotation> <xs:documentation>1-way, 2-way, anonymous</xs:documentation> </xs:annotation> @@ -367,7 +367,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="ssl-protocol" type="xs:string"/> + <xs:attribute name="ssl-protocol" type="xs:string" default="TLSv1"/> <xs:attribute name="keymanagement-algorithm" type="xs:string"/> <xs:attribute name="enable" type="xs:boolean"/> </xs:complexType> Modified: trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java =================================================================== --- trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-07-20 17:59:38 UTC (rev 4251) +++ trunk/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java 2012-07-20 19:20:16 UTC (rev 4252) @@ -126,7 +126,6 @@ private void validate(String marshalled) throws SAXException, IOException { URL xsdURL = Thread.currentThread().getContextClassLoader().getResource("schema/jboss-teiid.xsd"); - System.out.println(marshalled); SchemaFactory factory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema"); Schema schema = factory.newSchema(xsdURL); Modified: trunk/jboss-integration/src/test/resources/teiid-transport-config.txt =================================================================== --- trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2012-07-20 17:59:38 UTC (rev 4251) +++ trunk/jboss-integration/src/test/resources/teiid-transport-config.txt 2012-07-20 19:20:16 UTC (rev 4252) @@ -66,13 +66,13 @@ "type" => STRING, "description" => "Authentication Mode (1-way, 2-way, anonymous) ", "required" => false, - "default" => "anonymous" + "default" => "1-way" }, "ssl-ssl-protocol" => { "type" => STRING, "description" => "SSL protocol used", "required" => false, - "default" => "SSLv3" + "default" => "TLSv1" }, "ssl-keymanagement-algorithm" => { "type" => STRING,