### Eclipse Workspace Patch 1.0
#P org.eclipse.hyades.logging.adapter
Index: .project
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/.project,v
retrieving revision 1.1
diff -u -r1.1 .project
--- .project	26 Jan 2005 16:02:17 -0000	1.1
+++ .project	1 Feb 2006 15:54:00 -0000
@@ -3,8 +3,6 @@
 	<name>org.eclipse.hyades.logging.adapter</name>
 	<comment></comment>
 	<projects>
-		<project>org.apache.jakarta_oro</project>
-		<project>org.eclipse.hyades.logging.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
Index: .classpath
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/.classpath,v
retrieving revision 1.3
diff -u -r1.3 .classpath
--- .classpath	17 May 2005 15:35:37 -0000	1.3
+++ .classpath	1 Feb 2006 15:54:00 -0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="src-config"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: plugin.xml
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/plugin.xml,v
retrieving revision 1.6
diff -u -r1.6 plugin.xml
--- plugin.xml	15 Aug 2005 18:09:52 -0000	1.6
+++ plugin.xml	1 Feb 2006 15:54:00 -0000
@@ -5,6 +5,7 @@
      <extension-point id="contextListener" name="%ContextListener_Schema" schema="contextListener.exsd"/>
    <extension-point id="adapterComponent" name="%AdapterComponent_Schema" schema="adapterComponent.exsd"/>
    <extension-point id="substitutionExtension" name="%SubstitutionExtension_Schema" schema="substitutionExtension.exsd"/>
+   <extension-point id="filterExit" name="%FilterExit_Schema" schema="filterExit.exsd"/>
 
    <extension
          id="glaproblemmarker"
Index: plugin.properties
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/plugin.properties,v
retrieving revision 1.20
diff -u -r1.20 plugin.properties
--- plugin.properties	27 Jan 2006 19:25:27 -0000	1.20
+++ plugin.properties	1 Feb 2006 15:54:00 -0000
@@ -135,6 +135,9 @@
 HyadesGAComponent_Stopped_INFO_=IWAT0397I Generic Log Adapter Component {0} has stopped.
 HyadesGASensor_SingleOSFileSensor_Configuration_INFO_=IWAT0398I Sensor will read file {0} from directory {1} using the converter command {2}.
 HyadesGAValidation_Validation_Not_Supported_WARN_ = IWAT0399W Validation of adapter configuration is not supported since the run-time environment does not support XML schema validation.  Adapter configuration will not be validated.
+HyadesGA_CBE_Initialization_GetFilterExit_Failure_ERROR_ = IWAT0400E A failure occurred attempting to get the FilterExit extension {0} from the platform.
+HyadesGA_FilterExit_Invalid_FilterSpecification_ERROR_ = IWAT0401E Invalid regular expression syntax: {0}.
+
 HyadesGABufferedPeriodicReader_Converter_Process_Exit_Value_ERROR_ = IWAT0238E Converter process ended with exit value {0}
 HyadesGABufferedPeriodicReader_Converter_Command_Failed_ERROR_ = IWAT0239E Converter command failed: {0}
 HyadesGABufferedPeriodicReader_Determine_File_Modification_ERROR_ = IWAT0240E Exception occurred when determining if file {0} has changed: {1}
@@ -198,6 +201,7 @@
 ContextListener_Schema=Context Listeners
 AdapterComponent_Schema=Adapter Components
 SubstitutionExtension_Schema=Substitution Extensions
+FilterExit_Schema=Filter Exits
 
 # Command line strings:
 HyadesGA-cc=-cc
@@ -257,6 +261,9 @@
 HyadesGAstaticParserClassAttributeName=parserClassName
 HyadesGAstaticParserAgentName=Generic Log Parser Agent
 HyadesGAUsePreviousMatchSubstitutionAsDefault=usePreviousMatchSubstitutionAsDefault
+HyadesGAFilterAttributeName=filter
+HyadesGAFilterExitClassAttributeName=filterExitClass
+
 
 HyadesGAPropertyElementTagName=pu:Property
 HyadesGAPropertyNameAttributeName=propertyName
Index: src/org/eclipse/hyades/logging/adapter/impl/Sensor.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/impl/Sensor.java,v
retrieving revision 1.6
diff -u -r1.6 Sensor.java
--- src/org/eclipse/hyades/logging/adapter/impl/Sensor.java	20 Sep 2005 16:00:06 -0000	1.6
+++ src/org/eclipse/hyades/logging/adapter/impl/Sensor.java	1 Feb 2006 15:54:00 -0000
@@ -10,8 +10,14 @@
  * IBM - Initial API and implementation
  **********************************************************************/
 package org.eclipse.hyades.logging.adapter.impl;
+import java.util.Hashtable;
+
 import org.eclipse.hyades.logging.adapter.AdapterInvalidConfig;
 import org.eclipse.hyades.logging.adapter.ISensor;
+import org.eclipse.hyades.logging.adapter.sensors.BasicFilterExit;
+import org.eclipse.hyades.logging.adapter.util.FilterExitLoaderUtil;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
+import org.eclipse.hyades.logging.adapter.util.InvalidFilterSpecification;
 import org.eclipse.hyades.logging.adapter.util.Messages;
 import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
 import org.w3c.dom.Element;
@@ -28,6 +34,13 @@
 	protected boolean flushingMode = false;
 	private boolean initialized = false;
 	
+	/* The filter specification */
+	private String filter = null;
+	/* The filterExit class name */
+	private String filterExitClass = null;
+	/* The instance of filterExit class*/
+	private IFilterExit filterExitClassInstance = null;
+	
 	/* The size of the confidence buffer for determining if an append has occured within the file */
 	protected int confidenceBufferSize=1024;
 	
@@ -153,6 +166,74 @@
 		if (fileFooterSize < 0) {
 			throw new AdapterInvalidConfig(Messages.getString("HyadesGAComponentConfiguration_Invalid_Positive_Integer_Attribute_Value_ERROR_", Integer.toString(fileFooterSize), attrName, getName()));
 		}
+		Hashtable sensorProperties = getProperties();		
+		if (sensorProperties != null && !sensorProperties.isEmpty()) {
+				
+			 /**
+             * bugzilla 79565. It allows user to define rules for GLA sensor or extractor
+             * to filter out lines, records or data that are not of interest.
+             * filter is used to store the rule.
+             * filterExitClass is used to store the name of filterEixt class which is 
+             * provided by users. If users only define the filter rules, but not provide filterExitClass,
+             * the BasicFilterExit class will be used with the user defined filter rules.  
+             */
+				
+			filter = (String)sensorProperties.get(Messages.getString("HyadesGAFilterAttributeName"));
+					
+			filterExitClass = (String)sensorProperties.get(Messages.getString("HyadesGAFilterExitClassAttributeName"));
+			
+			if (filter != null) {
+				filter = filter.trim();
+				if (filter.length() == 0) {
+					filter = null;
+				}
+			}
+			
+			if (filterExitClass != null) {
+				filterExitClass = filterExitClass.trim();
+				if (filterExitClass.length() == 0) {
+					filterExitClass = null;
+				}
+			}
+            //Check if the filterExit property is not null
+			if (filterExitClass !=null && !filterExitClass.equals("")) {
+				try {
+					// load the class and instantiate an object
+					filterExitClassInstance = FilterExitLoaderUtil.instantiate(filterExitClass);
+					if(filter != null && !filter.equals(""))
+					{
+						try
+						{
+							filterExitClassInstance.setFilterSpecification(filter);
+						}catch (InvalidFilterSpecification ex)
+						{
+							 
+							throw new AdapterInvalidConfig(Messages.getString("HyadesGA_FilterExit_Invalid_FilterSpecification_ERROR_", filter));
+							
+						}
+					}
+				}
+				catch (Exception e) {
+					 
+	 				throw new AdapterInvalidConfig(Messages.getString("HyadesGA_CBE_Initialization_GetFilterExit_Failure_ERROR_",filterExitClass));
+				}			
+			}else if(filter != null && !filter.equals(""))
+			{
+				//The user doesn't provide the filter class, but gives the filter specification. 
+				// The BasicFilterExit class is used.
+				filterExitClassInstance = new BasicFilterExit();
+				try
+				{
+					filterExitClassInstance.setFilterSpecification(filter);
+				}catch (InvalidFilterSpecification ex)
+				{
+					 
+	 				throw new AdapterInvalidConfig(Messages.getString("HyadesGA_FilterExit_Invalid_FilterSpecification_ERROR_", filter));
+					
+				}
+				
+			}
+		}
 		
 		initialized = true;
 	}
@@ -170,4 +251,8 @@
 	{
 		return type;
 	}
+	
+	public IFilterExit getFilterExitClassInstance() {
+		return filterExitClassInstance;
+	}
 }
Index: src/org/eclipse/hyades/logging/adapter/impl/Extractor.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/impl/Extractor.java,v
retrieving revision 1.3
diff -u -r1.3 Extractor.java
--- src/org/eclipse/hyades/logging/adapter/impl/Extractor.java	17 Jun 2005 05:28:33 -0000	1.3
+++ src/org/eclipse/hyades/logging/adapter/impl/Extractor.java	1 Feb 2006 15:54:00 -0000
@@ -10,10 +10,16 @@
  * IBM - Initial API and implementation
  **********************************************************************/
 package org.eclipse.hyades.logging.adapter.impl;
+import java.util.Hashtable;
+
 import org.eclipse.hyades.logging.adapter.AdapterInvalidConfig;
 import org.eclipse.hyades.logging.adapter.IExtractor;
 import org.eclipse.hyades.logging.adapter.MessageString;
 import org.w3c.dom.Element;
