svn commit: r571328 - in /logging/log4j/companions/component/trunk: ./ src/main/java/org/apache/log4j/ src/main/java/org/apache/log4j/plugins/ src/main/java/org/apache/log4j/xml/ src/main/resources/org/ src/test/java/org/apache/log4j/plugins/ src/test/...

[carnold]

Author: carnold
Date: Thu Aug 30 15:02:18 2007
New Revision: 571328

URL: http://svn.apache.org/viewvc?rev=571328&view=rev
Log:
Eliminate PluginConfiguration by adding dependency on log4j 1.2.15

Removed:
    
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/plugins/PluginConfigurator.java
    
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/xml/UnrecognizedElementHandler.java
    logging/log4j/companions/component/trunk/src/main/resources/org/
    
logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/plugins/PluginConfiguratorTest.java
    
logging/log4j/companions/component/trunk/src/test/resources/org/apache/log4j/plugins/plugins1.xml
    
logging/log4j/companions/component/trunk/src/test/resources/org/apache/log4j/xml/
Modified:
    logging/log4j/companions/component/trunk/build.xml
    logging/log4j/companions/component/trunk/pom.xml
    
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java

Modified: logging/log4j/companions/component/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/build.xml?rev=571328&r1=571327&r2=571328&view=diff
==============================================================================
--- logging/log4j/companions/component/trunk/build.xml (original)
+++ logging/log4j/companions/component/trunk/build.xml Thu Aug 30 15:02:18 2007
@@ -38,7 +38,7 @@
     <property name="m2_repo" location="${user.home}/.m2/repository"/>
 
        <!--  Versions for dependencies   -->
-    <property name="log4j.version" value="1.2.9"/>
+    <property name="log4j.version" value="1.2.15"/>
     <property name="junit.version" value="3.8.1"/>
        
        <!--  Dependency locations - assumed to be in Maven 2 repository   -->

Modified: logging/log4j/companions/component/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/pom.xml?rev=571328&r1=571327&r2=571328&view=diff
==============================================================================
--- logging/log4j/companions/component/trunk/pom.xml (original)
+++ logging/log4j/companions/component/trunk/pom.xml Thu Aug 30 15:02:18 2007
@@ -213,7 +213,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.15</version>
     </dependency>    
   </dependencies>
   <reporting>

Modified: 
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java?rev=571328&r1=571327&r2=571328&view=diff
==============================================================================
--- 
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
 (original)
+++ 
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/LoggerRepositoryExImpl.java
 Thu Aug 30 15:02:18 2007
@@ -21,7 +21,6 @@
 import org.apache.log4j.or.ObjectRenderer;
 import org.apache.log4j.or.RendererMap;
 import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.PluginConfigurator;
 import org.apache.log4j.plugins.PluginRegistry;
 import org.apache.log4j.scheduler.Scheduler;
 import org.apache.log4j.spi.ErrorItem;
@@ -31,9 +30,9 @@
 import org.apache.log4j.spi.LoggerRepository;
 import org.apache.log4j.spi.LoggerRepositoryEventListener;
 import org.apache.log4j.spi.LoggerRepositoryEx;
-import org.apache.log4j.spi.OptionHandler;
 import org.apache.log4j.spi.RendererSupport;
 import org.apache.log4j.xml.UnrecognizedElementHandler;
+import org.apache.log4j.xml.DOMConfigurator;
 import org.w3c.dom.Element;
 
 import java.util.ArrayList;
@@ -589,11 +588,11 @@
             final Element element,
             final Properties props) throws Exception {
         if ("plugin".equals(element.getNodeName())) {
-            OptionHandler instance =
-                    PluginConfigurator.parseElement(element, props, 
Plugin.class);
+            Object instance =
+                    DOMConfigurator.parseElement(element, props, Plugin.class);
             if (instance instanceof Plugin) {
                 Plugin plugin = (Plugin) instance;
-                String pluginName = 
PluginConfigurator.subst(element.getAttribute("name"), props);
+                String pluginName = 
DOMConfigurator.subst(element.getAttribute("name"), props);
                 if (pluginName.length() > 0) {
                     plugin.setName(pluginName);
                 }
@@ -601,7 +600,7 @@
                 plugin.setLoggerRepository(this);
 
                 LogLog.debug("Pushing plugin on to the object stack.");
-                instance.activateOptions();
+                plugin.activateOptions();
                 return true;
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]