Project

General

Profile

« Previous | Next » 

Revision 7194

include eml2.0.0beta4 DTD during Metacat build so that we can continue to accept (and validate) beta4 documents.
This arose when testing Metacat as DataONE Coordinating Node where legacy documents are being housed in the CN.

View differences:

src/upgrade-db-to-2.0.0-oracle.sql
156 156
 */
157 157
ALTER TABLE xml_path_index MODIFY ( path VARCHAR2(4000) );
158 158

  
159
/**
160
 * include 2.0.0beta4 DTD
161
 */
162
INSERT INTO xml_catalog (entry_type, public_id, system_id)
163
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-@eml-beta4-version@//EN',
164
         '/dtd/eml-access-@eml-beta4-version@.dtd');
165
INSERT INTO xml_catalog (entry_type, public_id, system_id)
166
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-@eml-beta4-version@//EN',
167
          '/dtd/eml-attribute-@eml-beta4-version@.dtd');
168
INSERT INTO xml_catalog (entry_type, public_id, system_id)
169
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-@eml-beta4-version@//EN',
170
          '/dtd/eml-constraint-@eml-beta4-version@.dtd');
171
INSERT INTO xml_catalog (entry_type, public_id, system_id)
172
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-@eml-beta4-version@//EN',
173
          '/dtd/eml-coverage-@eml-beta4-version@.dtd');
174
INSERT INTO xml_catalog (entry_type, public_id, system_id)
175
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-@eml-beta4-version@//EN',
176
          '/dtd/eml-dataset-@eml-beta4-version@.dtd');
177
INSERT INTO xml_catalog (entry_type, public_id, system_id)
178
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-@eml-beta4-version@//EN',
179
          '/dtd/eml-entity-@eml-beta4-version@.dtd');
180
INSERT INTO xml_catalog (entry_type, public_id, system_id)
181
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-@eml-beta4-version@//EN',
182
          '/dtd/eml-literature-@eml-beta4-version@.dtd');
183
INSERT INTO xml_catalog (entry_type, public_id, system_id)
184
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-@eml-beta4-version@//EN',
185
          '/dtd/eml-physical-@eml-beta4-version@.dtd');
186
INSERT INTO xml_catalog (entry_type, public_id, system_id)
187
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-@eml-beta4-version@//EN',
188
          '/dtd/eml-project-@eml-beta4-version@.dtd');
189
INSERT INTO xml_catalog (entry_type, public_id, system_id)
190
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-@eml-beta4-version@//EN',
191
          '/dtd/eml-protocol-@eml-beta4-version@.dtd');
192
INSERT INTO xml_catalog (entry_type, public_id, system_id)
193
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-beta4-version@//EN',
194
          '/dtd/eml-software-@eml-beta4-version@.dtd');
195

  
159 196
/*
160 197
 * update the database version
161 198
 */
src/upgrade-db-to-2.0.0-postgres.sql
169 169
 */
170 170
ALTER TABLE xml_path_index ALTER COLUMN path TYPE text;
171 171

  
172
/**
173
 * include 2.0.0beta4 DTD
174
 */
175
INSERT INTO xml_catalog (entry_type, public_id, system_id)
176
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-@eml-beta4-version@//EN',
177
         '/dtd/eml-access-@eml-beta4-version@.dtd');
178
INSERT INTO xml_catalog (entry_type, public_id, system_id)
179
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-@eml-beta4-version@//EN',
180
          '/dtd/eml-attribute-@eml-beta4-version@.dtd');
181
INSERT INTO xml_catalog (entry_type, public_id, system_id)
182
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-@eml-beta4-version@//EN',
183
          '/dtd/eml-constraint-@eml-beta4-version@.dtd');
184
INSERT INTO xml_catalog (entry_type, public_id, system_id)
185
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-@eml-beta4-version@//EN',
186
          '/dtd/eml-coverage-@eml-beta4-version@.dtd');
187
INSERT INTO xml_catalog (entry_type, public_id, system_id)
188
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-@eml-beta4-version@//EN',
189
          '/dtd/eml-dataset-@eml-beta4-version@.dtd');
190
INSERT INTO xml_catalog (entry_type, public_id, system_id)
191
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-@eml-beta4-version@//EN',
192
          '/dtd/eml-entity-@eml-beta4-version@.dtd');
