Project

General

Profile

« Previous | Next » 

Revision 877

Added by Matt Jones almost 23 years ago

Improvements to the build process that make it easier to install the DTDs
form EML. There are now three new targets in the build.xml file:

getdtd: uses cvs to get a working copy of a tagged release of eml
  instdtd: copies the DTDs from the build directory to the install directory
   dtdsql: runs the "loaddtd.sql" script against the db to register the DTDs

Also updated the src/loaddtd.sql script to use ant tokens so that it is up
to date with respect to the version of ant configured in the build.xml file.

Finally some minor changes to the README in preparation for the 1.0.1 release.

View differences:

src/loaddtd.sql
1 
DELETE FROM xml_catalog
2 
      WHERE entry_type LIKE 'DTD'
3 
        AND public_id LIKE '%@eml-version@%';
1 4 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
2 
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-2.0.0beta6//EN',
3 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-access-2.0.0beta6.dtd');
5 
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-@eml-version@//EN',
6 
          'http://@server@@html-path@/dtd/eml-access-@eml-version@.dtd');
4 7 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
5 
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-2.0.0beta6//EN',
6 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-attribute-2.0.0beta6.dtd');
8 
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-@eml-version@//EN',
9 
          'http://@server@@html-path@/dtd/eml-attribute-@eml-version@.dtd');
7 10 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
8 
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-2.0.0beta6//EN',
9 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-constraint-2.0.0beta6.dtd');
11 
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-@eml-version@//EN',
12 
          'http://@server@@html-path@/dtd/eml-constraint-@eml-version@.dtd');
10 13 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
11 
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-2.0.0beta6//EN',
12 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-coverage-2.0.0beta6.dtd');
14 
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-@eml-version@//EN',
15 
          'http://@server@@html-path@/dtd/eml-coverage-@eml-version@.dtd');
13 16 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
14 
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN',
15 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-dataset-2.0.0beta6.dtd');
17 
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-@eml-version@//EN',
18 
          'http://@server@@html-path@/dtd/eml-dataset-@eml-version@.dtd');
16 19 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
17 
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-2.0.0beta6//EN',
18 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-entity-2.0.0beta6.dtd');
20 
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-@eml-version@//EN',
21 
          'http://@server@@html-path@/dtd/eml-entity-@eml-version@.dtd');
19 22 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
20 
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-2.0.0beta6//EN',
21 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-literature-2.0.0beta6.dtd');
23 
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-@eml-version@//EN',
24 
          'http://@server@@html-path@/dtd/eml-literature-@eml-version@.dtd');
22 25 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
23 
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-2.0.0beta6//EN',
24 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-physical-2.0.0beta6.dtd');
26 
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-@eml-version@//EN',
27 
          'http://@server@@html-path@/dtd/eml-physical-@eml-version@.dtd');
25 28 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
26 
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-2.0.0beta6//EN',
27 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-project-2.0.0beta6.dtd');
29 
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-@eml-version@//EN',
30 
          'http://@server@@html-path@/dtd/eml-project-@eml-version@.dtd');
28 31 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
29 
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-2.0.0beta6//EN',
30 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-protocol-2.0.0beta6.dtd');
32 
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-@eml-version@//EN',
33 
          'http://@server@@html-path@/dtd/eml-protocol-@eml-version@.dtd');
31 34 
INSERT INTO xml_catalog (entry_type, public_id, system_id)
32 
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-2.0.0beta6//EN',
33 
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-software-2.0.0beta6.dtd');
34 

  		




  35
  
  
    

  		




  36
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  37
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-2.0.0beta4//EN',


  		




  38
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-access-2.0.0.beta4e.dtd');


  		




  39
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  40
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-2.0.0beta4//EN',


  		




  41
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-attribute-2.0.0.beta4e.dtd');


  		




  42
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  43
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-2.0.0beta4//EN',


  		




  44
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-constraint-2.0.0.beta4e.dtd');


  		




  45
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  46
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-2.0.0beta4//EN',


  		




  47
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-coverage-2.0.0.beta4e.dtd');


  		




  48
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  49
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN',


  		




  50
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-dataset-2.0.0.beta4e.dtd');


  		




  51
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  52
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-distribution-2.0.0beta4//EN',


  		




  53
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-distribution-2.0.0.beta4e.dtd');


  		




  54
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  55
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-2.0.0beta4//EN',


  		




  56
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-entity-2.0.0.beta4e.dtd');


  		




  57
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  58
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-2.0.0beta4//EN',


  		




  59
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-literature-2.0.0.beta4e.dtd');


  		




  60
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  61
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-2.0.0beta4//EN',


  		




  62
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-physical-2.0.0.beta4e.dtd');


  		




  63
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  64
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-2.0.0beta4//EN',


  		




  65
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-project-2.0.0.beta4e.dtd');


  		




  66
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  67
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-2.0.0beta4//EN',


  		




  68
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-protocol-2.0.0.beta4e.dtd');


  		




  69
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  70
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-2.0.0beta4//EN',


  		




  71
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-software-2.0.0.beta4e.dtd');


  		




  72
  
  
    
