Index: lams_build/build.xml
===================================================================
diff -u -r4fdb87399fda5ddd4cf8316e0e039cd4eb9d758e -r0eec15acf1dc4180eb9685a816ba92d0954aeb31
--- lams_build/build.xml	(.../build.xml)	(revision 4fdb87399fda5ddd4cf8316e0e039cd4eb9d758e)
+++ lams_build/build.xml	(.../build.xml)	(revision 0eec15acf1dc4180eb9685a816ba92d0954aeb31)
@@ -142,14 +142,6 @@
 
 	
 	<target name="build-db" description="Rebuilds LAMS Database.">
-		<echo>Copying embedded MySQL drivers to library dir, if available</echo>
-		<copy todir="../lams_build/lib/mysql" overwrite="false" verbose="true">
-			<fileset dir="../mysql_embedded/connectors" erroronmissingdir="false">
-				<include name="*-driver.jar" />
-				<include name="*-db-files-${osPropertiesName}.jar" />
-			</fileset>
-		</copy>
-		
 		<ant antfile="../lams_common/build.xml" target="build-db" inheritAll="false" />
 	</target>
 	
@@ -167,6 +159,7 @@
 		<ant antfile="../lams_gradebook/build.xml"         target="_build-product" inheritAll="false" />
 	</target>
 	
+	
 	<target name="_build-ear" depends="_clean-dirs, _build-core">
 		<!-- Internal target: Assembles LAMS EAR in exploded form -->
 		<echo>${ant.project.name}: Copying libraries</echo>
@@ -630,7 +623,6 @@
 			<fileset file="${conf.dir}/standalone.xml" />
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        	<filter token="db.timezone" value="${db.timezone}"/>
@@ -644,7 +636,6 @@
 			<fileset file="${conf.dir}/slim/standalone.xml" />
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        	<filter token="db.timezone" value="${db.timezone}"/>
@@ -737,7 +728,6 @@
 			</fileset>
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        	<filter token="db.timezone" value="${db.timezone}"/>
Index: lams_build/build_base.xml
===================================================================
diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -r0eec15acf1dc4180eb9685a816ba92d0954aeb31
--- lams_build/build_base.xml	(.../build_base.xml)	(revision be86c0bc220914398d3ce8ec9ae9cab91b47353a)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 0eec15acf1dc4180eb9685a816ba92d0954aeb31)
@@ -21,6 +21,7 @@
 		<fileset dir="../../lams/lams_build/lib">
 			<include name="**/*.jar" />
 		</fileset>