193
INSERT INTO xml_catalog (entry_type, public_id, system_id)
194
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-@eml-beta4-version@//EN',
195
          '/dtd/eml-literature-@eml-beta4-version@.dtd');
196
INSERT INTO xml_catalog (entry_type, public_id, system_id)
197
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-@eml-beta4-version@//EN',
198
          '/dtd/eml-physical-@eml-beta4-version@.dtd');
199
INSERT INTO xml_catalog (entry_type, public_id, system_id)
200
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-@eml-beta4-version@//EN',
201
          '/dtd/eml-project-@eml-beta4-version@.dtd');
202
INSERT INTO xml_catalog (entry_type, public_id, system_id)
203
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-@eml-beta4-version@//EN',
204
          '/dtd/eml-protocol-@eml-beta4-version@.dtd');
205
INSERT INTO xml_catalog (entry_type, public_id, system_id)
206
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-beta4-version@//EN',
207
          '/dtd/eml-software-@eml-beta4-version@.dtd');
208

  
172 209
/*
173 210
 * update the database version
174 211
 */
src/loaddtdschema-postgres.sql
2 2
      WHERE entry_type LIKE 'DTD'
3 3
        AND public_id LIKE '%@eml-version@%';
4 4
DELETE FROM xml_catalog 
5
      WHERE entry_type LIKE 'DTD'
6
        AND public_id LIKE '%@eml-beta4-version@%';
7
DELETE FROM xml_catalog 
5 8
      WHERE entry_type LIKE 'Schema'
6 9
        AND system_id LIKE '%eml%';
7 10
INSERT INTO xml_catalog (entry_type, public_id, system_id)
......
37 40
INSERT INTO xml_catalog (entry_type, public_id, system_id)
38 41
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-version@//EN',
39 42
          '/dtd/eml-software-@eml-version@.dtd');
43
-- include 2.0.0beta4
40 44
INSERT INTO xml_catalog (entry_type, public_id, system_id)
45
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-@eml-beta4-version@//EN',
46
         '/dtd/eml-access-@eml-beta4-version@.dtd');
47
INSERT INTO xml_catalog (entry_type, public_id, system_id)
48
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-@eml-beta4-version@//EN',
49
          '/dtd/eml-attribute-@eml-beta4-version@.dtd');
50
INSERT INTO xml_catalog (entry_type, public_id, system_id)
51
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-@eml-beta4-version@//EN',
52
          '/dtd/eml-constraint-@eml-beta4-version@.dtd');
53
INSERT INTO xml_catalog (entry_type, public_id, system_id)
54
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-@eml-beta4-version@//EN',
55
          '/dtd/eml-coverage-@eml-beta4-version@.dtd');
56
INSERT INTO xml_catalog (entry_type, public_id, system_id)
57
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-@eml-beta4-version@//EN',
58
          '/dtd/eml-dataset-@eml-beta4-version@.dtd');
59
INSERT INTO xml_catalog (entry_type, public_id, system_id)
60
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-@eml-beta4-version@//EN',
61
          '/dtd/eml-entity-@eml-beta4-version@.dtd');
62
INSERT INTO xml_catalog (entry_type, public_id, system_id)
63
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-@eml-beta4-version@//EN',
64
          '/dtd/eml-literature-@eml-beta4-version@.dtd');
65
INSERT INTO xml_catalog (entry_type, public_id, system_id)
66
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-@eml-beta4-version@//EN',
67
          '/dtd/eml-physical-@eml-beta4-version@.dtd');
68
INSERT INTO xml_catalog (entry_type, public_id, system_id)
69
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-@eml-beta4-version@//EN',
70
          '/dtd/eml-project-@eml-beta4-version@.dtd');
71
INSERT INTO xml_catalog (entry_type, public_id, system_id)
72
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-@eml-beta4-version@//EN',
73
          '/dtd/eml-protocol-@eml-beta4-version@.dtd');
74
INSERT INTO xml_catalog (entry_type, public_id, system_id)
75
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-beta4-version@//EN',
76
          '/dtd/eml-software-@eml-beta4-version@.dtd');
77
--include schema
78
INSERT INTO xml_catalog (entry_type, public_id, system_id)
41 79
  VALUES ('Schema', '@eml2_0_1namespace@', '/schema/eml-2.0.1/eml.xsd');
42 80
INSERT INTO xml_catalog (entry_type, public_id, system_id)
43 81
  VALUES ('Schema', '@eml2_0_0namespace@', '/schema/eml-2.0.0/eml.xsd');