INSERT INTO xml_catalog (entry_type, public_id, system_id)


  		




  73
  
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-2.0.0beta5//EN',


  		




  74
  
  
    
          'http://metacat.nceas.ucsb.edu/knb/dtd/eml-software-2.0.0.beta5e.dtd');


  		




  
  35
  
    
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-version@//EN',


  		




  
  36
  
    
          'http://@server@@html-path@/dtd/eml-software-@eml-version@.dtd');


  		












  

    
      README
    
  





  8
  8
  
    
Metacat: XML Metadata Database


  		




  9
  9
  
    
------------------------------


  		




  10
  10
  
    

  		




  11
  
  
    
Version: 1.0.0 Release


  		




  
  11
  
    
Version: 1.0.1 Release


  		




  12
  12
  
    

  		




  13
  13
  
    
Send feedback and bugs to: knb-software@nceas.ucsb.edu


  		




  14
  14
  
    

  		




  ......




  28
  28
  
    
purposes.  Metacat currently uses an LDAP database for authenticating


  		




  29
  29
  
    
users, but was written to accomodate other authentication services as well.


  		




  30
  30
  
    

  		




  
  31
  
    
Release Notes


  		




  
  32
  
    
-------------


  		




  
  33
  
    
This is a simple interim bug fix.  No major functionality changes.  Bugs


  		




  
  34
  
    
fixed include:


  		




  
  35
  
    
   1) Fixed problem with authenticating using LDAP referrals


  		




  
  36
  
    
   2) Fixed bug that prevent groups from being used in access documents


  		




  
  37
  
    

  		




  31
  38
  
    
Documentation


  		




  32
  39
  
    
-------------


  		




  33
  40
  
    
