Project

General

Profile

« Previous | Next » 

Revision 780

Added by berkley over 23 years ago

fixed error with exception handling in metacat servlet and added new dtds to the sql script

View differences:

src/loaddtd.sql
1 1 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
2 2 
     VALUES ('DTD', '-//NCEAS//eml-dataset//EN',
3 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-dataset.dtd');
3 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-dataset.dtd');
4 4 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
5 5 
     VALUES ('DTD', '-//NCEAS//eml-file//EN',
6 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-file.dtd');
6 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-file.dtd');
7 7 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
8 8 
     VALUES ('DTD', '-//NCEAS//eml-variable//EN',
9 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-variable.dtd');
9 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-variable.dtd');
10 10 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
11 11 
     VALUES ('DTD', '-//NCEAS//eml-access//EN',
12 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-access.dtd');
12 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-access.dtd');
13 13 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
14 14 
     VALUES ('DTD', '-//NCEAS//eml-context//EN',
15 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-context.dtd');
15 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-context.dtd');
16 16 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
17 17 
     VALUES ('DTD', '-//NCEAS//eml-software//EN',
18 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-software.dtd');
18 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-software.dtd');
19 19 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
20 20 
     VALUES ('DTD', '-//NCEAS//eml-status//EN',
21 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-status.dtd');
21 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-status.dtd');
22 22 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
23 23 
     VALUES ('DTD', '-//NCEAS//eml-supplement//EN',
24 
     'http://dev.nceas.ucsb.edu/metadata/dtd/eml-supplement.dtd');
24 
     'http://dev.nceas.ucsb.edu/jones/dtd/eml-supplement.dtd');
25 25 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
26 26 
     VALUES ('DTD', '-//NCEAS//package//EN',
27 27 
             'http://dev.nceas.ucsb.edu/dtd/schemas/package.dtd');
......
30 30 
            'http://dev.nceas.ucsb.edu/dtd/schemas/resource.dtd');
31 31 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
32 32 
    VALUES ('DTD', '-//NCEAS//eml-dataset-2.0//EN',
33 
            'http://dev.nceas.ucsb.edu/metadata/dtd/eml-dataset-2.0.dtd');
33 
            'http://dev.nceas.ucsb.edu/jones/dtd/eml-dataset-2.0.dtd');
34 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
35 
    VALUES ('DTD', '-//NCEAS//eml-entity-2.0//EN',
36 
            'http://dev.nceas.ucsb.edu/jones/dtd/eml-entity-2.0.dtd');
src/edu/ucsb/nceas/metacat/MetaCatServlet.java
1082 1082 
      if (e instanceof SAXException) {
1083 1083 
        Exception e2 = ((SAXException)e).getException();
1084 1084 
        out.println("<error>");
1085 
        out.println(e2.getMessage());
1085 
        try
1086 
        {
1087 
          out.println(e2.getMessage());
1088 
        }
1089 
        catch(NullPointerException npe)
1090 
        {
1091 
          out.println(e.getMessage());
1092 
        }
1086 1093 
        out.println("</error>");
1087 1094 
      }
1088 1095 
      //e.printStackTrace(out);
build.xml
33 33 
   <target name="init">
34 34 
      <property name="jdbc-connect"
35 35 
                value="jdbc:oracle:thin:@dev.nceas.ucsb.edu:1521:exp"/>
36 
      <property name="installdir" value="/opt/tomcat/webapps/metadata" />
36 
      <property name="installdir" value="/opt/tomcat/webapps/jones" />
37 37 
      <property name="name" value="metacat"/>
38 38 
      <property name="Name" value="MetaCat"/>
39 39 
      <property name="release" value="1.0beta1"/>
40 40 
      <property name="web-base-url"
41 41 
                value="http://www.nceas.ucsb.edu/collab/2840/knbweb"/>
42 
      <property name="replication-path" value="/metadata/servlet/replication"/>
43 
      <property name="servlet-path" value="/metadata/servlet/metacat"/>
44 
      <property name="html-path" value="/metadata"/>
45 
      <property name="image-path" value="/img/metadata" />
42 
      <property name="replication-path" value="//servlet/replication"/>
43 
      <property name="servlet-path" value="/jones/servlet/metacat"/>
44 
      <property name="html-path" value="/jones"/>
45 
      <property name="image-path" value="/img/jones" />
46 46 
      <property name="server" value="dev.nceas.ucsb.edu"/>
47 
      <property name="replication-log" value="/home/computer/berkley/xmltodb/logs/metacatreplication.log"/>
47 
      <property name="replication-log" value="/tmp/metacatreplication.log"/>
48 48 
      <property name="dataport" value="4444"/>
49 
      <property name="user" value="metadata"/>
50 
      <property name="password" value="your-pw-goes-here"/>
49 
      <property name="user" value="jones"/>
50 
      <property name="password" value="kinkaj0u"/>
51 51 

  		




  52
  52
  
    
      <filter token="jdbc-connect" value="${jdbc-connect}"/>


  		




  53
  53
  
    
      <filter token="data-port" value="${dataport}"/>


  		












Also available in:  Unified diff