Index: lams_build/build_base.xml
===================================================================
diff -u -rdb79d4c0c5bbf8ed68cc436bee5fdc74e4ae72af -r05c0c567b00d8734f569868e644623e60c6849a3
--- lams_build/build_base.xml	(.../build_base.xml)	(revision db79d4c0c5bbf8ed68cc436bee5fdc74e4ae72af)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 05c0c567b00d8734f569868e644623e60c6849a3)
@@ -32,13 +32,6 @@
 	
 	<path id="product.classpath">
 		<path refid="libs.classpath"/>
-		<!-- Java CLASSPATH should be added as the last item -->
-		<!-- This property is supposed to be set in eclipse  -->
-		<pathelement location="${java.class.path}" />
-	</path>
-	
-	<path id="product.classes.classpath">
-		<path refid="product.classpath"/>
 		<pathelement location="${build.classes.java}"/>
 	</path>
 	
@@ -83,8 +76,8 @@
 	<target name="_print-classpath">
 		<!-- Internal target: Prints out paths to library and project classes. -->
 		<echo message="java.class.path = ${java.class.path}" />
-		<property name="product.classpath.string" refid="product.classpath" />
-		<echo message="product.classpath = ${product.classpath.string}" />
+		<property name="libs.classpath.string" refid="libs.classpath" />
+		<echo message="libs.classpath = ${libs.classpath.string}" />
 	</target>
 	
 	
@@ -155,7 +148,7 @@
                source="1.5"
                debug="on"
 			   debuglevel="lines,vars,source"
-               classpathref="product.classpath"
+               classpathref="libs.classpath"
                destdir="${build.classes.java}"
 		/>
         
@@ -179,7 +172,7 @@
 	           debug="on"
 			   debuglevel="lines,vars,source"
 			   destdir="${build.classes.test}"
-			   classpathref="product.classes.classpath" />
+			   classpathref="product.classpath" />
 			
 		<copy todir="${build.classes.test}" overwrite="true" verbose="true">
 			<fileset dir="${src.test.dir}">
@@ -350,7 +343,7 @@
 		<!-- Internal target: Adds subprojects' JAR/WAR 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" />
-		<echo>${ant.project.name}: Enable module in JBoss config files</echo>
+		<echo>${ant.project.name}: Enable module in EAR config files</echo>
 		<!-- Remove existing entries first, so it is possible to run target multiple times -->
 		<replaceregexp file="${jboss.deploy}/META-INF/application.xml"
 					   flags="gi"
@@ -463,7 +456,7 @@
 				<pathelement location="${conf.dir}" />
 				<pathelement location="${jboss.home}lib/javassist.jar" />
 				<path refid="logging.classpath"/>	
-				<path refid="product.classes.classpath" />
+				<path refid="product.classpath" />
 			</classpath>
 		</junit>
 		
@@ -499,7 +492,7 @@
 		
 		<!-- Define JSP compiler -->
 		<path id="jsp.precompile.classpath">
-			<path refid="product.classes.classpath"/>
+			<path refid="product.classpath"/>
 			<fileset dir="${jboss.home}/lib">
 				<include name="jboss-common-core.jar" />
 				<include name="jboss-logging-spi.jar" />
Index: lams_build/build_tools_base.xml
===================================================================
diff -u -r27cf2c4f928ddfff33847be34d80f0780581ba5c -r05c0c567b00d8734f569868e644623e60c6849a3
--- lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision 27cf2c4f928ddfff33847be34d80f0780581ba5c)
+++ lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision 05c0c567b00d8734f569868e644623e60c6849a3)
@@ -69,7 +69,7 @@
 		>
 			<classpath>
 				<path refid="logging.classpath"/>			
-				<path refid="product.classes.classpath"/>
+				<path refid="product.classpath"/>
 			</classpath>
 		</taskdef>
 			
Index: lams_tool_deploy/build.xml
===================================================================
diff -u -r0448afb64ed46bb19c6cbb5692f55d92cd9e1530 -r05c0c567b00d8734f569868e644623e60c6849a3
--- lams_tool_deploy/build.xml	(.../build.xml)	(revision 0448afb64ed46bb19c6cbb5692f55d92cd9e1530)
+++ lams_tool_deploy/build.xml	(.../build.xml)	(revision 05c0c567b00d8734f569868e644623e60c6849a3)
@@ -31,7 +31,7 @@
 		</fileset>
 	</path>
 
-	<path id="product.classes.classpath">
+	<path id="product.classpath">
 		<pathelement location="${build.classes.java}" />
 		<path refid="libs.classpath" />
 	</path>
@@ -80,7 +80,7 @@
 	           debug="${debug}"
 			   debuglevel="lines,vars,source"
 			   destdir="${build.classes.test}"
-			   classpathref="product.classes.classpath" />
+			   classpathref="product.classpath" />
 	</target>
 	
 	
@@ -122,7 +122,7 @@
 			</batchtest>
 			<classpath>
 				<pathelement location="${build.classes.test}" />
-				<path refid="product.classes.classpath" />
+				<path refid="product.classpath" />
 				<fileset dir="${test.file.dir}" />
 			</classpath>
 		</junit>