Tb-reach, hpv, and anc merge

assets/config/couchdb.properties

@@ -1,3 +1,4 @@
+#this file is used by motech
 host=localhost
 port=5984
 maxConnections=20

assets/config/opensrp.properties

@@ -20,7 +20,7 @@ mcts-report-delay-in-days=10
 mcts.poll.time.interval.in.minutes=10
 
 # OpenMRS configuration
-openmrs.url=http://localhost:8181/openmrs/
+openmrs.url=http://localhost:8080/openmrs/
 openmrs.username=admin
 openmrs.password=Admin123
 openmrs.idgen.url=/module/idgen/exportIdentifiers.form
@@ -51,7 +51,7 @@ jdbc.backend=MYSQL
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.username=root
 jdbc.password=VA1913wm
-jdbc.url=jdbc:mysql://localhost:3306/opensrp_tbreach?createDatabaseIfNotExist=true
+jdbc.url=jdbc:mysql://localhost:3306/opensrp?createDatabaseIfNotExist=true
 
 ##jdbc url with server and port but without database
 jdbc.url-wo-db=jdbc:mysql://localhost:3306
@@ -98,4 +98,4 @@ opensrp.authencation.cache.ttl=600
 redis.host=localhost
 redis.port=6379
 redis.password=RedI$P@S5
-redis.pool.max.connections=25
+redis.pool.max.connections=25

assets/config/schedule_tracking.properties

@@ -1 +1,2 @@
+#this file is used by motech
 schedule.definitions.directory=/schedules

assets/migrations/environments/development.properties

@@ -82,4 +82,4 @@ core_tablespace_location='/opt/postgres/core'
 error_tablespace_location ='/opt/postgres/error'
 schedule_tablespace_location='/opt/postgres/schedule'
 feed_tablespace_location='/opt/postgres/feed'
-form_tablespace_location='/opt/postgres/form'
+form_tablespace_location='/opt/postgres/form'

build/maven.properties

@@ -1,16 +1,16 @@
 #database configuration that is not likely to change unless massive refactoring  
-couchdb.db.opensrp=opensrp_tbreach
-couchdb.db.form=opensrp-form_tbreach
-couchdb.db.atomfeed=atomfeed_tbreach
-couchdb.db.mcts=opensrp-mcts_tbreach
-couchdb.db.motech-scheduletracking=motech-scheduletracking-api_tbreach
-couchdb.db.error=opensrp-errortrace_tbreach
+couchdb.db.opensrp=opensrp
+couchdb.db.form=opensrp-form
+couchdb.db.atomfeed=atomfeed
+couchdb.db.mcts=opensrp-mcts
+couchdb.db.motech-scheduletracking=motech-scheduletracking-api
+couchdb.db.error=opensrp-errortrace
 
 
-db.quartz=motechquartz_tbreach
-db.reporting=opensrp_tbreach
-db.reporting.report=report_tbreach
-db.reporting.anm=anm_report_tbreach
+db.quartz=motechquartz
+db.reporting=opensrp
+db.reporting.report=report
+db.reporting.anm=anm_report
 
 
 #selenium

opensrp-common/pom.xml

@@ -120,6 +120,10 @@
             <version>2.3</version>
             <scope>test</scope>
         </dependency>
-
+           <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.2</version>
+    </dependency>
     </dependencies>
 </project>

opensrp-common/src/main/java/org/opensrp/common/util/CustomCertificateSSLSocketFactory.java

@@ -30,7 +30,7 @@ public CustomCertificateSSLSocketFactory(KeyStore truststore) throws NoSuchAlgor
         super(truststore);
 
         System.setProperty("disable_bad_sslciphers", "yes");
-    	System.setProperty("jsse.enableSNIExtension", "false");
+    	System.setProperty("jsse.enableSNIExtension", "true");
 
         TrustManager tm = new X509TrustManager() {
             public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {

opensrp-common/src/main/java/org/opensrp/common/util/HostNameSetter.java

@@ -0,0 +1,77 @@
+package org.opensrp.common.util;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.net.ssl.SSLSocket;
+
+public class HostNameSetter {
+
+	private static final AtomicReference<HostNameSetter> CURRENT = new AtomicReference<>();
+
+	private final WeakReference<?> cls;
+	private final WeakReference<Method> setter;
+
+	private HostNameSetter(Class<?> clazz, Method setter) {
+		this.cls = new WeakReference<>(clazz);
+		this.setter = setter == null ? null : new WeakReference<>(setter);
+	}
+
+	private static Method init(Class<?> cls) {
+		Method s = null;
+		try {
+			s = cls.getMethod("setHost", String.class);
+		} catch (Exception e) {
+			initFail(e);
+		}
+		CURRENT.set(new HostNameSetter(cls, s));
+		return s;
+	}
+
+	private static void initFail(Exception e) {
+		// ignore
+	}
+
+	private Method reuse(Class<?> cls) {
+		final boolean wrongClass = this.cls.get() != cls;
+		if (wrongClass) {
+			return init(cls);
+		}
+
+		final boolean setterNotSupported = this.setter == null;
+		if (setterNotSupported) {
+			return null;
+		}
+
+		final Method s = setter.get();
+		final boolean setterLost = s == null;
+		return setterLost ? init(cls) : s;
+	}
+
+	/**
+	 * Invokes the {@code #setName(String)} method if one is present.
+	 *
+	 * @param hostname
+	 *            the name to set
+	 * @param sslsock
+	 *            the socket
+	 */
+	public static void setServerNameIndication(String hostname, SSLSocket sslsock) {
+		final Class<?> cls = sslsock.getClass();
+		final HostNameSetter current = CURRENT.get();
+		final Method setter = (current == null) ? init(cls) : current.reuse(cls);
+		if (setter != null) {
+			try {
+				setter.invoke(sslsock, hostname);
+			} catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {
+				setServerNameIndicationFail(e);
+			}
+		}
+	}
+
+	private static void setServerNameIndicationFail(Exception e) {
+		// ignore
+	}
+}