Index: lams_build/build.xml
===================================================================
diff -u -rde10989b7e9fc4b49ef4061b019be99ab32a51da -rb319f1b304e58f8000912d89bb0ef97add0d3f51
--- lams_build/build.xml	(.../build.xml)	(revision de10989b7e9fc4b49ef4061b019be99ab32a51da)
+++ lams_build/build.xml	(.../build.xml)	(revision b319f1b304e58f8000912d89bb0ef97add0d3f51)
@@ -7,6 +7,8 @@
 	<property file="common.properties" />
 	<property file="${osPropertiesName}.properties" />
 	
+	<!-- Check if WildFly was slimmed. It can be any file removed in slimming process -->
+	<available file="${server.home}/standalone/configuration/standalone-full.xml" property="non-slimmed"/>
 	
 	<target name="print-usage" description="Displays Ant targets descriptions">
 		<echo>
@@ -720,15 +722,8 @@
 		
 
 		<echo>${ant.project.name}: Deploying configuration files</echo>
-		<copy todir="${server.home}/standalone/configuration" overwrite="true" verbose="true">
-			<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}"/>
-	        </filterset>
-		</copy>
+		<antcall target="_deploy-standalone-config" />
+		<antcall target="_deploy-standalone-config-slimmed" />
 		
 		<!-- DELETE org/wildfly/clustering/web/undertow module. This module is used by default
 		 (no reconfiguration possible) by Wildfly shared-session (LAMS SSO) to store web sessions as
@@ -744,37 +739,32 @@
 			<fileset dir="${server.home}/standalone/deployments" includes="lams.ear.*"/>
 		</delete>
 		<touch file="${server.home}/standalone/deployments/lams.ear.dodeploy" />
-
-		<!-- 
+	</target>
+	
+	
+	<target name="_deploy-standalone-config" if="non-slimmed">
 		<copy todir="${server.home}/standalone/configuration" overwrite="true" verbose="true">
-			<fileset dir="${conf.dir}/${osPropertiesName}/jboss">
-				<include name="login-config.xml" />
-				<include name="jboss-service.xml" />
-			</fileset>
+			<fileset file="${conf.dir}/standalone.xml" />
 	        <filterset>
-	                <filter token="confdir" value="${server.home}/standalone/configuration" />
+	        	<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}"/>
 	        </filterset>
 		</copy>
-		
-		<copy todir="${server.home}/standalone/deploymentsers/jbossweb.deployer/META-INF" overwrite="true" verbose="true">
-			<fileset dir="${conf.dir}/${osPropertiesName}/jboss/jbossweb">
-				<include name="war-deployers-jboss-beans.xml" />
-			</fileset>
+	</target>
+	
+	
+	<target name="_deploy-standalone-config-slimmed" unless="non-slimmed">
+		<copy todir="${server.home}/standalone/configuration" overwrite="true" verbose="true">
+			<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}"/>
+	        </filterset>
 		</copy>
-		
-		<copy todir="${server.home}/standalone/deployments/jbossweb.sar/" overwrite="true" verbose="true">
-			<fileset dir="${conf.dir}/${osPropertiesName}/jboss/jbossweb">
-				<include name="server.xml" />
-				<include name="context.xml" />
-			</fileset>
-		</copy>
-		
-		<copy todir="${server.home}server/default/lib" overwrite="true">	
-			<fileset dir="lib/jboss">
-				<include name="*.jar" />
-			</fileset>
-		</copy>
-		-->
 	</target>
 	
 	
@@ -824,89 +814,34 @@
 	<target name="lams-cruise-min-tools" depends="_build-ear, build-db, deploy-ear, _deploy-resources, deploy-tools-minimal"
 	        description="Builds entire LAMS without tools (used for CruiseControl instance)" />
 	
-	
 
-
 	<target name="slim-wildfly" description="Makes a backup and removes unnecessary files from Wildfly 8.1; do not run twice!">
