Project

General

Profile

Revision 882

Updated documentation to reflect new installprocess.

Modified build.xml to properly copy the docs into the distribution, which
required some changes in the ant token filtering scheme.

View differences:

lib/style/resultset.xsl
247 247
                     </xsl:if>
248 248
                     <xsl:if test="starts-with(./triple, '')">
249 249
                       <xsl:attribute name="href">
250
                         <xsl:text>http://@server@@servlet-path@?action=read&amp;qformat=knb&amp;docid=</xsl:text>
250
                         <xsl:text>@server@@servlet-path@?action=read&amp;qformat=knb&amp;docid=</xsl:text>
251 251
                         <xsl:value-of select="./relationdoc" />
252 252
                       </xsl:attribute>
253 253
                       <xsl:if 
lib/metacat.properties
6 6
user=@user@
7 7
password=@password@
8 8
defaultDB=@jdbc-connect@
9
dbDriver=oracle.jdbc.driver.OracleDriver
9
dbDriver=@dbDriver@
10 10
dbAdapter=edu.ucsb.nceas.dbadapter.OracleAdapter
11 11
initialConnections=5
12 12
incrementConnections=5
......
21 21
htmlpath=@html-path@
22 22
packagedoctype=-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN
23 23
accessdoctype=-//ecoinformatics.org//eml-access-2.0.0beta4//EN
24
server=@server@
24
server=@serverhost@
25 25
authclass=edu.ucsb.nceas.metacat.AuthLdap
26 26
ldapurl=ldap://ldap.ecoinformatics.org:389/
27 27
ldapsurl=ldap://ldap.ecoinformatics.org:389/
......
34 34
replicationpath=@replication-path@
35 35
replicationlog=@replication-log@
36 36
dtdPath=@install-dir@/dtd/
37
dtdURL=http://@server@@html-path@/dtd/
37
dtdURL=@server@@html-path@/dtd/
38 38
datafilepath=@install-dir@/data/
39 39
certPath=@install-dir@/
40 40

  
lib/knb.xml
1 1
<?xml version="1.0"?>
2 2
<style-set name="knb">
3
  <default-style>http://@server@@style-path@/ascii-treeview.xsl</default-style>
3
  <default-style>@server@@style-path@/ascii-treeview.xsl</default-style>
4 4
  <doctype publicid="-//NCEAS//resultset//EN">
5
    <target publicid="-//W3C//HTML//EN">http://@server@@style-path@/resultset.xsl</target>
5
    <target publicid="-//W3C//HTML//EN">@server@@style-path@/resultset.xsl</target>
6 6
  </doctype>
7 7
  <doctype publicid="-//NCEAS//login//EN">
8
    <target publicid="-//W3C//HTML//EN">http://@server@@style-path@/login.xsl</target>
8
    <target publicid="-//W3C//HTML//EN">@server@@style-path@/login.xsl</target>
9 9
  </doctype>
10 10
  <doctype publicid="-//NCEAS//eml-dataset-2.0//EN">
11
    <target publicid="-//W3C//HTML//EN">http://@server@@style-path@/eml-dataset-display.xsl</target>
11
    <target publicid="-//W3C//HTML//EN">@server@@style-path@/eml-dataset-display.xsl</target>
12 12
  </doctype>
13 13
  <doctype publicid="-//NCEAS//eml-dataset//EN">
14
    <target publicid="-//W3C//HTML//EN">http://@server@@style-path@/eml-dataset-display.xsl</target>
14
    <target publicid="-//W3C//HTML//EN">@server@@style-path@/eml-dataset-display.xsl</target>
15 15
  </doctype>
16 16
  <doctype publicid="-//NCEAS//eml-resource//EN">
17
    <target publicid="-//W3C//HTML//EN">http://@server@@style-path@/eml-dataset-display.xsl</target>
17
    <target publicid="-//W3C//HTML//EN">@server@@style-path@/eml-dataset-display.xsl</target>
18 18
  </doctype>
19 19
  <doctype publicid="-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN">
20
    <target publicid="-//W3C//HTML//EN">http://@server@@style-path@/eml-dataset-display.xsl</target>
20
    <target publicid="-//W3C//HTML//EN">@server@@style-path@/eml-dataset-display.xsl</target>
21 21
  </doctype>
22 22
</style-set>
lib/marine/marine.xsl
165 165
        </p>
166 166
        </font>
167 167
        <hr />
