Project

General

Profile

Revision 8265

Refer to metacat.war deployments since those are now the default. https://projects.ecoinformatics.org/ecoinfo/issues/6082

View differences:

src/scripts/debian/knb
1
NameVirtualHost *:80
2
<VirtualHost *:80>
3
        DocumentRoot /var/lib/tomcat6/webapps/knb
4
        ServerName <your_hostname_here>
5

  
6
        ScriptAlias /knb/cgi-bin/ /var/lib/tomcat6/webapps/knb/cgi-bin/
7
        <Directory "/var/lib/tomcat6/webapps/knb/cgi-bin/">
8
                AllowOverride All
9
                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
10
                Order allow,deny
11
                Allow from all
12
        </Directory>
13

  
14
        <IfModule mod_jk.c>
15
                JkMount /knb ajp13
16
                JkMount /knb/* ajp13
17
                JkMount /knb/metacat ajp13
18
                JkMount /*.jsp ajp13
19
                JkUnMount /knb/cgi-bin/* ajp13
20
        </IfModule>
21
</VirtualHost>
22

  
src/scripts/debian/knb-ssl
1
<IfModule mod_ssl.c>
2
NameVirtualHost *:443
3
<VirtualHost *:443>
4
        DocumentRoot /var/lib/tomcat6/webapps/knb
5

  
6
        ScriptAlias /knb/cgi-bin/ /var/lib/tomcat6/webapps/knb/cgi-bin/
7
        <Directory "/var/lib/tomcat6/webapps/knb/cgi-bin/">
8
                AllowOverride All
9
                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
10
                Order allow,deny
11
                Allow from all
12
        </Directory>
13

  
14
        <IfModule mod_jk.c>
15
                JkMount /knb ajp13
16
                JkMount /knb/* ajp13
17
                JkMount /knb/metacat ajp13
18
                JkMount /*.jsp ajp13
19
                JkUnMount /knb/cgi-bin/* ajp13
20

  
21
                JkOptions +ForwardURICompatUnparsed
22
        </IfModule>
23

  
24
        AllowEncodedSlashes On
25
        AcceptPathInfo      On
26
        
27
        #   SSL Engine Switch:
28
        #   Enable/Disable SSL for this virtual host.
29
        SSLEngine on
30
        SSLOptions +StrictRequire +StdEnvVars +ExportCertData
31
        
32
        #   A self-signed (snakeoil) certificate can be created by installing
33
        #   the ssl-cert package. See
34
        #   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
35
        #   If both key and certificate are stored in the same file, only the
36
        #   SSLCertificateFile directive is needed.
37
        SSLCertificateFile /etc/ssl/certs/<your_cert_name>.crt
38
        SSLCertificateKeyFile /etc/ssl/private/<your_cert_name>.key
39
        
40
        #   Certificate Authority (CA):
41
        #   Set the CA certificate verification path where to find CA
42
        #   certificates for client authentication or alternatively one
43
        #   huge file containing all of them (file must be PEM encoded)
44
        #   Note: Inside SSLCACertificatePath you need hash symlinks
45
        #         to point to the certificate files. Use the provided
46
        #         Makefile to update the hash symlinks after changes.
47
        SSLCACertificatePath /etc/ssl/certs/
48
        #SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
49
        
50
        #   Client Authentication (Type):
51
        #   Client certificate verification type and depth.  Types are
52
        #   none, optional, require and optional_no_ca.  Depth is a
53
        #   number which specifies how deeply to verify the certificate
54
        #   issuer chain before deciding the certificate is not valid.
55
        <Location /knb/servlet/replication>
56
                SSLVerifyClient require
57
                SSLVerifyDepth  10
58
        </Location>
59

  
60
</VirtualHost>
61
</IfModule>
62
        
src/edu/ucsb/nceas/metacat/lsid/LSIDDataLookup.java
53 53

  
54 54
    public String getDocType(LSID lsid) {
55 55
      // example
56
      //http://metacat.nceas.ucsb.edu/knb/metacat?action=getrevisionanddoctype&docid=knb-lter-gce.109.6
56
      //http://metacat.nceas.ucsb.edu/metacat/metacat?action=getrevisionanddoctype&docid=knb-lter-gce.109.6
57 57
      // returns rev;doctype
58 58

  
59 59
      String _docType = null;
......
105 105
        InputStream docStream = null;
106 106

  
107 107
        // example metacat query
108
        // http://metacat.nceas.ucsb.edu/knb/metacat?action=read&qformat=xml&docid=knb-lter-gce.109.6
108
        // http://metacat.nceas.ucsb.edu/metacat/metacat?action=read&qformat=xml&docid=knb-lter-gce.109.6
109 109
        //
110 110

  
111 111
        ResourceBundle rb = ResourceBundle.getBundle("metacat-lsid");
src/edu/ucsb/nceas/metacat/DBQuery.java
414 414
      }//if
415 415
      else
416 416
      {
417
        //knb format, in this case we will get whole result and sent it out
417
        //skin format, in this case we will get whole result and sent it out
418 418
        response.setContentType("text/html");
419 419
        Writer nonout = null;
420 420
        StringBuffer xml = createResultDocument(xmlquery, qspec, nonout, user,
docs/user/metacat/source/replication.rst
167 167
     sudo cp <hostname>-apache.key /etc/ssl/private 
168 168

  
169 169
4. Apache needs to be configured to request a client certificate when the 
170
   replication API is utilized. The helper file named "knb-ssl" has default 
170
   replication API is utilized. The helper file named "metacat-site-ssl" has default 
171 171
   rules that configure Apache for SSL and client certificate authentication. 
172
   Set up these SSL settings by copying the knb-ssl file into the ``sites-available`` 
172
   Set up these SSL settings by copying the metacat-site-ssl file into the ``sites-available`` 
173 173
   directory, editing pertinent values to match your system and running 
174
   ``a2ensite`` to enable the site. (Note: some settings in knb-ssl need to be 
174
   ``a2ensite`` to enable the site. (Note: some settings in metacat-site-ssl need to be 
175 175
   changed to match the specifics of your system and Metacat deployment.) 
176 176

  
177 177
   ::
178 178
   
179
     sudo cp <metacat_helper_dir>/knb-ssl <apache_install_dir>/sites-available
180
     sudo a2ensite knb-ssl
179
     sudo cp <metacat_helper_dir>/metacat-site-ssl <apache_install_dir>/sites-available
180
     sudo a2ensite metacat-site-ssl
181 181

  
182 182
5. Enable the ssl module: 
183 183

  
src/scripts/debian/metacat-site-ssl
1
<IfModule mod_ssl.c>
2
NameVirtualHost *:443
3
<VirtualHost *:443>
4
        DocumentRoot /var/lib/tomcat6/webapps/metacat
5

  
6
        ScriptAlias /metacat/cgi-bin/ /var/lib/tomcat6/webapps/metacat/cgi-bin/
7
        <Directory "/var/lib/tomcat6/webapps/metacat/cgi-bin/">
8
                AllowOverride All
9
                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
10
                Order allow,deny
11
                Allow from all
12
        </Directory>
13

  
14
        <IfModule mod_jk.c>
15
                JkMount /metacat ajp13
16
                JkMount /metacat/* ajp13
17
                JkMount /metacat/metacat ajp13
18
                JkMount /*.jsp ajp13
19
                JkUnMount /metacat/cgi-bin/* ajp13
20

  
21
                JkOptions +ForwardURICompatUnparsed
22
        </IfModule>
23

  
24
        AllowEncodedSlashes On
25
        AcceptPathInfo      On
26
        
27
        #   SSL Engine Switch:
28
        #   Enable/Disable SSL for this virtual host.
29
        SSLEngine on
30
        SSLOptions +StrictRequire +StdEnvVars +ExportCertData
31
        
32
        #   A self-signed (snakeoil) certificate can be created by installing
33
        #   the ssl-cert package. See
34
        #   /usr/share/doc/apache2.2-common/README.Debian.gz for more info.
35
        #   If both key and certificate are stored in the same file, only the
36
        #   SSLCertificateFile directive is needed.
37
        SSLCertificateFile /etc/ssl/certs/<your_cert_name>.crt
38
        SSLCertificateKeyFile /etc/ssl/private/<your_cert_name>.key
39
        
40
        #   Certificate Authority (CA):
41
        #   Set the CA certificate verification path where to find CA
42
        #   certificates for client authentication or alternatively one
43
        #   huge file containing all of them (file must be PEM encoded)
44
        #   Note: Inside SSLCACertificatePath you need hash symlinks
45
        #         to point to the certificate files. Use the provided
46
        #         Makefile to update the hash symlinks after changes.
47
        SSLCACertificatePath /etc/ssl/certs/
48
        #SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
49
        
50
        #   Client Authentication (Type):
51
        #   Client certificate verification type and depth.  Types are
52
        #   none, optional, require and optional_no_ca.  Depth is a
53
        #   number which specifies how deeply to verify the certificate
54
        #   issuer chain before deciding the certificate is not valid.
55
        <Location /metacat/servlet/replication>
56
                SSLVerifyClient require
57
                SSLVerifyDepth  10
58
        </Location>
59

  
60
</VirtualHost>
61
</IfModule>
62
        
src/scripts/debian/postinst
15 15
/etc/init.d/tomcat6 stop
16 16

  
17 17
## backup the old war file
18
if [ -e ${TOMCAT_HOME}/webapps/knb.war ]
18
if [ -e ${TOMCAT_HOME}/webapps/metacat.war ]
19 19
then
20
  echo "Backing up ${TOMCAT_HOME}/webapps/knb.war to ${TOMCAT_HOME}/webapps/knb.war.${LONG_DATE}"
21
  mv ${TOMCAT_HOME}/webapps/knb.war ${TOMCAT_HOME}/webapps/knb.war.${LONG_DATE}
20
  echo "Backing up ${TOMCAT_HOME}/webapps/metacat.war to ${TOMCAT_HOME}/webapps/metacat.war.${LONG_DATE}"
21
  mv ${TOMCAT_HOME}/webapps/metacat.war ${TOMCAT_HOME}/webapps/metacat.war.${LONG_DATE}
22 22
fi  
23 23

  
24 24
## remove the knb application directory
25
if [ -d ${TOMCAT_HOME}/webapps/knb ]
25
if [ -d ${TOMCAT_HOME}/webapps/metacat ]
26 26
then
27 27
  echo "Removing the old metacat application directorties"
28
  rm -rf ${TOMCAT_HOME}/webapps/knb
28
  rm -rf ${TOMCAT_HOME}/webapps/metacat
29 29
fi 
30 30

  
31 31
## copy the new war file into the webapps directory
32
echo copying new knb.war file to ${TOMCAT_HOME}/webapps/knb.war
33
cp ${SOURCE_DIR}/knb.war ${TOMCAT_HOME}/webapps/knb.war
32
echo copying new metacat.war file to ${TOMCAT_HOME}/webapps/metacat.war
33
cp ${SOURCE_DIR}/metacat.war ${TOMCAT_HOME}/webapps/metacat.war
34 34

  
35 35
## expand the war file
36 36
CURR_DIR=`pwd`
37 37

  
38
## make knb directory and extract knb.war into it.
39
echo "Making knb application directory: ${TOMCAT_HOME}/webapps/knb"
40
mkdir ${TOMCAT_HOME}/webapps/knb
41
cd ${TOMCAT_HOME}/webapps/knb
38
## make knb directory and extract metacat.war into it.
39
echo "Making knb application directory: ${TOMCAT_HOME}/webapps/metacat"
40
mkdir ${TOMCAT_HOME}/webapps/metacat
41
cd ${TOMCAT_HOME}/webapps/metacat
42 42

  
43
echo "extracting knb.war into ${TOMCAT_HOME}/webapps/knb"
44
jar -xvf ${TOMCAT_HOME}/webapps/knb.war > /dev/null
45
chown -R ${TOMCAT_USER} ${TOMCAT_HOME}/webapps/knb
43
echo "extracting metacat.war into ${TOMCAT_HOME}/webapps/metacat"
44
jar -xvf ${TOMCAT_HOME}/webapps/metacat.war > /dev/null
45
chown -R ${TOMCAT_USER} ${TOMCAT_HOME}/webapps/metacat
46 46
echo cd to $CURR_DIR
47 47
cd $CURR_DIR
48 48

  
49
chmod -R  +x ${TOMCAT_HOME}/webapps/knb/cgi-bin
49
chmod -R  +x ${TOMCAT_HOME}/webapps/metacat/cgi-bin
50 50

  
51 51
###############################################################################
52 52
# Create Metacat External File Space
......
116 116
a2enmod jk
117 117

  
118 118
## copy in knb site file
119
if [ -e /etc/apache2/sites-available/knb ]
119
if [ -e /etc/apache2/sites-available/metacat ]
120 120
then 
121
  KNB_SITE_DIFF=`diff ${SOURCE_DIR}/knb /etc/apache2/sites-available/knb`
121
  KNB_SITE_DIFF=`diff ${SOURCE_DIR}/metacat /etc/apache2/sites-available/metacat`
122 122
  if [ "${KNB_SITE_DIFF}" != "" ]
123 123
  then
124
    echo "Backing up /etc/apache2/sites-available/knb to /etc/apache2/sites-available/knb.${LONG_DATE}"
125
    mv /etc/apache2/sites-available/knb /etc/apache2/sites-available/knb.${LONG_DATE}
124
    echo "Backing up /etc/apache2/sites-available/metacat to /etc/apache2/sites-available/metacat.${LONG_DATE}"
125
    mv /etc/apache2/sites-available/metacat /etc/apache2/sites-available/metacat.${LONG_DATE}
126 126
  fi
127 127
fi
128 128
echo "Copying knb site file to /etc/apache2/sites-available/"
129
cp ${SOURCE_DIR}/knb /etc/apache2/sites-available/
129
cp ${SOURCE_DIR}/metacat /etc/apache2/sites-available/
130 130

  
131 131
## enable knb site
132 132
echo "Enabling knb site"
src/scripts/bash/measure-metacat-query-performance.sh
10 10
METACAT=../build/metacat.jar
11 11
METACAT_CLIENT=../build/metacat-client.jar
12 12
UTILITIES=../lib/utilities.jar
13
METACATURL=http://chico.dyndns.org:8081/knb/metacat
13
METACATURL=http://chico.dyndns.org:8081/metacat/metacat
14 14
QUERY=../test/performance_measure_query
15 15
TIME=2
16 16
TOMCATUSER=tao
src/perl/transfer_emldocs_from_metacat1_to_metacat2.pl
41 41

  
42 42
my $listname = "list_of_docids";
43 43

  
44
my $metacat1_url = "https://mn-stage-ucsb-1.dataone.org/knb/metacat";
45
my $metacat2_url = "https://demo2.test.dataone.org/knb/metacat";
44
my $metacat1_url = "https://mn-stage-ucsb-1.dataone.org/metacat/metacat";
45
my $metacat2_url = "https://demo2.test.dataone.org/metacat/metacat";
46 46
my $username = "uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org";
47 47
my $password = "xxx";
48 48

  
src/perl/Metacat/test.pl
40 40
# Insert your test code below (better if it prints "ok 13"
41 41
# (correspondingly "not ok 13") depending on the success of chunk 13
42 42
# of the test code):
43
my $metacatUrl = "http://snow.joneseckert.org:8080/knb/servlet/metacat";
43
my $metacatUrl = "http://snow.joneseckert.org:8080/metacat/metacat";
44 44
my $username = 'uid=jones,o=NCEAS,dc=ecoinformatics,dc=org';
45 45
my $password = 'your-pw-goes-here';
46 46

  
src/edu/ucsb/nceas/metacat/MetaCatServlet.java
715 715
			// Check if this is a simple read request that doesn't use the
716 716
			// "action" syntax
717 717
			// These URLs are of the form:
718
			// http://localhost:8180/knb/metacat/docid/skinname
719
			// e.g., http://localhost:8180/knb/metacat/test.1.1/knb
718
			// http://localhost:8180/metacat/metacat/docid/skinname
719
			// e.g., http://localhost:8180/metacat/metacat/test.1.1/knb
720 720
			String pathInfo = request.getPathInfo();
721 721
			if (pathInfo != null) {
722 722
				String[] path = pathInfo.split("/");
docs/dev/testing-metacat.html
149 149
  <div class="code">&lt;workspace&gt;/metacat/test/test.properties</div>
150 150
  This should only hold one property: metacat.contextDir.  This should point to 
151 151
  the context directory for the metacat server you are testing.  For example:
152
  <div class="code">metacat.contextDir=/var/lib/tomcat6/webapps/knb</div>
152
  <div class="code">metacat.contextDir=/var/lib/tomcat6/webapps/metacat</div>
153 153
  The test classes will use this to determine where to look for the server
154 154
  metacat.properties file.</p>
155 155
  
......
159 159
  You will need to verify that all test.* properties are set correctly:
160 160
  <ul>
161 161
    <li>test.printdebug - true if you want debug output, false otherwise </li>
162
    <li>test.metacatUrl - the url for the metacat servlet (i.e. http://localhost:8080/knb/metacat)</li>
163
    <li>test.contextUrl - the url for the metacat web service (i.e. http://localhost:8080/knb)</li>
164
    <li>test.metacatDeployDir - the directory where metacat is physically deployed (i.e. /usr/local/tomcat/webapps/knb)</li>
162
    <li>test.metacatUrl - the url for the metacat servlet (i.e. http://localhost:8080/metacat/metacat)</li>
163
    <li>test.contextUrl - the url for the metacat web service (i.e. http://localhost:8080/metacat)</li>
164
    <li>test.metacatDeployDir - the directory where metacat is physically deployed (i.e. /usr/local/tomcat/webapps/metacat)</li>
165 165
    <li>test.mcUser - the first metacat test user ("uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org" should be fine)</li>
166 166
    <li>test.mcPassword - the first metacat test password ("kepler" should be fine)</li>
167 167
    <li>test.mcAnotherUser - the second metacat test user.  This user must be a member of the knb-usr 
......
264 264
  <p>For each Skin:</p>
265 265
  <ul>
266 266
  <li>View main skin page by going to:
267
    <div class="code">http://dev.nceas.ucsb.edu/knb/style/skins/&lt;skin_name&gt;</div>
267
    <div class="code">http://dev.nceas.ucsb.edu/metacat/style/skins/&lt;skin_name&gt;</div>
268 268
  for each skin, where &lt;skin_name&gt; is in:
269 269
    <div class="code">default, nceas, esa, knb, lter, ltss, obfs, nrs, sanparks, saeon</div>  
270 270
  Note that the kepler skin is installed on a different metacat instance and can be found at:
......
299 299
     <li>Use your search to find a document</li>
300 300
     <li>Choose the link to a document - you should see document details
301 301
     <li>In a separate browser, try the shortcut to the doc:
302
       <div class="code">http://dev.nceas.ucsb.edu/knb/metacat/&lt;doc_id&gt;/&lt;skin_name&gt;</div>
302
       <div class="code">http://dev.nceas.ucsb.edu/metacat/metacat/&lt;doc_id&gt;/&lt;skin_name&gt;</div>
303 303
     You should see the same results as going to the doc via search.</li>
304 304
     </ul>
305 305
  </li>
test/clienttestfiles/bad-schema-location.xml
2 2
   xmlns:prod="http://example.org/prod"
3 3
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
4 4
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
   xsi:schemaLocation="http://example.org/prod http://gorfdsdas/knb/test/chapter05prod.xsd
6
                       http://example.org/ord http://gorfdsdas/knb/test/chapter05ord.xsd">
5
   xsi:schemaLocation="http://example.org/prod http://gorfdsdas/metacat/test/chapter05prod.xsd
6
                       http://example.org/ord http://gorfdsdas/metacat/test/chapter05ord.xsd">
7 7
  <items>
8 8
    <prod:product>
9 9
      <number xsi:type="xs:short">557</number>
test/eml-sample.xml
79 79
      </dataFormat>
80 80
      <distribution>
81 81
        <online>
82
          <url>http://metacat.nceas.ucsb.edu/knb/servlet/metacat?action=read&amp;docid=knb.46.1</url>
82
          <url>http://metacat.nceas.ucsb.edu/metacat/metacat?action=read&amp;docid=knb.46.1</url>
83 83
        </online>
84 84
      </distribution>
85 85
    </physical>
test/stress-test/insert-load-test.py
58 58

  
59 59
# Initialize a metacat client connection and log in as test user
60 60
t1 = time()
61
mc = metacat.MetacatClient(host,'/knb/metacat')
61
mc = metacat.MetacatClient(host,'/metacat/metacat')
62 62
debug("[test] -- Processing Login")
63 63
response = mc.login('test', 'test', 'NCEAS')
64 64
t2 = time()
test/stress-test/metacat.py
33 33

  
34 34
class MetacatClient:
35 35

  
36
    def __init__(self, server="knb.ecoinformatics.org", urlPath="/knb/metacat"):
36
    def __init__(self, server="knb.ecoinformatics.org", urlPath="/metacat/metacat"):
37 37
        self.metacatUrlPath = urlPath
38 38
        self.metacatServer = server
39 39
        self.sessionid = None
test/stress-test/squery-load-test.py
54 54
debug("       host: $host ")
55 55
debug("************************************************** ")
56 56

  
57
mc = metacat.MetacatClient(host,'/knb/metacat')
57
mc = metacat.MetacatClient(host,'/metacat/metacat')
58 58

  
59 59
query_template_file = open('squery.xml.tmpl', 'r')
60 60
query_template = query_template_file.read()
test/stress-test/read-load-test.py
55 55

  
56 56
# Initialize a metacat client connection and log in as test user
57 57
t1 = time()
58
mc = metacat.MetacatClient(host,'/knb/metacat')
58
mc = metacat.MetacatClient(host,'/metacat/metacat')
59 59
debug("[test] -- Processing Login")
60 60
response = mc.login('test', 'test', 'NCEAS')
61 61
t2 = time()
test/jones.204.22.xml
1
<?xml version="1.0"?><!DOCTYPE dataset PUBLIC "-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN" "http://metacat.nceas.ucsb.edu/knb/dtd/eml-dataset-2.0.0beta6.dtd"><dataset>
1
<?xml version="1.0"?><!DOCTYPE dataset PUBLIC "-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN" "http://metacat.nceas.ucsb.edu/metacat/dtd/eml-dataset-2.0.0beta6.dtd"><dataset>
2 2
  <identifier>jones.204.22</identifier>
3 3
  <title>This is a test data set with taxonomic coverage</title>
4 4
  <originator>
test/test.properties
1 1
# Set this to the location of the metacat application context
2 2
# directory.  The tests will use this to find metacat.properties
3
metacat.contextDir=/var/lib/tomcat6/webapps/knb
4
#metacat.contextDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/knb
3
metacat.contextDir=/var/lib/tomcat6/webapps/metacat
4
#metacat.contextDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/metacat
test/edu/ucsb/nceas/metacat/util/MetacatPopulatorTest.java
77 77
            MetacatPopulator mp = new MetacatPopulator(
78 78
                    "http://knb.ecoinformatics.org/knb",  
79 79
                    /*"http://localhost:8080/knb"*/