src/loaddtdschema-oracle.sql
2 2
      WHERE entry_type LIKE 'DTD'
3 3
        AND public_id LIKE '%@eml-version@%';
4 4
DELETE FROM xml_catalog 
5
      WHERE entry_type LIKE 'DTD'
6
        AND public_id LIKE '%@eml-beta4-version@%';
7
DELETE FROM xml_catalog 
5 8
      WHERE entry_type LIKE 'Schema'
6 9
        AND system_id LIKE '%eml%';
7 10
INSERT INTO xml_catalog (entry_type, public_id, system_id)
......
37 40
INSERT INTO xml_catalog (entry_type, public_id, system_id)
38 41
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-version@//EN',
39 42
          '/dtd/eml-software-@eml-version@.dtd');
43
-- include 2.0.0beta4
40 44
INSERT INTO xml_catalog (entry_type, public_id, system_id)
45
  VALUES ('DTD', '-//ecoinformatics.org//eml-access-@eml-beta4-version@//EN',
46
         '/dtd/eml-access-@eml-beta4-version@.dtd');
47
INSERT INTO xml_catalog (entry_type, public_id, system_id)
48
  VALUES ('DTD', '-//ecoinformatics.org//eml-attribute-@eml-beta4-version@//EN',
49
          '/dtd/eml-attribute-@eml-beta4-version@.dtd');
50
INSERT INTO xml_catalog (entry_type, public_id, system_id)
51
  VALUES ('DTD', '-//ecoinformatics.org//eml-constraint-@eml-beta4-version@//EN',
52
          '/dtd/eml-constraint-@eml-beta4-version@.dtd');
53
INSERT INTO xml_catalog (entry_type, public_id, system_id)
54
  VALUES ('DTD', '-//ecoinformatics.org//eml-coverage-@eml-beta4-version@//EN',
55
          '/dtd/eml-coverage-@eml-beta4-version@.dtd');
56
INSERT INTO xml_catalog (entry_type, public_id, system_id)
57
  VALUES ('DTD', '-//ecoinformatics.org//eml-dataset-@eml-beta4-version@//EN',
58
          '/dtd/eml-dataset-@eml-beta4-version@.dtd');
59
INSERT INTO xml_catalog (entry_type, public_id, system_id)
60
  VALUES ('DTD', '-//ecoinformatics.org//eml-entity-@eml-beta4-version@//EN',
61
          '/dtd/eml-entity-@eml-beta4-version@.dtd');
62
INSERT INTO xml_catalog (entry_type, public_id, system_id)
63
  VALUES ('DTD', '-//ecoinformatics.org//eml-literature-@eml-beta4-version@//EN',
64
          '/dtd/eml-literature-@eml-beta4-version@.dtd');
65
INSERT INTO xml_catalog (entry_type, public_id, system_id)
66
  VALUES ('DTD', '-//ecoinformatics.org//eml-physical-@eml-beta4-version@//EN',
67
          '/dtd/eml-physical-@eml-beta4-version@.dtd');
68
INSERT INTO xml_catalog (entry_type, public_id, system_id)
69
  VALUES ('DTD', '-//ecoinformatics.org//eml-project-@eml-beta4-version@//EN',
70
          '/dtd/eml-project-@eml-beta4-version@.dtd');
71
INSERT INTO xml_catalog (entry_type, public_id, system_id)
72
  VALUES ('DTD', '-//ecoinformatics.org//eml-protocol-@eml-beta4-version@//EN',
73
          '/dtd/eml-protocol-@eml-beta4-version@.dtd');
74
INSERT INTO xml_catalog (entry_type, public_id, system_id)
75
  VALUES ('DTD', '-//ecoinformatics.org//eml-software-@eml-beta4-version@//EN',
76
          '/dtd/eml-software-@eml-beta4-version@.dtd');
77
--include schema
78
INSERT INTO xml_catalog (entry_type, public_id, system_id)
41 79
  VALUES ('Schema', '@eml2_0_1namespace@', '/schema/eml-2.0.1/eml.xsd');
42 80
INSERT INTO xml_catalog (entry_type, public_id, system_id)
43 81
  VALUES ('Schema', '@eml2_0_0namespace@', '/schema/eml-2.0.0/eml.xsd');