-		<!-- Backup -->
-		<copy todir="${server.home}/wildfly-slim/modules/system/layers/base/">
-			<fileset dir="${server.home}/modules/system/layers/base/">
-				<include name="com/fasterxml/jackson/**"/>
-				<include name="com/h2database/**"/>
-				<include name="gnu/**"/>
-				<include name="org/apache/avro/**"/>
-				<include name="org/apache/lucene/main/**"/>
-				<include name="org/apache/openjpa/**"/>
-				<include name="org/codehaus/jackson/**"/>
-				<include name="org/codehaus/jettison/**"/>
-				<include name="org/eclipse/**"/>
-				<include name="org/hibernate/3/**"/>
-				<include name="org/hibernate/4.1/**"/>
-				<include name="org/hibernate/envers/**"/>
-				<include name="org/hibernate/hql/**"/>
-				<include name="org/hibernate/search/**"/>
-				<include name="org/infinispan/lucene/**"/>
-				<include name="org/infinispan/query/main/**"/>
-				<include name="org/jberet/**"/>
-				<include name="org/jboss/as/aggregate/**"/>
-				<include name="org/jboss/as/appclient/**"/>
-				<include name="org/jboss/as/clustering/ejb3/**"/>
-				<include name="org/jboss/as/clustering/web/**"/>
-				<include name="org/jboss/as/cmp/**"/>
-				<include name="org/jboss/as/domain-add-user/**"/>
-				<include name="org/jboss/as/jaxr/**"/>
-				<include name="org/jboss/as/jaxrs/**"/>
-				<include name="org/jboss/as/jdr/**"/>
-				<include name="org/jboss/as/jpa/hibernate/**"/>
-				<include name="org/jboss/as/jsr77/**"/>
-				<include name="org/jboss/as/mail/**"/>
-				<include name="org/jboss/as/modcluster/**"/>
-				<include name="org/jboss/as/pojo/**"/>
-				<include name="org/jboss/as/sar/**"/>
-				<include name="org/jboss/as/security-api/**"/>
-				<include name="org/jboss/as/vault-tool/**"/>
-				<include name="org/jboss/as/version/main/jboss-as-version-8.1.0.Final.jar/**"/>
-				<include name="org/jboss/as/xts/**"/>
-				<include name="org/jboss/genericjms/**"/>
-				<include name="org/jboss/integration/**"/>
-				<include name="org/jboss/mod_cluster/**"/>
-				<include name="org/jboss/narayana/rts/**"/>
-				<include name="org/jboss/remoting3/**"/>
-				<include name="org/jboss/resteasy/jose-jwt/**"/>
-				<include name="org/jboss/resteasy/resteasy-atom-provider/**"/>
-				<include name="org/jboss/resteasy/resteasy-crypto/**"/>
-				<include name="org/jboss/resteasy/resteasy-jackson2-provider/**"/>
-				<include name="org/jboss/resteasy/resteasy-jackson-provider/**"/>
-				<include name="org/jboss/resteasy/resteasy-jettison-provider/**"/>
-				<include name="org/jboss/resteasy/resteasy-jsapi/**"/>
-				<include name="org/jboss/resteasy/resteasy-json-p-provider/**"/>
-				<include name="org/jboss/resteasy/resteasy-multipart-provider/**"/>
-				<include name="org/jboss/resteasy/resteasy-spring/**"/>
-				<include name="org/jboss/resteasy/resteasy-yaml-provider/**"/>
-				<include name="org/jboss/shrinkwrap/**"/>
-				<include name="org/jboss/ws/saaj-impl/**"/>
-				<include name="org/jboss/ws/tools/**"/>
-				<include name="org/jboss/xb/**"/>
-				<include name="org/osgi/**"/>
-				<include name="org/picketlink/**"/>
-				<include name="org/wildfly/extension/batch/**"/>
-				<include name="org/wildfly/extension/mod_cluster/**"/>
-				<include name="org/wildfly/extension/rts/**"/>
-				<include name="org/wildfly/jberet/**"/>
-				<include name="org/wildfly/mod_cluster/**"/>
-				<include name="org/yaml/**"/>
+		<delete includeemptydirs="true" verbose="true" failonerror="false">
+			<!-- Domain version of server. Standalone is used. -->
+			<fileset dir="${server.home}/domain/" />
+			<!-- Client -->
+			<fileset dir="${server.home}/appclient/" />
+			<!-- Binaries -->
+			<fileset dir="${server.home}/bin/">
+				<include name="client/"/>
+				<include name="init.d/"/>
+				<include name="service/"/>
+				<include name=".jbossclirc"/>
+				<include name="add*"/>
+				<include name="appclient*"/>
+				<include name="jconsole*"/>
+				<include name="jdr*"/>
+				<include name="domain*"/>
+				<include name="jboss-cli*"/>
+				<include name="run*"/>
+				<include name="vault*"/>
+				<include name="ws*"/>
 			</fileset>
-		</copy>
-
-		<!-- Backup -->
-		<copy overwrite="yes" todir="${server.home}/wildfly-slim/welcome-content/" verbose="true">
-			<fileset dir="${server.home}/welcome-content/">
-				<include name="*/**" />
+			<!-- Config files -->
+			<fileset dir="${server.home}/standalone/configuration/">
+				<include name="standalone-*"/>
 			</fileset>