+		<fileset file="../../lams/lams_common/build/lib/lams.jar" />
 		<!-- Same list as in projects' .classpath file references to WildFly modules.
 			 They need to be exactly listed as **/*.jar would load other versions of JARs
 			 that are also present in lams_build/lib.
@@ -48,8 +49,6 @@
 			<include name="org/apache/commons/io/main/commons-io-*.jar" />
 			<include name="org/apache/commons/lang/main/commons-lang-*.jar" />
 			<include name="org/apache/commons/codec/main/commons-codec-*.jar" />
-			<include name="org/apache/httpcomponents/core/main/httpclient-*.jar" />
-			<include name="org/apache/httpcomponents/core/main/httpcore-*.jar" />
 			<include name="javax/websocket/api/main/jboss-websocket-api*.jar" />
 			<include name="org/jboss/as/controller-client/main/wildfly-controller-client-*.jar" />
 			<include name="org/jboss/dmr/main/jboss-dmr-*.jar" />
@@ -156,7 +155,13 @@
 	<!-- Compilations								                      -->
 	<!-- ================================================================ -->
 
-	<target name="_compile-java" depends="_clean-dirs">
+	<available property="common.jar.exists" file="../../lams/lams_common/build/lib/lams.jar" type="file" />
+	
+	<target name="_build-common" unless="common.jar.exists">
+		<ant antfile="../lams_common/build.xml" target="_build-jar" inheritAll="false"/>
+	</target>
+	
+	<target name="_compile-java-nocommon" depends="_clean-dirs">
 		<!-- Internal target: Compile Java sources. -->
 		<echo>${ant.project.name}: Compiling Java sources</echo>
 		<javac srcdir="${src.java.dir}"
@@ -183,6 +188,8 @@
 		</copy>
 	</target>
 
+	<target name="_compile-java" depends="_build-common, _compile-java-nocommon" />
+
 	<!-- ================================================================ -->
 	<!-- Build archives        		    	          					  -->
 	<!-- ================================================================ -->
@@ -277,16 +284,6 @@
 	</target>
 	
 	
-	<target name="copy-to-lams-lib" if="product.core" depends="_build-jar"
-		    description="Copies JAR file to lams_build/lib/lams for other projects to use.">
-  		<copy overwrite="yes" todir="../../lams/lams_build/lib/lams">
-  			<fileset dir="${basedir}/build/lib">
-  				<include name="${product}.jar"/>
-  			</fileset>
-  		</copy>	
-	</target>
-	
-	
 	<target name="_add-conf-module">
 		<!-- Internal target: Adds subprojects' JAR/WAR to LAMS EAR application.xml -->
 		<property name="moduleActivationPlaceholder" value="&lt;!-- Optional Module Placeholder - do not remove --&gt;" />
Index: lams_build/conf/domain.xml
===================================================================
diff -u -r6986a20e217fd94d310d64a92f582a09b2ccc406 -r0eec15acf1dc4180eb9685a816ba92d0954aeb31
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision 6986a20e217fd94d310d64a92f582a09b2ccc406)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision 0eec15acf1dc4180eb9685a816ba92d0954aeb31)
@@ -41,6 +41,7 @@
         <extension module="org.wildfly.iiop-openjdk"/>
     </extensions>
     <system-properties>
+        <!-- IPv4 is not required, but setting this helps avoid unintended use of IPv6 -->
         <property name="java.net.preferIPv4Stack" value="true"/>
     </system-properties>
     <management>
@@ -228,62 +229,49 @@
             <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
             <subsystem xmlns="urn:jboss:domain:datasources:5.0">
                 <datasources>
-					<datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="true">
-					    <connection-url>@db.url.run@</connection-url>
-					    <driver>MySQL</driver>
-					    <connection-property name="characterEncoding">utf8</connection-property>
-					    <connection-property name="useUnicode">true</connection-property>
-					    <connection-property name="zeroDateTimeBehavior">CONVERT_TO_NULL</connection-property>
-					    <connection-property name="useSSL">false</connection-property>
-					    <connection-property name="autoReconnect">true</connection-property>
-					    <connection-property name="useLegacyDatetimeCode">false</connection-property>
-					    <connection-property name="serverTimezone">@db.timezone@</connection-property>
-					    
-					    <!-- Properties below are used only for embedded MySQL server -->
-					    <connection-property name="server.basedir">@db.location@</connection-property>
-					    <connection-property name="createDatabaseIfNotExist">false</connection-property>
-					    <connection-property name="server.initialize-user">false</connection-property>
-					    <connection-property name="server.thread_stack">128K</connection-property>
-					    <connection-property name="server.table_cache">4</connection-property>
-					    <connection-property name="server.read_buffer_size">256K</connection-property>
-					    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
-					    <connection-property name="server.max_allowed_packet">1M</connection-property>
-					    <connection-property name="server.key_buffer">16K</connection-property>
-					    <connection-property name="server.sort_buffer_size">64K</connection-property>
-					    <connection-property name="server.net_buffer_length">2K</connection-property>
-					    
-					    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-					    <pool>
-					      <min-pool-size>0</min-pool-size>
-					      <initial-pool-size>0</initial-pool-size>
-					      <max-pool-size>64</max-pool-size>
-					      <prefill>false</prefill>
-					      <use-strict-min>false</use-strict-min>
-					      <flush-strategy>FailingConnectionOnly</flush-strategy>
-					    </pool>
-					    <security>
-					      <user-name>@db.username@</user-name>
-					      <password>@db.password@</password>
-					    </security>
-					    <validation>
-					      <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
-					      <validate-on-match>true</validate-on-match>
-					      <background-validation>false</background-validation>
-					      <use-fast-fail>false</use-fast-fail>
-					    </validation>
-					    <timeout>
-					      <idle-timeout-minutes>5</idle-timeout-minutes>
-					      <xa-resource-timeout>0</xa-resource-timeout>
-					    </timeout>
-					    <statement>
-					      <track-statements>false</track-statements>
-					    </statement>
-				  	</datasource>
-				  
-	                <drivers>
-	                    <driver name="MySQL" module="com.mysql" />
-	                </drivers>
-                </datasources>
+                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false" jta="true">
+				    <connection-url>@db.url.run@</connection-url>
+				    <driver>MySQL</driver>
+				    <connection-property name="characterEncoding">utf8</connection-property>
+				    <connection-property name="useUnicode">true</connection-property>
+				    <connection-property name="zeroDateTimeBehavior">CONVERT_TO_NULL</connection-property>
+				    <connection-property name="useSSL">false</connection-property>
+				    <connection-property name="autoReconnect">true</connection-property>
+				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
+				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
+				    
+				    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+				    <pool>
+				      <min-pool-size>0</min-pool-size>
+				      <initial-pool-size>0</initial-pool-size>
+				      <max-pool-size>64</max-pool-size>
+				      <prefill>false</prefill>
+				      <use-strict-min>false</use-strict-min>
+				      <flush-strategy>FailingConnectionOnly</flush-strategy>
+				    </pool>
+				    <security>
+				      <user-name>@db.username@</user-name>
+				      <password>@db.password@</password>
+				    </security>
+				    <validation>
+				      <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
+				      <validate-on-match>true</validate-on-match>
+				      <background-validation>false</background-validation>
+				      <use-fast-fail>false</use-fast-fail>
+				    </validation>
+				    <timeout>
+				      <idle-timeout-minutes>5</idle-timeout-minutes>
+				      <xa-resource-timeout>0</xa-resource-timeout>
+				    </timeout>
+				    <statement>
+				      <track-statements>false</track-statements>
+				    </statement>
+			  	</datasource>
+			  
+                <drivers>
+                    <driver name="MySQL" module="com.mysql" />
+                </drivers>
+            </datasources>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
             <subsystem xmlns="urn:jboss:domain:ee:4.0">
@@ -313,10 +301,15 @@
                     <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/>
                     <singleton default-access-timeout="5000"/>
                 </session-bean>
+                <mdb>
+                    <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
+                    <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+                </mdb>
                 <pools>
                     <bean-instance-pools>
                         <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                         <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                        <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                     </bean-instance-pools>
                 </pools>
                 <caches>
@@ -525,6 +518,7 @@
             <subsystem xmlns="urn:jboss:domain:jmx:1.3">
                 <expose-resolved-model/>
                 <expose-expression-model/>
+                <!--<remoting-connector use-management-endpoint="false"/>-->
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:jpa:1.1">
                 <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
@@ -551,6 +545,7 @@
             <subsystem xmlns="urn:jboss:domain:remoting:4.0">
                 <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
             </subsystem>
+            <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/>
             <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
             <subsystem xmlns="urn:jboss:domain:resource-adapters:5.0"/>
             <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
@@ -571,6 +566,11 @@
                             <policy-module code="Delegating" flag="required"/>
                         </authorization>
                     </security-domain>
+                    <security-domain name="jboss-ejb-policy" cache-type="default">
+                        <authorization>
+                            <policy-module code="Delegating" flag="required"/>
+                        </authorization>
+                    </security-domain>
                     <security-domain name="jaspitest" cache-type="default">
                         <authentication-jaspi>
                             <login-module-stack name="dummy">
@@ -634,6 +634,10 @@
                 <handlers>
                     <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
                 </handlers>
+                <filters>
+                    <response-header name="server-header" header-name="Server" header-value="WildFly/10"/>
+                    <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
+                </filters>
             </subsystem>
             <subsystem xmlns="urn:jboss:domain:webservices:2.0">
                 <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
@@ -648,6 +652,15 @@
             <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
         </profile>
     </profiles>
+    <!--
+      ~ 
+      ~          Named interfaces that can be referenced elsewhere in the configuration. The configuration
+      ~          for how to associate these logical names with an actual network interface can either
+      ~          be specified here or can be declared on a per-host basis in the equivalent element in host.xml.
+      ~ 
+      ~          These default configurations require the binding specification to be done in host.xml.
+      ~     
+      -->
     <interfaces>
         <interface name="management"/>
         <interface name="public"/>
@@ -657,16 +670,23 @@
         <interface name="private">
             <inet-address value="${jboss.bind.address.private:127.0.0.1}"/>
         </interface>
+        <interface name="unsecure">
+            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
+        </interface>
     </interfaces>
     <socket-binding-groups>
         <socket-binding-group name="ha-sockets" default-interface="public">
+            <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
             <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="${jboss.https.port:8443}"/>
             <socket-binding name="modcluster" multicast-address="${jboss.modcluster.multicast.address:224.0.1.105}" multicast-port="23364"/>
             <socket-binding name="jgroups-mping" interface="private" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" interface="private" port="7600"/>
+            <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
             <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
+            <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
+            <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
             <socket-binding name="txn-status-manager" port="4713"/>
             <outbound-socket-binding name="mail-smtp">
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -r1b88aa3b08f1ef2523a2de5225ce011d7403d435 -r0eec15acf1dc4180eb9685a816ba92d0954aeb31
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 1b88aa3b08f1ef2523a2de5225ce011d7403d435)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 0eec15acf1dc4180eb9685a816ba92d0954aeb31)
@@ -29,7 +29,6 @@
      <!--  <module name="org.apache.commons.pool" export="true" />  WildFly 14 does not provide this library. It seems not neccessary anymore, though.-->
       <module name="org.apache.commons.fileupload" export="true" />
       <module name="org.apache.commons.validator" export="true" />
-      <module name="org.apache.httpcomponents" export="true" />
       <module name="org.apache.xmlcommons" export="true" />
       <module name="org.infinispan" export="true" />
       <module name="org.imsglobal" export="true" />
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r489e21001d0359e9f84fc6674d482b0d4a7df2b8 -r0eec15acf1dc4180eb9685a816ba92d0954aeb31
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 489e21001d0359e9f84fc6674d482b0d4a7df2b8)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 0eec15acf1dc4180eb9685a816ba92d0954aeb31)
@@ -270,19 +270,6 @@
 				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
 				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
 				    
-				    <!-- Properties below are used only for embedded MySQL server -->
-				    <connection-property name="server.basedir">@db.location@</connection-property>
-				    <connection-property name="createDatabaseIfNotExist">false</connection-property>
-				    <connection-property name="server.initialize-user">false</connection-property>
-				    <connection-property name="server.thread_stack">128K</connection-property>
-				    <connection-property name="server.table_cache">4</connection-property>
-				    <connection-property name="server.read_buffer_size">256K</connection-property>
-				    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
-				    <connection-property name="server.max_allowed_packet">1M</connection-property>
-				    <connection-property name="server.key_buffer">16K</connection-property>
-				    <connection-property name="server.sort_buffer_size">64K</connection-property>
-				    <connection-property name="server.net_buffer_length">2K</connection-property>
-				    
 				    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
 				    <pool>
 				      <min-pool-size>0</min-pool-size>
Index: lams_central/.classpath
===================================================================
diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -r0eec15acf1dc4180eb9685a816ba92d0954aeb31
--- lams_central/.classpath	(.../.classpath)	(revision be86c0bc220914398d3ce8ec9ae9cab91b47353a)
+++ lams_central/.classpath	(.../.classpath)	(revision 0eec15acf1dc4180eb9685a816ba92d0954aeb31)
@@ -24,8 +24,6 @@
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/httpcomponents/core/main/httpclient-4.5.2.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/httpclient"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/httpcomponents/core/main/httpcore-4.4.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/httpcore"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/codec/main/commons-codec-1.10.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/servlet/main/undertow-servlet-2.0.13.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/core/main/undertow-core-2.0.13.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/client/version.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/conn/ssl/PrivateKeyDetails.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/conn/ssl/PrivateKeyStrategy.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLContextBuilder.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/conn/ssl/SSLContexts.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/impl/client/CloseableHttpResponseProxy.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/impl/client/DefaultClientConnectionReuseStrategy.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/impl/conn/tsccm/package-info.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0eec15acf1dc4180eb9685a816ba92d0954aeb31 refers to a dead (removed) revision in file `3rdParty_sources/httpclient/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java'.
Fisheye: No comparison available.  Pass `N' to diff?