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