+import org.eclipse.hyades.logging.adapter.sensors.BasicFilterExit;
+import org.eclipse.hyades.logging.adapter.util.FilterExitLoaderUtil;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
+import org.eclipse.hyades.logging.adapter.util.InvalidFilterSpecification;
 import org.eclipse.hyades.logging.adapter.util.Messages;
 /**
  * This is an abstract Extractor class that uses basic Java String searching 
@@ -34,6 +40,13 @@
 	private String childEndPattern = null;
 	private boolean includeChildEndPattern = false;
 	
+	/* The filter specification */
+	private String filter = null;
+	/* The filterExit class name */
+	private String filterExitClass = null;
+	/* The instance of filterExit class*/
+	private IFilterExit filterExitClassInstance = null;
+	
 	/**
 	 * Set whether messages can be nested.
 	 * @param nestedMessages - boolean whether messages can be nested.
@@ -132,6 +145,74 @@
 				Boolean
 					.valueOf(element.getAttribute(Messages.getString("HyadesGAincludeEndPatternAttributeName")))
 					.booleanValue());
+		
+		Hashtable sensorProperties = getProperties();		
+		if (sensorProperties != null && !sensorProperties.isEmpty()) {
+			 /**
+             * bugzilla 79565. It allows user to define rules for GLA sensor or extractor
+             * to filter out lines, records or data that are not of interest.
+             * filter is used to store the rule.
+             * filterExitClass is used to store the name of filterEixt class which is 
+             * provided by users. If users only define the filter rules, but not provide filterExitClass,
+             * the BasicFilterExit class will be used with the user defined filter rules.  
+             */
+				
+			filter = (String)sensorProperties.get(Messages.getString("HyadesGAFilterAttributeName"));
+					
+			filterExitClass = (String)sensorProperties.get(Messages.getString("HyadesGAFilterExitClassAttributeName"));
+			
+			if (filter != null) {
+				filter = filter.trim();
+				if (filter.length() == 0) {
+					filter = null;
+				}
+			}
+			
+			if (filterExitClass != null) {
+				filterExitClass = filterExitClass.trim();
+				if (filterExitClass.length() == 0) {
+					filterExitClass = null;
+				}
+			}
+            //Check if the filterExit property is not null
+			if (filterExitClass !=null && !filterExitClass.equals("")) {
+				try {
+					// load the class and instantiate an object
+					filterExitClassInstance = FilterExitLoaderUtil.instantiate(filterExitClass);
+					if(filter != null && !filter.equals(""))
+					{
+						try
+						{
+							filterExitClassInstance.setFilterSpecification(filter);
+						}catch (InvalidFilterSpecification ex)
+						{
+							 
+							throw new AdapterInvalidConfig(Messages.getString("HyadesGA_FilterExit_Invalid_FilterSpecification_ERROR_", filter));
+							
+						}
+					}
+				}
+				catch (Exception e) {
+					 
+	 				throw new AdapterInvalidConfig(Messages.getString("HyadesGA_CBE_Initialization_GetFilterExit_Failure_ERROR_",filterExitClass));
+				}			
+			}else if(filter != null && !filter.equals(""))
+			{
+				//The user doesn't provide the filter class, but gives the filter specification. 
+				// The BasicFilterExit class is used.
+				filterExitClassInstance = new BasicFilterExit();
+				try
+				{
+					filterExitClassInstance.setFilterSpecification(filter);
+				}catch (InvalidFilterSpecification ex)
+				{
+					 
+	 				throw new AdapterInvalidConfig(Messages.getString("HyadesGA_FilterExit_Invalid_FilterSpecification_ERROR_", filter));
+					
+				}
+				
+			}
+		}
 	}
 	
 	/**
@@ -333,4 +414,12 @@
 	{
 		return includeChildEndPattern;
 	}
+	
+	/**
+	 * Get the instance of IFilteExit class
+	 * @returns filterExitClassInstance 
+	 */
+	public IFilterExit getFilterExitClassInstance() {
+		return filterExitClassInstance;
+	}
 }
Index: src/org/eclipse/hyades/logging/adapter/sensors/SingleOSFileSensor.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/sensors/SingleOSFileSensor.java,v
retrieving revision 1.8
diff -u -r1.8 SingleOSFileSensor.java
--- src/org/eclipse/hyades/logging/adapter/sensors/SingleOSFileSensor.java	31 Oct 2005 08:33:33 -0000	1.8
+++ src/org/eclipse/hyades/logging/adapter/sensors/SingleOSFileSensor.java	1 Feb 2006 15:54:00 -0000
@@ -20,14 +20,21 @@
 import java.io.RandomAccessFile;
 import java.util.Hashtable;
 
+import org.eclipse.hyades.logging.adapter.AdapterException;
 import org.eclipse.hyades.logging.adapter.AdapterInvalidConfig;
 import org.eclipse.hyades.logging.adapter.IComponent;
 import org.eclipse.hyades.logging.adapter.IContext;
 import org.eclipse.hyades.logging.adapter.impl.Context;
 import org.eclipse.hyades.logging.adapter.impl.Sensor;
 import org.eclipse.hyades.logging.adapter.impl.SensorStatus;
+import org.eclipse.hyades.logging.adapter.internal.util.SubstitutionExtensionLoaderUtil;
+import org.eclipse.hyades.logging.adapter.parsers.ISubstitutionExtension;
+import org.eclipse.hyades.logging.adapter.parsers.PreparationException;
 import org.eclipse.hyades.logging.adapter.util.BufferedPeriodicReader;
 import org.eclipse.hyades.logging.adapter.util.BufferedSinglePassReader;
+import org.eclipse.hyades.logging.adapter.util.FilterExitLoaderUtil;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
+import org.eclipse.hyades.logging.adapter.util.InvalidFilterSpecification;
 import org.eclipse.hyades.logging.adapter.util.Messages;
 import org.eclipse.hyades.logging.adapter.util.MultipleFilesReader;
 import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
@@ -71,6 +78,10 @@
 	
 	/* allocate the max blocking size  */
 	private String[] lastLine = new String[maximumBlocking];
+	
+	/* The instance of filterExit class*/
+	private IFilterExit filterExitClassInstance = null;
+	 
 		
 	
 	/* If the directory does not end with the proper file
@@ -120,6 +131,9 @@
 	 *
 	 * @see org.eclipse.hyades.logging.adapter.IComponent#update()
 	 */
+	/* (non-Javadoc)
+	 * @see org.eclipse.hyades.logging.adapter.impl.Sensor#update()
+	 */
 	public void update() throws AdapterInvalidConfig
 	{
 		// first get the basic configuration set
@@ -143,7 +157,9 @@
 			
 			converterCmdAttribute = (String)sensorProperties.get(Messages.getString("HyadesGAconverterCmdAttributeName"));
 			
-			converterShell = (String)sensorProperties.get(Messages.getString("HyadesGAconverterShellAttributeName"));										
+			converterShell = (String)sensorProperties.get(Messages.getString("HyadesGAconverterShellAttributeName"));
+			
+			
 		}
 		else {
 			// If there are no properties then get sensor parameters from the old SingelFileSensor type instance
@@ -188,6 +204,9 @@
 				converterShell = null;
 			}
 		}
+		
+		filterExitClassInstance = getFilterExitClassInstance();
+		
 
 		// Get the parent context so we can get the charset and
 		// continuous operation flag
@@ -208,6 +227,7 @@
 			throw new AdapterInvalidConfig(Messages.getString("HyadesGA_CBE_SingleFileSensor_Invalid_Config_File_ERROR_"));
 		}
 		
+		 
 		/* Assume the fileName specified is a regular expression and try to
 		 * use the MultipleFilesReader class.
 		 */
@@ -359,6 +379,10 @@
 		if (input != null) {
 
 			for (int i = 0; i < maximumBlocking; i++) {
+				
+				boolean pass = true;
+				do{
+							
 				try {
 					lastLine[i] = input.readLine();
 				}
@@ -373,13 +397,40 @@
 				if (lastLine[i] == null) {
 					i = maximumBlocking;
 				    rawLogFileName=null;
+				    break;
 				}
 				else {
+					//filter the input logs
+					if(filterExitClassInstance != null)
+					{
+						try
+						{
+							pass = filterExitClassInstance.filter(lastLine[i]);
+							if(!pass)
+							{
+								//this line is not of interest. Go to read next line
+								continue;
+							}
+						}catch (AdapterException e)
+						{
+							/**
+							 * something wrong during the filtering.We don't know this is 
+							 * an interested record or not. Pass this record to the
+							 * following component for processing.
+							 */
+							 CommonBaseEvent event = getEventFactory().createCommonBaseEvent();
+							 event.setMsg(e.toString());
+							 event.setSeverity(CommonBaseEvent.SEVERITY_WARNING);
+							 log(event);
+						}
+						
+					}
 					linesReadCount++;
 					/* Update the Sensor status */
 					incrementItemsProcessedCount();
 					((SensorStatus)status).incrementProcessedSize(lastLine[i].length());
 				}
+				}while(!pass);
 			}
 		}
 		
Index: src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java,v
retrieving revision 1.4
diff -u -r1.4 SimpleExtractor.java
--- src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java	17 Jun 2005 05:28:34 -0000	1.4
+++ src/org/eclipse/hyades/logging/adapter/extractors/SimpleExtractor.java	1 Feb 2006 15:54:00 -0000
@@ -14,9 +14,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.hyades.logging.adapter.AdapterException;
 import org.eclipse.hyades.logging.adapter.MessageString;
 import org.eclipse.hyades.logging.adapter.impl.Extractor;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
 import org.eclipse.hyades.logging.adapter.AdapterInvalidConfig;
+import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
 
 /**
  * This is a simple extractor implementation that uses simple string comparisons 
@@ -34,6 +37,9 @@
 	
 	protected String localLineSeparator = System.getProperty("line.separator");
 	
+	private IFilterExit filterExitClassInstance = null;
+	
+	
 	/**
 	 * Perform any initialization based on the configuration.
 	 */
