Index: lams_build/build_base.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build_base.xml,v
diff -u -r1.9 -r1.10
--- lams_build/build_base.xml	30 Aug 2012 16:23:33 -0000	1.9
+++ lams_build/build_base.xml	11 Sep 2012 17:55:22 -0000	1.10
@@ -6,16 +6,19 @@
 		It contains several most common tasks.
 	</description>
 	
-	 <!-- Directory of this parent file -->
-	 <dirname property="base.dir" file="${ant.file.build_base}"/>
+	<!-- Directory of this parent file -->
+	<dirname property="base.dir" file="${ant.file.build_base}"/>
 	 
-	 <!-- Import project specific property file; base dir for this is the importing build.xml file -->
-	 <property file="build.properties" />
-	 <!-- Import common property files; base dir for this is the current file -->
-	 <property file="${base.dir}/common.properties"/>
-	 <property file="${base.dir}/build.properties"/>
-	 <property file="${base.dir}/${osPropertiesName}.properties"/>
- 
+	<!-- Import project specific property file; base dir for this is the importing build.xml file -->
+	<property file="build.properties" />
+	<!-- Import common property files; base dir for this is the current file -->
+	<property file="${base.dir}/common.properties"/>
+	<property file="${base.dir}/build.properties"/>
+	<property file="${base.dir}/${osPropertiesName}.properties"/>
+	 
+	<!-- Used by subprojects to add their modules to LAMS EAR application.xml -->
+	<property name="moduleActivationPlaceholder" value="&lt;!-- Optional Module Placeholder - do not remove --&gt;" />
+	<loadfile srcFile="conf/moduleActivation.xml" property="moduleActivationEntry" failonerror="false" />
 	
 	<!-- Set library paths -->
 	<path id="libs.classpath" >
@@ -345,6 +348,17 @@
   			</fileset>
   		</copy>	
 	</target>
+	
+	
+	<target name="_deploy-module-conf">
+		<!-- Internal target: Adds subprojects' JAR/WAR to LAMS EAR application.xml -->
+		<echo>${ant.project.name}: Enable module in JBoss config files</echo>
+		<replaceregexp match="(${moduleActivationPlaceholder})" replace="${moduleActivationEntry}    \1">
+			<fileset dir="${jboss.deploy}">
+				<include name="META-INF/application.xml" />
+			</fileset>
+		</replaceregexp>
+	</target>
 
 	<!-- =================================================================== -->
 	<!-- Explode WAR                                        				 -->
Index: lams_build/conf/j2ee/lams.application.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/lams.application.xml,v
diff -u -r1.18 -r1.19
--- lams_build/conf/j2ee/lams.application.xml	2 Aug 2012 14:07:43 -0000	1.18
+++ lams_build/conf/j2ee/lams.application.xml	11 Sep 2012 17:55:22 -0000	1.19
@@ -50,24 +50,8 @@
 		</web>
     </module>
     
-    <!--SAML Integration - do not uncomment manually
-    <module>
-        <web>
-            <web-uri>lams-saml.war</web-uri>
-            <context-root>/lams/saml</context-root>
-        </web>
-    </module>
-    SAML Integration - do not uncomment manually-->
-    
-    <!--Mindapp Integration - do not uncomment manually
-    <module>
-        <web>
-            <web-uri>lams-mindapp.war</web-uri>
-            <context-root>/lams/mindapp</context-root>
-        </web>
-    </module>
-    Mindapp Integration - do not uncomment manually-->
-    
+	<!-- Optional Module Placeholder - do not remove -->
+	
     <!-- 
     	======================================================== 
 	 	  Tool modules and Security Roles 
Index: lams_signup/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_signup/build.xml,v
diff -u -r1.4 -r1.5
--- lams_signup/build.xml	30 Jul 2012 18:45:24 -0000	1.4
+++ lams_signup/build.xml	11 Sep 2012 17:55:20 -0000	1.5
@@ -5,17 +5,7 @@
 	<import file="../lams_build/build_base.xml"/>
 	
 	<!-- Below are Tool specifc targets and targets overriding ones from the imported base file. -->
-	<target name="deploy-war"  depends="build_base.deploy-war" description="Deploys WAR.">
-		<echo message="Enable lams-signup in JBoss config files" />
-		<replaceregexp flags="gi"
-				 match="(?:&lt;!--)?lams-signup - do not uncomment manually(?:--&gt;)?"
-				 replace="&lt;!-- lams-signup --&gt;">
-		 	<fileset dir="${jboss.deploy}">
-				<include name="META-INF/application.xml" />
-		 		<include name="lams-central.war/WEB-INF/web.xml" />
-		 	</fileset>
-		</replaceregexp>
-	</target>
+	<target name="deploy-war"  depends="build_base.deploy-war, _deploy-module-conf" description="Deploys WAR." />
 	
 
 	<target name="test-report" depends="_target-not-available"
Index: lams_signup/conf/moduleActivation.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_signup/conf/moduleActivation.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_signup/conf/moduleActivation.xml	11 Sep 2012 17:55:20 -0000	1.1
@@ -0,0 +1,11 @@
+
+    <module>
+        <web>
+            <web-uri>lams-signup.war</web-uri>
+            <context-root>/lams/signup</context-root>
+        </web>
+    </module>
+    <module>
+        <java>lams-signup.jar</java>
+    </module>
+