From cf9cb02abde68e2a52c4078b7ac0766341c84771 Mon Sep 17 00:00:00 2001
From: Ramesh Reddy <rareddy@jboss.org>
Date: Tue, 31 Jan 2017 14:10:24 -0500
Subject: [PATCH] TEIID-4731: Unable to connect to MongoDB pod from JBoss Data
 Virtualization (on OpenShift) (changing the default of authentication scheme
 used for MongoDB to SCRAM_SHA_1 as MongoDB >= 3.0 uses this auth scheme)

---
 .../jboss-as7/overlay/docs/teiid/teiid-releasenotes.html  | 8 ++++++++
 .../adapter/mongodb/MongoDBManagedConnectionFactory.java  | 2 +-
 connectors/connector-mongodb/src/main/rar/META-INF/ra.xml | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
index 9ff3e066b8..a2e02e9820 100644
--- a/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
+++ b/build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
@@ -224,6 +224,14 @@ <h2 class="western"><a name="Compatibility"></a>Compatibility Issues</h2>
 
 <h4 class="western">from ${project.version}</h4>  
 <ul>
+<li/>
+	<p style="margin-bottom: 0in">
+<a href='https://issues.jboss.org/browse/TEIID-4731'>TEIID-4731</a> - Unable to connect to MongoDB pod from JBoss Data Virtualization (on OpenShift) (changing the default of authentication scheme used for MongoDB to SCRAM_SHA_1 as MongoDB >= 3.0 uses this auth scheme)
+<li/>
+</ul>
+
+<h4 class="western">from 8.12.15.6_4</h4>  
+<ul>
 <li/>
 	<p style="margin-bottom: 0in">
 <a href='https://issues.jboss.org/browse/TEIID-2476'>TEIID-2476</a> - Exclude hidden tables/columns from metadata (filtering metadata based upon data roles,  improving the performance of pg system queries, allowing admin access to see everything, adding a test for properties, expanding the check of key records)
diff --git a/connectors/connector-mongodb/src/main/java/org/teiid/resource/adapter/mongodb/MongoDBManagedConnectionFactory.java b/connectors/connector-mongodb/src/main/java/org/teiid/resource/adapter/mongodb/MongoDBManagedConnectionFactory.java
index 5ed1cf83c7..2a78fa43ae 100644
--- a/connectors/connector-mongodb/src/main/java/org/teiid/resource/adapter/mongodb/MongoDBManagedConnectionFactory.java
+++ b/connectors/connector-mongodb/src/main/java/org/teiid/resource/adapter/mongodb/MongoDBManagedConnectionFactory.java
@@ -49,7 +49,7 @@ public enum SecurityType {None, SCRAM_SHA_1, MONGODB_CR, Kerberos, X509};
 	private String username;
 	private String password;
 	private String database;
-	private String securityType = SecurityType.None.name();
+	private String securityType = SecurityType.SCRAM_SHA_1.name();
 	private String authDatabase;
 	private Boolean ssl;
 
diff --git a/connectors/connector-mongodb/src/main/rar/META-INF/ra.xml b/connectors/connector-mongodb/src/main/rar/META-INF/ra.xml
index 7f73d4eacb..2d9550f6e1 100644
--- a/connectors/connector-mongodb/src/main/rar/META-INF/ra.xml
+++ b/connectors/connector-mongodb/src/main/rar/META-INF/ra.xml
@@ -64,6 +64,7 @@
                 <description>{$display:"Authentication Mechanism",$allowed:["None","SCRAM_SHA_1","MONGODB_CR", "Kerberos","X509"], $description:"Type of Authentication to used", $required:"false"}</description>
                 <config-property-name>SecurityType</config-property-name>
                 <config-property-type>java.lang.String</config-property-type>
+                <config-property-value>SCRAM_SHA_1</config-property-value>
             </config-property> 
             
             <config-property>