From: Pieter v. Z. <pv...@us...> - 2005-08-01 09:39:46
|
Update of /cvsroot/coefficient/coefficient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12921 Modified Files: build.xml Log Message: added make-opendgroups-all-release target wich was in branch v0.9.6 Index: build.xml =================================================================== RCS file: /cvsroot/coefficient/coefficient/build.xml,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** build.xml 18 Jul 2005 14:40:50 -0000 1.35 --- build.xml 1 Aug 2005 09:39:31 -0000 1.36 *************** *** 8,14 **** <property name="dir.jalopy" value="jalopyLib" /> <!--<property name="ear.file" value="${project.name}-${version}.ear" />--> ! <condition property="ear.file" value="${ear.prefix}_${project.name}-${version}.ear" else="${project.name}-${version}.ear"> <isset property="ear.prefix"/> ! </condition> <property name="ejb.jar.file" value="${project.name}-ejb.jar" /> <property name="war.file" value="${project.name}.war" /> --- 8,15 ---- <property name="dir.jalopy" value="jalopyLib" /> <!--<property name="ear.file" value="${project.name}-${version}.ear" />--> ! <!--condition property="ear.file" value="${ear.prefix}_${project.name}-${version}.ear" else="${project.name}-${version}.ear"> <isset property="ear.prefix"/> ! </condition--> ! <property name ="ear.file" value="${project.name}-${version}.ear"/> <property name="ejb.jar.file" value="${project.name}-ejb.jar" /> <property name="war.file" value="${project.name}.war" /> *************** *** 31,34 **** --- 32,37 ---- <property name="coefficient.src.all.release.file" value="coefficient-src-all-${version}.tar.gz" /> <property name="coefficient.core.src.release.file" value="coefficient-core-src-${version}" /> + <property name="src.test.dir" value="src-test" /> + <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties"> *************** *** 155,158 **** --- 158,162 ---- <pathelement location="${src.dir}" /> <pathelement location="${gen.src}" /> + <pathelement location="${src.test.dir}" /> </sourceroots> *************** *** 431,434 **** --- 435,439 ---- <include name="coefficient.properties" /> <include name="project.properties" /> + <include name="invoker.properties" /> <include name="VM_global_library.vm" /> </fileset> *************** *** 484,487 **** --- 489,493 ---- <include name="interceptors.properties" /> <include name="hibernate_util.properties" /> + <include name="invoker.properties" /> <include name="VM_global_library.vm" /> </webinf> *************** *** 568,571 **** --- 574,578 ---- <include name="project.properties" /> <include name="interceptors.properties" /> + <include name="invoker.properties" /> </webinf> <lib dir="${lib.dir}"> *************** *** 1144,1148 **** --- 1151,1319 ---- </target> + <!-- =================================================================== --> + <!-- M A K E OPENDGROUPS E J B J A R F I L E --> + <!-- =================================================================== --> + <target name="ejb-jar-opendgroups" description="Make opendgroups ejb jar file"> + <delete> + <fileset dir="${distribution.dir}"> + <include name="**/${ejb.jar.file}" /> + </fileset> + </delete> + <!-- do this so that the module templates will be in the classpath --> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}"> + <include name="**/templates/**/*" /> + <include name="**/images/**/*" /> + <include name="**/themes/**/resource/*" /> + </fileset> + + </copy> + + <jar destfile="${distribution.dir}/${ejb.jar.file}"> + <metainf dir="${gen.misc}"> + <include name="ejb-jar.xml" /> + <include name="jboss.xml" /> + </metainf> + <fileset dir="${src.misc}"> + <include name="hibernate.properties" /> + <include name="VM_global_library.vm" /> + </fileset> + <fileset dir="${src.misc.opendgroups}"> + <include name="hibernate_util.properties" /> + <include name="coefficient.properties" /> + <include name="project.properties" /> + </fileset> + <fileset dir="${src.misc}/calendar"> + <include name="*.js" /> + <include name="*.css" /> + </fileset> + <fileset dir="${classes.dir}"> + <include name="**/aspects/**/*" /> + <include name="**/events/**/*" /> + <include name="**/modules/**/*" /> + <include name="**/themes/**/*" /> + <include name="**/interfaces/**/*" /> + <include name="**/invokers/**/*" /> + <include name="**/core/**/*" /> + <include name="**/util/**/*" /> + <include name="**/html/**/*" /> + <include name="**/authentication/**/*" /> + <include name="**/statistics/**/*" /> + <include name="**/exception/**/*" /> + <include name="**/*.vm" /> + <include name="**/*.xml" /> + <include name="**/*.properties" /> + <include name="**/*.hbm.xml" /> + <include name="**/*.gif" /> + <include name="**/*.jpg" /> + </fileset> + <fileset dir="${lib.dir}"> + <exclude name="xdoclet-*" /> + <exclude name="xjavadoc-*" /> + <exclude name="aspectjtools.jar" /> + <exclude name="ant-contrib-0.4.jar" /> + <exclude name="mail/*.jar" /> + </fileset> + </jar> + </target> + + + <!-- =================================================================== --> + <!-- B U I L D E A R F I L E --> + <!-- =================================================================== --> + <target name="ear-opendgroups" depends="ejb-jar-opendgroups, war-ejb" description="Make ear file"> + <ear earfile="${distribution.dir}/${ear.file}" appxml="${src.misc}/application.xml"> + <fileset dir="${distribution.dir}" includes="${ejb.jar.file}" /> + <fileset dir="${distribution.dir}" includes="${war.file}" /> + <fileset dir="${src.misc}" includes="jbossmq-destinations-service.xml" /> + </ear> + </target> + + <!-- =================================================================== --> + <!-- D E P L O Y E A R F I L E --> + <!-- =================================================================== --> + <target name="deploy-opendgroups" depends="generate-ejb, compile, ear-opendgroups"> + <copy todir="${jboss.deploy.dir}" overwrite="yes"> + <fileset dir="${distribution.dir}" includes="${ear.file}" /> + </copy> + </target> + + <!-- =================================================================== --> + <!-- G E N E R A T E J B O S S/E J B OPENDGROUPS R E L E A S E --> + <!-- =================================================================== --> + <target name="make-opendgroups-all-release" depends="clean,deploy-opendgroups"> + + <copy file="${src.misc}/hibernate.properties.sample" tofile="hibernate.properties" /> + + <tar destfile="${distribution.dir}/${coefficient.opendgroups.ejb.all.release.file}.tar.gz" compression="gzip"> + <tarfileset dir="${distribution.dir}"> + <include name="${ear.file}" /> + </tarfileset> + <tarfileset dir="."> + <include name="hibernate.properties" /> + </tarfileset> + <tarfileset dir="${src.misc.opendgroups}"> + <include name="INSTALL*" /> + <include name="README*" /> + </tarfileset> + <tarfileset dir="${modules.dir}/mailForum/${distribution.dir}"> + <include name="*.ear" /> + </tarfileset> + <tarfileset dir="${modules.dir}/dgroupsDefaultTheme/${distribution.dir}"> + <include name="*.ear" /> + </tarfileset> + <tarfileset dir="${modules.dir}/dgroupsJalbiradariTheme/${distribution.dir}"> + <include name="*.ear" /> + </tarfileset> + <tarfileset dir="${modules.dir}/dgroupsNavigation/${distribution.dir}"> + <include name="*.ear" /> + </tarfileset> + <tarfileset dir="${modules.dir}/dgroupsOneWorldTheme/${distribution.dir}"> + <include name="*.ear" /> + </tarfileset> + <tarfileset dir="${modules.dir}/dgroupsPlainWhiteTheme/${distribution.dir}"> + <include name="*.ear" /> + </tarfileset> + <tarfileset dir="${modules.dir}/fileUpload/${distribution.dir}"> + <include name="*.ear" /> + </tarfileset> + </tar> + + <zip destfile="${distribution.dir}/${coefficient.opendgroups.ejb.all.release.file}.zip"> + <zipfileset dir="${distribution.dir}"> + <include name="${ear.file}" /> + </zipfileset> + <zipfileset dir="."> + <include name="hibernate.properties" /> + </zipfileset> + <zipfileset dir="${src.misc.opendgroups}"> + <include name="INSTALL*" /> + <include name="README*" /> + </zipfileset> + <zipfileset dir="${modules.dir}/mailForum/${distribution.dir}"> + <include name="*.ear" /> + </zipfileset> + <zipfileset dir="${modules.dir}/dgroupsDefaultTheme/${distribution.dir}"> + <include name="*.ear" /> + </zipfileset> + <zipfileset dir="${modules.dir}/dgroupsJalbiradariTheme/${distribution.dir}"> + <include name="*.ear" /> + </zipfileset> + <zipfileset dir="${modules.dir}/dgroupsNavigation/${distribution.dir}"> + <include name="*.ear" /> + </zipfileset> + <zipfileset dir="${modules.dir}/dgroupsOneWorldTheme/${distribution.dir}"> + <include name="*.ear" /> + </zipfileset> + <zipfileset dir="${modules.dir}/dgroupsPlainWhiteTheme/${distribution.dir}"> + <include name="*.ear" /> + </zipfileset> + <zipfileset dir="${modules.dir}/fileUpload/${distribution.dir}"> + <include name="*.ear" /> + </zipfileset> + </zip> + <delete file="hibernate.properties" /> + </target> |