build.xml
174 174
		<property name="seek-tag" value="tags/ECOGRID_1_2_2" />
175 175
		<property name="eml-module" value="eml" />
176 176
		<property name="eml-version" value="2.0.0beta6" />
177
		<property name="eml-beta4-version" value="2.0.0beta4" />
177 178
		<property name="eml-beta-tag"
178 179
			value="BRANCH_EML_2_0_0_BETA_6_FOR_METACAT" />
180
		<property name="eml-beta4-tag"
181
					value="RELEASE_EML_2_BETA_4" />
179 182
		<property name="eml2_0_0-schema-tag"
180 183
			value="RELEASE_EML_2_0_0_UPDATE_1" />
181 184
		<property name="eml2_0_1-schema-tag" value="RELEASE_EML_2_0_1" />
......
240 243
			value="${style-common-relpath}" />
241 244

  
242 245
		<filter token="eml-version" value="${eml-version}" />
246
		<filter token="eml-beta4-version" value="${eml-beta4-version}" />
243 247
		<filter token="eml2_0_0namespace" value="${eml2_0_0namespace}" />
244 248
		<filter token="eml2_0_1namespace" value="${eml2_0_1namespace}" />
245 249
		<filter token="eml2_1_0namespace" value="${eml2_1_0namespace}" />
......
278 282
		<property name="docdir" value="./docs" />
279 283
		<property name="cgidir" value="./cgi-bin" />
280 284
		<property name="testdir" value="./test" />
281
		<property name="testtorun" value="GenerateSystemMetadataTest" />
285
		<property name="testtorun" value="MNodeServiceTest" />
282 286
		<property name="junittestsdir"
283 287
			value="./test/edu/ucsb/nceas/metacattest" />
284 288
		<property name="junitnettestsdir"
......
333 337
			value="https://code.ecoinformatics.org/code/seek/${seek-tag}/projects/ecogrid/" />
334 338
		<property name="svn.emlBetaUrl"
335 339
			value="https://code.ecoinformatics.org/code/eml/branches/${eml-beta-tag}" />
340
		<property name="svn.emlBeta4Url"
341
					value="https://code.ecoinformatics.org/code/eml/tags/${eml-beta4-tag}" />
336 342
		<property name="svn.eml200SchemaUrl"
337 343
			value="https://code.ecoinformatics.org/code/eml/tags/${eml2_0_0-schema-tag}" />
338 344
		<property name="svn.eml201SchemaUrl"
......
554 560
		<delete file="./harvest-list-editor-${release}.tar" />
555 561
	</target>
556 562

  
557
	<target name="geteml" depends="getemlpre2,geteml2+,getConversionXSL"
563
	<target name="geteml" depends="getemlpre2,getemlpre2beta4,geteml2+,getConversionXSL"
558 564
		if="eml.required" description="Calls getemlpre2 and geteml2+ targets" />
559 565

  
560 566
	<target name="getemlpre2" depends="prepare" if="eml.required"
......
580 586
			</fileset>
581 587
		</copy>
582 588
	</target>
589
	
590
	<target name="getemlpre2beta4" depends="prepare" if="eml.required"
591
			description="Checks EML-beta4 out of svn and copies dtds to your metacat sandbox">
592
			<svn>
593
				<export srcUrl="${svn.emlBeta4Url}"
594
					destPath="${build.tmp}/eml_${eml-beta4-tag}" />
595
			</svn>
596
			<mkdir dir="lib/dtd" />
597
			<copy todir="lib/dtd" filtering="yes">
598
				<fileset
599
					dir="${build.tmp}/eml_${eml-beta4-tag}">
600
					<include name="*.dtd" />
601
				</fileset>
602
				<mapper type="glob" from="eml-*.dtd"
603
					to="eml-*-${eml-beta4-version}.dtd" />
604
			</copy>
583 605

  
606
			<!--
607
			<copy todir="${style-common-cvsrelpath}" filtering="yes">
608
				<fileset
609
					dir="${build.tmp}/eml_${eml-beta4-tag}/style">
610
					<include name="**/*.xsl" />
611
				</fileset>
612
			</copy>
613
			-->
614
		</target>
615

  
584 616
	<target name="geteml2+" depends="prepare" if="eml.required"
585 617
		description="Checks eml-2 out of svn and copies schema and xsl to your metacat sandbox">
586 618
		<svn>

Also available in: Unified diff