Project

General

Profile

« Previous | Next » 

Revision 822

Revised build.xml and metacat.properties to make it easier to
install alternative stylesheets for metacat. In the process,
replaced the deprecated copydir and copyfile commands in build.xml
with appropriate "copy" commands.

View differences:

build.xml
45 45
      <property name="image-path" value="/img/jones" />
46 46
      <property name="server" value="dev.nceas.ucsb.edu"/>
47 47
      <property name="replication-log" value="/tmp/metacatreplication.log"/>
48
      <property name="dataport" value="4444"/>
49 48
      <property name="user" value="jones"/>
50 49
      <property name="password" value="your-pw-goes-here"/>
50
      <property name="result-style" 
51
         value="file:///opt/tomcat/webapps/${html-path}/style/resultset.xsl" />
51 52

  
52 53
      <filter token="jdbc-connect" value="${jdbc-connect}"/>
53
      <filter token="data-port" value="${dataport}"/>
54 54
      <filter token="install-dir" value="${installdir}"/>
55 55
      <filter token="server" value="${server}"/>
56 56
      <filter token="replication-log" value="${replication-log}"/>
......
62 62
      <filter token="image-path" value="${image-path}"/>
63 63
      <filter token="web-base-url" value="${web-base-url}"/>
64 64
      <filter token="replication-path" value="${replication-path}"/>
65
      <filter token="result-style" value="${result-style}"/>
65 66
      <property name="srcdir" value="./src" />
66 67

  
67 68
      <property name="build.dir" value="./build"/>
......
108 109
      <mkdir dir="${build.dest}"/>
109 110
      <mkdir dir="${build.javadocs}"/>
110 111

  
111
      <copydir src="${srcdir}" 
112
               dest="${build.src}" 
113
               filtering="yes"
114
               includes="edu/**, com/**"
115
               excludes="**/CVS* **/.#* **/*.sql"/>
116

  
112
      <copy todir="${build.src}" filtering="yes">
113
        <fileset dir="${srcdir}">
114
          <include name="edu/**"/>
115
          <include name="com/**"/>
116
          <exclude name="**/CVS*"/>
117
          <exclude name="**/.#*"/>
118
          <exclude name="**/*.sql"/>
119
        </fileset>
120
      </copy>
117 121
   </target>
118 122

  
119 123
   <target name="compile" depends="prepare">
......
121 125
              destdir="${build.dest}" 
122 126
              classpath="${cpath}" 
123 127
              excludes="**/*.sql" /> 
124
       <copyfile src="lib/metacat.properties" 
125
                 dest="${build.dest}/${package.home}/metacat.properties" 
126
                 filtering="yes" />
127
       <copyfile src="lib/srbProps.properties" 
128
                 dest="${build.dest}/${package.home}/srbProps.properties"/>
128
       <copy file="lib/metacat.properties" 
129
             tofile="${build.dest}/${package.home}/metacat.properties" 
130
             filtering="yes" />
131
       <copy file="lib/srbProps.properties" 
132
             tofile="${build.dest}/${package.home}/srbProps.properties"/>
129 133
   </target> 
130 134

  
131 135
   <target name="jar" depends="compile">
132 136
       <delete file="${build.dir}/${name}.jar" />
133
       <copydir src="lib/srbrmi" dest="${build.dest}" />
137
       <copy todir="${build.dest}">
138
         <fileset dir="lib/srbrmi"/>
139
       </copy>
134 140
       <jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"
135 141
            excludes="**/protocols/" />
136 142
   </target> 
......
143 149

  
144 150
   <target name="install" depends="jar">
145 151
       <mkdir dir="${installdir}/WEB-INF/lib" />
146
       <copyfile src="${build.dir}/${name}.jar" 
147
                 dest="${installdir}/WEB-INF/lib/${name}.jar" />
148
       <copyfile src="${xmlp2}" 
149
                 dest="${installdir}/WEB-INF/lib/xerces.jar" />
150
       <copyfile src="${xmlp}" 
151
                 dest="${installdir}/WEB-INF/lib/xmlparserv2.jar" />
152
       <copyfile src="${jdbc}" 
153
                 dest="${installdir}/WEB-INF/lib/oracle-jdbc111.jar" />
154
       <copyfile src="${cos}" 
155
                 dest="${installdir}/WEB-INF/lib/cos.jar" />
156
       <copyfile src="lib/web.xml" 
157
                 dest="${installdir}/WEB-INF/web.xml" />
158
       <copydir src="lib"
159
                dest="${build.img}"
160
                includes="*.jpg,*.png,*.gif,**/marine/*.jpg, **/marine/*.png, **/marine/*.gif"/>
161
       <copydir src="lib" dest="${installdir}"
162
                filtering="yes"
163
                excludes="*.jar,*.properties,web.xml,**/srbrmi/*" />
152
       <copy file="${build.dir}/${name}.jar" 
153
             tofile="${installdir}/WEB-INF/lib/${name}.jar" />
154
       <copy file="${xmlp2}" 
155
             tofile="${installdir}/WEB-INF/lib/xerces.jar" />
156
       <copy file="${xmlp}" 
157
             tofile="${installdir}/WEB-INF/lib/xmlparserv2.jar" />
158
       <copy file="${jdbc}" 
159
             tofile="${installdir}/WEB-INF/lib/oracle-jdbc111.jar" />
160
       <copy file="${cos}" 
161
             tofile="${installdir}/WEB-INF/lib/cos.jar" />
162
       <copy file="lib/web.xml" 
163
             tofile="${installdir}/WEB-INF/web.xml" />
164
       <copy todir="${build.img}" filtering="no">
165
         <fileset dir="lib">
166
           <include name="**/*.jpg"/>
167
           <include name="**/*.png"/>
168
           <include name="**/*.gif"/>
169
         </fileset>
170
       </copy>
171
       <copy todir="${installdir}" filtering="yes">
172
         <fileset dir="lib">
173
           <exclude name="*.jar"/>
174
           <exclude name="*.properties"/>
175
           <exclude name="web.xml"/>
176
           <exclude name="**/srbrmi*"/>
177
         </fileset>
178
       </copy>
164 179
       <mkdir dir="${installdir}/dtd" />
165
       <copydir src="./lib/dtd" dest="${installdir}/dtd"
166
                filtering="yes"
167
                includes="*.dtd" />
180
       <copy todir="${installdir}/dtd" filtering="yes">
181
         <fileset dir="lib/dtd">
182
           <include name="*.dtd"/>
183
         </fileset>
184
       </copy>
168 185
   </target> 
169 186

  
170 187
   <target name="clean" depends="init">
171
       <deltree dir="${build.dir}" />
188
       <delete dir="${build.dir}" />
172 189
   </target>
173 190

  
174 191
   <target name="jdoc" depends="prepare">
175
       <javadoc packagenames="edu.ucsb.nceas.metacat"
192
       <javadoc packagenames="edu.ucsb.nceas.*"
176 193
           sourcepath="${build.src}"
177 194
           destdir="${build.javadocs}"
178 195
           author="true"

Also available in: Unified diff