Project

General

Profile

Revision 3095

I've added new properties called "styled-shared-path" and
"style-shared-relpath" that represent the directory in
$METACAT_HOME/lib/style/shared. This directory contains shared XSL
stylesheets that are similar to those found in $METACAT_HOME/lib/style/common,
but differ enough that they are not backwards-compatible, and therefore
needed a new location so as to not stomp on the common files used by skins
that were built prior to the PISCO skin.

View differences:

build.xml
183 183
      <property name="servlet-path"        value="/${metacat.context}/metacat"/>
184 184
      <property name="html-path"           value="/${metacat.context}"/>
185 185
      <property name="systemidserver"      value="${http.protocol}://${httpserver}"/>
186
      <property name="style-common-relpath"
187
                                           value="/style/common"/>
188
      <property name="style-common-cvsrelpath"
189
                                           value="lib${style-common-relpath}"/>
190
      <property name="style-common-fullpath"
191
                                           value="/${installdir}${style-common-relpath}"/>
186
      <property name="style-common-relpath" value="/style/common"/>
187
      <property name="style-shared-relpath" value="/style/shared"/>
188
      <property name="style-common-cvsrelpath" value="lib${style-common-relpath}"/>
189
      <property name="style-common-fullpath" value="/${installdir}${style-common-relpath}"/>
192 190
      <property name="templates.dir"       value="${style-common-fullpath}/templates"/>
193
      <property name="style-common-path"
194
                                           value="/${metacat.context}${style-common-relpath}"/>
191
      <property name="style-common-path"   value="/${metacat.context}${style-common-relpath}"/>
192
      <property name="style-shared-path"   value="/${metacat.context}${style-shared-relpath}"/>
195 193
      <property name="style-skins-relpath" value="/style/skins"/>
196 194
      <property name="style-skins-path"    value="/${metacat.context}${style-skins-relpath}"/>
197 195
      <property name="replication-log"     value="/tmp/metacatreplication.log"/>
......
286 284
      <filter token="style-common-relpath" value="${style-common-relpath}"/>
287 285
      <filter token="style-common-fullpath" value="${style-common-fullpath}"/>
288 286
      <filter token="style-common-path" value="${style-common-path}"/>
287
      <filter token="style-shared-path" value="${style-shared-path}"/>
289 288
      <filter token="templates.dir" value="${templates.dir}"/>
290 289

  
291 290
      <!-- The "style-path" filter is used by the eml xsl stylesheets!!  -->

Also available in: Unified diff