Attachment 55791 Details for Bug 127970 – patch file

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

patch file

bug127970_patch.txt (text/plain), 3.08 KB, created by Cindy Jin

on 2006-12-15 16:18:56 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Cindy Jin

Created: 2006-12-15 16:18:56 EST

Size: 3.08 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.logging.adapter
>Index: src/org/eclipse/hyades/logging/adapter/internal/util/AdapterConfigValidator.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/internal/util/AdapterConfigValidator.java,v
>retrieving revision 1.6
>diff -u -r1.6 AdapterConfigValidator.java
>--- src/org/eclipse/hyades/logging/adapter/internal/util/AdapterConfigValidator.java	3 Nov 2005 04:51:38 -0000	1.6
>+++ src/org/eclipse/hyades/logging/adapter/internal/util/AdapterConfigValidator.java	15 Dec 2006 20:54:39 -0000
>@@ -108,9 +108,9 @@
> 		}
> 		//Get the Schema URIs from the system GLA_HOME/schema directory
> 		else {
>-			if (System.getProperty("GLA_HOME") != null) {
>-
>-				String glaHome = System.getProperty("GLA_HOME");
>+			String glaHome = System.getProperty("GLA_HOME");
>+		
>+			if (glaHome != null && !glaHome.trim().equals("")) {
> 				
> 				// Strip any double quotes from GLA_HOME value
> 				if (glaHome.startsWith("\"") && glaHome.endsWith("\"")) {
>@@ -134,10 +134,16 @@
> 					}
> 				}
> 			    else {
>-			    	logMessage(Messages.getString("HyadesGAValidation_GLAHome_Invalid_ERROR_", glaHome));
>+			    	retValue = "";
>+			    	logMessage(Messages.getString("HyadesGAValidation_GLAHome_Invalid_ERROR_", glaHome),CommonBaseEvent.SEVERITY_CRITICAL);
> 			    }
> 			} else {
>-				logMessage(Messages.getString("HyadesGAValidation_No_GLAHome_ERROR_"));
>+				/**
>+				 * Bugziila 127970 if GLA_HOME is not set, only a warning message should be issued.
>+				 * 
>+				 */
>+				retValue = "";
>+				logMessage(Messages.getString("HyadesGAValidation_No_GLAHome_ERROR_"),CommonBaseEvent.SEVERITY_WARNING);
> 			}	
> 		}
> 		return retValue.trim();
>@@ -163,9 +169,17 @@
>             try {
>                     
>                     factory.setAttribute(JAXP_Schema_Language, W3C_XML_Schema);
>-                    factory.setAttribute(externalSchemaLocation, getExternalSchemaLocationValues(isWorkbench));
>-
>-                    factory.setValidating(true);
>+                    String schemaLocation = getExternalSchemaLocationValues(isWorkbench);
>+                   
>+                    /**
>+                     * Bugzilla 127970 -- if the schemaLocation is not set, don't validate schema
>+                     */
>+                    if(schemaLocation != null && !schemaLocation.trim().equals(""))
>+                    {
>+                    	factory.setAttribute(externalSchemaLocation, schemaLocation);
>+                        factory.setValidating(true);
>+                    }
>+                    
> 
>             } catch (Exception e) {
>                     
>@@ -273,11 +287,11 @@
> 	/*
> 	 * Log a message
> 	 */
>-	public void logMessage(String msg) {
>+	public void logMessage(String msg,  short severity) {
> 
> 		CommonBaseEvent event = getEventFactory().createCommonBaseEvent();
> 
>-		event.setSeverity(CommonBaseEvent.SEVERITY_CRITICAL);
>+		event.setSeverity(severity);
> 		event.setMsg(msg);
> 		
> 		if (logger != null) {

Actions: View

Attachments on bug 127970: 55791