fix installer for filters. split synonyms to own file

Author: Shoelace

src/Appender/Appender.type.plb

@@ -0,0 +1,93 @@
+create or replace
+TYPE BODY Appender 
+as 
+	member function getName return varchar2
+	is
+	begin
+		return m_name;
+	end;
+
+	member procedure append(event LogEvent) 
+	is
+	begin
+		null;
+	end;
+
+	member function getLayout return Layout
+	is
+	begin
+		return m_layout;
+	end;
+
+	member function toString return varchar2
+	is
+	begin
+		return 'Appender('||m_name||',...)';
+	end;
+
+	map member function Compare return varchar2
+	is
+	begin
+		return toString();
+	end;
+
+   constructor function Appender(name VARCHAR2, filter Filter, layout Layout,ignoreExceptions boolean ) return self as result
+	is
+	begin
+		m_name := name;
+		m_filter := filter;
+		m_layout := layout;
+		return;
+	end;
+
+
+
+    member procedure addFilter(Filter filter) 
+	IS BEGIN
+        if self.m_filter IS NULL THEN
+            self.m_filter := filter;
+		ELSIF self.m_filter is of (CompositeFilter) THEN
+           null;-- treat(self.m_filter as CompositeFilter).addFilter(filter);
+        ELSE 
+			NULL;
+            --final Filter[] filters = new Filter[] {self.filter, filter};
+            --self.filter = CompositeFilter.createFilters(filters);
+		END IF;
+    END;
+
+    /**
+     * Remove a Filter.
+     * @param filter The Filter to remove.
+     */
+    member procedure removeFilter(Filter filter) 
+	IS BEGIN
+        if (self.m_filter = filter) THEN
+            self.m_filter := null;
+        elsif (filter is of (CompositeFilter)) then
+            --CompositeFilter composite = (CompositeFilter) filter;
+            --composite = composite.removeFilter(filter);
+            --if (composite.size() > 1) {
+                --self.filter = composite;
+            --} else if (composite.size() == 1) {
+                --final Iterator<Filter> iter = composite.iterator();
+                --self.filter = iter.next();
+            --} else {
+                --self.filter = null;
+            --}
+			null;
+        end if;
+    END;
+
+    member function hasFilter return boolean
+	is begin
+	return m_filter IS NOT NULL;
+	end;
+
+    member function isFiltered(event LogEvent) return boolean
+	IS BEGIN
+		return m_filter is not null AND m_filter.dofilter(event) = Result.DENY;
+        --return filter != null && filter.filter(event) == Filter.Result.DENY;
+	END;
+end;
+/
+show errors

src/Appender/Appender.type.pls

@@ -36,57 +36,3 @@ not final not instantiable ;
 /
 show errors
 
-
-create or replace
-TYPE BODY Appender 
-as 
-
-    member procedure addFilter(Filter filter) 
-	IS BEGIN
-        if self.m_filter IS NULL THEN
-            self.m_filter := filter;
-		ELSIF self.m_filter is of (CompositeFilter) THEN
-            self.m_filter.addFilter(filter);
-        ELSE 
-			NULL;
-            --final Filter[] filters = new Filter[] {self.filter, filter};
-            --self.filter = CompositeFilter.createFilters(filters);
-		END IF;
-    END;
-
-    /**
-     * Remove a Filter.
-     * @param filter The Filter to remove.
-     */
-    member procedure removeFilter(Filter filter) 
-	IS BEGIN
-        if (self.m_filter = filter) THEN
-            self.m_filter := null;
-        elsif (filter is of (CompositeFilter)) then
-            --CompositeFilter composite = (CompositeFilter) filter;
-            --composite = composite.removeFilter(filter);
-            --if (composite.size() > 1) {
-                --self.filter = composite;
-            --} else if (composite.size() == 1) {
-                --final Iterator<Filter> iter = composite.iterator();
-                --self.filter = iter.next();
-            --} else {
-                --self.filter = null;
-            --}
-			null;
-        end if;
-    END;
-
-    member function hasFilter return boolean
-	is begin
-	return m_filter IS NOT NULL;
-	end;
-
-    member function isFiltered(event LogEvent) return boolean
-	IS BEGIN
-		return m_filter is not null AND m_filter.dofilter(event) = Result.DENY;
-        --return filter != null && filter.filter(event) == Filter.Result.DENY;
-	END;
-end;
-/
-show errors

