Project

General

Profile

« Previous | Next » 

Revision 2277

Updated build.xml to use new sql scripts.

View differences:

build.xml
30 30
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
31 31
-->
32 32
<project name="metacat" default="jar" basedir=".">
33

  
33
  <property environment="env"/>
34 34
  <property file="build.properties"/>  <!-- USER SPECIFIC PROPS -->
35 35

  
36 36
  <target name="check-db">
......
73 73
     <!-- Property to indicate is not MSSQL installation-->
74 74
     <property name="other" value="yes"/>
75 75
     <property name="install-sql"
76
               value="xmltables_postgres.sql" />
76
               value="xmltables-postgres.sql" />
77 77
     <property name="upgrade-1.2-sql"
78
               value="upgrade-db-to-1.2_postgres.sql" />
78
               value="upgrade-db-to-1.2-postgres.sql" />
79 79
     <property name="upgrade-1.3-sql"
80
               value="upgrade-db-to-1.3_postgres.sql" />
80
               value="upgrade-db-to-1.3-postgres.sql" />
81 81
     <property name="upgrade-1.4-sql"
82
               value="upgrade-db-to-1.4_postgres.sql" />
82
               value="upgrade-db-to-1.4-postgres.sql" />
83 83
    </target>
84 84

  
85 85
   <target name="sqlserver" if="use-sqlserver">
......
99 99

  
100 100
   <target name="config" depends="check-db,oracle,postgresql,sqlserver">
101 101
      <!-- usr for client testing, generally you don't need change-->
102
      <property name="mcuser" value="uid=tao,o=NCEAS,dc=ecoinformatics,dc=org"/>
102
      <property name="mcuser" value="uid=jones,o=NCEAS,dc=ecoinformatics,dc=org"/>
103 103
      <property name="mcpassword" value=""/>
104 104
      <property name="mcanotheruser" value="uid=jtao,o=LTER,dc=ecoinformatics,dc=org"/>
105 105
      <property name="mcanotherpassword" value=""/>
......
262 262

  
263 263
      <property name="srcdir" value="./src" />
264 264
      <property name="testdir" value="./test" />
265
      <property name="testtorun" value="MetacatClientTest" />
265
      <property name="testtorun" value="BuildIndexTest" />
266 266
      <property name="junittestsdir" value="./test/edu/ucsb/nceas/metacattest" />
267 267
      <property name="junitnettestsdir" value="./test/edu/ucsb/nceas/metacatnettest" />
268 268
      <property name="build.dir" value="./build"/>
......
571 571
      <mkdir dir="${installdir}/style/skins/${skin-name}" />
572 572
      <copy todir="${installdir}/style/skins/${skin-name}" filtering="yes">
573 573
       <fileset dir="lib/style/skins/${skin-name}">
574
           <include name="*.*"/>
575 574
           <exclude name="*.png"/>
576 575
           <exclude name="*.gif"/>
577 576
           <exclude name="*.jpg"/>
577
           <exclude name="**/CVS*"/>
578
           <exclude name="**/.#*"/>
578 579
       </fileset>
579 580
      </copy>
580 581
     <copy todir="${installdir}/style/skins/${skin-name}" filtering="no">
......
582 583
           <include name="*.png"/>
583 584
           <include name="*.gif"/>
584 585
           <include name="*.jpg"/>
586
           <exclude name="**/CVS*"/>
587
           <exclude name="**/.#*"/>
585 588
       </fileset>
586 589
      </copy>
590
      <!--
587 591
      <mkdir dir="${installdir}/style/skins/${skin-name}/images" />
588 592
     <copy todir="${installdir}/style/skins/${skin-name}/images" filtering="no">
589 593
       <fileset dir="lib/style/skins/${skin-name}/images">
......
592 596
           <include name="*.jpg"/>
593 597
       </fileset>
594 598
      </copy>
599
      -->
595 600

  
596 601
      <echo message="Install Skin completed." />
597 602
   </target>

Also available in: Unified diff