@@ -42,6 +48,8 @@
 		
 		/* create our store for keeping data between invocations */
 		inputs=new StringArray();
+		
+		filterExitClassInstance = getFilterExitClassInstance();
 	}
 	
 	/**
@@ -108,6 +116,7 @@
 				0,
 				inputs.lastAddedString,
 				inputs.contents[inputs.lastAddedString].length() - 1);
+		
 						
 		/* The results of our search */
 		StringPosition start=new StringPosition();
@@ -139,12 +148,61 @@
 		/* Format our results and return */
 		Object[] entries=results.toArray();
 		if(entries.length>0) {
-			MessageString[] messages=new MessageString[entries.length];
+			
+			MessageString[] tmpMessages=new MessageString[entries.length];
+			int validMsgCount = 0;
 			for(int i=0; i<entries.length; i++) {
-				messages[i]=(MessageString)entries[i];
+				/*If there is a filterExit class, check whether this is an interested record*/
+				if(filterExitClassInstance != null)
+				{
+					try
+					{
+						String msgStr = ((MessageString)entries[i]).getValue();
+						boolean pass = filterExitClassInstance.filter(msgStr);
+						if(!pass)
+						{
+							tmpMessages[i]=null;
+							continue;
+						}
+					}catch(AdapterException ex)
+					{
+						/**
+						 * something wrong during the filtering.We don't know this is 
+						 * an interested record or not. Pass this record to the
+						 * following component for processing.
+						 */
+						
+						 CommonBaseEvent event = getEventFactory().createCommonBaseEvent();
+						 event.setMsg(ex.toString());
+						 event.setSeverity(CommonBaseEvent.SEVERITY_WARNING);
+						 log(event);
+					}
+					
+				}
+				tmpMessages[i]=(MessageString)entries[i];
+				validMsgCount++;
+			}
+			if(filterExitClassInstance != null)
+			{
+				/**
+				 * Only return the interested records.
+				 */
+				MessageString[] messages = new MessageString[validMsgCount];
+				validMsgCount = 0;
+				for(int k=0; k<tmpMessages.length;k++)
+				{
+					if(tmpMessages[k]!=null)
+					{
+						messages[validMsgCount++]=tmpMessages[k];
+					}
+				}
+				incrementItemsProcessedCount(messages.length);
+				return messages;
+				
 			}
-			incrementItemsProcessedCount(entries.length);
-			return messages;
+			//no filter against the records
+			return tmpMessages;
+			
 		}
 
 		return null;
Index: src/org/eclipse/hyades/logging/adapter/AdapterPlugin.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.adapter/src/org/eclipse/hyades/logging/adapter/AdapterPlugin.java,v
retrieving revision 1.6
diff -u -r1.6 AdapterPlugin.java
--- src/org/eclipse/hyades/logging/adapter/AdapterPlugin.java	17 Jun 2005 05:28:34 -0000	1.6
+++ src/org/eclipse/hyades/logging/adapter/AdapterPlugin.java	1 Feb 2006 15:54:00 -0000
@@ -25,6 +25,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.hyades.logging.adapter.parsers.ISubstitutionExtension;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
 import org.eclipse.hyades.logging.adapter.util.Messages;
 import org.osgi.framework.BundleContext;
 
@@ -199,4 +200,50 @@
 		}
 		return extension;
 	}
+	
+	/**
+     *  Get a filter class instance for the specified class name
+     * @param classname of the filter class
+     * @return a filter class instance with the specified class name
+     * @throws AdapterException
+     */
+	public static synchronized IFilterExit getFilterExit(String classname) throws ClassCastException, AdapterException {
+
+		IFilterExit filterExit = null;
+		IConfigurationElement[] elements = null;
+
+		
+		try {
+
+			elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.hyades.logging.adapter", "filterExit");
+		}
+		catch (Throwable e) {
+			// Just return null if we're not running in eclipse
+			return null;
+		}
+		
+		for (int i = 0; i < elements.length; i++) {
+
+			IConfigurationElement elem = elements[i];
+
+			if (elem.getAttribute("name").equals(classname)) {
+
+				try {
+
+					filterExit = (IFilterExit) elem.createExecutableExtension("name");
+
+					return filterExit;
+					
+				}
+				catch (ClassCastException e) {
+					// We want to know if the object is not of the correct type.
+					throw e;
+				}
+				catch (Throwable e) {
+					throw new AdapterException(Messages.getString("HyadesGAInitialization_GetFilterExit_Failure_ERROR_", classname), e);
+				}
+			}
+		}
+		return filterExit;
+	}
 }