80
                    "https://demo1.test.dataone.org/knb/d1/mn", 
81
                    //"https://knb-test-1.test.dataone.org/knb/d1/mn", 
80
                    "https://demo1.test.dataone.org/metacat/d1/mn", 
81
                    //"https://knb-test-1.test.dataone.org/metacat/d1/mn", 
82 82
                    /*"msucci"*//*"connolly.301"*/ 
83 83
                    "tao.1.1", //"frog", 
84 84
                    "uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org", 
test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java
93 93
	  /**Constants*/
94 94
	  private static String SRBDATAFILEDIR = "/home/tao/data-file/IPCC"; // Dir for storing srb data file
95 95
	  private static String DOCLISTFILE       = "docidList"; // File name which stores IPCC document id
96
	  private static String METACATURL      = "http://chico.dyndns.org/knb/metacat";
96
	  private static String METACATURL      = "http://chico.dyndns.org/metacat/metacat";
97 97
	  private static String USERNAME          = "uid=dpennington,o=LTER,dc=ecoinformatics,dc=org";
98 98
	  private static String PASSWORD           = "password";
99 99
	  private static String TABLEONLINEURL= "/eml:eml/dataset/dataTable/physical/distribution/online/url";
test/edu/ucsb/nceas/metacattest/service/XMLSchemaServiceTest.java
63 63
  
