Project

General

Profile

Revision 4213

Added by daigle over 12 years ago

qualify xml and eml properties with an xml. prefix

View differences:

test/edu/ucsb/nceas/metacattest/QuerySpecificationTest.java
96 96
  	  {
97 97
		  PropertyService.getInstance("build/tests");
98 98
  		  MetaCatUtil.pathsForIndexing 
99
  		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
99
  		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
100 100
  	  }
101 101
  	  catch(Exception e)
102 102
  	  {
......
148 148
        try {
149 149
            System.out.println("---- SQL ------------------");
150 150
            QuerySpecification qspec = new QuerySpecification(xml, 
151
                    PropertyService.getProperty("saxparser"), 
151
                    PropertyService.getProperty("xml.saxparser"), 
152 152
                    PropertyService.getProperty("document.accNumSeparator"));
153 153
            String query = qspec.printSQL(false);
154 154
           assertTrue(selectionQuery.equals(query.trim()));
......
167 167
        try {
168 168
            System.out.println("---- orginal EXT SQL  ------------------\n"+extendedQuery);
169 169
            QuerySpecification qspec = new QuerySpecification(xml, 
170
                    PropertyService.getProperty("saxparser"), 
170
                    PropertyService.getProperty("xml.saxparser"), 
171 171
                    PropertyService.getProperty("document.accNumSeparator"));
172 172
            String query = 
173 173
                    qspec.printExtendedSQL(
test/edu/ucsb/nceas/metacattest/SubTreeTest.java
53 53
	  {
54 54
		  PropertyService.getInstance("build/tests");
55 55
		  MetaCatUtil.pathsForIndexing 
56
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
56
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
57 57
	  }
58 58
	  catch(Exception e)
59 59
	  {
test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java
83 83
		  {
84 84
			  PropertyService.getInstance("build/tests");
85 85
			  MetaCatUtil.pathsForIndexing 
86
			         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
86
			         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
87 87
		  }
88 88
		  catch(Exception e)
89 89
		  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestDetailLogTest.java
57 57
	  {
58 58
		  PropertyService.getInstance("build/tests");
59 59
		  MetaCatUtil.pathsForIndexing 
60
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
60
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
61 61
	  }
62 62
	  catch(Exception e)
63 63
	  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvesterTest.java
48 48
		try {
49 49
			PropertyService.getInstance("build/tests");
50 50
			MetaCatUtil.pathsForIndexing = MetaCatUtil.getOptionList(
51
					PropertyService.getProperty("indexPaths"));
51
					PropertyService.getProperty("xml.indexPaths"));
52 52
		} catch (Exception e) {
53 53
			System.err.println("Exception in initialize option in MetacatServletNetTest "
54 54
					+ e.getMessage());
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestDocumentTest.java
57 57
	  {
58 58
		  PropertyService.getInstance("build/tests");
59 59
		  MetaCatUtil.pathsForIndexing 
60
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
60
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
61 61
	  }
62 62
	  catch(Exception e)
63 63
	  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestLogTest.java
64 64
	  {
65 65
		  PropertyService.getInstance("build/tests");
66 66
		  MetaCatUtil.pathsForIndexing 
67
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
67
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
68 68
	  }
69 69
	  catch(Exception e)
70 70
	  {
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestSiteScheduleTest.java
56 56
	  {
57 57
		  PropertyService.getInstance("build/tests");
58 58
		  MetaCatUtil.pathsForIndexing 
59
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
59
		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
60 60
	  }
61 61
	  catch(Exception e)
62 62
	  {
test/edu/ucsb/nceas/metacattest/QueryGroupTest.java
47 47
  	  {
48 48
		  PropertyService.getInstance("build/tests");
49 49
  		  MetaCatUtil.pathsForIndexing 
50
  		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
50
  		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
51 51
  	  }
52 52
  	  catch(Exception e)
53 53
  	  {
test/edu/ucsb/nceas/metacattest/BuildIndexTest.java
86 86
  	  {
87 87
  		  PropertyService.getInstance("build/tests");
88 88
  		  MetaCatUtil.pathsForIndexing 
89
  		         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
89
  		         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
90 90
  	  }
91 91
  	  catch(Exception e)
92 92
  	  {
test/edu/ucsb/nceas/metacattest/ReplicationServerListTest.java
57 57
                     PropertyService.getProperty("junitreplicationurl");
58 58
			  PropertyService.getInstance("build/tests");
59 59
			  MetaCatUtil.pathsForIndexing 
60
			         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
60
			         = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
61 61
		  }
62 62
		  catch(Exception e)
63 63
		  {
lib/metacat.properties
133 133
ldap.templates.searchResults=searchResults.tmpl
134 134

  
135 135
############### Organization Values ###############
136

  
136 137
#ldap.NCEAS.dn=o=NCEAS,dc=ecoinformatics,dc=org
137 138
organization.configured.NCEAS=false
138 139
organization.name.NCEAS=National Center for Ecological Analysis and Synthesis
......
227 228

  
228 229
######## XML / EML  #########################################
229 230

  
230
saxparser=org.apache.xerces.parsers.SAXParser
231
eml2_0_0namespace=eml://ecoinformatics.org/eml-2.0.0
232
eml2_0_1namespace=eml://ecoinformatics.org/eml-2.0.1
233
eml2_1_0namespace=eml://ecoinformatics.org/eml-2.1.0
234
packagedoctype=-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN, -//ecoinformatics.org//eml-dataset-2.0.0beta4//EN
235
accessdoctype=-//ecoinformatics.org//eml-access-2.0.0beta6//EN, -//ecoinformatics.org//eml-access-2.0.0beta4//EN
236
physicaldoctype=-//ecoinformatics.org//eml-physical-2.0.0beta6//EN, -//ecoinformatics.org//eml-physical-2.0.0beta4//EN
237
entitydoctype=-//ecoinformatics.org//eml-entity-2.0.0beta6//EN, -//ecoinformatics.org//eml-entity-2.0.0beta4//EN
238
packagedoctypeset=BIN,-//ecoinformatics.org//eml-access-2.0.0beta6//EN,-//ecoinformatics.org//eml-access-2.0.0beta4//EN,-//ecoinformatics.org//eml-attribute-2.0.0beta6//EN,-//ecoinformatics.org//eml-attribute-2.0.0beta4//EN,-//ecoinformatics.org//eml-constraint-2.0.0beta6//EN,-//ecoinformatics.org//eml-constraint-2.0.0beta4//EN,-//ecoinformatics.org//eml-coverage-2.0.0beta6//EN,-//ecoinformatics.org//eml-coverage-2.0.0beta4//EN,-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN,-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN,-//ecoinformatics.org//eml-entity-2.0.0beta6//EN,-//ecoinformatics.org//eml-entity-2.0.0beta4//EN,-//ecoinformatics.org//eml-literature-2.0.0beta6//EN,-//ecoinformatics.org//eml-literature-2.0.0beta4//EN,-//ecoinformatics.org//eml-physical-2.0.0beta6//EN,-//ecoinformatics.org//eml-physical-2.0.0beta4//EN,-//ecoinformatics.org//eml-project-2.0.0beta6//EN,-//ecoinformatics.org//eml-project-2.0.0beta4//EN,-//ecoinformatics.org//eml-protocol-2.0.0beta6//EN,-//ecoinformatics.org//eml-protocol-2.0.0beta4//EN,-//ecoinformatics.org//eml-software-2.0.0beta6//EN,-//ecoinformatics.org//eml-software-2.0.0beta4//EN
239
indexNamespaces=eml://ecoinformatics.org/eml-2.0.0,eml://ecoinformatics.org/eml-2.0.1
240
indexPaths=organizationName,originator/individualName/surName,originator/individualName/givenName,originator/organizationName,creator/individualName/surName,creator/individualName/givenName,creator/organizationName,dataset/title,keyword,geographicCoverage/boundingCoordinates/northBoundingCoordinate,geographicCoverage/boundingCoordinates/southBoundingCoordinate,geographicCoverage/boundingCoordinates/westBoundingCoordinate,geographicCoverage/boundingCoordinates/eastBoundingCoordinate,eastBoundingCoordinate,title,entityName,individualName/surName,abstract/para,surName,givenName,para,geographicDescription,literalLayout,eastbc,northbc,westbc,southbc,dataset/access/allow/principal,entityName,taxonRankValue,dataset/dataTable/physical/distribution/online/url,dataset/spatialRaster/physical/distribution/online/url,@packageId,/reviewHistory/review/packageId,EcogridRegEntry/description,EcogridRegEntry/serviceName,EcogridRegEntry/endPoint,associatedParty/individualName/surName,associatedParty/organizationName,coverage/temporalCoverage/singleDateTime/alternativeTimeScale/timeScaleName,coverage/temporalCoverage/rangeOfDates/beginDate/alternativeTimeScale/timeScaleName,coverage/temporalCoverage/rangeOfDates/endDate/alternativeTimeScale/timeScaleName,placekey,idinfo/citation/citeinfo/title,idinfo/citation/citeinfo/origin,idinfo/keywords/theme/themekey,abstract
231
xml.saxparser=org.apache.xerces.parsers.SAXParser
232
xml.eml2_0_0namespace=eml://ecoinformatics.org/eml-2.0.0
233
xml.eml2_0_1namespace=eml://ecoinformatics.org/eml-2.0.1
234
xml.eml2_1_0namespace=eml://ecoinformatics.org/eml-2.1.0
235
xml.packagedoctype=-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN, -//ecoinformatics.org//eml-dataset-2.0.0beta4//EN
236
xml.accessdoctype=-//ecoinformatics.org//eml-access-2.0.0beta6//EN, -//ecoinformatics.org//eml-access-2.0.0beta4//EN
237
xml.physicaldoctype=-//ecoinformatics.org//eml-physical-2.0.0beta6//EN, -//ecoinformatics.org//eml-physical-2.0.0beta4//EN
238
xml.entitydoctype=-//ecoinformatics.org//eml-entity-2.0.0beta6//EN, -//ecoinformatics.org//eml-entity-2.0.0beta4//EN
239
xml.packagedoctypeset=BIN,-//ecoinformatics.org//eml-access-2.0.0beta6//EN,-//ecoinformatics.org//eml-access-2.0.0beta4//EN,-//ecoinformatics.org//eml-attribute-2.0.0beta6//EN,-//ecoinformatics.org//eml-attribute-2.0.0beta4//EN,-//ecoinformatics.org//eml-constraint-2.0.0beta6//EN,-//ecoinformatics.org//eml-constraint-2.0.0beta4//EN,-//ecoinformatics.org//eml-coverage-2.0.0beta6//EN,-//ecoinformatics.org//eml-coverage-2.0.0beta4//EN,-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN,-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN,-//ecoinformatics.org//eml-entity-2.0.0beta6//EN,-//ecoinformatics.org//eml-entity-2.0.0beta4//EN,-//ecoinformatics.org//eml-literature-2.0.0beta6//EN,-//ecoinformatics.org//eml-literature-2.0.0beta4//EN,-//ecoinformatics.org//eml-physical-2.0.0beta6//EN,-//ecoinformatics.org//eml-physical-2.0.0beta4//EN,-//ecoinformatics.org//eml-project-2.0.0beta6//EN,-//ecoinformatics.org//eml-project-2.0.0beta4//EN,-//ecoinformatics.org//eml-protocol-2.0.0beta6//EN,-//ecoinformatics.org//eml-protocol-2.0.0beta4//EN,-//ecoinformatics.org//eml-software-2.0.0beta6//EN,-//ecoinformatics.org//eml-software-2.0.0beta4//EN
240
xml.indexNamespaces=eml://ecoinformatics.org/eml-2.0.0,eml://ecoinformatics.org/eml-2.0.1
241
xml.indexPaths=organizationName,originator/individualName/surName,originator/individualName/givenName,originator/organizationName,creator/individualName/surName,creator/individualName/givenName,creator/organizationName,dataset/title,keyword,geographicCoverage/boundingCoordinates/northBoundingCoordinate,geographicCoverage/boundingCoordinates/southBoundingCoordinate,geographicCoverage/boundingCoordinates/westBoundingCoordinate,geographicCoverage/boundingCoordinates/eastBoundingCoordinate,eastBoundingCoordinate,title,entityName,individualName/surName,abstract/para,surName,givenName,para,geographicDescription,literalLayout,eastbc,northbc,westbc,southbc,dataset/access/allow/principal,entityName,taxonRankValue,dataset/dataTable/physical/distribution/online/url,dataset/spatialRaster/physical/distribution/online/url,@packageId,/reviewHistory/review/packageId,EcogridRegEntry/description,EcogridRegEntry/serviceName,EcogridRegEntry/endPoint,associatedParty/individualName/surName,associatedParty/organizationName,coverage/temporalCoverage/singleDateTime/alternativeTimeScale/timeScaleName,coverage/temporalCoverage/rangeOfDates/beginDate/alternativeTimeScale/timeScaleName,coverage/temporalCoverage/rangeOfDates/endDate/alternativeTimeScale/timeScaleName,placekey,idinfo/citation/citeinfo/title,idinfo/citation/citeinfo/origin,idinfo/keywords/theme/themekey,abstract
241 242

  
242 243
######## Outgoing email  #########################################
243 244

  
src/edu/ucsb/nceas/metacat/DBValidate.java
71 71
    alreadyHandle = false;
72 72
    try {
73 73
      // Get an instance of the parser
74
      String parserName = PropertyService.getProperty("saxparser");
74
      String parserName = PropertyService.getProperty("xml.saxparser");
75 75
      parser = XMLReaderFactory.createXMLReader(parserName);
76 76
      parser.setFeature("http://xml.org/sax/features/validation",true);
77 77
      //parser.setValidationMode(true);     // Oracle
src/edu/ucsb/nceas/metacat/MetacatReplication.java
1255 1255
        {
1256 1256
          String recordDoctype = rs.getString(3);
1257 1257
          Vector packagedoctypes = MetaCatUtil.getOptionList(
1258
                                     PropertyService.getProperty("packagedoctype"));
1258
                                     PropertyService.getProperty("xml.packagedoctype"));
1259 1259
          //if this is a package file, put it at the end
1260 1260
          //because if a package file is read before all of the files it
1261 1261
          //refers to are loaded then there is an error
......
1303 1303
          if(!recordDoctype.equals("BIN"))
1304 1304
          { //don't replicate data files
1305 1305
            Vector packagedoctypes = MetaCatUtil.getOptionList(
1306
                                     PropertyService.getProperty("packagedoctype"));
1306
                                     PropertyService.getProperty("xml.packagedoctype"));
1307 1307
            if(recordDoctype != null && !packagedoctypes.contains(recordDoctype))
1308 1308
            {   //if this is a package file, put it at the end
1309 1309
              //because if a package file is read before all of the files it
src/edu/ucsb/nceas/metacat/MetaCatServlet.java
366 366
        
367 367
        try {
368 368
        	MetaCatUtil.pathsForIndexing
369
                = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
369
                = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
370 370
        
371 371
        	MetaCatUtil.pathsForIndexing = 
372
        		MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
372
        		MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexPaths"));
373 373
        }
374 374
        catch (PropertyNotFoundException pnfe) {
375 375
        	MetaCatUtil.pathsForIndexing = null;
......
3420 3420
        Vector packageSet = null;
3421 3421
        try {
3422 3422
        	packageSet = 
3423
        		MetaCatUtil.getOptionList(PropertyService.getProperty("packagedoctypeset"));
3423
        		MetaCatUtil.getOptionList(PropertyService.getProperty("xml.packagedoctypeset"));
3424 3424
        } catch (PropertyNotFoundException pnfe) {
3425 3425
        	logMetacat.error("Could not find package doctype set.  Setting to null: " 
3426 3426
        			+ pnfe.getMessage());
src/edu/ucsb/nceas/metacat/ContentTypeProvider.java
104 104
  private String BINARY     = "binary";
105 105
  private String BINARYTYPE = "application/octet-stream";
106 106

  
107
  private String ENTITYDOCTYPE = "entitydoctype";
108
  private String PHYSICALDOCTYPE = "physicaldoctype";
107
  private String ENTITYDOCTYPE = "xml.entitydoctype";
108
  private String PHYSICALDOCTYPE = "xml.physicaldoctype";
109 109
  private String EML2DOCTYPE = "eml2namespace";
110 110
  private String DATAFORMAT = "dataFormat";
111 111
  private String TEXTFORMAT = "textFormat";
......
403 403
      }//while
404 404

  
405 405
      // set up data package type
406
      if ((MetaCatUtil.getOptionList(PropertyService.getProperty("packagedoctype"))).
406
      if ((MetaCatUtil.getOptionList(PropertyService.getProperty("xml.packagedoctype"))).
407 407
                                     contains(packType))
408 408
      {
409 409
        //this is beta4 or beta6 version
......
411 411
        packageType = BETA;
412 412
      }
413 413
      else if ((MetaCatUtil.getOptionList
414
               (PropertyService.getProperty("eml2_0_0namespace"))).contains(packType))
414
               (PropertyService.getProperty("xml.eml2_0_0namespace"))).contains(packType))
415 415
      {
416 416
        // this eml 2 document
417 417
        logMetacat.warn("This is EML2.0.0 package");
418 418
        packageType = EML2;
419 419
      }
420 420
      else if ((MetaCatUtil.getOptionList
421
               (PropertyService.getProperty("eml2_0_1namespace"))).contains(packType))
421
               (PropertyService.getProperty("xml.eml2_0_1namespace"))).contains(packType))
422 422
      {
423 423
        // this eml 2 document
424 424
        logMetacat.warn("This is EML2.0.1 package");
src/edu/ucsb/nceas/metacat/IndexingTimerTask.java
59 59
	    		
60 60
	    		dbConn = DBConnectionPool.getDBConnection("IndexingThread");
61 61
	    		serialNumber = dbConn.getCheckOutSerialNumber();
62
	            Vector indexNamespaces = MetaCatUtil.getOptionList(PropertyService.getProperty("indexNamespaces"));
62
	            Vector indexNamespaces = MetaCatUtil.getOptionList(PropertyService.getProperty("xml.indexNamespaces"));
63 63
	            String nonJoinCriteria = "b.docid is NULL";
64 64
	    		boolean first = true;
65 65

  
src/edu/ucsb/nceas/metacat/PermissionController.java
454 454
			// if it is an access document
455 455
			if (doctype != null
456 456
					&& ((MetaCatUtil.getOptionList(PropertyService
457
							.getProperty("accessdoctype")).contains(doctype)))) {
457
							.getProperty("xml.accessdoctype")).contains(doctype)))) {
458 458

  
459 459
				return true;
460 460
			}
src/edu/ucsb/nceas/metacat/DocumentImpl.java
105 105
    	String eml201NameSpace = null;
106 106
    	String eml200NameSpace = null;
107 107
    	try {
108
    		eml210NameSpace = PropertyService.getProperty("eml2_1_0namespace");
109
    		eml200NameSpace = PropertyService.getProperty("eml2_0_1namespace");
110
    		eml201NameSpace = PropertyService.getProperty("eml2_0_0namespace");
108
    		eml210NameSpace = PropertyService.getProperty("xml.eml2_1_0namespace");
109
    		eml200NameSpace = PropertyService.getProperty("xml.eml2_0_1namespace");
110
    		eml201NameSpace = PropertyService.getProperty("xml.eml2_0_0namespace");
111 111
    	} catch (PropertyNotFoundException pnfe) {
112 112
    		System.err.println("Could not get property in static block: " 
113 113
					+ pnfe.getMessage());
......
2631 2631
        PreparedStatement pstmt = null;
2632 2632
        String documenttype = getDocTypeFromDBForCurrentDocument(accnumber);
2633 2633
        try {
2634
            String packagedoctype = PropertyService.getProperty("packagedoctype");
2634
            String packagedoctype = PropertyService.getProperty("xml.packagedoctype");
2635 2635
            Vector packagedoctypes = new Vector();
2636 2636
            packagedoctypes = MetaCatUtil.getOptionList(packagedoctype);
2637 2637
            String docIdWithoutRev = MetaCatUtil.getDocIdFromAccessionNumber(accnumber);
......
2661 2661
            // if it is an access file
2662 2662
            else if (documenttype != null
2663 2663
                    && MetaCatUtil.getOptionList(
2664
                            PropertyService.getProperty("accessdoctype")).contains(
2664
                            PropertyService.getProperty("xml.accessdoctype")).contains(
2665 2665
                            documenttype)) {
2666 2666
                dbconn = DBConnectionPool.getDBConnection(
2667 2667
                        "DocumentImpl.runRelationAndAccessHandeler");
......
3032 3032
            EntityResolver eresolver;
3033 3033
            DTDHandler dtdhandler;
3034 3034
            // Get an instance of the parser
3035
            String parserName = PropertyService.getProperty("saxparser");
3035
            String parserName = PropertyService.getProperty("xml.saxparser");
3036 3036
            parser = XMLReaderFactory.createXMLReader(parserName);
3037 3037
            if (ruleBase != null && ruleBase.equals(EML200)) {
3038 3038
                logMetacat.warn("Using eml 2.0.0 parser");
src/edu/ucsb/nceas/metacat/ReplicationHandler.java
896 896
      ContentHandler chandler = dh;
897 897

  
898 898
      // Get an instance of the parser
899
      String parserName = PropertyService.getProperty("saxparser");
899
      String parserName = PropertyService.getProperty("xml.saxparser");
900 900
      parser = XMLReaderFactory.createXMLReader(parserName);
901 901

  
902 902
      // Turn off validation
src/edu/ucsb/nceas/metacat/RelationHandler.java
193 193
		Vector accessdoctypes;
194 194
		try {
195 195
			accessdoctypes = MetaCatUtil.getOptionList(PropertyService
196
				.getProperty("accessdoctype"));
196
				.getProperty("xml.accessdoctype"));
197 197
		} catch (PropertyNotFoundException pnfe) {
198 198
			throw new SQLException("Could not find access doctype: " + pnfe.getMessage());
199 199
		}
src/edu/ucsb/nceas/metacat/DBQuery.java
211 211
     */
212 212
    public DBQuery() throws PropertyNotFoundException
213 213
    {
214
        String parserName = PropertyService.getProperty("saxparser");
214
        String parserName = PropertyService.getProperty("xml.saxparser");
215 215
        this.parserName = parserName;
216 216
    }
217 217

  
......
268 268
    		this.docidOverride.add(docids);
269 269
    	}
270 270
        
271
        String parserName = PropertyService.getProperty("saxparser");
271
        String parserName = PropertyService.getProperty("xml.saxparser");
272 272
        this.parserName = parserName;
273 273
    }
274 274

  
src/edu/ucsb/nceas/metacat/DBSAXHandler.java
238 238
			// if it is data package insert triple into relationtion table;
239 239
			if (doctype != null
240 240
					&& MetaCatUtil.getOptionList(
241
							PropertyService.getProperty("packagedoctype")).contains(
241
							PropertyService.getProperty("xml.packagedoctype")).contains(
242 242
							doctype) && hasTriple && !isRevisionDoc) {
243 243

  
244 244
				// initial handler and write into relationdb only for
......
427 427
		try {
428 428
			if (doctype != null
429 429
					&& MetaCatUtil.getOptionList(
430
							PropertyService.getProperty("packagedoctype")).contains(doctype)
430
							PropertyService.getProperty("xml.packagedoctype")).contains(doctype)
431 431
					&& localName.equals("triple")) {
432 432
				startParseTriple = true;
433 433
				hasTriple = true;
src/edu/ucsb/nceas/metacat/AccessControlList.java
129 129
                           String user, String[] groups, int serverCode)
130 130
                  throws SAXException, IOException, McdbException, PropertyNotFoundException
131 131
  {
132
		String parserName = PropertyService.getProperty("saxparser");
132
		String parserName = PropertyService.getProperty("xml.saxparser");
133 133
		this.server = SystemUtil.getSecureServerURL();
134 134
		this.sep = PropertyService.getProperty("document.accNumSeparator");
135 135

  
......
672 672
  {
673 673
    StringBuffer output = new StringBuffer();
674 674
    StringBuffer outTemp = new StringBuffer();
675
    String accDoctype = PropertyService.getProperty("accessdoctype");
676
    String server = PropertyService.getProperty("server");
675
    String accDoctype = PropertyService.getProperty("xml.accessdoctype");
676
    String server = PropertyService.getProperty("server.name");
677 677
    String docurl = "metacat://" + server + "/?docid=" + docid;
678 678
    String systemID;
679 679
    boolean isOwned = false;
docs/user/saxparser.html
45 45
      // Get an instance of the parser
46 46
      // Get the class name of SAX driver from some XML parser like:
47 47
      // org.apache.xerces.parsers.SAXParser
48
      <span class="emphasis">String parserName = util.getOption("saxparser");</span>
48
      <span class="emphasis">String parserName = util.getOption("xml.saxparser");</span>
49 49
      // Given a class name, this method attempts to load and instantiate the class as an XML reader
50 50
      <span class="emphasis">parser = XMLReaderFactory.createXMLReader(parserName);</span>
51 51

  

Also available in: Unified diff