168
        <form action="http://@server@@servlet-path@#browse" 
168
        <form action="@server@@servlet-path@#browse" 
169 169
              method="POST"> 
170 170
        <a name="beginform" />  
171 171
        <table width="100%" border="0">
......
444 444
                  </xsl:if>
445 445
                  <xsl:if test="starts-with(./relationdoc, 'metacat')">
446 446
                    <xsl:attribute name="href">
447
                      <xsl:text>http://@server@@servlet-path@?action=read&amp;qformat=html&amp;docid=</xsl:text>
447
                      <xsl:text>@server@@servlet-path@?action=read&amp;qformat=html&amp;docid=</xsl:text>
448 448
                      <xsl:value-of select="./relationdoc" />
449 449
                    </xsl:attribute>
450 450
                    <xsl:if test="./relationdoctype = '-//NCEAS//eml-variable//EN'">
lib/marine.html
34 34
<body class="emlbody"> 
35 35

  
36 36
<script language="JavaScript">
37
 window.location="http://@server@@servlet-path@?" +
37
 window.location="@server@@servlet-path@?" +
38 38
  "action=query&anyfield=%&returndoctype=any&qformat=html&" +
39 39
  "returnfield=resource/dataset/originator/individualName/surName&" +
40 40
  "returnfield=resource/dataset/originator/individualName/givenName&" + 
......
51 51
 
52 52
<noscript>
53 53
Please click 
54
<a href="http://@server@@servlet-path@?
54
<a href="@server@@servlet-path@?
55 55
action=query&anyfield=%&returndoctype=any&qformat=html&
56 56
returnfield=resource/dataset/originator/individualName/surName&
57 57
returnfield=resource/dataset/originator/individualName/givenName&
......
64 64
</noscript>
65 65

  
66 66
Please click 
67
<a href="http://@server@@servlet-path@??
67
<a href="@server@@servlet-path@??
68 68
action=query&anyfield=%&returndoctype=any&qformat=html&
69 69
returnfield=resource/dataset/originator/individualName/surName&
70 70
returnfield=resource/dataset/originator/individualName/givenName&
src/loaddtd.sql
3 3
        AND public_id LIKE '%@eml-version@%';
4 4
INSERT INTO xml_catalog (entry_type, public_id, system_id)
5 5
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-@eml-version@//EN',
6
          'http://@server@@html-path@/dtd/eml-access-@eml-version@.dtd');
6
          '@server@@html-path@/dtd/eml-access-@eml-version@.dtd');
7 7
INSERT INTO xml_catalog (entry_type, public_id, system_id)
8 8
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-@eml-version@//EN',
9
          'http://@server@@html-path@/dtd/eml-attribute-@eml-version@.dtd');
9
          '@server@@html-path@/dtd/eml-attribute-@eml-version@.dtd');
10 10
INSERT INTO xml_catalog (entry_type, public_id, system_id)
11 11
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-@eml-version@//EN',
12
          'http://@server@@html-path@/dtd/eml-constraint-@eml-version@.dtd');
12
          '@server@@html-path@/dtd/eml-constraint-@eml-version@.dtd');
13 13
INSERT INTO xml_catalog (entry_type, public_id, system_id)
14 14
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-@eml-version@//EN',
15
          'http://@server@@html-path@/dtd/eml-coverage-@eml-version@.dtd');
15
          '@server@@html-path@/dtd/eml-coverage-@eml-version@.dtd');
16 16
INSERT INTO xml_catalog (entry_type, public_id, system_id)
17 17
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-@eml-version@//EN',
18
          'http://@server@@html-path@/dtd/eml-dataset-@eml-version@.dtd');
18
          '@server@@html-path@/dtd/eml-dataset-@eml-version@.dtd');
19 19
INSERT INTO xml_catalog (entry_type, public_id, system_id)
20 20
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-@eml-version@//EN',
21
          'http://@server@@html-path@/dtd/eml-entity-@eml-version@.dtd');
21
          '@server@@html-path@/dtd/eml-entity-@eml-version@.dtd');
22 22
INSERT INTO xml_catalog (entry_type, public_id, system_id)
23 23
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-@eml-version@//EN',
24
          'http://@server@@html-path@/dtd/eml-literature-@eml-version@.dtd');
24
          '@server@@html-path@/dtd/eml-literature-@eml-version@.dtd');