64 64
  public void testGetBaseUrlFromSchemaURL()
65 65
  {
66
      String url="http://www.example.com/knb/example.xsd";
67
      String base = "http://www.example.com/knb/";
66
      String url="http://www.example.com/metacat/example.xsd";
67
      String base = "http://www.example.com/metacat/";
68 68
      String baseURL = XMLSchemaService.getBaseUrlFromSchemaURL(url);
69 69
      assertTrue("The base url should be "+base, baseURL.equals(base));
70 70
      url = "www.example.com/example.xsd";
71 71
      baseURL = XMLSchemaService.getBaseUrlFromSchemaURL(url);
72 72
      assertTrue("The base url should be "+null, baseURL==null);
73
      url="http://www.example.com/knb/";
73
      url="http://www.example.com/metacat/";
74 74
      baseURL = XMLSchemaService.getBaseUrlFromSchemaURL(url);
75 75
      assertTrue("The base url should be "+url, baseURL.equals(url));
76 76
  }
metacat-index/src/main/webapp/WEB-INF/web.xml
15 15
    
16 16
    <context-param>
17 17
      <param-name>metacat.properties.path</param-name>
18
      <param-value>/knb/WEB-INF/metacat.properties</param-value>
18
      <param-value>/metacat/WEB-INF/metacat.properties</param-value>
19 19
      <description>The metacat.properties file for sibling metacat deployment. Note that the context can change</description>
20 20
    </context-param>