See the docs directory for detailed documentation and installation 


  		












  

    
      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="dbDriver" value="oracle.jdbc.driver.OracleDriver"/>


  		




  36
  37
  
    
      <property name="installdir" value="/opt/tomcat/webapps/jones" />


  		




  37
  38
  
    
      <property name="name" value="metacat"/>


  		




  38
  39
  
    
      <property name="Name" value="MetaCat"/>


  		




  39
  
  
    
      <property name="release" value="1.0.0"/>


  		




  
  40
  
    
      <property name="release" value="1.0.1"/>


  		




  40
  41
  
    
      <property name="web-base-url" 


  		




  41
  42
  
    
                value="http://knb.ecoinformatics.org"/>


  		




  42
  43
  
    
      <property name="replication-path" value="/servlet/replication"/>


  		




  ......




  50
  51
  
    
      <property name="password" value="your-pw-goes-here"/>


  		




  51
  52
  
    
      <property name="config-dir" value="${installdir}" />


  		




  52
  53
  
    
      <property name="default-style" value="knb" />


  		




  53
  
  
    
      <property name="eml-version" value="2.0beta4" />


  		




  54
  
  
    
      <property name="eml-tag" value="RELEASE_EML_2_BETA_4" />


  		




  
  54
  
    
      <property name="eml-module" value="mdstandards/eml" />


  		




  
  55
  
    
      <property name="eml-version" value="2.0.0beta6" />


  		




  
  56
  
    
      <property name="eml-tag" value="RELEASE_EML_2_0_0_BETA_6" />


  		




  
  57
  
    
      <property name="cvsroot" 


  		




  
  58
  
    
                value=":ext:jones@cvs.nceas.ucsb.edu:/cvs/pbi" />


  		




  55
  59
  
    

  		




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


  		




  57
  61
  
    
      <filter token="install-dir" value="${installdir}"/>


  		




  ......




  68
  72
  
    
      <filter token="replication-path" value="${replication-path}"/>


  		




  69
  73
  
    
      <filter token="config-dir" value="${config-dir}"/>


  		




  70
  74
  
    
      <filter token="default-style" value="${default-style}"/>


  		




  
  75
  
    
      <filter token="eml-version" value="${eml-version}"/>


  		




  
  76
  
    

  		




  71
  77
  
    
      <property name="srcdir" value="./src" />


  		




  72
  
  
    

  		




  73
  78
  
    
      <property name="build.dir" value="./build"/>


  		




  74
  79
  
    
      <property name="build.src" value="${build.dir}/src"/>


  		




  75
  80
  
    
      <property name="build.dest" value="${build.dir}/classes"/>


  		




  ......




  118
  123
  
    
        <fileset dir="${srcdir}">


  		




  119
  124
  
    
          <include name="edu/**"/>


  		




  120
  125
  
    
          <include name="com/**"/>


  		




  
  126
  
    
          <include name="**/*.sql"/>


  		




  121
  127
  
    
          <exclude name="**/CVS*"/>


  		




  122
  128
  
    
          <exclude name="**/.#*"/>


  		




  123
  
  
    
          <exclude name="**/*.sql"/>


  		




  124
  129
  
    
        </fileset>


  		




  125
  130
  
    
      </copy>


  		




  126
  131
  
    
   </target>


  		




  ......




  152
  157
  
    
            includes="**/protocols/" />


  		




  153
  158
  
    
   </target> 


  		




  154
  159
  
    

  		




  
  160
  
    
   <target name="getdtd" depends="prepare">


  		




  
  161
  
    
        <cvs cvsRoot="${cvsroot}"


  		




  
  162
  
    
             package="${eml-module}"


  		




  
  163
  
    
             tag="${eml-tag}"


  		




  
  164
  
    
             dest="${build.src}" />


  		




  
  165
  
    
   </target>


  		




  
  166
  
    

  		




  
  167
  
    
   <target name="instdtd" depends="getdtd">


  		




  
  168
  
    
       <mkdir dir="${installdir}/dtd" />


  		




  
  169
  
    
       <copy todir="${installdir}/dtd" filtering="yes">


  		




  
  170
  
    
         <fileset dir="${build.src}/${eml-module}">


  		




  
  171
  
    
           <include name="*.dtd"/>


  		




  
  172
  
    
         </fileset>


  		




  
  173
  
    
         <mapper type="glob" from="eml-*.dtd" to="eml-*-${eml-version}.dtd" />


  		




  
  174
  
    
       </copy>


  		




  
  175
  
    
   </target> 


  		




  
  176
  
    

  		




  
  177
  
    
   <target name="dtdsql" depends="prepare">


  		




  
  178
  
    
     <echo/>


  		




  
  179
  
    
     <echo>Registering the DTDs with the new Metacat instance...</echo>


  		




  
  180
  
    
     <sql driver="${dbDriver}"


  		




  
  181
  
    
          classpath="${jdbc}"


  		




  
  182
  
    
          url="${jdbc-connect}"


  		




  
  183
  
    
          userid="${user}"


  		




  
  184
  
    
          password="${password}"


  		




  
  185
  
    
          src="${build.src}/loaddtd.sql" />


  		




  
  186
  
    
   </target>


  		




  
  187
  
    

  		




  155
  188
  
    
   <target name="install" depends="jar">


  		




  156
  189
  
    
       <mkdir dir="${installdir}/WEB-INF/lib" />


  		




  157
  190
  
    
       <copy file="${build.dir}/${name}.jar" 


  		




  ......




  182
  215
  
    
         </fileset>


  		




  183
  216
  
    
       </copy>


  		




  184
  217
  
    
       <mkdir dir="${installdir}/dtd" />


  		




  185
  
  
    
       <copy todir="${installdir}/dtd" filtering="yes">


  		




  186
  
  
    
         <fileset dir="lib/dtd">


  		




  187
  
  
    
           <include name="*.dtd"/>


  		




  188
  
  
    
         </fileset>


  		




  189
  
  
    
       </copy>


  		




  
  218
  
    
       <echo>


  		




  
  219
  
    
             ***********************************************************


  		




  
  220
  
    
              Remember to copy the appropriate DTD


  		




  
  221
  
    
              files to the installation dtd directory. If you have cvs


  		




  
  222
  
    
              access this can be done using "ant instdtd".


  		




  
  223
  
    

  		




  
  224
  
    
              Remember to register the default DTDs by running the


  		




  
  225
  
    
              "${build.src}/loaddtd.sql script". This is most easily


  		




  
  226
  
    
              done by using the "ant dtdsql" which will run it for you.


  		




  
  227
  
    
             ***********************************************************


  		




  
  228
  
    
       </echo>


  		




  190
  229
  
    
   </target> 


  		




  191
  230
  
    

  		




  192
  231
  
    
   <target name="clean" depends="init">


  		












Also available in:  Unified diff