25 25
INSERT INTO xml_catalog (entry_type, public_id, system_id)
26 26
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-@eml-version@//EN',
27
          'http://@server@@html-path@/dtd/eml-physical-@eml-version@.dtd');
27
          '@server@@html-path@/dtd/eml-physical-@eml-version@.dtd');
28 28
INSERT INTO xml_catalog (entry_type, public_id, system_id)
29 29
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-@eml-version@//EN',
30
          'http://@server@@html-path@/dtd/eml-project-@eml-version@.dtd');
30
          '@server@@html-path@/dtd/eml-project-@eml-version@.dtd');
31 31
INSERT INTO xml_catalog (entry_type, public_id, system_id)
32 32
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-@eml-version@//EN',
33
          'http://@server@@html-path@/dtd/eml-protocol-@eml-version@.dtd');
33
          '@server@@html-path@/dtd/eml-protocol-@eml-version@.dtd');
34 34
INSERT INTO xml_catalog (entry_type, public_id, system_id)
35 35
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-version@//EN',
36
          'http://@server@@html-path@/dtd/eml-software-@eml-version@.dtd');
36
          '@server@@html-path@/dtd/eml-software-@eml-version@.dtd');
docs/user/metacatinstall.html
211 211
      &lt;property name="html-path" value="/metadata"/&gt;
212 212
      &lt;property name="image-path" value="/img/metadata" /&gt;
213 213
      &lt;property name="style-path" value="/jones/style"/&gt;
214
      &lt;property name="server" value="metacat.nceas.ucsb.edu"/&gt;
214
      &lt;property name="serverhost" value="dev.nceas.ucsb.edu"/&gt;
215
      &lt;property name="server" value="http://metacat.nceas.ucsb.edu"/&gt;
215 216
      &lt;property name="replication-log" value="metacatreplication.log"/&gt;
216 217
      &lt;property name="user" value="metadata"/&gt;
217 218
      &lt;property name="password" value="your-pw-goes-here"/&gt;
......
274 275
   should be a directory that is accessible by the web server.
275 276
  </li>
276 277
  <li>
277
   Server is the full internet name of the server on which Metacat is running.
278
   The serverhost is the full internet name of the server on which Metacat 
279
   is running.
278 280
  </li>
279 281
  <li>
282
   The server is the http address on which Metacat is running.
283
  </li>
284
  <li>
280 285
   Replication-log is the location at which you want Metacat to place any 
281 286
   replication log files.  The user that starts Tomcat must have permission to
282 287
   write to this directory.
docs/user/default.css
1
 /*
2
  *   '$RCSfile$'
3
  *     Purpose: Default style sheet for KNB project web pages 
4
  *              Using this stylesheet rather than placing styles directly in 
5
  *              the KNB web documents allows us to globally change the 
6
  *              formatting styles of the entire site in one easy place.
7
  *   Copyright: 2000 Regents of the University of California and the
8
  *               National Center for Ecological Analysis and Synthesis
9
  *     Authors: Matt Jones
10
  *
11
  *    '$Author$'
12
  *      '$Date$'
13
  *  '$Revision$'
14
  *
15
  * This program is free software; you can redistribute it and/or modify
16
  * it under the terms of the GNU General Public License as published by
17
  * the Free Software Foundation; either version 2 of the License, or
18
  * (at your option) any later version.
19
  *
20
  * This program is distributed in the hope that it will be useful,
21
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
22
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
23
  * GNU General Public License for more details.
24
  *
25
  * You should have received a copy of the GNU General Public License
26
  * along with this program; if not, write to the Free Software
27
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
28
  */
29

  
30
body { 
31
    color: black; 
32
    background: white;
33
    font-size: 1em; 
34
    font-family: Arial,Helvetica,sans-serif; }
35
a {
36
    color: green;
37
    text-decoration: underline; }
38
a.toollink {
39
    color: green;
40
    text-decoration: none; }
41
a.sitelink {
42
    color: green;
43
    text-decoration: none; 
44
    font-weight: bold; }
45
.logo {
46
    background: #ccccff;
47
    color: green;
48
    width: 3em;
49
    margin-left: 0.5em;
50
    margin-right: 0.5em;
51
    margin-top: 0.5em;
52
    margin-bottom: 0.5em;
53
    padding: 0.5em;
54
    font-size: 2em; 
55
    font-weight: bold; }
56
.tabledefault {
57
    background: white;
58
    color: black;
59
    width: 100%;
60
    font-size: 1em; 
61
    left-padding: 0.25em;
62
    right-padding: 0.25em; }