-		</copy>
-
-		<!-- Delete files -->
-		<delete includeemptydirs="true" verbose="true">
+			<!-- Libraries -->
 			<fileset dir="${server.home}/modules/system/layers/base/">
 				<include name="com/fasterxml/jackson/"/>
 				<include name="com/h2database/"/>
@@ -941,6 +876,7 @@
 				<include name="org/jboss/as/pojo/"/>
 				<include name="org/jboss/as/sar/"/>
 				<include name="org/jboss/as/security-api/"/>
+				<include name="org/jboss/as/webservices/"/>
 				<include name="org/jboss/as/vault-tool/"/>
 				<include name="org/jboss/as/version/main/jboss-as-version-8.1.0.Final.jar/"/>
 				<include name="org/jboss/as/xts/"/>
@@ -973,301 +909,16 @@
 				<include name="org/wildfly/mod_cluster/"/>
 				<include name="org/yaml/"/>
 			</fileset>
-		</delete>
-
-		<delete includeemptydirs="true" verbose="true">
+			<!-- Default content -->
 			<fileset dir="${server.home}">
 				<include name="welcome-content/" />
 			</fileset>
-		</delete>
-	</target>
-
-
-
-	<target name="slim-jboss" description="Makes a backup and removes unnecessary files from JBoss 5.1; do not run twice!">
-		<!-- Fail until it's ready for WildFly -->
-		<fail />
-
-		<!-- Backup -->
-		<copy todir="${server.home}server/default/slim-backup/server/default/deploy">
+			<!-- Other -->
 			<fileset dir="${server.home}/standalone/deployments/">
-				<include name="ejb*.xml" />
-				<include name="jms-ra.rar" />
-				<include name="quartz-ra.rar" />
-				<include name="mail*" />
-				<include name="schedule*.xml"/>
-				<include name="hsqldb-ds.xml"/>
-				<include name="hdscanner-jboss-beans.xml"/>
-				<include name="jboss-xa-jdbc.rar"/>
-				<include name="sqlexception-service.xml"/>
-				<include name="legacy-invokers-service.xml"/>
-				<include name="jsr88-service.xml"/>
-				<include name="monitoring-service.xml"/>
-				<include name="profileservice-jboss-beans.xml"/>
-				<include name="transaction-service.xml"/>
-
-				<include name="profileservice-secured.jar/"/>
-				<include name="uuid-key-generator.sar/"/>
-				<include name="messaging/"/>
-				<include name="jbossws.sar/"/>
-				<include name="admin-console.war/"/>
-				<include name="jmx-remoting.sar/"/>
-				<include name="jmx-console.war/"/>
-				<include name="xnio-provider.jar/"/>
-				<include name="http-invoker.sar/"/>
-				<include name="management/"/>
-				<include name="ROOT.war/"/>
+				<include name="README.txt"/>
 			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/server/default/deployers">
