Project

General

Profile

« Previous | Next » 

Revision 5311

Added by daigle over 14 years ago

Merge 1.9.2 changes back into the trunk

View differences:

XMLSchema.java
98 98 
		try {
99 99 
			this.localFileUri = SystemUtil.getContextURL() + XMLSchemaService.SCHEMA_DIR
100 100 
					+ fileName;
101 
			logMetacat.debug("localFileUri: " + this.localFileUri);
101 
			logMetacat.debug("XMLSchema.setFileName - localFileUri: " + this.localFileUri);
102 102 
		} catch (PropertyNotFoundException pnfe) {
103 103 
			localFileUri = XMLSchemaService.SCHEMA_DIR + fileName;
104 
			logMetacat.warn("Could not get context url. Setting localFileUri to: "
104 
			logMetacat.warn("XMLSchema.setFileName - Could not get context url. Setting localFileUri to: "
105 105 
					+ localFileUri);
106 106 
		}
107 107 
		try {
108 108 
			String fileDir = SystemUtil.getContextDir() + XMLSchemaService.SCHEMA_DIR
109 109 
				+ fileName;
110 110 
			this.localFileDir = FileUtil.normalizePath(fileDir);
111 
			logMetacat.debug("localFileDir: " + this.localFileDir);
111 
			logMetacat.debug("XMLSchema.setFileName - localFileDir: " + this.localFileDir);
112 112 
		} catch (PropertyNotFoundException pnfe) {
113 113 
			localFileDir = XMLSchemaService.SCHEMA_DIR + fileName;
114 
			logMetacat.warn("Could not get context directory. Setting localFileDir to: "
114 
			logMetacat.warn("XMLSchema.setFileName - Could not get context directory. Setting localFileDir to: "
115 115 
					+ localFileDir);
116 116 
		}
117 117 
	}
......
177 177 
			try {
178 178 
				localFileUri = SystemUtil.getContextURL() + XMLSchemaService.SCHEMA_DIR + localFileUri;
179 179 
			} catch (PropertyNotFoundException pnfe) {
180 
				logMetacat.warn("Could not find context url: " + pnfe.getMessage() +
180 
				logMetacat.warn("XMLSchema.setLocalFileUri - Could not find context url: " + pnfe.getMessage() +
181 181 
						". Setting schema file uri to: " + XMLSchemaService.SCHEMA_DIR + localFileUri);
182 182 
				localFileUri = XMLSchemaService.SCHEMA_DIR + localFileUri;
183 183 
			}

Also available in: Unified diff