Index: src/org/eclipse/hyades/logging/adapter/util/IFilterExit.java
===================================================================
RCS file: src/org/eclipse/hyades/logging/adapter/util/IFilterExit.java
diff -N src/org/eclipse/hyades/logging/adapter/util/IFilterExit.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/hyades/logging/adapter/util/IFilterExit.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,34 @@
+package org.eclipse.hyades.logging.adapter.util;
+/**********************************************************************
+ * Copyright (c) 2005,2006 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id: InvalidFilterSpecification,v 1.0 2006/01/31 23:29:43 Exp $
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ * 
+ **********************************************************************/
+
+import org.eclipse.hyades.logging.adapter.AdapterException;
+
+public interface IFilterExit {
+
+
+	/**
+	 * Filter the data specified and return true if the data is to be included for parsing
+	 * @param data - the data to filter
+	 * @return booean - true if the data is to be parsed, false if the data is to be excluded
+	 * @throws AdapterException if filtering cannot be performed
+	 */
+	public boolean filter(String data) throws AdapterException;
+
+	/**
+	 * Set the filter specification to be used when filtering. 
+	 * @param filterSpec - the filter specification
+	 * @throws InvalidFilterSpecification if the filter specification is invalid
+	 */	
+	public void setFilterSpecification(String filterSpec) throws InvalidFilterSpecification;
+}
Index: src/org/eclipse/hyades/logging/adapter/sensors/BasicFilterExit.java
===================================================================
RCS file: src/org/eclipse/hyades/logging/adapter/sensors/BasicFilterExit.java
diff -N src/org/eclipse/hyades/logging/adapter/sensors/BasicFilterExit.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/hyades/logging/adapter/sensors/BasicFilterExit.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,53 @@
+package org.eclipse.hyades.logging.adapter.sensors;
+/**********************************************************************
+ * Copyright (c) 2005,2006 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id: InvalidFilterSpecification,v 1.0 2006/01/31 23:29:43 Exp $
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ * 
+ **********************************************************************/
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import org.eclipse.hyades.logging.adapter.AdapterException;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
+import org.eclipse.hyades.logging.adapter.util.InvalidFilterSpecification;
+import org.eclipse.hyades.logging.adapter.util.Messages;
+
+public class BasicFilterExit implements IFilterExit {
+
+	private Pattern compiledExpression = null;
+		
+	public boolean filter(String data) throws AdapterException {
+		
+		if(compiledExpression != null)
+		{
+			Matcher matcher = compiledExpression.matcher(data);
+			boolean found = matcher.find();
+			return found;
+		}
+		else
+		{
+			throw new AdapterException();
+		}
+	}
+
+	public void setFilterSpecification(String filterSpec)
+			throws InvalidFilterSpecification {
+		try
+		{
+			compiledExpression = Pattern.compile(filterSpec, Pattern.MULTILINE);
+		}catch (PatternSyntaxException e)
+		{
+			throw new InvalidFilterSpecification(Messages.getString("HyadesGA_FilterExit_Invalid_FilterSpecification_ERROR_", filterSpec));
+		}
+	}
+
+}
Index: src/org/eclipse/hyades/logging/adapter/util/properties/plugin.properties
===================================================================
RCS file: src/org/eclipse/hyades/logging/adapter/util/properties/plugin.properties
diff -N src/org/eclipse/hyades/logging/adapter/util/properties/plugin.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/hyades/logging/adapter/util/properties/plugin.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,304 @@
+#####################################################
+# Hyades Generic Adapter strings
+#
+#**********************************************************************
+# * Copyright (c) 2005,2006 IBM Corporation and others.
+# * All rights reserved.   This program and the accompanying materials
+# * are made available under the terms of the Eclipse Public License v1.0
+# * which accompanies this distribution, and is available at
+# * http://www.eclipse.org/legal/epl-v10.html
+# * $Id: plugin.properties,v 1.20 2006/01/27 19:25:27 dnsmith Exp $
+# *
+# * Contributors:
+# * IBM - Initial API and implementation
+# **********************************************************************/
+#####################################################
+#====================================================================
+# To code developer:
+#   Do NOT change the properties between this line and the
+#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
+#   Make a new property name, append to the end of the file and change
+#   the code to use the new property.
+#====================================================================
+#####################################################
+
+# NLS_MESSAGEFORMAT_VAR
+# NLS_ENCODING=UTF-8
+
+
+HyadesGACommand_line_usage=Command line usage: Adapter [-cc ContextConfiguration.xml] [-ac ComponentConfigurations.xml]
+
+HyadesGAAdapterFatal_ERROR_=IWAT0310E Generic Log Adapter could not be started due to configuration problems.
+HyadesGAContextFatal_ERROR_=IWAT0311E Context will not be run due to fatal configuration error.
+HyadesGAContextConfigurationErrorContextCountMismatchFatal_ERROR_=IWAT0312E Adapter cannot start.  Configuration error: Number of Context's is not the same as the number of ContextInstance's.  They must be the same.
+HyadesGAContextInstanceConfigurationErrorComponentMismatchFatal_ERROR_=IWAT0313E Adapter cannot start.  Context and ContextInstance configurations do not match for context {0}.  The number of components must be the same.
+HyadesGAContextInstanceConfigurationErrorComponentIdNotFoundFatal_ERROR_=IWAT0314E Adapter cannot start.  Configuration error:  Component with ID {0} cannot be found in context with ID {1}.
+HyadesGAContextInstanceConfigurationErrorContextIdNotFoundFatal_ERROR_=IWAT0315E Adapter cannot start.  Configuration error:  ContextInstance ID {0} cannot be found in the list of Context''s.
+HyadesGAContextInstantiation_ERROR_=IWAT0316E Error building context {0}. {1}
+HyadesGAComponentInstantiation_ERROR_=IWAT0317E Error building component {0}. {1}
+HyadesGAClassLoad_ERROR_=IWAT0318E {0} was not found.
+HyadesGAInstantiation_ERROR_=IWAT0319E Class {0} cannot be instantiated.
+HyadesGAAccess_ERROR_=IWAT0320E {0} is not accessible due to security restrictions.
+HyadesGAMalformedParserExpression_ERROR_=IWAT0321E Regular expression is malformed.
+HyadesGAPatternSyntaxException_Details = Exception = {0}  Pattern = {1}
+HyadesGAPatternSyntaxException_Index = Index = {0}
+HyadesGASubstitutionRuleIgnored_WARN_=IWAT0322W Substitution rule will be ignored because it is invalid ({0}).
+
+HyadesGA_CBE_File_Outputter_Write_ERROR_=IWAT0323E Common Base Event File outputter {0} cannot write to file {1}. Exception: {2}
+HyadesGA_CBE_File_Outputter_Create_ERROR_=IWAT0324E Common Base Event File outputter {0} cannot create file {1}. Exception: {2}
+
+HyadesGA_CBE_Formatter_MsgDataElement_WARN_=IWAT0325W Common Base Event formatter {0} has received an invalid MsgDataElement property name: {1}.
+
+HyadesGA_CBE_Formatter_Duplicate_ContextDataElement_WARN_=IWAT0326W Common Base Event formatter {0} has received the ContextDataElement property {1} but it cannot be set because {2} is set.
+HyadesGA_CBE_Formatter_ContextDataElement_WARN_=IWAT0327W Common Base Event formatter {0} has received an invalid ContextDataElement property name: {1}.
+
+HyadesGA_CBE_Formatter_ComponentIdentification_WARN_=IWAT0328W Common Base Event formatter {0} has received an invalid ComponentIdentification property name: {1}.
+
+HyadesGA_CBE_Formatter_SituationType_WARN_=IWAT0329W Common Base Event formatter {0} has received the situation type {1} but this CBE has a different situation type.
+HyadesGA_CBE_Formatter_AvailableSituation_WARN_=IWAT0330W Common Base Event formatter {0} has received the property name {1} that is not an Available Situation property.
+HyadesGA_CBE_Formatter_RequestSituation_WARN_=IWAT0331W Common Base Event formatter {0} has received the property name {1} that is not a Request Situation property.
+HyadesGA_CBE_Formatter_StartSituation_WARN_=IWAT0332W Common Base Event formatter {0} has received the property name {1} that is not a Start Situation property.
+HyadesGA_CBE_Formatter_StopSituation_WARN_=IWAT0333W Common Base Event formatter {0} has received the property name {1} that is not a Stop Situation property.
+HyadesGA_CBE_Formatter_ConnectSituation_WARN_=IWAT0334W Common Base Event formatter {0} has received the property name {1} that is not a Connect Situation property.
+HyadesGA_CBE_Formatter_ConfigureSituation_WARN_=IWAT0335W Common Base Event formatter {0} has received the property name {1} that is not a Configure Situation property.
+HyadesGA_CBE_Formatter_CreateSituation_WARN_=IWAT0336W Common Base Event formatter {0} has received the property name {1} that is not a Create Situation property.
+HyadesGA_CBE_Formatter_DestroySituation_WARN_=IWAT0337W Common Base Event formatter {0} has received the property name {1} that is not a Destroy Situation property.
+HyadesGA_CBE_Formatter_ReportSituation_WARN_=IWAT0338W Common Base Event formatter {0} has received the property name {1} that is not a Report Situation property.
+HyadesGA_CBE_Formatter_FeatureSituation_WARN_=IWAT0339W Common Base Event formatter {0} has received the property name {1} that is not a Feature Situation property.
+HyadesGA_CBE_Formatter_DependencySituation_WARN_=IWAT0340W Common Base Event formatter {0} has received the property name {1} that is not a Dependency Situation property.
+HyadesGA_CBE_Formatter_OtherSituation_WARN_=IWAT0341W Common Base Event formatter {0} has received the property name {1} that is not an Other Situation property.
+
+HyadesGA_CBE_Formatter_Invalid_Situation_WARN_=IWAT0342W Common Base Event formatter {0} has received an invalid Situation property name {1}.
+HyadesGA_CBE_Formatter_Invalid_SituationType_WARN_=IWAT0343W Common Base Event formatter {0} has received an invalid Situation Type property name {1}.
+HyadesGA_CBE_Formatter_Invalid_AssociatedEvent_WARN_=IWAT0344W Common Base Event formatter {0} has received an invalid AssociatedEvent property name {1}.
+HyadesGA_CBE_Formatter_Invalid_AssociationEngine_WARN_=IWAT0345W Common Base Event formatter {0} has received an invalid AssociationEngine property name {1}.
+
+HyadesGA_CBE_Formatter_Duplicate_ExtendedDataElement_WARN_=IWAT0346W Common Base Event formatter {0} has received the ExtendedDataElement property {1} but it cannot be set because {2} is set.
+HyadesGA_CBE_Formatter_Invalid_ExtendedDataElement_WARN_=IWAT0347W Common Base Event formatter {0} has received an invalid ExtendedDataElement property name {1}.
+HyadesGA_CBE_Formatter_Invalid_CommmonBaseEvent_WARN_=IWAT0348W Common Base Event formatter {0} has received an invalid CommmonBaseEvent property name {1}.
+HyadesGA_CBE_Formatter_Invalid_Property_WARN_=IWAT0349W Common Base Event formatter {0} has received an invalid property name string {1}.
+HyadesGA_CBE_Formatter_Non_Numeric_Property_WARN_=IWAT0350W Common Base Event formatter {0} has received an non numeric value when it was expecting one when processing {1}.
+HyadesGA_CBE_Formatter_Exception_WARN_=IWAT0351W Common Base Event formatter {0} has received an exception when processing {1} - {2}.
+
+HyadesGA_CBE_Logging_Agent_Waiting_INFO_=IWAT0352I Common Base Event logging agent outputter {0} is waiting for agent {1} to be monitored...
+
+HyadesGA_CBE_Logging_Agent_Write_ERROR_=IWAT0353E Common Base Event logging agent outputter {0} cannot write to agent {1} due to the following exception: {2}
+
+HyadesGAInitialization_Internal_Logging_Not_Started_WARN_ = IWAT0354W Generic Log Adapter internal logging failure: {0}
+
+HyadesGA_CBE_ProcessUnit_ERROR_=IWAT0355E Process Unit {0} has been requested to process Event Items.
+
+HyadesGA_CBE_Sensor_getNext_INFO_=IWAT0356I Sensor getNext has been requested from {0}.
+
+HyadesGA_CBE_File_Parsing_ERROR_=IWAT0357E Exception parsing file {0}:  {1}.
+
+HyadesGA_CBE_Simple_Extractor_Message_INFO_=IWAT0358I The following message is being passed on: {0}
+HyadesGA_CBE_Regular_Expression_Extractor_Start_Pattern_Invalid_ERROR_=IWAT0359E The extractor start pattern regular expression is malformed: {0}.
+HyadesGA_CBE_Regular_Expression_Extractor_End_Pattern_Invalid_ERROR_=IWAT0360E The extractor end pattern regular expression is malformed: {0}.
+
+HyadesGA_CBE_Parser_Preparation_SubstitutionExtensionClass_NotFound_ERROR_=IWAT0361E Could not find substitution extension class {0}.
+HyadesGA_CBE_Parser_Preparation_SubstitutionExtensionClass_Exception_ERROR_=IWAT0362E Exception occurred intantiating substitution extension class {0}.
+HyadesGA_CBE_Parser_Preparation_Invalid_Time_Format_ERROR_=IWAT0363E The time format {0} is invalid.
+HyadesGA_CBE_Parser_Run_SubstitutionExtensionClass_Invalid_ERROR_=IWAT0364E Substitution extension class {0} does not implement ISubstitutionExtension or IStatefulSubstitutionExtension.
+HyadesGA_CBE_Parser_Run_StatelessSubstitutionExtensionClass_Exception_ERROR_=IWAT0365E Stateless substitution extension class {0} threw an exception.
+HyadesGA_CBE_Parser_Run_StatefulSubstitutionExtensionClass_Exception_ERROR_=IWAT0366E Stateful substitution extension class {0} threw an exception.
+HyadesGA_CBE_Parser_Run_TimeParser_Exception_ERROR_=IWAT0367E The time {0} could not be parsed with format {1} because an exception occurred.
+HyadesGA_CBE_Adapter_No_Config_File_Specified_ERROR_=IWAT0368E An adapter configuration file must be specified on the command line.
+HyadesGA_CBE_Adapter_No_Config_File_ERROR_=IWAT0369E The adapter configuration file {0} cannot be found.
+HyadesGA_CBE_Adapter_Config_File_Open_ERROR_=IWAT0370E The adapter configuration file {0} cannot be opened.
+HyadesGA_CBE_Adapter_Config_File_Parse_ERROR_=IWAT0371E The adapter configuration file {0} cannot be parsed.
+HyadesGA_CBE_Adapter_Config_File_Missing_Element_ERROR_=IWAT0372E The adapter configuration file {0} is missing the element {1}.
+HyadesGA_CBE_Adapter_Config_File_Save_ERROR_=IWAT0373E The adapter configuration file {0} cannot be saved due to the following reason: {1}
+HyadesGA_CBE_Adapter_No_Config_File_Migration_Required_INFO_=IWAT0374I No migration is required for the adapter configuration file {0}.
+HyadesGA_CBE_SingleFileSensor_Invalid_Config_File_ERROR_=IWAT0375E The SingleOSFileSensor configuration is incorrect. The directory or fileName property is missing or invalid.
+HyadesGA_CBE_StaticParserSensor_Invalid_Config_File_ERROR_=IWAT0376E The StaticParserSensor configuration is incorrect. The directory, fileName or parserClassName property is missing or invalid.
+HyadesGA_CBE_SingleFileOutputter_Invalid_Config_File_ERROR_=IWAT0377E The CBEFileOutputter configuration is incorrect. The directory or fileName property is missing or invalid.
+HyadesGA_CBE_Logging_Agent_Buffer_Specification_WARN_=IWAT0378W Common Base Event logging agent outputter {0} has invalid buffer specification.  Using default size of {1}
+HyadesGA_CBE_Parser_Preparation_No_Parser_Element_ERROR_=IWAT0379E Could not find the parser configuration element {0} in the adapter configuration file.
+HyadesGA_CBE_Parser_Preparation_Separator_Token_Pattern_Invalid_ERROR_=IWAT0380E The parser separator token regular expression is malformed: {0}.
+HyadesGA_CBE_Parser_Preparation_Designation_Token_Pattern_Invalid_ERROR_=IWAT0381E The parser designation token regular expression is malformed: {0}.
+HyadesGAValidation_Fatal_ERROR_=IWAT0382E Adapter Validation Fatal Error: {0}
+HyadesGAValidation_ERROR_=IWAT0383E Adapter Validation Error: {0}
+HyadesGAValidation_WARN_=IWAT0384W Adapter Validation Warning: {0}
+HyadesGAValidation_Getting_Schemas_ERROR_=IWAT0385E Could not get schema files: {0}
+HyadesGAValidation_No_GLAHome_ERROR_=IWAT0386E GLA_HOME is not provided to JVM
+HyadesGAValidation_GLAHome_Invalid_ERROR_=IWAT0387E GLA_HOME value {0} is not valid.
+HyadesGAContextInstanceConfiguration_LocaleNotFound_ERROR_=IWAT0388E Could not determine a locale for this context based on language {0} and country {1}.  Aborting this context.
+HyadesGAContextInstanceConfiguration_CharsetNotSupported_ERROR_=IWAT0389E The character set {0} specified for this context is not supported.  Aborting this context.
+HyadesGAContextInstanceConfiguration_ContextLocaleSetting_INFO_=IWAT0390I Context is configured to run in locale {0}.
+HyadesGAContextInstanceConfiguration_ContextCharsetSetting_INFO_=IWAT0391I Context is configured to run with character set {0}.
+HyadesGAContextInstanceConfiguration_ConfigurationComplete_INFO_=IWAT0392I Finished configuring the context {0}.
+HyadesGAContext_Started_INFO_=IWAT0393I Generic Log Adapter Context {0} has started.
+HyadesGAContext_Stopped_INFO_=IWAT0394I Generic Log Adapter Context {0} has stopped.
+HyadesGAComponent_ConfigurationComplete_INFO_=IWAT0395I Finished configuring the component {0}.
+HyadesGAComponent_Started_INFO_=IWAT0396I Generic Log Adapter Component {0} has started.
+HyadesGAComponent_Stopped_INFO_=IWAT0397I Generic Log Adapter Component {0} has stopped.
+HyadesGASensor_SingleOSFileSensor_Configuration_INFO_=IWAT0398I Sensor will read file {0} from directory {1} using the converter command {2}.
+HyadesGAValidation_Validation_Not_Supported_WARN_ = IWAT0399W Validation of adapter configuration is not supported since the run-time environment does not support XML schema validation.  Adapter configuration will not be validated.
+HyadesGA_CBE_Initialization_GetFilterExit_Failure_ERROR_ = IWAT0400E A failure occurred attempting to get the FilterExit extension {0} from the platform.
+HyadesGA_FilterExit_Invalid_FilterSpecification_ERROR_ = IWAT0401E Invalid regular expression syntax: {0}.
+
+HyadesGABufferedPeriodicReader_Converter_Process_Exit_Value_ERROR_ = IWAT0238E Converter process ended with exit value {0}
+HyadesGABufferedPeriodicReader_Converter_Command_Failed_ERROR_ = IWAT0239E Converter command failed: {0}
+HyadesGABufferedPeriodicReader_Determine_File_Modification_ERROR_ = IWAT0240E Exception occurred when determining if file {0} has changed: {1}
+HyadesGA_CBE_Parser_Run_Match_And_Substitution_Failure_ERROR_ = IWAT0404E A failure occurred attempting to substitute {0} using the match string {1} in the rule for attribute {2}.  Exception: {3}
+HyadesGA_AdapterLogOutputter_No_Logger_ERROR_ = IWAT0411E No output logger is defined for this Adapter Log Outputter.
+HyadesGAContextInstanceConfiguration_JVM_Charset_Not_Found_WARN_ = IWAT0415W The default JVM file encoding could not be determined.  Character set encoding {0} will be used to read the log file.
+
+HyadesGAInitialization_GetContextListeners_Failure_ERROR_ = IWAT0418E A failure occurred attempting to get the context listeners from the platform.
+HyadesGAInitialization_GetComponent_Failure_ERROR_ = IWAT0419E A failure occurred attempting to get the adapter component {0} from the platform.
+HyadesGAInitialization_GetSubstitutionExtension_Failure_ERROR_ = IWAT0420E A failure occurred attempting to get the substitutution extension {0} from the platform.
+HyadesGAInitialization_Invalid_Class_Failure_ERROR_ = IWAT0421E Invalid class: {0} is not an instance of {1}.
+HyadesGAInitialization_ContextConfiguration_Failure_ERROR_ = IWAT0422E Could not create context configuration using adapter configuration file {0}.
+HyadesGAInitialization_ContextInstanceConfiguration_Failure_ERROR_ = IWAT0423E Could not create context instance configuration using adapter configuration file {0}.
+HyadesGABufferedPeriodicReader_Log_File_Open_Failed_ERROR_ = IWAT0424E Failed to open log file {0}.  Exception: {1}
+HyadesGATrace_Component_Processing_End_INFO_ = IWAT0425I Component {0} is returning {1} items.
+HyadesGA_CBE_StaticParserSensor_Parser_Class_Load_ERROR_ = IWAT0426E The static parser class {0} could not be loaded.  Ensure it is accessible via the classpath or an extension point.
+HyadesGA_CBE_StaticParserSensor_GetParser_Failure_ERROR_ = IWAT0427E A failure occurred attempting to get the static parser {0} from the platform.
+
+HyadesGAFilter_FilterType_Class_Not_Found_ERROR_ 					= IWAT0429E FilterType class {0} was not found in class path.
+HyadesGAFilter_FilterType_Class_Instantiation_ERROR_ 				= IWAT0430E FilterType class {0} could not be instantiated. Exception: {1}
+HyadesGAFilter_FilterRule_Invalid_No_Value_ERROR_ 					= IWAT0431E A filter rule is invalid.  There is no attribute value.
+HyadesGAFilter_Preparation_No_Filter_Element_ERROR_ 				= IWAT0432E Could not find the filter configuration element {0} in the adapter configuration file.
+HyadesGAFilter_Preparation_Invalid_Filter_Element_ERROR_ 			= IWAT0433E Invalid filter configuration element {0} in the adapter configuration file.
+HyadesGAFilter_Preparation_Invalid_Filter_Rule_No_Operator_ERROR_ 	= IWAT0434E Invalid filter rule element {0} in the adapter configuration file. There is no operator.
+HyadesGAFilter_FilterRule_Invalid_Operator_ERROR_ 					= IWAT0435E A filter rule for attribute {0} is invalid.  The operator {1} is invalid for the filter type.
+HyadesGAFilter_FilterRuleBlock_Invalid_Operator_ERROR_ 				= IWAT0436E A filter rule block is invalid.  The operator {0} is invalid.  It must be AND or OR.
+HyadesGAFilter_FilterRule_Invalid_No_Impl_Class_ERROR_				= IWAT0437E A filter rule is invalid.  There is no implementation class.
+
+HyadesGA_CBE_Formatter_Missing_Required_Field_ERROR_ = IWAT0438E Common Base Event formatter {0} cannot create a CommmonBaseEvent because required property {1} is missing.
+HyadesGA_CBE_Formatter_Invalid_Field_Value_ERROR_ = IWAT0440E Common Base Event formatter {0} cannot create a CommmonBaseEvent because the value for property {1} is invalid.  Value={2} Problem={3}
+
+HyadesGAContextConfigurationWarning_Logging_Level_Incorrect_WARN_   = IWAT0443W The value {0} of the attribute {1} of component {2} is invalid.  It must be an integer between 0 and 99.  {1} will be set to 30.
+HyadesGAContextInstanceConfiguration_Continuous_Operation_Value_Invalid_ERROR_ = IWAT0444E The value {0} of the attribute {1} of {2} is invalid.  It must be a boolean value of {3} or {4}.
+HyadesGAContextInstanceConfiguration_Pause_Interval_Value_Invalid_ERROR_ = IWAT0445E The value {0} of the attribute {1} of {2} is invalid.  It must be an integer value greater than zero. 
+HyadesGAContextInstanceConfiguration_Max_Idle_Time_Value_Invalid_ERROR_ = IWAT0446E The value {0} of the attribute {1} of {2} is invalid.  It must be a positive integer value.
+HyadesGAContextInstanceConfiguration_Required_Continuous_Attribute_Missing_ERROR_ = IWAT0447E The attribute {0} of {1} is missing.  It is required if the attribute {2} has a value of {3}.
+HyadesGAComponentConfiguration_Invalid_Integer_Attribute_Value_ERROR_ = IWAT0448E The value {0} of the attribute {1} of component {2} is invalid. It must be an integer value greater than zero.
+HyadesGAComponentConfiguration_Required_Attribute_Missing_ERROR_ = IWAT0449E The attribute {0} of component {1} is missing.  It is a required attribute.
+HyadesGAComponentConfiguration_Invalid_Positive_Integer_Attribute_Value_ERROR_ = IWAT0450E The value {0} of the attribute {1} of component {2} is invalid.  It must be a positive integer value.
+HyadesGAContextInstanceConfiguration_Month_Value_Invalid_ERROR_ = IWAT0451E The value {0} of the attribute {1} of {2} is invalid.  It must be an integer value between 1 and 12.
+HyadesGAContextInstanceConfiguration_Day_Value_Invalid_ERROR_ = IWAT0452E The value {0} of the attribute {1} of {2} is invalid.  It must be an integer value between 1 and 31.
+HyadesGAContextInstanceConfiguration_Timezone_Value_Invalid_ERROR_ = IWAT0453E The value {0} of the attribute {1} of {2} is invalid.  It must be a timezone offset from GMT in the format specified in RFC 822.  For example, -0500.
+
+HyadesGABufferedPeriodicReader_Log_File_Read_Failed_ERROR_ = IWAT0476E Failed to read log file {0}.  Exception: {1}
+HyadesGABufferedPeriodicReader_No_Records_Read_ERROR_ = IWAT0477E No records were found in log file {0}.
+HyadesGA_CBE_Log_Outputter_AgentControllerUnavailable_ERROR_=IWAT0478E Common Base Event Logging Agent outputter cannot communicate with Agent Controller. Ensure Agent Controller is running and Agent Controller native libraries are accessible.
+
+# Message strings:
+EXCEPTION                                           = Exception
+
+# plugin.xml strings:
+
+STR_GLA_CFG_PRBLM= Generic Log Adapter Configuration Problem
+
+#====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+#====================================================================
+
+pluginName=Hyades Generic Log Adapter Runtime
+providerName=Eclipse.org
+ContextListener_Schema=Context Listeners
+AdapterComponent_Schema=Adapter Components
+SubstitutionExtension_Schema=Substitution Extensions
+FilterExit_Schema=Filter Exits
+
+# Command line strings:
+HyadesGA-cc=-cc
+HyadesGA-ac=-ac
+
+# File symbol and tag names in the xml schema:
+HyadesGADefaultContextConfigurationFile=SimpleContextConfiguration.xml
+HyadesGADefaultComponentConfigurationsFile=SimpleComponentConfigurations.xml
+HyadesGA=:
+
+HyadesGAExecutableClassAttributeName=executableClass
+HyadesGANameAttributeName=name
+HyadesGAUniqueIDAttributeName=uniqueID
+HyadesGADescriptionAttributeName=description
+HyadesGARoleAttributeName=role
+HyadesGALoggingLevelAttributeName=loggingLevel
+HyadesGARoleVersionAttributeName=roleVersion
+HyadesGARoleCreationDateAttributeName=roleCreationDate
+HyadesGARoleVersionDescriptionAttributeName=roleVersionDescription
+HyadesGAImplementationVersionAttributeName=implementationVersion
+HyadesGAImplemenationCreationDateAttributeName=implementationCreationDate
+HyadesGAImplemenationVersionDescriptionAttributeName=implementationVersionDescription
+HyadesGAAdapterProcessUnitNamespaceAttributeTagName=xmlns:pu
+HyadesGAAdapterProcessUnitNamespaceAttributeValue=http://www.eclipse.org/hyades/schema/ProcessUnit.xsd
+
+HyadesGAtypeAttributeName=type
+HyadesGAagentNameAttributeName=agentName
+HyadesGAdirectoryAttributeName=directory
+HyadesGAfileNameAttributeName=fileName
+HyadesGAstaticParserClassAttributeName=parserClassName
+HyadesGAconverterCmdAttributeName=converter
+HyadesGAconverterShellAttributeName=shell
+HyadesGAexpirationAttributeName=expiration
+HyadesGAmaximumBlockingAttributeName=maximumBlocking
+HyadesGAconfidenceBufferSizeAttributeName=confidenceBufferSize
+HyadesGAfileFooterSizeAttributeName=fileFooterSize
+HyadesGAwaitTimeAttributeName=waitUntilLoggingTime
+HyadesGAnestedMessagesAttributeName=nestedMessages
+HyadesGAcontainsLineBreaksAttributeName=containsLineBreaks
+HyadesGAreplaceLineBreaksAttributeName=replaceLineBreaks
+HyadesGAstartPatternAttributeName=startPattern
+HyadesGAendPatternAttributeName=endPattern
+HyadesGAincludeStartPatternAttributeName=includeStartPattern
+HyadesGAincludeEndPatternAttributeName=includeEndPattern
+HyadesGAlineBreakSymbolAttributeName=lineBreakSymbol
+HyadesGARuleElementTagName=RuleElement
+HyadesGARuleAttributeTagName=RuleAttribute
+HyadesGASubstitutionRuleTagName=SubstitutionRule
+HyadesGAPositionsAttributeName=positions
+HyadesGAMatchAttributeName=match
+HyadesGASubstituteAttributeName=substitute
+HyadesGADesignationTokenName=designationToken
+HyadesGASeparatorTokenAttributeName=separatorToken
+HyadesGAIndexAttributeName=index
+HyadesGAResourceURLAttributeName=resourceURL
+HyadesGAcontextListenerAttributeName=contextListener
+HyadesGAstaticParserClassAttributeName=parserClassName
+HyadesGAstaticParserAgentName=Generic Log Parser Agent
+HyadesGAUsePreviousMatchSubstitutionAsDefault=usePreviousMatchSubstitutionAsDefault
+HyadesGAFilterAttributeName=filter
+HyadesGAFilterExitClassAttributeName=filterExitClass
+
+
+HyadesGAPropertyElementTagName=pu:Property
+HyadesGAPropertyNameAttributeName=propertyName
+HyadesGAPropertyValueAttributeName=propertyValue
+HyadesGASensorPropertyElementTagName=sensor:SensorProperty
+HyadesGASensorPropertyNameAttributeName=propertyName
+HyadesGASensorPropertyValueAttributeName=propertyValue
+HyadesGAExtensionPointPackageNameTag=org.eclipse.hyades.logging.parsers
+HyadesGAExtensionPointNameTag=logParser
+HyadesGAExtensionPointIDTag=id
+HyadesGAUnknownNameTag=unknown
+HyadesGAStaticParserOutputterTagName=StaticParserOutputter
+HyadesGAStaticParserLoggerKeyName=loggerKey
+HyadesGASingleFileSensorTagName=sensor:SingleFileSensor
+HyadesGAStaticParserSensorTagName=sensor:StaticParserSensor
+HyadesGASingleFileOutputterTypeTagName=op:SingleFileOutputterType
+HyadesGALogOutputterTypeTagName=op:LoggingAgentOutputterType
+HyadesGAEclipseErrorDialogOutputterTypeTagName=op:EclipseErrorDialogOutputter
+HyadesGAuseBuiltInFunctionAttributeName=useBuiltInFunction
+HyadesGAsubstitutionExtensionClassAttributeName=substitutionExtensionClass
+HyadesGAdefaultValueAttributeName=defaultValue
+HyadesGAtimeFormatAttributeName=timeFormat
+HyadesGAbufferSizeAttributeName=bufferSize
+HyadesGAisRequiredByParentAttributeName=isRequiredByParent
+HyadesGAisChildChoiceAttributeName=isChildChoice
+HyadesGAAdapterContextName=AdapterContext
+
+HyadesGAFilterTagName=filter:Filter
+HyadesGAFilterRuleBlockElementTagName=FilterRuleBlock
+HyadesGAFilterRuleElementTagName=FilterRule
+HyadesGAOperatorAttributeName=operator
+HyadesGANegationAttributeName=negation
+HyadesGAImplementationClassAttributeName=implementationClass
+HyadesGAAttributeValueAttributeName=attributeValue
+HyadesGAttributeNamePathElementTagName=attributeNamePath
+HyadesGAttributeNameElementTagName=attributeName
+HyadesGANodeElementTagName=node
+
Index: src/org/eclipse/hyades/logging/adapter/util/FilterExitLoaderUtil.java
===================================================================
RCS file: src/org/eclipse/hyades/logging/adapter/util/FilterExitLoaderUtil.java
diff -N src/org/eclipse/hyades/logging/adapter/util/FilterExitLoaderUtil.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/hyades/logging/adapter/util/FilterExitLoaderUtil.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,64 @@
+package org.eclipse.hyades.logging.adapter.util;
+
+
+import org.eclipse.hyades.logging.adapter.AdapterPlugin;
+
+/**********************************************************************
+ * Copyright (c) 2005,2006 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id: InvalidFilterSpecification,v 1.0 2006/01/31 23:29:43 Exp $
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ * 
+ **********************************************************************/
+public class FilterExitLoaderUtil
+{
+	
+	/**
+	 * Instatiate an object and guarantee its class.
+	 * @param className The name of the class to instantiate.
+	 **/
+	public static IFilterExit instantiate(String className) throws ClassNotFoundException, ClassCastException
+	{	
+		IFilterExit extension = null;
+	
+		try
+		{
+			Class o = Class.forName(className);
+			extension = (IFilterExit)o.newInstance();
+
+		}
+		catch (ClassCastException e) {
+			/* If we don't have an implementation of ISubstitutionExtension then
+			 * throw a ClassNotFoundException.
+			 */
+			throw e;
+		}
+		catch (Throwable e) {
+			/* We may be running inside of eclipse.  If this is the case then we will 
+			 * look at our extensions to see if anyone has provided this class in 
+			 * another plugin.
+			 */
+			 
+			 try {
+			 	extension = AdapterPlugin.getFilterExit(className);
+			 }
+			 catch(ClassCastException exc) {
+			 	throw exc;
+			 }
+			 catch(Throwable eprime) {
+			 	throw new ClassNotFoundException(eprime.toString()) ;
+			 }
+		}
+		// Don't return a null extension object
+		if (extension == null) {
+			throw new ClassNotFoundException(className) ;
+		}
+		return extension;
+	}
+ 	  
+}
Index: src/org/eclipse/hyades/logging/adapter/util/InvalidFilterSpecification.java
===================================================================
RCS file: src/org/eclipse/hyades/logging/adapter/util/InvalidFilterSpecification.java
diff -N src/org/eclipse/hyades/logging/adapter/util/InvalidFilterSpecification.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/hyades/logging/adapter/util/InvalidFilterSpecification.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,57 @@
+package org.eclipse.hyades.logging.adapter.util;
+
+/**********************************************************************
+ * Copyright (c) 2005,2006 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * $Id: InvalidFilterSpecification,v 1.0 2006/01/31 23:29:43 Exp $
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ * 
+ **********************************************************************/
+import org.eclipse.hyades.logging.adapter.AdapterException;
+ 
+
+public class InvalidFilterSpecification extends AdapterException {	
+	/**
+	 * serial version UID
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * Constructor for InvalidFilterSpecification.
+	 */
+	public InvalidFilterSpecification()
+	{
+		super();
+	}
+	/**
+	 * Create an AInvalidFilterSpecification with the specified message.
+	 * @param message
+	 */
+	public InvalidFilterSpecification(String message)
+	{
+		super(message);
+	}
+	/**
+	 * Create an InvalidFilterSpecification with the specified message and cause exception.
+	 * @param message
+	 * @param cause
+	 */
+	public InvalidFilterSpecification(String message, Throwable cause)
+	{
+		super(message, cause);
+	}
+	/**
+	 * Create an InvalidFilterSpecification with the specified cause exception.
+	 * @param cause
+	 */
+	public InvalidFilterSpecification(Throwable cause)
+	{
+		super(cause);
+	}
+
+}
Index: filterExit.exsd
===================================================================
RCS file: filterExit.exsd
diff -N filterExit.exsd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ filterExit.exsd	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,113 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.hyades.logging.adapter">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.hyades.logging.adapter" id="filterExit" name="Generic Log Adapter FilterExit Extension"/>
+      </appInfo>
+      <documentation>
+         This extension point is used for registering IFilterExit classes with the adapter.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="filterExitClassname" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="filterExitClassname">
+      <annotation>
+         <appInfo>
+            <meta.element labelAttribute="id" icon="icon"/>
+         </appInfo>
+      </annotation>
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;pre&gt;
+   &lt;extension   point=&quot;org.eclipse.hyades.logging.adapter.filterExit&quot;&gt;
+      &lt;filterClassname            name=&quot;com.xxx.adapter.util.MyFilter&quot;&gt;
+      &lt;/filterClassname&gt;
+   &lt;/extension&gt;
+&lt;/pre&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         The value of the name attribute of the filterExitClassname element must be an implementation of &lt;samp&gt;org.eclipse.hyades.logging.adapter.util.IFilterExit&lt;/samp&gt;.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2005 IBM Corporation and others.
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+      </documentation>
+   </annotation>
+
+</schema>
#P org.eclipse.hyades.logging.parsers
Index: src/org/eclipse/hyades/logging/parsers/Parser.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/src/org/eclipse/hyades/logging/parsers/Parser.java,v
retrieving revision 1.10
diff -u -r1.10 Parser.java
--- src/org/eclipse/hyades/logging/parsers/Parser.java	26 Jan 2006 20:33:22 -0000	1.10
+++ src/org/eclipse/hyades/logging/parsers/Parser.java	1 Feb 2006 15:54:23 -0000
@@ -20,6 +20,11 @@
 import java.util.Locale;
 
 import org.apache.commons.logging.Log;