-			<fileset dir="${server.home}/standalone/deploymentsers">
-				<include name="ejb3-timerservice-jboss-beans.xml"/>
-				<include name="jboss-ejb3-endpoint-deployer.jar"/>
-				<include name="ejb-deployer-jboss-beans.xml"/>
-				<include name="messaging-definitions-jboss-beans.xml"/>
-				<include name="hibernate-deployer-jboss-beans.xml"/>
-				<include name="jsr77-deployers-jboss-beans.xml"/>
-				<include name="logbridge-jboss-beans.xml"/>
-				<include name="clustering-deployer-jboss-beans.xml"/>
-
-				<include name="bsh.deployer/"/>
-				<include name="jbossws.deployer/"/>
-				<include name="seam.deployer/"/>
-				<include name="xnio.deployer/"/>
-				<include name="webbeans.deployer/"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/server/default/deployers/jbossweb.deployer"
-			  file="${server.home}/standalone/deploymentsers/jbossweb.deployer/web.xml"/>
-		<copy todir="${server.home}server/default/slim-backup/server/default/deployers/jbossweb.deployer/META-INF"
-			  file="${server.home}/standalone/deploymentsers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
-
-		<copy todir="${server.home}server/default/slim-backup/server/default/conf">
-			<fileset dir="${server.home}/standalone/configuration">
-				<include name="bootstrap.xml"/>
-				<include name="standardjboss.xml"/>
-				<include name="jax-ws-catalog.xml"/>
-				<include name="chap8.keystore"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/server/default/conf/props">
-			<fileset dir="${server.home}/standalone/configuration/props">
-				<include name="messaging-*.properties"/>
-				<include name="jbossws-*.properties"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/server/default/conf/bootstrap">
-			<fileset dir="${server.home}/standalone/configuration/bootstrap">
-				<include name="deployers.xml"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/server/">
-			<fileset dir="${jboss.server}">
-				<include name="all/"/>
-				<include name="minimal"/>
-				<include name="standard"/>
-				<include name="web"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/bin/">
-			<fileset dir="${server.home}/bin">
-				<include name="password_tool.sh"/>
-				<include name="probe*"/>
-				<include name="twiddle*"/>
-				<include name="ws*"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/common/lib/">
-			<fileset dir="${server.home}/common/lib">
-				<include name="antlr.jar"/>
-				<include name="autonumber-plugin.jar"/>
-				<include name="bcel.jar"/>
-				<include name="bsf.jar"/>
-				<include name="bsh.jar"/>
-				<include name="commons-collections.jar"/>
-				<include name="commons-logging.jar"/>
-				<include name="dtdparser121.jar"/>
-				<include name="hibernate-jmx.jar"/>
-				<include name="hibernate-validator.jar"/>
-				<include name="hsqldb.jar"/>
-				<include name="hsqldb-plugin.jar"/>
-				<include name="jbossas-remoting.jar"/>
-				<include name="jbossha.jar"/>
-				<include name="jboss-iiop.jar"/>
-				<include name="jboss-jaspi-api.jar"/>
-				<include name="jboss-jsr77.jar"/>
-				<include name="jbossjts-jacorb.jar"/>
-				<include name="jboss-management.jar"/>
-				<include name="jboss-messaging.jar"/>
-				<include name="jboss-messaging-int.jar"/>
-				<include name="jboss-monitoring.jar"/>
-				<include name="jboss-negotiation.jar"/>
-				<include name="jboss-profileservice.jar"/>
-				<include name="jboss-remoting-aspects.jar"/>
-				<include name="jboss-security-aspects.jar"/>
-				<include name="jboss-srp.jar"/>
-				<include name="jbossws-native-*.jar"/>
-				<include name="log4j-snmp-appender.jar"/>
-				<include name="mail-plugin.jar"/>
-				<include name="scheduler-*.jar"/>
-				<include name="xnio-api.jar"/>
-			</fileset>
-		</copy>
-
-		<copy todir="${server.home}server/default/slim-backup/">
-			<fileset dir="${server.home}/">
-				<include name="jar-versions.xml"/>
-				<include name="readme.html"/>
-				<include name="docs/"/>
-			</fileset>
-		</copy>
-
-		<!-- Reconfiguration -->
-		<copy overwrite="yes" file="conf/slim/bootstrap.xml" tofile="${server.home}/standalone/configuration/bootstrap.xml"/>
-		<copy overwrite="yes" file="conf/slim/standardjboss.xml" tofile="${server.home}/standalone/configuration/standardjboss.xml"/>
-		<copy overwrite="yes" file="conf/slim/deployers.xml" tofile="${server.home}/standalone/configuration/bootstrap/deployers.xml"/>
-		<copy overwrite="yes" file="conf/slim/legacy-invokers-service.xml" tofile="${server.home}/standalone/deployments/legacy-invokers-service.xml"/>
-		<copy overwrite="yes" file="conf/slim/war-deployers-jboss-beans.xml"
-			                  tofile="${server.home}/standalone/deploymentsers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
-		<copy overwrite="yes" file="conf/slim/web.xml"
-				              tofile="${server.home}/standalone/deploymentsers/jbossweb.deployer/web.xml"/>
-
-		<!-- Delete files -->
-		<delete includeemptydirs="true" verbose="true">
-			<fileset dir="${server.home}/standalone/deployments">
-				<include name="ejb*.xml"/>
-				<include name="jms-ra.rar"/>
-				<include name="quartz-ra.rar"/>
-				<include name="mail*"/>
-				<include name="schedule*.xml"/>
-				<include name="hsqldb-ds.xml"/>
-				<include name="hdscanner-jboss-beans.xml"/>
-				<include name="jboss-xa-jdbc.rar"/>
-				<include name="sqlexception-service.xml"/>
-				<include name="jsr88-service.xml"/>
-				<include name="monitoring-service.xml"/>
-				<include name="profileservice-jboss-beans.xml"/>
-				<include name="transaction-service.xml"/>
-
-				<include name="profileservice-secured.jar/"/>
-				<include name="uuid-key-generator.sar/"/>
-				<include name="messaging/"/>
-				<include name="jbossws.sar/"/>
-				<include name="admin-console.war/"/>
-				<include name="jmx-remoting.sar/"/>
-				<include name="jmx-console.war/"/>
-				<include name="xnio-provider.jar/"/>
-				<include name="http-invoker.sar/"/>
-				<include name="management/"/>
-				<include name="ROOT.war/"/>
-			</fileset>
-			<fileset dir="${server.home}/standalone/deploymentsers">
-				<include name="ejb3-timerservice-jboss-beans.xml"/>
-				<include name="jboss-ejb3-endpoint-deployer.jar"/>
-				<include name="ejb-deployer-jboss-beans.xml"/>
-				<include name="messaging-definitions-jboss-beans.xml"/>
-				<include name="hibernate-deployer-jboss-beans.xml"/>
-				<include name="jsr77-deployers-jboss-beans.xml"/>
-				<include name="logbridge-jboss-beans.xml"/>
-				<include name="clustering-deployer-jboss-beans.xml"/>
-
-				<include name="bsh.deployer/"/>
-				<include name="jbossws.deployer/"/>
-				<include name="seam.deployer/"/>
-				<include name="xnio.deployer/"/>
-				<include name="webbeans.deployer/"/>
-			</fileset>
-			<fileset dir="${server.home}/standalone/configuration">
-				<include name="jax-ws-catalog.xml"/>
-				<include name="chap8.keystore"/>
-			</fileset>
-			<fileset dir="${server.home}/standalone/configuration/props">
-				<include name="messaging-*.properties"/>
-				<include name="jbossws-*.properties"/>
-			</fileset>
-			<fileset dir="${jboss.server}">
-				<include name="all/"/>
-				<include name="minimal/"/>
-				<include name="standard/"/>
-				<include name="web/"/>
-			</fileset>
-			<fileset dir="${server.home}/bin">
-				<include name="password_tool.sh"/>
-				<include name="probe*"/>
-				<include name="twiddle*"/>
-				<include name="ws*"/>
-			</fileset>
-			<fileset dir="${server.home}/common/lib">
-				<include name="antlr.jar"/>
-				<include name="autonumber-plugin.jar"/>
-				<include name="bcel.jar"/>
-				<include name="bsf.jar"/>
-				<include name="bsh.jar"/>
-				<include name="commons-collections.jar"/>
-				<include name="commons-logging.jar"/>
-				<include name="dtdparser121.jar"/>
-				<include name="hibernate-jmx.jar"/>
-				<include name="hibernate-validator.jar"/>
-				<include name="hsqldb.jar"/>
-				<include name="hsqldb-plugin.jar"/>
-				<include name="jbossas-remoting.jar"/>
-				<include name="jbossha.jar"/>
-				<include name="jboss-iiop.jar"/>
-				<include name="jboss-jaspi-api.jar"/>
-				<include name="jboss-jsr77.jar"/>
-				<include name="jbossjts-jacorb.jar"/>
-				<include name="jboss-management.jar"/>
-				<include name="jboss-messaging.jar"/>
-				<include name="jboss-messaging-int.jar"/>
-				<include name="jboss-monitoring.jar"/>
-				<include name="jboss-negotiation.jar"/>
-				<include name="jboss-profileservice.jar"/>
-				<include name="jboss-remoting-aspects.jar"/>
-				<include name="jboss-security-aspects.jar"/>
-				<include name="jboss-srp.jar"/>
-				<include name="jbossws-native-*.jar"/>
-				<include name="log4j-snmp-appender.jar"/>
-				<include name="mail-plugin.jar"/>
-				<include name="scheduler-*.jar"/>
-				<include name="xnio-api.jar"/>
-			</fileset>
-			<fileset dir="${server.home}">
-				<include name="docs/"/>
-				<include name="jar-versions.xml"/>
-				<include name="readme.html"/>
-			</fileset>
+			<fileset dir="${server.home}/docs/" />
+			<fileset dir="${server.home}/.installation/" />
 		</delete>
 	</target>