63
.tablepanel {
64
    background: #eeeeee;
65
    color: black;
66
    font-size: 1em; 
67
    left-padding: 0.25em;
68
    right-padding: 0.25em; }
69
.tablehead {
70
    background: #ccccff;
71
    vertical-align: baseline;
72
    color: black;
73
    font-size: 1em;
74
    font-weight: bold;
75
    }
76
.tableheadcontrast {
77
    background: #dddddd;
78
    vertical-align: baseline;
79
    color: black;
80
    font-size: 1.2em; 
81
    font-weight: bold; }
82
.title { 
83
    color: black; 
84
    margin-top: 1em;
85
    font-size: 1.5em; 
86
    font-weight: bold; }
87
.subtitle { 
88
    color: black; 
89
    margin-top: 0.5em;
90
    margin-left: 3em;
91
    font-weight: bold;
92
    font-style: italic; }
93
.pagetitle {
94
    font-family: Arial,Helvetica,sans-serif;
95
    font-size: 3em;
96
    font-weight: bold;
97
    color: green;
98
    margin-left: 0.25em; }
99
.pagesub {
100
    font-family: Arial,Helvetica,sans-serif;
101
    font-size: 1em;
102
    font-weight: bold;
103
    color: green;
104
    margin-left: 3em;
105
    margin-top: 0.5em;
106
    margin-bottom: 2em; }
107
.instright { 
108
    color: black; 
109
    text-align: right;
110
    vertical-align: middle;
111
    padding: 1em;
112
    font-size: 1em; 
113
    font-weight: bold; }
114
.instleft { 
115
    color: black; 
116
    text-align: left;
117
    vertical-align: middle;
118
    padding: 1em;
119
    font-size: 1em; 
120
    font-weight: bold; }
121
p { 
122
    margin: 0.25em; }
123
.required { 
124
    color: red; }
125
.emphasis { 
126
    color: red; }
127
p.label { 
128
    color: black; 
129
    font-weight: bold; }
130
p.contact { 
131
    color: black; 
132
    padding: 1em;
133
    font-size: 0.75em; 
134
    font-weight: normal;
135
    font-style: italic; }
136
p.header {
137
    color: black; 
138
    padding: 1em;
139
    font-size: 0.75em; 
140
    font-weight: bold; }
141
img.logoright {
142
    padding: 0.5em;
143
    border: none;
144
    float: right; }
145
img.logoleft {
146
    padding: 0.25em;
147
    border: none;
148
    float: left; }