src/Appender/SMTPAppender.type.pls

@@ -39,11 +39,9 @@ as
 
 		dolog boolean := true;
 
-
 	BEGIN
-		if isfiltered() then
-			IF
-		end if;
+		--if isfiltered() then
+		--end if;
 		if dolog THEN
 			dbms_output.put_line('EMAIL');
 			send_mail(p_to   => 'dsplbrun@abdn.ac.uk'

src/Core/LogImpl.pkb

@@ -112,8 +112,8 @@ k_appenders(k_appenders.last) := dbmsOutputAppender('dbmsoutput',null, k_layout,
 k_appenders.EXTEND;
 k_appenders(k_appenders.LAST) := TableAppender('tableoutput',NULL, NULL, FALSE);
 
-k_appenders.EXTEND;
-k_appenders(k_appenders.LAST) := SMTPAppender('SMTPoutput',ThresholdFilter(LogLevel.ERROR,null,null), k_layout, FALSE);
+--k_appenders.EXTEND;
+--k_appenders(k_appenders.LAST) := SMTPAppender('SMTPoutput',ThresholdFilter(LogLevel.ERROR,null,null), k_layout, FALSE);
 
 
 END;

src/grants.sql

@@ -1,13 +1,33 @@
 --types
 grant execute on log4_object to public;
 grant execute on Logger to public;
-grant execute on Filter to public;
 grant execute on Marker to public;
+grant execute on Result to public;
 grant execute on LogLevel to public;
 grant execute on GenericException to public;
-grant execute on DBMSOutputAppender to public;
+
+grant execute on LogEvent to public;
+grant execute on Log4oracleLogEvent to public;
+
+--layouts
 grant execute on Layout to public;
 grant execute on PatternLayout to public;
+grant execute on SimpleLayout to public;
+
+--Message
+grant execute on Message to public;
+grant execute on ObjectMessage to public;
+grant execute on ParameterizedMessage to public;
+grant execute on SimpleMessage to public;
+
+--appender types
+grant execute on DBMSOutputAppender to public;
+grant execute on SMTPAppender to public;
+grant execute on TableAppender to public;
+
+--Filters
+grant execute on Filter to public;
+grant execute on ThresholdFilter to public;
 
 --tables
 grant select,delete  on log_table to public;
@@ -18,20 +38,3 @@ grant execute on LogManager to public;
 grant execute on MarkerManager to public;
 grant execute on ThreadContext to public;
 
-
-create public synonym Logger for log4.Logger;
-create public synonym LogLevel for log4.Logger;
-create public synonym GenericException for log4.GenericException;
-
-create public synonym LogManager for log4.LogManager;
-create public synonym MarkerManager for log4.MarkerManager;
-create public synonym ThreadContext for log4.ThreadContext;
-
-create public synonym log_table for log4.log_table;
-create public synonym log_levels for log4.log_levels;
-
-create public synonym DBMSOutputAppender for log4.DBMSOutputAppender ;
-create public synonym Layout for log4.Layout ;
-create public synonym PatternLayout for log4.PatternLayout ;
-
-

src/install.sql

@@ -177,8 +177,6 @@ prompt &line1
 @@Layout/Layout.pls
 
 
-@@Appender/Appender.type.pls
-
 @@Core/Log4oracleLogEvent.type.pls
 
 @@Core/Pattern/PatternConverter.sql
@@ -221,6 +219,12 @@ prompt &line1
 --logger must be last
 @@Core/Logger.type.pls
 
+@@Core/Result.type.pls
+@@Core/Filter.type.pls
+@@Core/ThresholdFilter.type.pls
+@@Core/CompositeFilter.type.pls
+
+@@Appender/Appender.type.pls
 
 --
 
@@ -231,6 +235,7 @@ prompt &line1
 @@Config/log_levels.sql
 
 @@Appender/DBMSOutputAppender.type.pls
+@@Appender/SMTPAppender.type.pls
 
 @@Appender/log_table_plain.sql
 @@Appender/TableAppender.type.pls
@@ -266,6 +271,7 @@ prompt &line1
 @@Core/LogImpl.pkb
 @@Core/ThreadContext.pkb
 
+@@Appender/Appender.type.plb
 
 @@Layout/LayoutBody.pls
 @@Layout/PatternLayoutBody.pls

src/synonyms.sql

@@ -0,0 +1,40 @@
+--types
+create or replace public synonym log4_object for log4.log4_object;
+create or replace public synonym Logger for log4.Logger;
+create or replace public synonym Marker for log4.Marker;
+create or replace public synonym Result for log4.Result;
+create or replace public synonym LogLevel for log4.LogLevel;
+create or replace public synonym GenericException for log4.GenericException;
+
+create or replace public synonym LogEvent for log4.LogEvent;
+create or replace public synonym Log4oracleLogEvent for log4.Log4oracleLogEvent;
+
+--layouts
+create or replace public synonym Layout for log4.Layout;
+create or replace public synonym PatternLayout for log4.PatternLayout;
+create or replace public synonym SimpleLayout for log4.SimpleLayout;
+
+--Message
+create or replace public synonym Message for log4.Message;
+create or replace public synonym ObjectMessage for log4.ObjectMessage;
+create or replace public synonym ParameterizedMessage for log4.ParameterizedMessage;
+create or replace public synonym SimpleMessage for log4.SimpleMessage;
+
+--appender types
+create or replace public synonym DBMSOutputAppender for log4.DBMSOutputAppender;
+create or replace public synonym SMTPAppender for log4.SMTPAppender;
+create or replace public synonym TableAppender for log4.TableAppender;
+
+--Filters
+create or replace public synonym Filter for log4.Filter;
+create or replace public synonym ThresholdFilter for log4.ThresholdFilter;
+
+--tables
+create or replace public synonym log_table for log4.log_table;
+create or replace public synonym log_levels for log4.log_levels;
+
+--packages
+create or replace public synonym LogManager for log4.LogManager;
+create or replace public synonym MarkerManager for log4.MarkerManager;
+create or replace public synonym ThreadContext for log4.ThreadContext;
+

src/uninstall.sql

@@ -1,7 +1,6 @@
 drop table log_table;
 drop table log_levels;
 
-drop type log4_object force;
 drop type log4_array force;
 drop type logger force;
 drop type Marker force;
@@ -51,8 +50,15 @@ drop TYPE BODY TABLEAPPENDER;
 drop TYPE TABLEAPPENDER;
 drop TYPE BODY DBMSOUTPUTAPPENDER;
 drop TYPE DBMSOUTPUTAPPENDER;
+drop TYPE SMTPAPPENDER;
 drop TYPE APPENDER;
 
+drop TYPE THRESHOLDFILTER;
+drop TYPE COMPOSITEFILTER;
+drop TYPE FILTERARRAY;
+drop TYPE FILTER;
+drop TYPE RESULT;
+
 drop type THREADCONTEXTCONTEXTMAP;
 drop type THREADCONTEXTCONTEXTSTACK;
 drop type ThreadContextStack;
@@ -82,5 +88,6 @@ drop type PARAMETERIZEDMESSAGE;
 drop type LOGGERPATTERNCONVERTER;
 drop type PATTERNFORMATTER;
 
+drop type log4_object;
 
 prompt you can now run: purge recyclebin;;