21 21

  
lib/certificateAuthenCode/bbaker_diff_metacat.txt
226 226
> org.ietf.jgss.<span class="tooltip" title="included in standard JRE/JDK libraries">GSSCredential</span> credential = server.get(<span class="tooltip" title="MyProxy username">username</span>, <span class="tooltip" title="MyProxy passphrase">passphrase</span>, <span class="tooltip" title="Credential lifetime in seconds">lifetime</span>);
227 227
> 
228 228
> // 2. Connect to Metacat via GSI+HTTPS
229
> String metacatUrl = "https://&lt;metacat server&gt;:8443/knb/metacat/";
229
> String metacatUrl = "https://&lt;metacat server&gt;:8443/metacat/metacat/";
230 230
> edu.ucsb.nceas.metacat.client.Metacat client 
231 231
>     = edu.ucsb.nceas.metacat.client.MetacatFactory.createMetacatConnection(metacatUrl);
232 232
> String loginResult = client.login(credential);
......
243 243
>       IDs, which will generally be LDAP DNs.  You can do this in a map
244 244
>       file that starts out in
245 245
>       <code>metacat/src/gsimap.properties</code> and gets deployed to
246
>       Tomcat's <code>webapps/knb/WEB-INF/</code> directory.  You can
246
>       Tomcat's <code>webapps/metacat/WEB-INF/</code> directory.  You can
247 247
>       modify it in either place, but it will be overwritten each time
248 248
>       you redeploy Metacat if you change it in Tomcat's installation
249 249
>       directory.</p>
......
275 275
> 
276 276
>       <p>Short answer: replace "<code>https</code>" with
277 277
>       "<code>httpg</code>".</p>
278
>       <blockquote><pre><code><i>https</i>://&lt;metacat server&gt;:8443/knb/metacat/</code></pre></blockquote>
278
>       <blockquote><pre><code><i>https</i>://&lt;metacat server&gt;:8443/metacat/metacat/</code></pre></blockquote>
279 279
>       <p>becomes</p>
280
>       <blockquote><pre><i>httpg</i>://&lt;metacat server&gt;:8443/knb/metacat/</pre></blockquote>
280
>       <blockquote><pre><i>httpg</i>://&lt;metacat server&gt;:8443/metacat/metacat/</pre></blockquote>
281 281
> 
282 282
>       <p>Long answer: The URL in the example above,
283
>       <code>https://&lt;metacat server&gt;:8443/knb/metacat/</code>,
283
>       <code>https://&lt;metacat server&gt;:8443/metacat/metacat/</code>,
284 284
>       uses the <code>HTTPS</code> protocol.  However, actually
285 285
>       handling that connection requires a protocol handler that
286 286
>       understands GSI+HTTPS instead of plain HTTPS.  Fortunately,
lib/workflowscheduler/workflowscheduler.properties
156 156
######## Workflow engine section              #########################################
157 157
executionEngine.endPointAddress=http://localhost:8080/axis2/services/KeplerWebService
158 158

  
159
workflowScheduler.authServiceUrl=http://localhost:8080/knb/services/AuthenticationService
160
workflowScheduler.authorizationServiceUrl=http://localhost:8080/knb/services/AuthorizationService
159
workflowScheduler.authServiceUrl=http://localhost:8080/metacat/services/AuthenticationService
160
workflowScheduler.authorizationServiceUrl=http://localhost:8080/metacat/services/AuthorizationService
161 161

  
162 162
######## junit test section  ################
163 163

  
164 164
test.printdebug=true
165
test.metacatUrl=http://indus.msi.ucsb.edu/knb/metacat
166
test.contextUrl=http://indus.msi.ucsb.edu/knb
167
test.metacatDeployDir=/usr/local/tomcat/webapps/knb
165
test.metacatUrl=http://indus.msi.ucsb.edu/metacat/metacat
166
test.contextUrl=http://indus.msi.ucsb.edu/metacat
167
test.metacatDeployDir=/usr/local/tomcat/webapps/metacat
168 168
test.mcUser=uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org
169 169
test.mcPassword=kepler
170 170
test.mcAnotherUser=uid=test,o=NCEAS,dc=ecoinformatics,dc=org
lib/oaipmh/eml201toDublinCore.xsl
20 20
       to be carried out once.
21 21
    -->     
22 22
  <xsl:variable name="ids" select="//*[@id!='']"/>
23
  <xsl:variable name="metacat-server">http://metacat.lternet.edu/knb/metacat</xsl:variable>
23
  <xsl:variable name="metacat-server">http://metacat.lternet.edu/metacat/metacat</xsl:variable>
24 24

  
25 25
  <xsl:template match="/">
26 26
    <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" 
lib/oaipmh/eml210toDublinCore.xsl
20 20
       to be carried out once.
21 21
    -->     
22 22
  <xsl:variable name="ids" select="//*[@id!='']"/>
23
  <xsl:variable name="metacat-server">http://metacat.lternet.edu/knb/metacat</xsl:variable>
23
  <xsl:variable name="metacat-server">http://metacat.lternet.edu/metacat/metacat</xsl:variable>
24 24

  
25 25
  <xsl:template match="/">
26 26
    <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" 
lib/oaipmh/eml200toDublinCore.xsl
20 20
       to be carried out once.
21 21
    -->     
22 22
  <xsl:variable name="ids" select="//*[@id!='']"/>
23
  <xsl:variable name="metacat-server">http://metacat.lternet.edu/knb/metacat</xsl:variable>
23
  <xsl:variable name="metacat-server">http://metacat.lternet.edu/metacat/metacat</xsl:variable>
24 24

  
25 25
  <xsl:template match="/">
26 26
    <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" 
lib/style/skins/first/first-resultset.xsl
41 41
			<head>
42 42
				<title>Search Results</title>
43 43
				<link rel="stylesheet" type="text/css"
44
					href="/knb/style/skins/{$qformat}/{$qformat}.css" />
44
					href="/metacat/style/skins/{$qformat}/{$qformat}.css" />
45 45
				<script language="Javascript" type="text/JavaScript"
46
					src="/knb/style/skins/{$qformat}/{$qformat}.js" />
46
					src="/metacat/style/skins/{$qformat}/{$qformat}.js" />
47 47
				<script language="Javascript" type="text/JavaScript"
48
					src="/knb/style/common/branding.js" />
48
					src="/metacat/style/common/branding.js" />
49 49
				<script language="JavaScript">