+import org.eclipse.hyades.logging.adapter.sensors.BasicFilterExit;
+import org.eclipse.hyades.logging.adapter.util.FilterExitLoaderUtil;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
+import org.eclipse.hyades.logging.adapter.util.InvalidFilterSpecification;
+import org.eclipse.hyades.logging.adapter.util.Messages;
 import org.eclipse.hyades.logging.adapter.util.MultipleFilesReader;
 import org.eclipse.hyades.logging.adapter.util.SequenceNumbersByTime;
 import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
@@ -130,6 +135,21 @@
      * String to hold lines read from log file to be parsed. 
      */
     protected String curLine = "";
+    
+    /**
+     * Regular expression for filter specification  
+     */
+    protected String filter = null;
+
+    /**
+     * filterExit class name
+     */
+    protected String filterExitClass = null;
+    
+    /**
+     * Instance of filterExit class 
+     */
+    protected IFilterExit filterExitClassInstance = null;
 
     /**
      * Factory for creating events.
@@ -401,6 +421,67 @@
                 totalSize = file.length();
                 logFile = new RandomAccessFile(file,"r");
             }
+            /**
+             * bugzilla 79565. It allows user to define rules for GLA sensor or extractor
+             * to filter out lines, records or data that are not of interest.
+             * filter is used to store the rule.
+             * filterExitClass is used to store the name of filterEixt class which is 
+             * provided by users. If users only define the filter rules, but not provide filterExitClass,
+             * the BasicFilterExit class will be used with the user defined filter rules.  
+             */
+            filter = ((String) (table.get(ParserConstants.FILTER_SPECIFICATION_KEY)));
+            filterExitClass = ((String) (table.get(ParserConstants.FILTER_EXIT_CLASS)));
+            
+            if (filter != null) {
+				filter = filter.trim();
+				if (filter.length() == 0) {
+					filter = null;
+				}
+			}
+			
+			if (filterExitClass != null) {
+				filterExitClass = filterExitClass.trim();
+				if (filterExitClass.length() == 0) {
+					filterExitClass = null;
+				}
+			}
+            //Check if the filterExit property is not null
+			if (filterExitClass !=null && !filterExitClass.equals("")) {
+				try {
+					// load the class and instantiate an object
+					filterExitClassInstance = FilterExitLoaderUtil.instantiate(filterExitClass);
+					if(filter != null && !filter.equals(""))
+					{
+						try
+						{
+							filterExitClassInstance.setFilterSpecification(filter);
+						}catch (InvalidFilterSpecification ex)
+						{
+							throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_INVALID_FILTER_SPECIFICATION_ERROR_",filter));
+						}
+					}
+				}
+				catch (Exception e) {
+					
+					throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_LOAD_FILTEREXIT_CLASS_ERROR_",filterExitClass));
+				}			
+			}else if(filter != null && !filter.equals(""))
+			{
+				//users don't provide the filter class, but give the filter specification, 
+				// then use BasicFilterExit class
+				filterExitClassInstance = new BasicFilterExit();
+				try
+				{
+					filterExitClassInstance.setFilterSpecification(filter);
+				}catch (InvalidFilterSpecification ex)
+				{
+					 
+					throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_INVALID_FILTER_SPECIFICATION_ERROR_",filter));
+					
+				}
+				
+			}
+            
 
             charset = ((String) (table.get(ParserConstants.FILE_CHARSET_KEY)));
             fileLocale = ((Locale)(table.get(ParserConstants.FILE_LOCALE_KEY)));
