Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
07/02/08 19:40:36 (5 months ago)
Author:
bmckown
Message:

Merging trunk to complex-obs [4379][4764]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/complex-obs/build.xml

    r4417 r4785  
    163163        </target> 
    164164 
     165        <target name="package-all" depends="package-api,package-api-tests,package-web-src" 
     166                description="packages api, test, and web jars for use in modules"/> 
     167         
    165168        <target name="package-api" depends="compile-api" description="create api jar"> 
    166169                <mkdir dir="${dist.dir}" /> 
    …… 
    214217                        <compilerarg line="${compile.arguments}" /> 
    215218                </javac> 
    216                 <copy todir="${build.dir}"> 
    217                         <fileset dir="${test.dir}/api/org/openmrs/test" includes="TestingApplicationContext.xml" /> 
    218                         <fileset dir="${test.dir}/api/org/openmrs/test/include/" includes="initialInMemoryTestDataSet.xml" /> 
    219                 </copy> 
     219                 
     220                <!-- move files over that are required for modules to use this test-openmrs-api*.jar file --> 
     221                <copy todir="${build.dir}/org/openmrs/test" file="${test.dir}/api/org/openmrs/test/TestingApplicationContext.xml" /> 
     222                <copy todir="${build.dir}/org/openmrs/test/include" file="${test.dir}/api/org/openmrs/test/include/initialInMemoryTestDataSet.xml" /> 
     223                 
    220224        </target> 
    221225 
    …… 
    227231                        </manifest> 
    228232                        <fileset dir="${build.dir}"> 
     233                                <exclude name="**/web/test/*.class" /> 
    229234                                <include name="**/test/*.class" /> 
    230                                 <include name="TestingApplicationContext.xml" /> 
    231                                 <include name="**/initialInMemoryTestDataSet.xml" /> 
     235                                <include name="org/openmrs/test/TestingApplicationContext.xml" /> 
     236                                <include name="org/openmrs/test/include/initialInMemoryTestDataSet.xml" /> 
    232237                        </fileset> 
    233238                </jar> 
    …… 
    246251        </target> 
    247252 
    248     <target name="deploy" depends="package-web" if="tomcat.home" description="Move war into the tomcat's webapps directory"> 
    249                 <copy todir="${tomcat.home}/webapps"> 
    250                         <fileset file="${dist.dir}/${webapp.name}.war" /> 
    251                 </copy> 
     253        <!--  
     254                TODO: The 'deploy' target doesn't work all that well with our setup for some reason.     
     255        --> 
     256    <target name="deploy" depends="package-web" if="tomcat.home" description="Move war into the tomcat's webapps directory - "> 
     257                <echo message="Deploying webapp to Tomcat.  NOTE: The 'deploy' target is not working as expected yet."/> 
     258        <war src="${dist.dir}/${webapp.name}.war" 
     259            dest="${tomcat.home}/webapps/${webapp.name}"/> 
    252260    </target> 
     261         
     262        <target name="undeploy" if="tomcat.home" description="undeploy war file to servlet container's deployment dir"> 
     263                <echo message="Undeploying webapp from Tomcat"/> 
     264                <delete file="${tomcat.home}/webapps/${webapp.name}.war"/> 
     265                <delete dir="${tomcat.home}/webapps/${webapp.name}"/> 
     266        </target>                
     267         
    253268         
    254269        <target name="deploy-web" description="standalone copy web target"> 
    …… 
    266281                </copy> 
    267282        </target> 
     283 
     284         
     285 
     286         
    268287         
    269288        <target name="package-web-init" depends="compile-web" description="start creation of webapp. Use package-web for complete"> 
    …… 
    536555        </target> 
    537556         
     557         
     558 
     559         
    538560</project>