-
-
-	<target name="slim-jboss-revert" description="Reverts changes made by slim-jboss task">
-		<!-- Fail until it's ready for WildFly -->
-		<fail />
-
-		<copy overwrite="yes" todir="${server.home}" verbose="true">
-			<fileset dir="${server.home}server/default/slim-backup/">
-				<include name="*/**"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="slim-wildfly-revert" description="Reverts changes made by slim-wildfly task">
-		<copy overwrite="yes" todir="${server.home}/modules/system/layers/base/" verbose="true">
-			<fileset dir="${server.home}/wildfly-slim/modules/system/layers/base/">
-				<include name="*/**"/>
-			</fileset>
-		</copy>
-		<copy overwrite="yes" todir="${server.home}/welcome-content/" verbose="true">
-			<fileset dir="${server.home}/wildfly-slim/welcome-content/">
-				<include name="*/**"/>
-			</fileset>
-		</copy>		
-	</target>
-</project>
+</project>
\ No newline at end of file
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/slim/bootstrap.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/slim/deployers.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/slim/legacy-invokers-service.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u
--- lams_build/conf/slim/standalone.xml	(revision 0)
+++ lams_build/conf/slim/standalone.xml	(revision b319f1b304e58f8000912d89bb0ef97add0d3f51)
@@ -0,0 +1,477 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:2.2">
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.jsf"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.undertow"/>
+    </extensions>
+    <management>
+        <security-realms>
+            <security-realm name="ManagementRealm">
+                <authentication>
+                    <local default-user="$local" skip-group-loading="true"/>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+            <security-realm name="ApplicationRealm">
+                <authentication>
+                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
+                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization>
+                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+        </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
+        <management-interfaces>
+            <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
+                <socket-binding http="management-http"/>
+            </http-interface>
+        </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
+    </management>
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:2.0">
+            <use-deployment-logging-config value="false" />
+            <add-logging-api-dependencies value="true" />
+
+            <periodic-rotating-file-handler name="FILE"
+                autoflush="true">
+                <formatter>
+                    <named-formatter name="PATTERN" />
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log" />
+                <suffix value="'.'yyyy-MM-dd" />
+                <append value="true" />
+
+            </periodic-rotating-file-handler>
+
+            <console-handler name="CONSOLE">
+                <target name="System.out" />
+                <level name="INFO" />
+                <formatter>
+                    <named-formatter name="CONSOLEPATTERN" />
+                </formatter>
+            </console-handler>
+
+            <periodic-rotating-file-handler name="AUDITFILE"
+                autoflush="true">
+                <level name="INFO" />
+                <formatter>
+                    <named-formatter name="AUDITPATTERN" />
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="audit.log" />
+                <suffix value="'.'yyyy-MM-dd" />
+                <append value="true" />
+            </periodic-rotating-file-handler>
+
+            <size-rotating-file-handler name="LAMSFILE"
+                autoflush="true">
+                <level name="DEBUG" />
+                <formatter>
+                    <named-formatter name="LAMSPATTERN" />
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="lams.log" />
+                <rotate-size value="5m" />
+                <max-backup-index value="20" />
+                <append value="true" />
+            </size-rotating-file-handler>
+
+            <console-handler name="LAMSCONSOLE">
+                <target name="System.out" />
+                <level name="DEBUG" />
+                <formatter>
+                    <named-formatter name="LAMSCONSOLEPATTERN" />
+                </formatter>
+            </console-handler>
+
+            <size-rotating-file-handler name="HIBERNATEFILE"
+                autoflush="true">
+                <level name="INFO" />
+                <formatter>
+                    <named-formatter name="HIBERNATEPATTERN" />
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="hibernatelams.log" />
+                <rotate-size value="5m" />
+                <max-backup-index value="20" />
+                <append value="true" />
+            </size-rotating-file-handler>
+
+            <!-- ISO8601 date format -->
+            <formatter name="HIBERNATEPATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c - %m%n" />
+            </formatter>
+            <formatter name="LAMSCONSOLEPATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+            </formatter>
+            <formatter name="LAMSPATTERN">
+                <pattern-formatter
+                    pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n" />
+            </formatter>
+            <formatter name="AUDITPATTERN">
+                <pattern-formatter
+                    pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t:%x] %-5p %c - %m%n" />
+            </formatter>
+
+            <!-- ABSOLUTE date format -->
+            <formatter name="CONSOLEPATTERN">
+                <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+            </formatter>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d %-5p [%c] (%t) %m%n" />
+            </formatter>
+
+            <logger category="org.lamsfoundation.lams"
+                use-parent-handlers="false">
+                <level name="DEBUG" />
+                <handlers>
+                    <handler name="LAMSFILE" />
+                    <handler name="LAMSCONSOLE" />
+                </handlers>
+            </logger>
+
+            <logger category="org.wildfly" use-parent-handlers="false">
+                <level name="DEBUG" />
+                <handlers>
+                    <handler name="LAMSFILE" />
+                    <handler name="LAMSCONSOLE" />
+                </handlers>
+            </logger>
+
+            <logger
+                category="org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter"
+                use-parent-handlers="false">
+                <level name="INFO" />
+                <handlers>
+                    <handler name="LAMSFILE" />
+                    <handler name="LAMSCONSOLE" />
+                </handlers>
+            </logger>
+
+            <logger category="org.lamsfoundation.lams.util.audit"
+                use-parent-handlers="false">
+                <level name="INFO" />
+                <handlers>
+                    <handler name="AUDITFILE" />
+                </handlers>
+            </logger>
+
+            <logger category="org.hibernate" use-parent-handlers="false">
+                <level name="INFO" />
+                <handlers>
+                    <handler name="HIBERNATEFILE" />
+                </handlers>
+            </logger>
+
+            <logger category="org.jboss">
+                <level name="INFO" />
+            </logger>
+
+            <logger category="org.apache">
+                <level name="INFO" />
+            </logger>
+
+            <logger category="jacorb">
+                <level name="WARN" />
+            </logger>
+
+            <logger category="javax.enterprise.resource.webcontainer.jsf">
+                <level name="INFO" />
+            </logger>
+
+            <logger category="org.jgroups">
+                <level name="WARN" />
+            </logger>
+
+            <logger category="org.quartz">
+                <level name="INFO" />
+            </logger>
+
+            <logger category="org.jboss.management">
+                <level name="INFO" />
+            </logger>
+
+            <logger category="org.jboss.serial">
+                <level name="INFO" />
+            </logger>
+
+            <root-logger>
+                <level name="DEBUG" />
+                <handlers>
+                    <handler name="CONSOLE" />
+                    <handler name="FILE" />
+                </handlers>
+            </root-logger>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+            <datasources>
+                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false">
+				    <connection-url>jdbc:mysql://localhost:3306/lams_wildfly</connection-url>
+				    <driver>MySQL</driver>
+				    <connection-property name="characterEncoding">utf8</connection-property>
+				    <connection-property name="useUnicode">true</connection-property>
+				    <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+				   
+				    <!-- Properties below are used only for embedded MySQL server -->
+				    <connection-property name="server.basedir">C:/lams/database</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>lams</user-name>
+				      <password>lamsdemo</password>
+				    </security>
+				    <validation>
+				      <valid-connection-checker class-name="org.jboss.resource.adapter.jdbc.vendor.MySQLValidConnectionChecker"/>
+				      <validate-on-match>false</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:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" auto-deploy-zipped="false" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee:2.0">
+            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+            </concurrent>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/lams-ds" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:io:1.1">
+            <worker name="default"/>
+            <buffer-pool name="default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
+            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
+                <local-cache name="default" />
+            </cache-container>
+            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
+                <local-cache name="passivation" batching="true">
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
+                <local-cache name="persistent" batching="true">
+                    <file-store passivation="false" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate" start="EAGER">
+                <local-cache name="entity" start="EAGER" statistics-enabled="true">
+                    <transaction mode="NON_XA"/>
+                    <eviction strategy="LRU" max-entries="5000"/>
+                    <expiration max-idle="100000" lifespan="1000000"/>
+                </local-cache>
+                <local-cache name="local-query" start="EAGER" statistics-enabled="true" >
+                    <transaction mode="NONE"/>
+                    <eviction strategy="LRU" max-entries="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps" start="EAGER" statistics-enabled="true" >
+                    <transaction mode="NONE"/>
+                    <eviction strategy="NONE"/>
+                </local-cache>
+                <!-- contentrepository cache settings template -->
+                <local-cache name="contentrepository-entity" start="EAGER" statistics-enabled="true">
+                    <transaction mode="NON_XA"/>
+                    <eviction strategy="LRU" max-entries="200"/>
+                    <expiration max-idle="100000" lifespan="900000"/>
+                </local-cache>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jca:2.0">
+            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+            <bean-validation enabled="true"/>
+            <default-workmanager>
+                <short-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+            <cached-connection-manager/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
+            <expose-resolved-model/>
+            <expose-expression-model/>
+            <remoting-connector/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
+            <remote-naming/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+            <endpoint worker="default"/>
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+        <subsystem xmlns="urn:jboss:domain:security:1.2">
+            <security-domains>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="Remoting" flag="optional">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                        <login-module code="RealmDirect" flag="required">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                    </authentication>
+                </security-domain>
+                <security-domain name="jboss-web-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="lams" cache-type="default">
+                    <authentication>
+                        <login-module code="org.lamsfoundation.lams.security.UniversalLoginModule" flag="required">
+                            <module-option name="dsJndiName" value="java:jboss/datasources/lams-ds"/>
+                            <module-option name="principalsQuery" value="SELECT password FROM lams_user WHERE login=?"/>
+                            <module-option name="rolesQuery" value="
+				             	SELECT DISTINCT  r.name,'Roles' FROM
+				             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+				             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+				             	LEFT OUTER JOIN lams_role r USING (role_id)
+				             	WHERE u.login=?"
+				             />
+                        </login-module>
+                    </authentication>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:transactions:2.0">
+            <core-environment>
+                <process-id>
+                    <uuid/>
+                </process-id>
+            </core-environment>
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:undertow:1.2">
+            <buffer-cache name="default"/>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http"/>
+                <host name="default-host" alias="localhost">
+                    <filter-ref name="server-header"/>
+                    <filter-ref name="x-powered-by-header"/>
+                </host>
+            </server>
+            <servlet-container name="default" default-encoding="UTF-8">
+                <jsp-config/>
+                <websockets/>
+            </servlet-container>
+            <filters>
+                <response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
+                <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
+            </filters>
+        </subsystem>
+    </profile>
+    <interfaces>
+        <interface name="management">
+            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+        </interface>
+        <interface name="public">
+            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+        </interface>
+        <interface name="unsecure">
+            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
+        </interface>
+    </interfaces>
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <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="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+        <outbound-socket-binding name="mail-smtp">
+            <remote-destination host="localhost" port="25"/>
+        </outbound-socket-binding>
+    </socket-binding-group>
+</server>
\ No newline at end of file
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/slim/standardjboss.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/slim/war-deployers-jboss-beans.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/slim/web.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -rde10989b7e9fc4b49ef4061b019be99ab32a51da -rb319f1b304e58f8000912d89bb0ef97add0d3f51
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision de10989b7e9fc4b49ef4061b019be99ab32a51da)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision b319f1b304e58f8000912d89bb0ef97add0d3f51)
@@ -6,16 +6,23 @@
         <extension module="org.jboss.as.connector"/>
         <extension module="org.jboss.as.deployment-scanner"/>
         <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jdr"/>
         <extension module="org.jboss.as.jmx"/>
         <extension module="org.jboss.as.jpa"/>
         <extension module="org.jboss.as.jsf"/>
         <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.mail"/>
         <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.pojo"/>
         <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.sar"/>
         <extension module="org.jboss.as.security"/>
         <extension module="org.jboss.as.transactions"/>
         <extension module="org.jboss.as.webservices"/>
         <extension module="org.jboss.as.weld"/>