50 50
					<![CDATA[
51 51
					function submitform(action,form_ref) {
......
143 143
					</xsl:attribute>
144 144
	
145 145
					<td class="text_plain">
146
						<form action="/knb/metacat"
146
						<form action="/metacat/metacat"
147 147
							method="POST">
148 148
							<xsl:attribute name="name">
149 149
								<xsl:value-of select="translate(./docid, '()-.', '____')" />
......
224 224
				<tr class="searchresultsdivider">
225 225
					<td colspan="5">
226 226
						<img
227
							src="/knb/style/skins/default/images/transparent1x1.gif"
227
							src="/metacat/style/skins/default/images/transparent1x1.gif"
228 228
							width="1" height="1" />
229 229
					</td>
230 230
				</tr>
lib/style/skins/mets/dryad.xsl
147 147
		
148 148
		<!-- General, non-citation, metadata display-->
149 149
		<html xmlns="http://www.w3.org/1999/xhtml" xmlns:dri="http://di.tamu.edu/DRI/1.0/" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
150
		<!--<link type="text/css" rel="stylesheet" media="screen" href="/knb/style/skins/default/default.css" />-->
150
		<!--<link type="text/css" rel="stylesheet" media="screen" href="/metacat/style/skins/default/default.css" />-->
151 151
		<xsl:call-template name="documenthead"/>
152 152
		<body id="Overview">
153 153
		<div id="main_wrapper">
......
479 479
								<img src="knb/style/skins/mets/cc-zero.png"/>
480 480
							</a>
481 481
							<a href="http://opendefinition.org/">
482
								<img src="/knb/style/skins/mets/opendata.png"/>
482
								<img src="/metacat/style/skins/mets/opendata.png"/>
483 483
							</a>
484 484
						</div>
485 485
					</xsl:if>
......
489 489
						<i18n:text>xmlui.dri2xhtml.METS-1.0.license-cc0</i18n:text>
490 490
						<xsl:text> &#160; </xsl:text>
491 491
						<a href="http://creativecommons.org/publicdomain/zero/1.0/" target="_blank">
492
							<img src="/knb/style/skins/mets/cc-zero.png"/>
492
							<img src="/metacat/style/skins/mets/cc-zero.png"/>
493 493
						</a>
494 494
						<a href="http://opendefinition.org/">
495
							<img src="/knb/style/skins/mets/opendata.png"/>
495
							<img src="/metacat/style/skins/mets/opendata.png"/>
496 496
						</a>
497 497
					</div>
498 498
				</xsl:otherwise>
lib/style/skins/dev/harvesterUpload.html
1 1
<html>
2 2
<head>
3 3
<title>Metacat Upload/Delete Interface</title>
4
<link rel="stylesheet" type="text/css" href="/knb/style/rowcol.css">
4
<link rel="stylesheet" type="text/css" href="/metacat/style/rowcol.css">
5 5
</head>
6 6

  
7 7
<body class="emlbody">
lib/metacat.properties
148 148
datamanager.password=datamanager
149 149
datamanager.maxconnections=10
150 150

  
151
#datamanager.endpoint.query=http://ecogrid.ecoinformatics.org/knb/services/QueryService
152
#datamanager.endpoint.authenticatedquery=http://ecogrid.ecoinformatics.org/knb/services/AuthenticatedQueryService
153
#datamanager.endpoint.authentication=http://ecogrid.ecoinformatics.org/knb/services/AuthenticationService
154
#datamanager.endpoint.put=http://ecogrid.ecoinformatics.org/knb/services/PutService
155
#datamanager.endpoint.identifier=http://ecogrid.ecoinformatics.org/knb/services/IdentificationService
151
#datamanager.endpoint.query=http://ecogrid.ecoinformatics.org/metacat/services/QueryService
152
#datamanager.endpoint.authenticatedquery=http://ecogrid.ecoinformatics.org/metacat/services/AuthenticatedQueryService
153
#datamanager.endpoint.authentication=http://ecogrid.ecoinformatics.org/metacat/services/AuthenticationService
154
#datamanager.endpoint.put=http://ecogrid.ecoinformatics.org/metacat/services/PutService
155
#datamanager.endpoint.identifier=http://ecogrid.ecoinformatics.org/metacat/services/IdentificationService
156 156
#datamanager.srb.endpoint=
157 157
#datamanager.srb.machinename=
158 158

  
......
441 441
Identify.earliestDatestamp=2000-01-01T00:00:00Z
442 442
Identify.deletedRecord=no
443 443
# Append something unique like .1, .2, etc to 'Identify.description' for each occurrence
444
#Identify.description.1=<description><oai-identifier xmlns\="http\://www.openarchives.org/OAI/2.0/oai-identifier" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.openarchives.org/OAI/2.0/oai-identifier http\://www.openarchives.org/OAI/2.0/oai-identifier.xsd"><scheme>oai</scheme><repositoryIdentifier>metacat.lternet.edu</repositoryIdentifier><delimiter>\:</delimiter><sampleIdentifier>http\://metacat.lternet.edu/knb/metacat/knb-lter-lno.1</sampleIdentifier></oai-identifier></description>
444
#Identify.description.1=<description><oai-identifier xmlns\="http\://www.openarchives.org/OAI/2.0/oai-identifier" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.openarchives.org/OAI/2.0/oai-identifier http\://www.openarchives.org/OAI/2.0/oai-identifier.xsd"><scheme>oai</scheme><repositoryIdentifier>metacat.lternet.edu</repositoryIdentifier><delimiter>\:</delimiter><sampleIdentifier>http\://metacat.lternet.edu/metacat/metacat/knb-lter-lno.1</sampleIdentifier></oai-identifier></description>
445 445
# List the supported metadataPrefixes along with the class that performs the associated crosswalk
446 446
Crosswalks.oai_dc=edu.ucsb.nceas.metacat.oaipmh.provider.server.crosswalk.Eml2oai_dc
447 447
Crosswalks.eml-2.0.0=edu.ucsb.nceas.metacat.oaipmh.provider.server.crosswalk.Eml200
......
504 504
######## junit test section  ################
505 505

  
506 506
test.printdebug=true
507
test.metacatUrl=http://localhost:8080/knb/metacat
508
test.contextUrl=http://localhost:8080/knb
507
test.metacatUrl=http://localhost:8080/metacat/metacat
508
test.contextUrl=http://localhost:8080/metacat
509 509
test.workflowSchedulerUrl=http://localhost:8080/workflowscheduler/scheduler
510
test.metacatDeployDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/knb
510
test.metacatDeployDir=/Users/leinfelder/tools/apache-tomcat-6/webapps/metacat
511 511
test.mcUser=uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org
512 512
test.mcPassword=kepler
513 513
test.mcAnotherUser=uid=test,o=NCEAS,dc=ecoinformatics,dc=org
......
517 517
test.lterUser=uid=knbuser,o=LTER,dc=ecoinformatics,dc=org
518 518
test.lterPassword=b1gf1$h
519 519
test.testProperty=testing
520
test.replication.targetServer=fred.msi.ucsb.edu/knb
520
test.replication.targetServer=fred.msi.ucsb.edu/metacat
521 521

  
522 522
######## Developers Section #########################################
523 523

  
src/python/insertDocs.py
40 40
    sys.exit(1)
41 41

  
42 42
print "Logging into destination server"
43
dest = metacat.MetacatClient('localhost:8080','/knb/metacat')
43
dest = metacat.MetacatClient('localhost:8080','/metacat/metacat')
44 44
dest.login('username','password','NCEAS')
45 45

  
46 46
print "Open docid list and loop"
src/python/metacat.py
33 33

  
34 34
class MetacatClient:
35 35

  
36
    def __init__(self, server="knb.ecoinformatics.org", urlPath="/knb/metacat"):
36
    def __init__(self, server="localhost:8080", urlPath="/metacat/metacat"):
37 37
        self.metacatUrlPath = urlPath
38 38
        self.metacatServer = server
39 39
        self.sessionid = None
src/python/transferEml.py
38 38
    sys.exit(1)
39 39

  
40 40
print "Logging into destination server"
41
dest = metacat.MetacatClient('yourserver:8180','/knb/metacat')
41
dest = metacat.MetacatClient('yourserver:8180','/metacat/metacat')
42 42
dest.login('user','password','NCEAS')
43 43

  
44 44
print "Logging into source server"
src/scripts/debian/metacat-site
1
NameVirtualHost *:80
2
<VirtualHost *:80>
3
        DocumentRoot /var/lib/tomcat6/webapps/metacat
4
        ServerName <your_hostname_here>
5

  
6
        ScriptAlias /metacat/cgi-bin/ /var/lib/tomcat6/webapps/metacat/cgi-bin/
7
        <Directory "/var/lib/tomcat6/webapps/metacat/cgi-bin/">
8
                AllowOverride All
9
                Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
10
                Order allow,deny
11
                Allow from all
12
        </Directory>
13

  
14
        <IfModule mod_jk.c>
15
                JkMount /metacat ajp13
16
                JkMount /metacat/* ajp13
17
                JkMount /metacat/metacat ajp13
18
                JkMount /*.jsp ajp13
19
                JkUnMount /metacat/cgi-bin/* ajp13
20
        </IfModule>
21
</VirtualHost>
22

  
src/scripts/bash/buildIndex.sh
12 12
    echo "USAGE: $0 docidfile"
13 13
    exit 1
14 14
fi 
15
echo 'Please type metacat url (It should look like "http://pacific.msi.ucsb.edu:8080/knb/metacat")'
15
echo 'Please type metacat url (It should look like "http://pacific.msi.ucsb.edu:8080/metacat/metacat")'
16 16
read metacatBaseURL
17 17
echo 'Please type KNB user name (It should look like "uid=tao,o=NCEAS,dc=ecoinformatics,dc=org")'
18 18
read username
src/scripts/bash/measure-metacat-query-performance2.sh
9 9
#variables
10 10
JUNIT=/usr/local/devtools/apache-ant/lib/junit-4.3.1.jar
11 11
PROJECT=/home/tao/project/metacat
12
METACATURL=http://chico.dyndns.org:8081/knb/metacat
12
METACATURL=http://chico.dyndns.org:8081/metacat/metacat
13 13
TOMCATUSER=tao
14 14

  
15 15

  
src/perl/update_emldoc_data.pl
43 43
my $metacat1_url = "http://dataknp.sanparks.org/sanparks/metacat";
44 44
my $username = "uid=judithk,o=SANParks,dc=ecoinformatics,dc=org";
45 45
my $password = "xxxxxx";
46
#my $metacat1_url = "http://fred.msi.ucsb.edu/knb/metacat";
46
#my $metacat1_url = "http://fred.msi.ucsb.edu/metacat/metacat";
47 47
#my $username = "uid=leinfelder,o=NCEAS,dc=ecoinformatics,dc=org";
48 48
#my $password = "xxxxxx";
49 49

  
src/edu/ucsb/nceas/metacat/spatial/WmsFilter.java
35 35
      long before = System.currentTimeMillis();
36 36
      
37 37
      // Attributes != Paramters but there is no setParameter
38
      //request.setAttribute("SLD", "http://pmark.msi.ucsb.edu:8180/knb/style/skins/ebm/spatial/data_bounds_style.sld");
38
      //request.setAttribute("SLD", "http://pmark.msi.ucsb.edu:8180/metacat/style/skins/ebm/spatial/data_bounds_style.sld");
39 39

  
40 40
      Enumeration e = request.getParameterNames();
41 41
      while( e.hasMoreElements() ) {
src/edu/ucsb/nceas/metacat/admin/PropertiesAdmin.java
354 354
	 * In the web.xml of the Metacat-index context, there is a parameter:
355 355
	 * <context-param>
356 356
     * <param-name>metacat.properties.path</param-name>
357
     * <param-value>/knb/WEB-INF/metacat.properties</param-value>
357
     * <param-value>/metacat/WEB-INF/metacat.properties</param-value>
358 358
     * <description>The metacat.properties file for sibling metacat deployment. Note that the context can change</description>
359 359
     *  </context-param>
360 360
     *  It points to the default metacat context - knb. If we rename the context, we need to change the value of there.
docs/user/metacat/source/submitting.rst
139 139
3. Double-check that Metacat's temporary folder, application.tempDir, is 
140 140
   writable by the apache user, usually www-data or apache. 
141 141

  
142
4. Make sure that the following scripts (found in ``<tomcat-home>/webapps/knb/cgi-bin``) 
142
4. Make sure that the following scripts (found in ``<tomcat-home>/webapps/metacat/cgi-bin``) 
143 143
   are executable: register-dataset.cgi and ldapweb.cgi.
144 144

  
145 145
  ::
146 146
  
147
    sudo chmod +x <tomcat-home>/webapps/knb/cgi-bin/*.cgi
147
    sudo chmod +x <tomcat-home>/webapps/metacat/cgi-bin/*.cgi
148 148

  
149 149
5. Restart Apache.
150 150

  
......
173 173
disable the 'show site list' setting before you can submit the form without 
174 174
errors. You may also wish to remove (or modify) the list of NCEAS-specific 
175 175
projects that appear in the default registry. To remove these form fields, 
176
open Metacat's administrative interface (http://<your.context.url>/knb/admin) 
176
open Metacat's administrative interface (http://<your.context.url>/metacat/admin) 
177 177
and select the Skins Specific Properties Configuration option. On the skins 
178 178
configuration page, uncheck the boxes beside any form elements that you do not 
179 179
wish to appear in the registry.
......
576 576
  <title>Search</title>
577 577
  </head>
578 578
  <body>
579
  <form method="POST" action="http://panucci.nceas.ucsb.edu/knb/servlet/metacat">
579
  <form method="POST" action="http://panucci.nceas.ucsb.edu/metacat/metacat">
580 580

  
581 581
  Search for:
582 582

  
......
831 831

  
832 832
For more information about each EarthGrid service and its WSDL file, navigate 
833 833
to the "services" page on your Metacat server 
834
(e.g., http://knb.ecoinformatics.org/knb/services). 
834
(e.g., http://knb.ecoinformatics.org/metacat/services). 
835 835
Note that the AdminService and Version service that appear on this page are 
836 836
not part of EarthGrid.
837 837

  
......
884 884
   
885 885
   Set the Metacat URL in the Morpho preferences to point to your Metacat.
886 886

  
887
For more information about Morpho, please see: http://knb.ecoinformatics.org/morphoportal.jsp
887
For more information about Morpho, please see: http://knb.ecoinformatics.org/
888 888

  
889 889
Creating Your Own Client
890 890
------------------------
docs/user/metacat/source/oaipmh.rst
13 13
supported by an OAI-PMH compliant data provider (also referred to as a 
14 14
repository). These methods are:
15 15

  
16
1. ``GetRecord``  retrieves zero or one complete metadata record from a repository;
17
2. ``Identify``  retrieves information about a repository;
18
3. ``ListIdentifiers`` – retrieves zero or more metadata record “headers” (not the complete metadata record) from a repository;
19
4. ``ListMetadataFormats``  retrieves a list of available metadata record formats supported by a repository;
20
5. ``ListRecords`` – retrieves zero or more complete metadata records from a respository; and
21
6. ``ListSets``  retrieves the set structure from a repository.
16
1. ``GetRecord`` - retrieves zero or one complete metadata record from a repository;
17
2. ``Identify`` - retrieves information about a repository;
18
3. ``ListIdentifiers`` - retrieves zero or more metadata record "headers" (not the complete metadata record) from a repository;
19
4. ``ListMetadataFormats`` - retrieves a list of available metadata record formats supported by a repository;
20
5. ``ListRecords`` - retrieves zero or more complete metadata records from a repository; and
21
6. ``ListSets`` - retrieves the set structure from a repository.
22 22

  
23 23
The OAI-PMH compliant data provider must accept requests from both HTTP GET 
24 24
and HTTP POST request methods. Responses from the data provider must be 
......
105 105

  
106 106
Users of the Metacat OAI-PMH Data Provider should be aware of the following issues:
107 107

  
108
* 'Deleted' Status  OAI-PMH repositories can optionally flag records with 
108
* 'Deleted' Status - OAI-PMH repositories can optionally flag records with 
109 109
  a 'deleted' status, indicating that a record in the metadata format 
110 110
  specified by the metadataPrefix is no longer available. Since Metacat does 
111 111
  not provide a mechanism for retrieving a list of deleted documents, the use 
112 112
  of the 'deleted' status is not supported in this implementation of the 
113 113
  OAI-PMH Data Provider. This represents a possible future enhancement.
114
* Sets  OAI-PMH repositories can optionally support set hierarchies. Since it 
114
* Sets - OAI-PMH repositories can optionally support set hierarchies. Since it 
115 115
  has not been determined how set hierarchies should be structured in 
116 116
  Metacat, this implementation of the OAI-PMH repository does not support 
117 117
  set hierarchies. This represents a possible future enhancement.
118
* Datestamp Granularity  When expressing datestamps for repository documents, 
118
* Datestamp Granularity - When expressing datestamps for repository documents, 
119 119
  OAI-PMH allows two levels of granularity: day granularity and seconds 
120 120
  granularity. Since the Metacat database stores the value of its 
121 121
  ``xml_documents.date_updated`` field in day granularity, it is the level 
......
133 133

  
134 134
Users of the Metacat OAI-PMH Harvester should be aware of the following issues:
135 135

  
136
* Handling of 'Deleted' status   The Metacat OAI-PMH Harvester program does 
136
* Handling of 'Deleted' status -  The Metacat OAI-PMH Harvester program does 
137 137
  check to see whether a 'deleted' status is flagged for a harvested document, 
138 138
  and if it is, the document is correspondingly deleted from the Metacat repository.
139
* Datestamp Granularity  When expressing datestamps for repository documents, 
140
  OAI-PMH allows two levels of granularity  day granularity and seconds 
139
* Datestamp Granularity - When expressing datestamps for repository documents, 
140
  OAI-PMH allows two levels of granularity - day granularity and seconds 
141 141
  granularity. Since the Metacat database stores the value of its 
142 142
  ``xml_documents.last_updated`` field in day granularity, it is also the 
143 143
  level that is supported by both the Metacat OAI-PMH Data Provider and the 
......
175 175

  
176 176
   ::
177 177
   
178
     ``oaipmh.repositoryIdentifier``  A string that identifies this repository
179
     ``Identify.adminEmail``  The email address of the repository administrator
178
     ``oaipmh.repositoryIdentifier`` - A string that identifies this repository
179
     ``Identify.adminEmail`` - The email address of the repository administrator
180 180

  
181 181
3. Edit the deployment descriptor (``web.xml``) file, also in the WEB-INF 
182 182
   directory. Uncomment the servlet-name and servlet-mapping entries for the 
183
   DataProvider servlet by removing the surrounding “<!--“ and “-->” strings:
183
   DataProvider servlet by removing the surroundin "<!--" and "-->" strings:
184 184

  
185 185
   ::
186 186
   
......
213 213
+----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
214 214
| AbstractCatalog.secondsToLive          | 3600                                                                       | The lifetime, in seconds, of the resumptionToken.                                                                                               |
215 215
+----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
216
| AbstractCatalog.granularity            | YYYY-MM-DD or                                                              | Granularity of datestamps. Either ‘days granularity’ or ‘seconds granularity’ values can be used.                                               |
216
| AbstractCatalog.granularity            | YYYY-MM-DD or                                                              | Granularity of datestamps. Either "days granularity" or "seconds granularity" values can be used.                                               |
217 217
|                                        | YYYY-MM-DDThh:mm:ssZ                                                       |                                                                                                                                                 |
218 218
+----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
219 219
| Identify.repositoryName                | Metacat OAI-PMH Data Provider                                              | A name for the repository.                                                                                                                      |
220 220
+----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
221 221
| Identify.earliestDatestamp             | 2000-01-01T00:00:00Z                                                       | Earliest datestamp supported by this repository                                                                                                 |
222 222
+----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
223
| Identify.deletedRecord                 | yes or no                                                                  | Use ‘yes’ if the repository indicates the status of deleted records; use ‘no’ if it doesn’t.                                                    |
223
| Identify.deletedRecord                 | yes or no                                                                  | Use "yes" if the repository indicates the status of deleted records; use "no" if it doesn't.                                                    |
224 224
+----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
225 225
| Identify.adminEmail                    | mailto:tech_support@someplace.org                                          | Email address of the repository administrator.                                                                                                  |
226 226
+----------------------------------------+----------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
......
316 316
         -dn uid=jdoe,o=myorg,dc=ecoinformatics,dc=org \
317 317
         -password some_password \
318 318
         -metadataPrefix oai_dc \
319
         http://baseurl.repository.org/knb/dataProvider
319
         http://baseurl.repository.org/metacat/dataProvider
320 320

  
321 321
   On Linux/Unix: 
322 322

  
......
326 326
         -dn uid=jdoe,o=myorg,dc=ecoinformatics,dc=org \
327 327
         -password some_password \
328 328
         -metadataPrefix oai_dc \
329
         http://baseurl.repository.org/knb/dataProvider
329
         http://baseurl.repository.org/metacat/dataProvider
330 330

  
331 331
                        
332 332
Command line options and parameters are described in the following table:
......
346 346
+-----------------------------+----------------------------------------------------+-----------------------------------------------------------------------------------------------------+
347 347
| -setSpec                    | ``-setSpec someSet``                               | Harvest documents belonging to this set. (Optional)                                                 |
348 348
+-----------------------------+----------------------------------------------------+-----------------------------------------------------------------------------------------------------+
349
| base_url                    | ``http://baseurl.repository.org/knb/dataProvider`` | Base URL of the remote repository                                                                   |
349
| base_url                    | ``http://baseurl.repository.org/metacat/dataProvider`` | Base URL of the remote repository                                                                   |
350 350
+-----------------------------+----------------------------------------------------+-----------------------------------------------------------------------------------------------------+
351 351

  
352 352

  
docs/user/metacat/source/harvester.rst
126 126

  
127 127
   ::
128 128
   
129
     http://somehost.somelocation.edu:8080/knb/index.jsp
129
     http://somehost.somelocation.edu:8080/metacat/index.jsp
130 130

  
131 131
   then the Harvester Registration page would be accessed at: 
132 132

  
133 133
   ::
134 134
   
135
     http://somehost.somelocation.edu:8080/knb/style/skins/default/harvesterRegistrationLogin.jsp
135
     http://somehost.somelocation.edu:8080/metacat/style/skins/default/harvesterRegistrationLogin.jsp
136 136

  
137 137
.. figure:: images/screenshots/image065.jpg
138 138
   :align: center
......
267 267

  
268 268
   ::
269 269
   
270
     set METACAT_HOME=C:\somePath\knb
270
     set METACAT_HOME=C:\somePath\metacat
271 271

  
272 272
   On Linux/Unix (bash shell): 
273 273
   
......
494 494

  
495 495
   ::
496 496
   
497
     http://somehost.somelocation.edu:8080/knb/index.jsp
497
     http://somehost.somelocation.edu:8080/metacat/index.jsp
498 498

  
499 499
   then the Harvester Registration page would be accessed at: 
500 500

  
501 501
   ::
502 502

  
503
     http://somehost.somelocation.edu:8080/knb/style/skins/default/harvesterRegistrationLogin.jsp
503
     http://somehost.somelocation.edu:8080/metacat/style/skins/default/harvesterRegistrationLogin.jsp
504 504

  
505 505
2. Enter and submit your Metacat account information. On the subsequent screen, 
506 506
   click Unregister to remove your site and discontinue harvests. 
docs/user/metacat/source/query-index.rst
42 42
Index configuration
43 43
----------------------------
44 44
Metacat-index is deployed as a separate web application (metacat-index.war) and should be deployed 
45
as a sibling of the Metacat webapp (knb.war). Deploying metacat-index.war is only required when SOLR support
45
as a sibling of the Metacat webapp (metacat.war). Deploying metacat-index.war is only required when SOLR support
46 46
is desired and can safely be omitted if it will not be utilized for any given Metacat deployment.
47 47

  
48 48
During the initial installation/upgrade, an empty index will be initialized in the configured "solr-home" location.
docs/user/metacat/source/geoserver.rst
48 48
is used to configure GeoServer to use this shared data directory. To further 
49 49
configure GeoServer, use the Web-based configuration utility, 
50 50
which is available at: http://your.server.com/context/geoserver.jsp 
51
(e.g., http://knb.ecoinformatics.org/knb/geoserver.jsp). 
51
(e.g., http://knb.ecoinformatics.org/metacat/geoserver.jsp). 
52 52

  
53 53
Common configuration tasks include:
54 54

  
......
106 106
To add a map to a Web page, simply include the map interface using an iframe:: 
107 107

  
108 108
  <iframe scrolling="no" frameborder="0" width="780" height="420" 
109
          src="/knb/style/common/spatial/map.jsp">
109
          src="/metacat/style/common/spatial/map.jsp">
110 110
  </iframe>
111 111

  
112
The map URL, ``/knb/style/common/spatial/map.jsp``, is 
112
The map URL, ``/metacat/style/common/spatial/map.jsp``, is 
113 113
the default map interface. If you plan to customize the map interface, copy
114 114
the map.jsp file into your skin's directory (either the default or 
115 115
customized skin directory). 
......
118 118

  
119 119
  cp -r style/common/spatial/map.jsp /style/skins/<myskin>/spatial
120 120

  
121
You can access the customized map with the URL: ``/knb/style/skins/<myskin>/spatial/map.jsp`` 
121
You can access the customized map with the URL: ``/metacat/style/skins/<myskin>/spatial/map.jsp`` 
122 122

  
123 123
Configuring the Size and Initial Extent of the Map
124 124
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
127 127
:doc:`configuration` for directions). Once the file has been copied, you can 
128 128
modify the map's initial extent in: ``${skin.dir}/spatial/map.jsp``.
129 129

  
130
To change the maps initial extent, edit the bounding box. The default is to 
130
To change the map's initial extent, edit the bounding box. The default is to 
131 131
show the entire globe. The ``initMap()`` function should also be given the skin 
132 132
name so that spatial search results can be correctly styled.
133 133

  
......
160 160

  
161 161
::
162 162

  
163
  <option value=“-149.725,68.475 -149.3254,68.725”> Arctic LTER (ARC)</option>
163
  <option value="-149.725,68.475 -149.3254,68.725"> Arctic LTER (ARC)</option>
164 164

  
165 165
Configuring the Visual Portrayal of Geospatial Data (e.g., symbology and color)
166 166
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
188 188

  
189 189
1. Point your browser to ``http://your.server/geoserver``, log in to GeoServer, 
190 190
   and navigate to the "Data Stores" configuration page under ``Data > Stores``. 
191
2. Create a new vector data source from a Shapefile in the “metacat” workspace.
191
2. Create a new vector data source from a Shapefile in the "metacat" workspace.
192 192

  
193 193
.. figure:: images/screenshots/image055.png
194 194
   :align: center
......
219 219
   GeoServer's Layer Preview allows you to see an OpenLayer rendering of the new layer.
220 220

  
221 221
8. Copy the default ``map.js`` file that assembles the map in OpenLayers 
222
   (``style/common/spatial/map.js``) to your skins spatial directory.
223
9. Edit the init() method to include your new layer in the map  either as an 
222
   (``style/common/spatial/map.js``) to your skin's spatial directory.
223
9. Edit the init() method to include your new layer in the map - either as an 
224 224
   overlay or as a base layer.
225 225
10. Point your browser to the map interface. Your new layer should appear with 
226 226
    the existing ones.
......
229 229
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
230 230
There are hundreds of sources of spatial data made publically available 
231 231
through WMS (check out http://wms-sites.com for a good catalog). To add these 
232
data sources to your map, add the layers in your skins ``spatial/map.js`` file.
232
data sources to your map, add the layers in your skin's ``spatial/map.js`` file.
233 233

  
234 234
Spatial Queries
235 235
---------------
......
239 239

  
240 240
An example of a spatial query string is::
241 241

  
242
  http://localhost/knb/metacat?action=spatial_query&xmin=-117.5&xmax=-64&ymin=3&ymax=46&skin=default
242
  http://localhost/metacat/metacat?action=spatial_query&xmin=-117.5&xmax=-64&ymin=3&ymax=46&skin=default
243 243

  
244 244
Where ``xmin``, ``xmax``, ``ymin`` and ``ymax`` represent the western, eastern, 
245 245
southern and northern bounding coordinates (the "bounding box"), respectively. 
docs/user/metacat/source/sitemaps.rst
1 1
Enabling Web Searches: Sitemaps
2 2
===============================
3 3

  
4
Sitemaps are XML files that tell search enginessuch as Google, which is 
5
discussed in this section--which URLs on your websites are available for 
4
Sitemaps are XML files that tell search engines - such as Google, which is 
5
discussed in this section - which URLs on your websites are available for 
6 6
crawling. Currently, the only way for a search engine to crawl and index 
7 7
Metacat so that individual metadata entries are available via Web searches 
8 8
is with a sitemap. Metacat automatically creates sitemaps for all public 
......
33 33
Verify that your sitemap files are available to the Web by browsing to::
34 34

  
35 35
  <your_web_context>/sitemaps/metacat<X>.xml 
36
  (e.g., your.server.org/knb/sitemaps/metacat1.xml)
36
  (e.g., your.server.org/metacat/sitemaps/metacat1.xml)
37 37

  
38 38
Registering a Sitemap
39 39
---------------------
docs/user/metacat/source/event-logging.rst
7 7
include only certain events: events from a particular IP address, user, event 
8 8
type, or that occurred after a specified start date or before an end date. 
9 9

  
10
The following URL is used to return the basic logan XML-formatted log of all 
10
The following URL is used to return the basic log- an XML-formatted log of all 
11 11
events since the log was initiated::
12 12

  
13 13
  http://some.metacat.host/context/metacat?action=getlog 
build.xml
828 828
	</target>
829 829

  
830 830
	<target name="install" depends="build-metacat"
831
		description="* Full Install For Development *">
831
		description="* Install Metacat For Development *">
832 832
		<copy file="${dist.dir}/${metacat.context}.war"
833 833
			todir="${app.deploy.dir}" />
834
               <!-- <copy file="${dist.dir}/${metacat.context}.war"
835
                        todir="${app.deploy.dir2}" />-->
836 834
		<delete dir="${app.deploy.dir}/${metacat.context}" />
837
		<!--<delete dir="${app.deploy.dir2}/${metacat.context}" />-->
838 835
		<copy file="${dist.dir}/geoserver.war"
839 836
					todir="${app.deploy.dir}" />
837
		<delete dir="${app.deploy.dir}/geoserver" />
840 838
		<copy file="${dist.dir}/metacat-index.war"
841 839
					todir="${app.deploy.dir}" />
840
		<delete dir="${app.deploy.dir}/metacat-index" />
841
		<copy file="${dist.dir}/metacatui.war"
842
					todir="${app.deploy.dir}" />
843
		<delete dir="${app.deploy.dir}/metacatui" />
842 844
		<tstamp>
843 845
			<format property="NOW" pattern="MM/dd/yyyy hh:mm:ss aa" />
844 846
		</tstamp>
......
1533 1535
		</copy>
1534 1536
		<chmod file="${deb.pkg.dir}/DEBIAN/postinst" perm="755" />
1535 1537

  
1536
		<copy file="${dist.dir}/knb.war"
1538
		<copy file="${dist.dir}/${metacat.context}.war"
1537 1539
			todir="${deb.pkg.dir}/usr/share/metacat-${metacat.version}" />
1538 1540
		<copy file="./metacat-bin-${metacat.version}.tar.gz"
1539 1541
			tofile="${deb.pkg.dir}/metacat_${metacat.version}.orig.tar.gz" />
build.properties
10 10
# Tomcat dev deployment directory
11 11
# build.tomcat.dir=/usr/local/tomcat
12 12
build.tomcat.dir=/Users/leinfelder/tools/apache-tomcat-6
13

  
14 13
# install ant target uses this to determine where to drop 
15 14
# the war file in an installation.  Test classes will use
16 15
# this value to find metacat.properties
......
20 19
# CVS access to retrieve latest EML, seek and utilities 
21 20
cvsroot=:ext:${env.USER}@cvs.ecoinformatics.org:/cvs
22 21

  
23
## metacat.context will be used to name war only
24
metacat.context=knb
22
## metacat.context will be used to name war
23
metacat.context=metacat
25 24
workflowscheduler.context=workflowscheduler
26 25
authority.context=authority
27 26

  
docs/user/metacat/source/configuration.rst
95 95

  
96 96
1. Stop Tomcat and edit the Metacat properties (``metacat.properties``) file in the
97 97
   Metacat context directory inside the Tomcat application directory. The 
98
   Metacat context directory is the name of the application (usually knb):
98
   Metacat context directory is the name of the application (usually metacat):
99 99

  
100 100
  ::
101 101
  
......
205 205
Property          Description
206 206
================  ============================================================
207 207
Metacat Context   The name of the deployed Metacat WAR file (minus the .war 
208
                  extension). E.g., "knb"
208
                  extension). E.g., "metacat"
209 209
Server Name       The DNS name of the server hosting Metacat, not including 
210 210
                  port numbers or the protocol ("http://"). 
211 211
HTTP Port         The non-secure port where Metacat will be available.
......
413 413
  <CONTEXT_DIR>/WEB_INF/metacat.properties
414 414

  
415 415
Where ``<CONTEXT_DIR>`` is the directory in which the Metacat application code 
416
lives (e.g., ``/var/lib/tomcat6/webapps/knb``). The path is a combination 
416
lives (e.g., ``/var/lib/tomcat6/webapps/metacat``). The path is a combination 
417 417
of the Web application directory (e.g., ``/var/lib/tomcat6/webapps/``) and 
418
the Metacat context directory (e.g., ``knb``). Both values depend upon how your 
418
the Metacat context directory (e.g., ``metacat``). Both values depend upon how your 
419 419
system was set up during installation.
420 420

  
421 421
For information about each property and default or example settings, please 
docs/user/metacat/source/install.rst
58 58
3. Log in to PostgreSQL and create the 'metacat' user
59 59
4. Download Metacat from the `Metacat Download Page`_ and extract the archive
60 60
5. ``sudo mkdir /var/metacat; sudo chown -R <tomcat_user> /var/metacat``
61
6. ``sudo cp <metacat_package_dir>/knb.war <tomcat_app_dir>``
61
6. ``sudo cp <metacat_package_dir>/metacat.war <tomcat_app_dir>``
62 62
7. ``sudo /etc/init.d/tomcat6 restart``
63 63
8. Configure Metacat through the Web interface
64 64

  
......
98 98
================== ===========================================================
99 99
File               Description
100 100
================== ===========================================================
101
knb.war            The Metacat Web archive file (WAR) 
102
knb                Sample Web definition file used by Apache on Ubuntu/Debian 
101
metacat.war        The Metacat Web archive file (WAR) 
102
metacat-site       Sample Web definition file used by Apache on Ubuntu/Debian 
103 103
                   Linux systems. 
104
knb.ssl            Sample SSL definition file used by Apache on Ubuntu/Debian 
104
metacat-site-ssl   Sample SSL definition file used by Apache on Ubuntu/Debian 
105 105
                   Linux systems.
106 106
jk.conf            Sample JkMount configuration file used by Apache on 
107 107
                   Ubuntu/Debian Linux systems. 
......
278 278
        ServerName dev.nceas.ucsb.edu 
279 279
        ErrorLog /var/log/httpd/error_log 
280 280
        CustomLog /var/log/httpd/access_log common 
281
        ScriptAlias /cgi-bin/ "/var/www/cgi-knb/" 
282
        <Directory /var/www/cgi-knb/> 
281
        ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" 
282
        <Directory /var/www/cgi-bin/> 
283 283
          AllowOverride None 
284 284
          Options ExecCGI 
285 285
          Order allow,deny 
286 286
          Allow from all 
287 287
        </Directory> 
288
        ScriptAlias /knb/cgi-bin/ "/var/www/webapps/knb/cgi-bin/" 
289
        <Directory "/var/www/webapps/knb/cgi-bin/"> 
288
        ScriptAlias /metacat/cgi-bin/ "/var/www/webapps/metacat/cgi-bin/" 
289
        <Directory "/var/www/webapps/metacat/cgi-bin/"> 
290 290
          AllowOverride None 
291 291
          Options ExecCGI 
292 292
          Order allow,deny 
293 293
          Allow from all 
294 294
        </Directory> 
295
        JkMount /knb ajp13 
296
        JkMount /knb/* ajp13 
297
        JkMount /knb/metacat ajp13 
298
        JkUnMount /knb/cgi-bin/* ajp13 
299
        JkMount /*.jsp ajp13 
300 295
        JkMount /metacat ajp13 
301 296
        JkMount /metacat/* ajp13 
297
        JkMount /metacat/metacat ajp13 
298
        JkUnMount /metacat/cgi-bin/* ajp13 
299
        JkMount /*.jsp ajp13 
302 300
      </VirtualHost> 
303 301

  
304 302
  3. Copy the "workers.properties" file provided by Metacat into your Apache configuration directory (<apache_install_dir>/conf/).  Depending on whether you are installing from binary distribution or source, the workers.properties file will be in one of two locations:
......
352 350
  sudo a2dismod jk
353 351
  sudo a2enmod jk
354 352

  
355
4. Apache needs to know about the Metacat site. The helper file named "knb" has rules that tell Apache which traffic to route to Metacat. Set up the knb (Metacat) site by dropping the knb file into the sites-available directory and running a2ensite to enable the site:
353
4. Apache needs to know about the Metacat site. The helper file named "metacat-site" has rules that tell Apache which traffic to route to Metacat. Set up Metacat site by dropping the metacat-site file into the sites-available directory and running a2ensite to enable the site:
356 354

  
357 355
::
358 356

  
359
  sudo cp <metacat_helper_dir>/knb <apache_install_dir>/sites-available
360
  sudo a2ensite knb
357
  sudo cp <metacat_helper_dir>/metacat-site <apache_install_dir>/sites-available
358
  sudo a2ensite metacat-site
361 359
  
362 360
5. Disable the default Apache site configuration:
363 361

  
......
535 533
    sudo chown -R <tomcat_user> /var/metacat
536 534

  
537 535

  
538
3.  Install the Metacat WAR in the Tomcat web-application directory. For instructions on downloading the Metacat WAR, please see Downloading Metacat.  Typically, Tomcat will look for its application files (WAR files) in the <tomcat_home>/webapps directory (e.g., /usr/share/tomcat6/webapps). Your instance of Tomcat may be configured to look in a different directory. We will refer to the Tomcat application directory as <tomcat_app_dir>.  NOTE: The name of the WAR file (e.g., knb.war) provides the application context, which appears in the URL of the Metacat (e.g., http://yourserver.com/knb/). To change the context, simply change the name of the WAR file to the desired name before copying it.  To install the Metacat WAR:
536
3.  Install the Metacat WAR in the Tomcat web-application directory. For instructions on downloading the Metacat WAR, please see Downloading Metacat.  Typically, Tomcat will look for its application files (WAR files) in the <tomcat_home>/webapps directory (e.g., /usr/share/tomcat6/webapps). Your instance of Tomcat may be configured to look in a different directory. We will refer to the Tomcat application directory as <tomcat_app_dir>.  NOTE: The name of the WAR file (e.g., metacat.war) provides the application context, which appears in the URL of the Metacat (e.g., http://yourserver.com/metacat/). To change the context, simply change the name of the WAR file to the desired name before copying it.  To install the Metacat WAR:
539 537

  
540 538
  ::
541 539

  
542
    sudo cp <metacat_package_dir>/knb.war <tomcat_app_dir>
540
    sudo cp <metacat_package_dir>/metacat.war <tomcat_app_dir>
543 541

  
544 542

  
545 543
4. Restart Tomcat. Log in as the user that runs your Tomcat server (often "tomcat") and type:  
......
578 576

  
579 577
  ::
580 578

  
581
    cp <web_app_dir>/knb <backup_dir>/knb.<yyyymmdd>
582
    cp <web_app_dir>/knb.war <backup_dir>/knb.war.<yyyymmdd>
579
    cp <web_app_dir>/metacat <backup_dir>/metacat.<yyyymmdd>
580
    cp <web_app_dir>/metacat.war <backup_dir>/metacat.war.<yyyymmdd>
583 581

  
584 582
  Warning: Do not backup the files to the ``<web_app_dir>`` directory.  Tomcat will
585 583
  try to run the backup copy as a service.
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff