Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.3 -r1.4
--- lams_common/build.xml	7 Dec 2004 07:21:42 -0000	1.3
+++ lams_common/build.xml	9 Dec 2004 00:59:04 -0000	1.4
@@ -14,25 +14,21 @@
 	&properties;
 
 	<path id="all-libs">
-		<fileset dir="${lib.dir}">
+		<fileset dir="${lib}">
 			<include name="**/*.jar"/>
 		</fileset>
 	</path>
-	
+
 	<path id="project.classpath">
-		<!-- If Eclipse is not used, this should be ${build.classes} -->
-		<pathelement location="${classes}" />
 		<path refid="all-libs"/>
 		<!-- Java CLASSPATH should be added as the last item -->
-		<!-- This property is supposed to be set in .ant.properties file -->
-		<!-- Currently this is not set properly but it does not matter
-			as long as ${classes} is used in the project.classpath -->
+		<!-- This property is supposed to be set in eclipse  -->
 		<pathelement location="${java.class.path}" />
 	</path>
-	
+
 	<target name="usage">
 		<echo message=""/>
-		<echo message="${project.name} build file"/>
+		<echo message="${project} build file"/>
 		<echo message="------------------------------------------------------"/>
 		<echo message=""/>
 		<echo message="Among the available targets are:"/>
@@ -94,7 +90,7 @@
 
 		<middlegen-learningdesign
          appname="learningdesign"
-         prefsdir="${middlegen.dir}"
+         prefsdir="${middlegen}"
          gui="${gui}"
          databaseurl="${database.url}"
          driver="${database.driver}"
@@ -106,7 +102,7 @@
         >
 
 			<hibernate 
-			destination="${hbm.dir}"
+			destination="${hbm}"
 			package="${package.learningdesign.name}"
             genXDocletTags="true"
             javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper"
@@ -132,8 +128,8 @@
          classname="net.sf.hibernate.tool.hbm2java.Hbm2JavaTask"
          classpathref="all-libs"
       />
-		<hbm2java-learningdesign output="${src.java.dir}">
-			<fileset dir="${hbm.dir}/${package.learningdesign.dir}">
+		<hbm2java-learningdesign output="${src.java}">
+			<fileset dir="${hbm}/${package.learningdesign}">
 				<include name="*.hbm.xml"/>
 			</fileset>
 		</hbm2java-learningdesign>
@@ -149,82 +145,119 @@
 	<target name="preparedirs">
 		<mkdir dir="${build}"/>
 		<mkdir dir="${build.classes}"/>
-		<mkdir dir="${build.dist}"/>
 		<mkdir dir="${build.lib}"/>
-		<mkdir dir="${build.web}"/>
 	</target>
 
 
 	<target name="clean" depends="preparedirs" description="removes all class files">
 		<delete>
-	  		<fileset dir="${build.classes}"/>
-	  		<fileset dir="${build.lib}"/>
+			<fileset dir="${build.classes}"/>
+			<fileset dir="${build.lib}"/>
 		</delete>
 		<mkdir dir="${build.classes}"/>
 		<mkdir dir="${build.lib}"/>
 	</target>
-	
+
+	<target name="compile" depends="clean" description="compile java sources">
+		<javac srcdir="${src.java}"
+	         	 	destdir="${build.classes}" deprecation="on" debug="on">
+			<classpath>
+				<path refid="project.classpath"/>
+			</classpath>
+		</javac>
+	</target>
+
 	<!-- ================================================================ -->
 	<!-- making packages for deployment					    	          -->
 	<!-- ================================================================ -->
-	<target name="web-jar" description="creates jar file">
-    	<delete file="${build.lib}/${product.name}.jar"/>
-    	<jar jarfile="${build.lib}/${product.name}.jar">
-    		<fileset dir="${basedir}/classes">
-      		</fileset>
-    	</jar>
+	<target name="lams-jar" depends="compile" description="creates jar file">
+		<delete file="${build.lib}/${product}.jar"/>
+		<jar jarfile="${build.lib}/${product}.jar">
+			<fileset dir="${build.classes}">
+			</fileset>
+			<fileset dir="${hbm}">
+			</fileset>
+		</jar>
 	</target>
-	
+
 	<!-- - - - - - - - - - - - - - - - - - - - - - - - -  -->
 	<!-- Creates the war archive                          -->
-	<!-- - - - - - - - - - - - - - - - - - - - - - - - -  --> 
-	<target name="war" depends="web-jar" description="creates war file">
-  		<delete file="${build.lib}/${product.name}.war"/>
-  		<war warfile="${build.lib}/${product.name}.war" 
+	<!-- - - - - - - - - - - - - - - - - - - - - - - - -  -->
+	<target name="lams-war" depends="lams-jar" description="creates war file">
+		<delete file="${build.lib}/${product}.war"/>
+		<war warfile="${build.lib}/${product}.war" 
   				webxml="${webinf}/web.xml">
-  			<webinf dir="${webinf}">
-  				<include name="jboss-web.xml"/>
-  				<include name="struts/*"/>
-  				<include name="jstl/*"/>
-  			</webinf>
-  			<lib dir="${build.lib}">
-  				<include name="${product.name}.jar"/>
-  			</lib>
-  			<fileset dir="${web}">
-  				<include name="*"/>
-  				<include name="admin/*"/>
-  			</fileset>
-  		</war>
-  	</target>
+			<webinf dir="${webinf}">
+				<include name="*.xml"/>
+				<include name="*.properties"/>
+				<include name="struts/*"/>
+				<include name="jstl/*"/>
+			</webinf>
+			<lib dir="${build.lib}">
+				<include name="${product}.jar"/>
+			</lib>
+			<fileset dir="${web}">
+				<include name="*"/>
+				<include name="admin/*"/>
+			</fileset>
+		</war>
+	</target>
 
-	<target name="deploy-jar-war" depends="web-jar,war">
-		<copy file="${build.lib}/${product.name}.jar"
+	<target name="deploy-lams" depends="lams-jar,lams-war">
+		<copy file="${build.lib}/${product}.jar"
 				todir="${jboss-home}/server/default/deploy"/>
-		<copy file="${build.lib}/${product.name}.war"
+		<copy file="${build.lib}/${product}.war"
 				todir="${jboss-home}/server/default/deploy"/>
 	</target>
 
 	<!-- =================================================================== -->
-	<!-- copy jar files and cofigure files                                   -->
+	<!-- copy jar files and cofiguration files                               -->
 	<!-- =================================================================== -->
-  	<target name="copyfiles" depends="" description="copy lib and config files">
-  		<copy overwrite="yes" todir="${jboss-home}/server/default/lib/">
-  			<fileset dir="${lib.dir}">
-  				<include name="**/*.jar"/>
-  			</fileset>
-  		</copy>
-  		<copy overwrite="yes" todir="${jboss-home}/server/default/conf/">
-  			<fileset dir="${conf.jboss.dir}/">
-  				<include name="login-config.xml"/>
-  			</fileset>
-  		</copy>
-  		<copy overwrite="yes" todir="${jboss-home}/server/default/deploy/">
-  			<fileset dir="${conf.jboss.dir}/service">
-  				<include name="mysql*.xml"/>
-  			</fileset>
-  		</copy>
+	<target name="copyfiles" depends="" description="copy lib and config files">
+		<copy overwrite="yes" todir="${jboss-home}/server/default/lib/">
+			<fileset dir="${lib}/cglib/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/hibernate/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/j2ee/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/jakarta-commons/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/jdom/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/log4j/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/mysql/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/odmg/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/spring/">
+				<include name="*.jar"/>
+			</fileset>
+			<fileset dir="${lib}/struts/">
+				<include name="*.jar"/>
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${jboss-home}/server/default/conf/">
+			<fileset dir="${conf.jboss}/">
+				<include name="login-config.xml"/>
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${jboss-home}/server/default/deploy/">
+			<fileset dir="${conf.jboss}/service">
+				<include name="mysql*.xml"/>
+			</fileset>
+		</copy>
 
-  	</target>
-	
+	</target>
+
 </project>
 
Index: lams_common/properties.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/Attic/properties.xml,v
diff -u -r1.2 -r1.3
--- lams_common/properties.xml	7 Dec 2004 07:21:42 -0000	1.2
+++ lams_common/properties.xml	9 Dec 2004 00:59:04 -0000	1.3
@@ -5,44 +5,40 @@
    	<!-- =================================================================== -->
 	
 	<!-- progect-wide properties -->
-	<property name="project.name"                  value="LAMS"/>
-	<property name="product.name"                  value="lams"/>
+	<property name="project"                  value="LAMS"/>
+	<property name="product"                  value="lams"/>
 	<property name="version"                       value="1.1"/>
 
 	<!-- xdoclet properties-->	
 	<property name="xdoclet.version"               value="1.2.2"/>
 	
 	<!-- path properties -->
-	<property name="lib.dir"                       value="${basedir}/lib"/>
-	<property name="src.dir"                       value="${basedir}/src"/>
-	<property name="src.java.dir"                  value="${basedir}/src/java"/>
-	<property name="conf.dir"                      value="${basedir}/conf"/>
-	<property name="conf.jboss.dir"                value="${conf.dir}/jboss"/>
-	<property name="hbm.dir"                       value="${conf.dir}/hibernate/mappings"/>
+	<property name="lib"                       value="${basedir}/lib"/>
+	<property name="src"                       value="${basedir}/src"/>
+	<property name="src.java"                  value="${basedir}/src/java"/>
+	<property name="conf"                      value="${basedir}/conf"/>
+	<property name="conf.jboss"                value="${conf}/jboss"/>
+	<property name="hbm"                       value="${conf}/hibernate/mappings"/>
 
 	<property name="web"                           value="${basedir}/web"/>
 	<property name="webinf"                        value="${web}/WEB-INF"/>
 	
-	<property name="jboss-home"                    value="D:/jboss-3.2.6"/>
+	<property name="jbosshome"                    value="D:/jboss-3.2.6"/>
 	
 	<property name="build"                         value="${basedir}/build"/>
 	<property name="build.classes"                 value="${build}/classes"/>
-	<property name="build.dist"                    value="${build}/dist"/>
 	<property name="build.lib"                     value="${build}/lib"/>
-	<property name="build.lib.ext"                 value="${build}/lib/ext"/>
-	<property name="build.web"                     value="${build}/web"/>
 	
-	<property name="package.dir"                   value="com/lamsinternational/lams"/>
-	<property name="package.learningdesign.dir"    value="${package.dir}/learningdesign"/>
-	<property name="package.usermanagement.dir"    value="${package.dir}/usermanagement"/>
+	<property name="package"                   value="com/lamsinternational/lams"/>
+	<property name="package.learningdesign"    value="${package}/learningdesign"/>
+	<property name="package.usermanagement"    value="${package}/usermanagement"/>
 	
 	<property name="package.name"                  value="com.lamsinternational.lams"/>
-	<property name="package.learningdesign.name"   value="${package.name}.learningdesign"/>
-	<property name="package.usermanagement.name"   value="${package.name}.usermanagement"/>
+	<property name="package.learningdesign.name"   value="${package}.learningdesign"/>
+	<property name="package.usermanagement.name"   value="${package}.usermanagement"/>
 	
 	<!--  database related properties -->
-	<property name="database.script.file"          value="${script.dir}/${script_file}.sql"/>
-	<property name="database.driver.file"          value="${lib.dir}/mysql/mysql-connector-java-3.0.16-ga-bin.jar"/>   
+	<property name="database.driver.file"          value="${lib}/mysql/mysql-connector-java-3.0.16-ga-bin.jar"/>   
 	<property name="database.driver.classpath"     value="${database.driver.file}"/>
 	<property name="database.driver"               value="org.gjt.mm.mysql.Driver"/>
 	<property name="database.url"                  value="jdbc:mysql://localhost/lams"/>
@@ -52,5 +48,5 @@
 	<property name="database.catalog"              value=""/>
 
 	<!-- middlegen properties -->
-	<property name="middlegen.dir"                 value="${conf.dir}/middlegen"/>
+	<property name="middlegen"                 value="${conf}/middlegen"/>
 	<property name="gui"                           value="true"/>	
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/domain/Activity.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/domain/Group.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/domain/Grouping.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/domain/LearningDesign.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/domain/LearningLibrary.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/com/lamsinternational/lams/learningdesign/domain/Transition.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.1 -r1.2
--- lams_common/web/WEB-INF/struts/struts-config.xml	7 Dec 2004 07:18:33 -0000	1.1
+++ lams_common/web/WEB-INF/struts/struts-config.xml	9 Dec 2004 00:59:20 -0000	1.2
@@ -33,12 +33,14 @@
 	<!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
 	<!-- ===================== Plugin Definition  ======================== -->
+	<!-- 
 	<plug-in className="org.apache.struts.tiles.TilesPlugin">
 		<set-property property="definitions-config"
 			value="/WEB-INF/tiles/tiles-defs.xml" />
 		<set-property property="definitions-debug" value="0" />
 		<set-property property="definitions-parser-details" value="0" />
 		<set-property property="definitions-parser-validate" value="true" />
 	</plug-in>
+	-->
 
 </struts-config>
\ No newline at end of file