+        <extension module="org.wildfly.extension.batch"/>
         <extension module="org.wildfly.extension.io"/>
         <extension module="org.wildfly.extension.undertow"/>
     </extensions>
@@ -241,6 +248,15 @@
                 </handlers>
             </root-logger>
         </subsystem>
+        <subsystem xmlns="urn:jboss:domain:batch:1.0">
+            <job-repository>
+                <in-memory/>
+            </job-repository>
+            <thread-pool>
+                <max-threads count="10"/>
+                <keepalive-time time="30" unit="seconds"/>
+            </thread-pool>
+        </subsystem>
         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
                 <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false">
@@ -322,7 +338,7 @@
             <buffer-pool name="default"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
-            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
+<cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
                 <local-cache name="default" />
             </cache-container>
             <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
@@ -356,6 +372,7 @@
                 </local-cache>
             </cache-container>
         </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jca:2.0">
             <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
             <bean-validation enabled="true"/>
@@ -375,6 +392,7 @@
             </default-workmanager>
             <cached-connection-manager/>
         </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jmx:1.3">
             <expose-resolved-model/>
             <expose-expression-model/>
@@ -384,14 +402,21 @@
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jsf:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:mail:2.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
+                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+            </mail-session>
+        </subsystem>
         <subsystem xmlns="urn:jboss:domain:naming:2.0">
             <remote-naming/>
         </subsystem>
+        <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
         <subsystem xmlns="urn:jboss:domain:remoting:2.0">
             <endpoint worker="default"/>
             <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
         <subsystem xmlns="urn:jboss:domain:security:1.2">
             <security-domains>
                 <security-domain name="other" cache-type="default">
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/jbossweb/context.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/jbossweb/server.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/unix/jboss/jbossweb/war-deployers-jboss-beans.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/jbossweb/context.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/jbossweb/server.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b319f1b304e58f8000912d89bb0ef97add0d3f51 refers to a dead (removed) revision in file `lams_build/conf/windows/jboss/jbossweb/war-deployers-jboss-beans.xml'.
Fisheye: No comparison available.  Pass `N' to diff?