@@ -789,4 +870,12 @@
 	public long getTotalSize() {
 		return totalSize;
 	}
+	
+	/**
+	 * Get the instance of IFilteExit class
+	 * @returns filterExitClassInstance 
+	 */
+	public IFilterExit getFilterExitClassInstance() {
+		return filterExitClassInstance;
+	}
 }
Index: src/org/eclipse/hyades/logging/parsers/AbstractAccessLogParser.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/src/org/eclipse/hyades/logging/parsers/AbstractAccessLogParser.java,v
retrieving revision 1.7
diff -u -r1.7 AbstractAccessLogParser.java
--- src/org/eclipse/hyades/logging/parsers/AbstractAccessLogParser.java	25 Jan 2006 23:29:43 -0000	1.7
+++ src/org/eclipse/hyades/logging/parsers/AbstractAccessLogParser.java	1 Feb 2006 15:54:23 -0000
@@ -25,6 +25,7 @@
 import java.util.Date;
 import java.util.Locale;
 
+import org.eclipse.hyades.logging.adapter.AdapterException;
 import org.eclipse.hyades.logging.core.Guid;
 import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
 import org.eclipse.hyades.logging.events.cbe.ComponentIdentification;
@@ -176,6 +177,26 @@
 				
 				//Only parse non-empty (e.g. lines with one or more non-whitespace characters) lines:
 				if (curLine.length() > 0) {
+					
+					if(filterExitClassInstance != null)
+					{
+						try
+						{
+							boolean pass = filterExitClassInstance.filter(curLine);
+							if(!pass)
+							{
+                               //Read the next line in the file:
+								curLine = readALine();
+								continue;
+							}
+							
+						}catch (AdapterException e)
+						{
+							  
+							throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_FILTERING_ERROR_", curLine));
+						}
+						 
+					}
 
 					//Parse the log record:
 					//ASSUMPTION:  Access log records do NOT span multiple lines.  Each log record is contained on one line.
Index: src/org/eclipse/hyades/logging/parsers/ParserConstants.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/src/org/eclipse/hyades/logging/parsers/ParserConstants.java,v
retrieving revision 1.9
diff -u -r1.9 ParserConstants.java
--- src/org/eclipse/hyades/logging/parsers/ParserConstants.java	26 Jan 2006 20:33:23 -0000	1.9
+++ src/org/eclipse/hyades/logging/parsers/ParserConstants.java	1 Feb 2006 15:54:23 -0000
@@ -55,7 +55,9 @@
     public final static String FILE_CHARSET_KEY = "characater_set";
     public final static String FILE_LOCALE_KEY = "locale";
     public final static String CONTINUOUS_KEY = "continuous";
-    
+    public final static String FILTER_SPECIFICATION_KEY = "filter";
+    public final static String FILTER_EXIT_CLASS = "filterExitClass";
+
     public final static String APACHE_VERSION_KEY = "APACHE_VERSION";
     public final static String APPLICATION_VERSION_KEY = "version";
     public final static String APACHE_HTTP_SERVER = "Apache HTTP Server";
Index: src/org/eclipse/hyades/logging/parsers/AbstractErrorLogParser.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/src/org/eclipse/hyades/logging/parsers/AbstractErrorLogParser.java,v
retrieving revision 1.6
diff -u -r1.6 AbstractErrorLogParser.java
--- src/org/eclipse/hyades/logging/parsers/AbstractErrorLogParser.java	25 Jan 2006 23:29:43 -0000	1.6
+++ src/org/eclipse/hyades/logging/parsers/AbstractErrorLogParser.java	1 Feb 2006 15:54:23 -0000
@@ -24,6 +24,8 @@
 import java.util.Date;
 import java.util.Locale;
 
+import org.eclipse.hyades.logging.adapter.AdapterException;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
 import org.eclipse.hyades.logging.core.Guid;
 import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
 import org.eclipse.hyades.logging.events.cbe.ComponentIdentification;
@@ -145,6 +147,7 @@
 
         curLine = readALine();
         arrayIndex = 0;
+        IFilterExit filterExitClassInstance = getFilterExitClassInstance();
 
         try {
 
@@ -156,6 +159,25 @@
 
                 //Only parse non-empty (e.g. lines with one or more non-whitespace characters) lines:
                 if (curLine.length() > 0) {
+                	if(filterExitClassInstance != null)
+					{
+						try
+						{
+							boolean pass = filterExitClassInstance.filter(curLine);
+							if(!pass)
+							{
+                               //Read the next line in the file:
+								curLine = readALine();
+								continue;
+							}
+							
+						}catch (AdapterException e)
+						{
+							  
+							throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_FILTERING_ERROR_", curLine));
+						}
+						 
+					}
 
                     //ASSUMPTION:  At least one valid log record (e.g. containing at least a time stamp, category and message) appears in each log file, otherwise the log file is deemed invalid. 
 
Index: src/org/eclipse/hyades/logging/parsers/MonitoringParser.java
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/src/org/eclipse/hyades/logging/parsers/MonitoringParser.java,v
retrieving revision 1.9
diff -u -r1.9 MonitoringParser.java
--- src/org/eclipse/hyades/logging/parsers/MonitoringParser.java	7 Oct 2005 19:48:32 -0000	1.9
+++ src/org/eclipse/hyades/logging/parsers/MonitoringParser.java	1 Feb 2006 15:54:23 -0000
@@ -23,8 +23,12 @@
 import java.util.Hashtable;
 import java.util.Locale;
 
+import org.eclipse.hyades.logging.adapter.sensors.BasicFilterExit;
 import org.eclipse.hyades.logging.adapter.util.BufferedPeriodicReader;
 import org.eclipse.hyades.logging.adapter.util.BufferedSinglePassReader;
+import org.eclipse.hyades.logging.adapter.util.FilterExitLoaderUtil;
+import org.eclipse.hyades.logging.adapter.util.IFilterExit;
+import org.eclipse.hyades.logging.adapter.util.InvalidFilterSpecification;
 import org.eclipse.hyades.logging.adapter.util.MultipleFilesReader;
 import org.eclipse.hyades.logging.events.cbe.CommonBaseEvent;
 /**
@@ -51,7 +55,7 @@
 	/* Support for multiple log files */
 	private boolean multi = false; // specify whether multi files are being monitored
 	private RandomAccessFile tmpLog = null;
-
+	
     /**
      * This function is called to provide user-specified information to the parser.
      * Currently, this superclass method handles the path and name of the log file
@@ -205,6 +209,67 @@
 				input.setMultiFile(multi);
             }
 
+            /**
+             * bugzilla 79565. It allows user to define rules for GLA sensor or extractor
+             * to filter out lines, records or data that are not of interest.
+             * filter is used to store the rule.
+             * filterExitClass is used to store the name of filterEixt class which is 
+             * provided by users. If users only define the filter rules, but not provide filterExitClass,
+             * the BasicFilterExit class will be used with the user defined filter rules.  
+             */
+            filter = ((String) (table.get(ParserConstants.FILTER_SPECIFICATION_KEY)));
+            filterExitClass = ((String) (table.get(ParserConstants.FILTER_EXIT_CLASS)));
+            
+            if (filter != null) {
+				filter = filter.trim();
+				if (filter.length() == 0) {
+					filter = null;
+				}
+			}
+			
+			if (filterExitClass != null) {
+				filterExitClass = filterExitClass.trim();
+				if (filterExitClass.length() == 0) {
+					filterExitClass = null;
+				}
+			}
+            //Check if the filterExit property is not null
+			if (filterExitClass !=null && !filterExitClass.equals("")) {
+				try {
+					// load the class and instantiate an object
+					filterExitClassInstance = FilterExitLoaderUtil.instantiate(filterExitClass);
+					if(filter != null && !filter.equals(""))
+					{
+						try
+						{
+							filterExitClassInstance.setFilterSpecification(filter);
+						}catch (InvalidFilterSpecification ex)
+						{
+							throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_INVALID_FILTER_SPECIFICATION_ERROR_",filter));
+						}
+					}
+				}
+				catch (Exception e) {
+					
+					throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_LOAD_FILTEREXIT_CLASS_ERROR_",filterExitClass));
+				}			
+			}else if(filter != null && !filter.equals(""))
+			{
+				//users don't provide the filter class, but give the filter specification, 
+				// then use BasicFilterExit class
+				filterExitClassInstance = new BasicFilterExit();
+				try
+				{
+					filterExitClassInstance.setFilterSpecification(filter);
+				}catch (InvalidFilterSpecification ex)
+				{
+					 
+					throw new LogParserException(ParserUtilities.getResourceString("LOG_PARSER_INVALID_FILTER_SPECIFICATION_ERROR_",filter));
+					
+				}
+				
+			}
+            
             array_size = (Integer)table.get(ParserConstants.MESSAGE_ARRAY_SIZE_KEY);
             if (array_size != null) {
             	MessageArraySize = array_size.intValue();
Index: plugin.properties
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/plugin.properties,v
retrieving revision 1.12
diff -u -r1.12 plugin.properties
--- plugin.properties	27 Jan 2006 19:25:30 -0000	1.12
+++ plugin.properties	1 Feb 2006 15:54:23 -0000
@@ -37,7 +37,10 @@
 REMOTE_LOG_PARSER_CONFIG_PARAMETER_ERROR_           = IWAT0075E The log parser's initialization parameters are not set properly.
 LOG_PARSER_INVALID_FILE_NAME_ERROR_                 = IWAT0243E The log file {0} does not exist.
 LOG_PARSER_CANNOT_READ_FILE_ERROR_                  = IWAT0244E Cannot read the log file {0}.
+LOG_PARSER_INVALID_FILTER_SPECIFICATION_ERROR_      = IWAT0245E Invalid regular expression syntax for filter specification {0}.
+LOG_PARSER_LOAD_FILTEREXIT_CLASS_ERROR_             = IWAT0246E Errors occurred loading the {0} class.
 LOG_PARSER_PARSING_ERROR_							= IWAT0412E Errors occurred parsing the log file {0}.
+LOG_PARSER_FILTERING_ERROR_                         = IWAT0413E Errors occurred filtering the line {0}.
 
 #java util logging simple format exception
 JAVA_UTIL_LOGGIN_GENERAL_EXCEPTION_MESSAGE_ERROR_	= IWAT0479E Error parsing Java Logging XML log.
Index: .project
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/.project,v
retrieving revision 1.1
diff -u -r1.1 .project
--- .project	26 Jan 2005 16:02:17 -0000	1.1
+++ .project	1 Feb 2006 15:54:23 -0000
@@ -3,8 +3,6 @@
 	<name>org.eclipse.hyades.logging.parsers</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.hyades.logging.commons</project>
-		<project>org.eclipse.hyades.logging.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
Index: .classpath
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/.classpath,v
retrieving revision 1.5
diff -u -r1.5 .classpath
--- .classpath	17 May 2005 15:35:37 -0000	1.5
+++ .classpath	1 Feb 2006 15:54:23 -0000
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src.config"/>
 	<classpathentry kind="src" path="src.import"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/META-INF/MANIFEST.MF,v
retrieving revision 1.5
diff -u -r1.5 MANIFEST.MF
--- META-INF/MANIFEST.MF	25 Jan 2006 23:29:43 -0000	1.5
+++ META-INF/MANIFEST.MF	1 Feb 2006 15:54:23 -0000
@@ -17,8 +17,8 @@
  org.eclipse.hyades.logging.parsers.importer,
  org.eclipse.hyades.logging.parsers.internal.importer
 Require-Bundle: org.eclipse.hyades.logging.core;visibility:=reexport,
- org.eclipse.hyades.logging.adapter;visibility:=reexport,
  org.eclipse.swt,
  org.eclipse.core.resources,
- com.ibm.icu
+ com.ibm.icu,
+ org.eclipse.hyades.logging.adapter
 Eclipse-AutoStart: true