Project

General

Profile

« Previous | Next » 

Revision 4240

Added by daigle over 16 years ago

move the intall-ldap and install-registry functionality into the warprepare target.

View differences:

build.xml
184 184
   	  <property name="srcdir"              value="./src" />
185 185
   	  <property name="lib.dir"             value="./lib" />
186 186
   	  <property name="docdir"              value="./docs" />
187
 	  <property name="cgidir"              value="./cgi-bin" />
187 188
      <property name="testdir"             value="./test" />
188 189
      <property name="testtorun"           value="BuildIndexTest" />
189 190
      <property name="junittestsdir"       value="./test/edu/ucsb/nceas/metacattest" />
......
363 364
       <delete file="./harvest-list-editor-${release}.tar" />
364 365
   </target>
365 366

  
366
   <target  name="geteml" depends="getemlpre2,geteml2+" if="eml.required"
367
   <target  name="geteml" depends="getemlpre2,geteml2+,getConversionXSL" if="eml.required"
367 368
            description="Calls getemlpre2 and geteml2+ targets" />
368 369

  
369 370
   <target name="getemlpre2" depends="prepare" if="eml.required"
......
579 580
      <delete file="${dev.deploy.dir}/${metacat.context}/WEB-INF/server-config.wsdd"/>
580 581
   </target>
581 582

  
582
   <target name="install-registry" depends="init,getConversionXSL"
583
   <!-- target name="install-registry" depends="init,getConversionXSL"
583 584
            description="Install Registry">
584 585

  
585 586
      <mkdir dir="${inst.cgi.dir}" />
......
587 588
            todir="${inst.cgi.dir}"/>
588 589
      <chmod file="${inst.cgi.dir}/register-dataset.cgi" perm="ugo+x" />
589 590

  
590
      <!-- TODO SCW: set the permissions on this folder to be writable by the apache user -->
591
      <! - - TODO SCW: set the permissions on this folder to be writable by the apache user - - >
591 592
      <mkdir dir="${temp-dir}" />
592
      <!-- TODO SCW: use relative paths to grab these instead of copying to tmp,
593
                     used in readDocumentFromMetacat -->
593
      <! - - TODO SCW: use relative paths to grab these instead of copying to tmp,
594
                     used in readDocumentFromMetacat - - >
594 595
      <copy todir="${temp-dir}" filtering="yes">
595 596
       <fileset dir="lib/style/common/emlb6toeml2">
596 597
         <include name="*.xsl"/>
......
599 600
      </copy>
600 601

  
601 602
      <echo message="Install Registry completed." />
602
   </target>
603
   </target -->
603 604

  
604
   <target name="install-ldap" depends="init"
605
   <!-- target name="install-ldap" depends="init"
605 606
            description="Install Metacat LDAP Access">
606 607

  
607 608
      <mkdir dir="${inst.cgi.dir}" />
......
611 612
      <mkdir dir="${templates.dir}" />
612 613
      <copy todir="${templates.dir}">
613 614
        <fileset dir="lib/style/common/templates">
614
			<!-- SCW: Copy all files -->
615
			< ! - - SCW: Copy all files - - >
615 616
        </fileset>
616 617
      </copy>
617 618
      <echo message="ldapweb install complete." />
618
   </target>
619
   </target -->
619 620

  
620 621

  
621 622
   <target name="install-skin" depends="init"
......
680 681
       </war>
681 682
   </target>
682 683
	
683
	
684

  
685 684
   <target name="warPrepare" depends="jar,clientjar,harvesterjar"
686 685
            description="Prepare files for creating a web archive (WAR)">
687 686

  
......
690 689
       <property name="war.context" value="${build.war}/${metacat.context}" />
691 690
   	   <property name="war.webinf.sql" value="${war.webinf}/sql" />
692 691
   	   <property name="war.context.docs" value="${war.context}/docs" />
692
	   <property name="war.context.cgi" value="${war.context}/cgi-bin" />  
693
   	   <property name="war.context.temp" value="${war.context}/temp" />
694
   	   <property name="war.context.templates" value="${war.context}${style-common-relpath}/templates" />
693 695
       <mkdir dir="${war.lib}" />
694 696
       <mkdir dir="${war.webinf}" />
695 697
       <mkdir dir="${war.context}" />
696 698
   	   <mkdir dir="${war.webinf.sql}" />
697 699
   	   <mkdir dir="${war.context.docs}" />
700
       <mkdir dir="${war.context.cgi}" />
701
   	   <mkdir dir="${war.context.temp}" />
702
       <mkdir dir="${war.context.templates}" />
698 703
       
699 704
   	   <!--copy file="${lib.dir}/${jdbc.lib.oracle}" todir="${war.lib}" / -->
700 705
	   <!--copy file="${lib.dir}/${jdbc.lib.postgres}" todir="${war.lib}" / -->
......
774 779
	           <include name="**/*.sql"/>
775 780
	         </fileset>
776 781
	   </copy>
782
       
783
   	   <!-- registry cgi section -->
784
       <copy file="src/perl/register-dataset.cgi" todir="${war.context.cgi}"/>
785
       <!-- chmod file="${war.context.cgi}/register-dataset.cgi" perm="ugo+x" / -->
786

  
787
       <!-- TODO SCW: set the permissions on this folder to be writable by the apache user -->
788
       <!-- TODO SCW: use relative paths to grab these instead of copying to tmp,
789
                   used in readDocumentFromMetacat -->
790
   	   <!-- TODO MCD copy temp files to actual location using config util?? -->
791
       <copy todir="${war.context.temp}" filtering="yes">
792
         <fileset dir="lib/style/common/emlb6toeml2">
793
           <include name="*.xsl"/>
794
           <include name="*.xml"/>
795
         </fileset>
796
       </copy>
797
   	
798
       <!-- ldap cgi section -->
799
       <copy file="src/perl/ldapweb.cgi" todir="${war.context.cgi}" />
800
       <!-- chmod file="${war.context.cgi}/ldapweb.cgi" perm="ugo+x" / -->
801
       <copy todir="${war.context.templates}">
802
         <fileset dir="lib/style/common/templates">
803
			<!-- SCW: Copy all files -->
804
         </fileset>
805
       </copy>
777 806
   </target>
778 807

  
779 808
   <target name="getConversionXSL" depends="prepare"

Also available in: Unified diff