149
.roweven {
150
    background: #c0d3e7; }
151
.rowodd {
152
    background: white; }
153
.highlight  {
154
    background-color: #dddddd; 
155
    font-size: -1; }
156
.plaintext {
157
    color: black;
158
    font-weight: normal;
159
    font-size: 1em;
160
    }
161
.boldtext {
162
    color: black;
163
    font-weight: bold;
164
    font-size: 1em;
165
    }
0 166

  
build.xml
40 40
      <property name="release" value="1.0.1"/>
41 41
      <property name="web-base-url" 
42 42
                value="http://knb.ecoinformatics.org"/>
43
      <property name="replication-path" value="/servlet/replication"/>
43
      <property name="replication-path" value="/jones/servlet/replication"/>
44 44
      <property name="servlet-path" value="/jones/servlet/metacat"/>
45 45
      <property name="html-path" value="/jones"/>
46 46
      <property name="image-path" value="/img/jones" />
47 47
      <property name="style-path" value="/jones/style"/>
48
      <property name="server" value="dev.nceas.ucsb.edu"/>
48
      <property name="serverhost" value="dev.nceas.ucsb.edu"/>
49
      <property name="server" value="http://${serverhost}"/>
49 50
      <property name="replication-log" value="/tmp/metacatreplication.log"/>
50 51
      <property name="user" value="jones"/>
51 52
      <property name="password" value="your-pw-goes-here"/>
......
57 58
      <property name="cvsroot" 
58 59
                value=":ext:jones@cvs.nceas.ucsb.edu:/cvs/pbi" />
59 60

  
61

  
62
      <filter token="docrooturl" value="./" />
60 63
      <filter token="jdbc-connect" value="${jdbc-connect}"/>
64
      <filter token="dbDriver" value="${dbDriver}"/>
61 65
      <filter token="install-dir" value="${installdir}"/>
66
      <filter token="serverhost" value="${serverhost}"/>
62 67
      <filter token="server" value="${server}"/>
63 68
      <filter token="replication-log" value="${replication-log}"/>
64 69
      <filter token="release" value="${release}"/>
......
85 90
      <property name="build.javadocs" value="${build.dir}/docs/api"/>
86 91
      <property name="build.img" value="/opt/httpd/html${image-path}"/>
87 92

  
88
      <property name="dist.dir" value="./dist"/>
93
      <property name="dist.dir" value="dist"/>
89 94
      <property name="ver.dir" value="${dist.dir}/${name}-${release}"/>
90 95
      <property name="ver.src" value="${ver.dir}/src"/>
91 96

  
......
256 261
      <delete dir="${ver.dir}" />
257 262
      <mkdir dir="${ver.dir}"/>
258 263
      <copy todir="${ver.dir}">
259
        <fileset dir="." excludes="**/CVS* **/.#* **/src* **/test* **/build*"/>
264
        <fileset dir="." 
265
            excludes="**/CVS* **/.#* **/src* **/test* **/build* **/docs* ${dist.dir}"/>
260 266
      </copy>
261 267
      <copy todir="${ver.dir}" file="build.xml"/>
262 268
      <copy todir="${ver.dir}/lib" file="${build.dir}/metacat.jar"/>
263 269
      <copy todir="${ver.dir}/lib" file="${build.dir}/protocol.jar"/>
270

  
271
      <copy todir="${ver.dir}/docs" filtering="yes">
272
        <fileset dir="docs" excludes="**/*gif **/*jpg **/*png" />
273
      </copy>
274
      <copy todir="${ver.dir}/docs" filtering="no">
275
        <fileset dir="docs" includes="**/*gif **/*jpg **/*png" />
276
      </copy>
264 277
      <copy todir="${ver.dir}/docs/dev">
265 278
        <fileset dir="${build.dir}/docs"/>
266 279
      </copy>
267 280
       
268
      <delete file="./lib/${name}-${release}.zip"/>
269
      <zip zipfile="./lib/${name}-${release}.zip" basedir="${dist.dir}"/>
270
      <delete file="./lib/${name}-${release}.tar.gz" />
271
      <tar tarfile="./lib/${name}-${release}.tar" basedir="${dist.dir}"/>
272
      <gzip zipfile="./lib/${name}-${release}.tar.gz" 
273
                src="./lib/${name}-${release}.tar"/>
274
      <delete file="./lib/${name}-${release}.tar" />
281
      <delete file="./${name}-${release}.zip"/>
282
      <zip zipfile="./${name}-${release}.zip" basedir="${dist.dir}"/>
283
      <delete file="./${name}-${release}.tar.gz" />
284
      <tar tarfile="./${name}-${release}.tar" basedir="${dist.dir}"/>
285
      <gzip zipfile="./${name}-${release}.tar.gz" 
286
                src="./${name}-${release}.tar"/>
287
      <delete file="./${name}-${release}.tar" />
275 288
  </target> 
276 289

  
277 290
  <target name="distsrc" depends="dist">
......
280 293
        <fileset dir="./src"/>
281 294
      </copy>
282 295

  
283
      <delete file="./lib/${name}-src-${release}.zip"/>
284
      <zip zipfile="./lib/${name}-src-${release}.zip" basedir="${dist.dir}"/>
285
      <delete file="./lib/${name}-src-${release}.tar.gz" />
286
      <tar tarfile="./lib/${name}-src-${release}.tar" basedir="${dist.dir}"/>
287
      <gzip zipfile="./lib/${name}-src-${release}.tar.gz" 
288
                src="./lib/${name}-src-${release}.tar"/>
289
      <delete file="./lib/${name}-src-${release}.tar" />
296
      <delete file="./${name}-src-${release}.zip"/>
297
      <zip zipfile="./${name}-src-${release}.zip" basedir="${dist.dir}"/>
298
      <delete file="./${name}-src-${release}.tar.gz" />
299
      <tar tarfile="./${name}-src-${release}.tar" basedir="${dist.dir}"/>
300
      <gzip zipfile="./${name}-src-${release}.tar.gz" 
301
                src="./${name}-src-${release}.tar"/>
302
      <delete file="./${name}-src-${release}.tar" />
290 303
      <delete dir="${dist.dir}"/>
291 304
  </target> 
292 305

  

Also available in: Unified diff