cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r432060 [2/2] - in /incubator/cayenne/main/trunk: ./ core/cayenne-jdk1.4-core/ core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/access/ core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/conf/ core/cayenne-jdk1.4-core/src/ma...
Date Wed, 16 Aug 2006 22:50:29 GMT
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/project/validator/TreeNodeValidator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/project/validator/TreeNodeValidator.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/project/validator/TreeNodeValidator.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/project/validator/TreeNodeValidator.java Wed Aug 16 15:50:25 2006
@@ -19,7 +19,6 @@
 
 package org.apache.cayenne.project.validator;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.map.DataMap;
@@ -44,8 +43,6 @@
  */
 public abstract class TreeNodeValidator {
 
-    private static Logger logObj = Logger.getLogger(TreeNodeValidator.class);
-
     // initialize singleton validators
     protected static final DomainValidator domainValidator = new DomainValidator();
     protected static final DataNodeValidator nodeValidator = new DataNodeValidator();
@@ -116,10 +113,6 @@
         }
         else {
             // ignore unknown nodes
-            String className = (validatedObj != null)
-                    ? validatedObj.getClass().getName()
-                    : "(null object)";
-            logObj.info("Validation not supported for object of class: " + className);
             return;
         }
 

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java Wed Aug 16 15:50:25 2006
@@ -23,7 +23,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataChannel;
 import org.apache.cayenne.access.ClientServerChannel;
@@ -34,6 +33,8 @@
 import org.apache.cayenne.remote.RemoteService;
 import org.apache.cayenne.remote.RemoteSession;
 import org.apache.cayenne.util.Util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A generic implementation of an RemoteService. Subclasses can be customized to work with
@@ -47,7 +48,7 @@
     public static final String EVENT_BRIDGE_FACTORY_PROPERTY = "cayenne.RemoteService.EventBridge.factory";
 
     // keep logger non-static so that it could be garbage collected with this instance..
-    private final Logger logObj = Logger.getLogger(BaseRemoteService.class);
+    private final Log logObj = LogFactory.getLog(BaseRemoteService.class);
 
     protected DataDomain domain;
 

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/HttpRemoteService.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/HttpRemoteService.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/HttpRemoteService.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/remote/service/HttpRemoteService.java Wed Aug 16 15:50:25 2006
@@ -25,9 +25,10 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.DataChannel;
 import org.apache.cayenne.remote.RemoteSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A {@link org.apache.cayenne.remote.RemoteService} implementation that stores
@@ -41,7 +42,7 @@
     static final String SESSION_ATTRIBUTE = "HttpRemoteService.ServerSession";
 
     // keep logger non-static so that it could be garbage collected with this instance..
-    private final Logger logObj = Logger.getLogger(HttpRemoteService.class);
+    private final Log logObj = LogFactory.getLog(HttpRemoteService.class);
 
     private Map sharedChannels = new HashMap();
 

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/CayenneGenerator.java Wed Aug 16 15:50:25 2006
@@ -26,8 +26,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.Path;
 import org.apache.cayenne.gen.AntClassGenerator;
 import org.apache.cayenne.gen.ClassGenerator;
 import org.apache.cayenne.gen.DefaultClassGenerator;
@@ -36,6 +34,9 @@
 import org.apache.cayenne.map.MapLoader;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.util.Util;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
 import org.xml.sax.InputSource;
 
 import foundrylogic.vpp.VPPConfig;
@@ -46,7 +47,7 @@
  * 
  * @author Andrus Adamchik
  */
-public class CayenneGenerator extends CayenneTask {
+public class CayenneGenerator extends Task {
 
     protected String includeEntitiesPattern;
     protected String excludeEntitiesPattern;
@@ -73,7 +74,6 @@
      * Executes the task. It will be called by ant framework.
      */
     public void execute() throws BuildException {
-        configureLogging();
         validateAttributes();
 
         try {

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DataPortTask.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DataPortTask.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DataPortTask.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DataPortTask.java Wed Aug 16 15:50:25 2006
@@ -24,8 +24,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.DataPort;
@@ -33,6 +31,9 @@
 import org.apache.cayenne.conf.FileConfiguration;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.util.Util;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 
 /**
  * A "cdataport" Ant task implementing a frontend to DataPort allowing porting database
@@ -41,7 +42,7 @@
  * @author Andrus Adamchik
  * @since 1.2: Prior to 1.2 DataPort classes were a part of cayenne-examples package.
  */
-public class DataPortTask extends CayenneTask {
+public class DataPortTask extends Task {
 
     protected File projectFile;
     protected String maps;
@@ -57,7 +58,6 @@
     }
 
     public void execute() throws BuildException {
-        configureLogging();
         validateParameters();
 
         FileConfiguration configuration = new FileConfiguration(projectFile);

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java Wed Aug 16 15:50:25 2006
@@ -22,8 +22,6 @@
 import java.io.File;
 import java.sql.Driver;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.cayenne.access.DbGenerator;
 import org.apache.cayenne.conn.DriverDataSource;
 import org.apache.cayenne.dba.DbAdapter;
@@ -31,6 +29,9 @@
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.MapLoader;
 import org.apache.cayenne.util.Util;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.xml.sax.InputSource;
 
 /**
@@ -41,7 +42,7 @@
  * @since 1.2
  */
 // TODO: support classpath attribute for loading the driver
-public class DbGeneratorTask extends CayenneTask {
+public class DbGeneratorTask extends Task {
 
     protected DbAdapter adapter;
     protected File map;
@@ -60,7 +61,6 @@
 
 
     public void execute() {
-        configureLogging();
 
         // prepare defaults
         if (adapter == null) {

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/tools/DeploymentConfigurator.java Wed Aug 16 15:50:25 2006
@@ -22,12 +22,13 @@
 import java.io.File;
 import java.util.Iterator;
 
-import org.apache.tools.ant.BuildException;
 import org.apache.cayenne.project.DataNodeConfigInfo;
 import org.apache.cayenne.project.ProjectConfigInfo;
 import org.apache.cayenne.project.ProjectConfigurator;
 import org.apache.cayenne.project.ProjectException;
 import org.apache.cayenne.util.Util;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 /**
  * A "cdeploy" Ant task providing an Ant frontend to
@@ -35,7 +36,7 @@
  * 
  * @author Andrus Adamchik
  */
-public class DeploymentConfigurator extends CayenneTask {
+public class DeploymentConfigurator extends Task {
 
     protected ProjectConfigInfo info;
 
@@ -55,7 +56,6 @@
      * Executes the task. It will be called by ant framework.
      */
     public void execute() throws BuildException {
-        configureLogging();
         
         validateAttributes();
 

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/ResourceLocator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/ResourceLocator.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/ResourceLocator.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/ResourceLocator.java Wed Aug 16 15:50:25 2006
@@ -29,11 +29,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
-import org.apache.cayenne.conf.Configuration;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Utility class to find resources (files, etc.), using a preconfigured strategy.
@@ -42,21 +39,7 @@
  */
 public class ResourceLocator {
 
-    private static Logger logObj;
-
-    // Create a Predicate that will enable logging only when
-    // Configuration.isLoggingConfigured() returns true.
-    // The passed predicate argument is ignored.
-    static {
-        Predicate p = new Predicate() {
-
-            public boolean evaluate(Object o) {
-                return Configuration.isLoggingConfigured();
-            }
-        };
-
-        logObj = new PredicateLogger(ResourceLocator.class, p);
-    }
+    private static Log logObj = LogFactory.getLog(ResourceLocator.class);
 
     // properties for enabling/disabling certain lookup strategies
     protected boolean skipAbsolutePath;
@@ -64,7 +47,7 @@
     protected boolean skipCurrentDirectory;
     protected boolean skipHomeDirectory;
 
-    // additional lookup paths (as Strings) 
+    // additional lookup paths (as Strings)
     protected List additionalClassPaths;
     protected List additionalFilesystemPaths;
 
@@ -520,81 +503,4 @@
             throw new IllegalArgumentException("Path '" + path + "' is not a directory.");
         }
     }
-
-    /**
-     * Custom logger that can be dynamically turned on/off by evaluating a Predicate.
-     */
-    protected static class PredicateLogger extends Logger {
-
-        private Logger _target;
-        private Predicate _predicate;
-
-        private PredicateLogger(String name) {
-            super(name);
-        }
-
-        public PredicateLogger(Class clazz, Predicate condition) {
-            this(clazz.getName(), condition);
-        }
-
-        public PredicateLogger(String name, Predicate condition) {
-            this(name);
-            _target = Logger.getLogger(name);
-            _predicate = condition;
-        }
-
-        public void debug(Object arg0, Throwable arg1) {
-            this.log(Level.DEBUG, arg0, arg1);
-        }
-
-        public void debug(Object arg0) {
-            this.log(Level.DEBUG, arg0);
-        }
-
-        public void info(Object arg0, Throwable arg1) {
-            this.log(Level.INFO, arg0, arg1);
-        }
-
-        public void info(Object arg0) {
-            this.log(Level.INFO, arg0);
-        }
-
-        public void warn(Object arg0, Throwable arg1) {
-            this.log(Level.WARN, arg0, arg1);
-        }
-
-        public void warn(Object arg0) {
-            this.log(Level.WARN, arg0);
-        }
-
-        public void error(Object arg0, Throwable arg1) {
-            this.log(Level.ERROR, arg0, arg1);
-        }
-
-        public void error(Object arg0) {
-            this.log(Level.ERROR, arg0);
-        }
-
-        public void fatal(Object arg0, Throwable arg1) {
-            this.log(Level.FATAL, arg0, arg1);
-        }
-
-        public void fatal(Object arg0) {
-            this.log(Level.FATAL, arg0);
-        }
-
-        public void log(Priority arg0, Object arg1, Throwable arg2) {
-            if (_predicate.evaluate(arg1)) {
-                _target.log(arg0, arg1);
-            }
-        }
-
-        public void log(Priority arg0, Object arg1) {
-            if (_predicate.evaluate(arg1)) {
-                _target.log(arg0, arg1);
-            }
-        }
-
-    }
-
 }

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/util/WebApplicationResourceLocator.java Wed Aug 16 15:50:25 2006
@@ -27,9 +27,8 @@
 
 import javax.servlet.ServletContext;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.log4j.Logger;
-import org.apache.cayenne.conf.Configuration;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A ResourceLocator that can find resources relative to web application context.
@@ -38,21 +37,7 @@
  */
 public class WebApplicationResourceLocator extends ResourceLocator {
 
-    private static Logger logObj;
-
-    // Create a Predicate that will enable logging only when
-    // Configuration.isLoggingConfigured() returns true.
-    // The passed predicate argument is ignored.
-    static {
-        Predicate p = new Predicate() {
-
-            public boolean evaluate(Object o) {
-                return Configuration.isLoggingConfigured();
-            }
-        };
-
-        logObj = new PredicateLogger(WebApplicationResourceLocator.class, p);
-    }
+    private static Log logObj = LogFactory.getLog(WebApplicationResourceLocator.class);
 
     protected ServletContext context;
     protected List additionalContextPaths;

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java Wed Aug 16 15:50:25 2006
@@ -21,7 +21,6 @@
 
 package org.apache.cayenne.wocompat.parser;
 
-import org.apache.log4j.Logger;
 import java.io.*;
 import java.util.*;
 import org.apache.cayenne.wocompat.PlistDataStructureFactory;
@@ -33,7 +32,6 @@
  * <a href="http://www.reportmill.com/">http://www.reportmill.com/</a></p>
  */
 public class Parser implements ParserConstants {
-    private static Logger logObj = Logger.getLogger(Parser.class);
 
     private PlistDataStructureFactory factory = new DefaultPlistDataStructureFactory();
 
@@ -66,7 +64,6 @@
             return object("");
         }
         catch (ParseException pe) {
-           logObj.info("Error parsing plist", pe);
            return null;
         }
     }

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj Wed Aug 16 15:50:25 2006
@@ -31,7 +31,6 @@
 
 package org.apache.cayenne.wocompat.parser;
 
-import org.apache.log4j.Logger;
 import java.io.*; 
 import java.util.*;
 import org.apache.cayenne.wocompat.PlistDataStructureFactory;
@@ -43,7 +42,6 @@
  * <a href="http://www.reportmill.com/">http://www.reportmill.com/</a></p>
  */
 public class Parser {
-    private static Logger logObj = Logger.getLogger(Parser.class);
     
     private PlistDataStructureFactory factory = new DefaultPlistDataStructureFactory();
     
@@ -76,7 +74,6 @@
             return object("");
         }
         catch (ParseException pe) {
-           logObj.info("Error parsing plist", pe);
            return null;
         }
     }

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java Wed Aug 16 15:50:25 2006
@@ -20,7 +20,6 @@
 
 
 package org.apache.cayenne.wocompat.parser;
-import org.apache.log4j.Logger;
 import java.io.*;
 import java.util.*;
 import org.apache.cayenne.wocompat.PlistDataStructureFactory;

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/CayenneExceptionTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/CayenneExceptionTst.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/CayenneExceptionTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/CayenneExceptionTst.java Wed Aug 16 15:50:25 2006
@@ -21,13 +21,10 @@
 
 import junit.framework.TestCase;
 
-import org.apache.log4j.Logger;
-
 /**
  * @author Andrus Adamchik
  */
 public class CayenneExceptionTst extends TestCase {
-    static final Logger logObj = Logger.getLogger(CayenneExceptionTst.class);
 
     public void testConstructor1() throws Exception {
         CayenneException ex = new CayenneException();

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/TranslationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/TranslationTestCase.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/TranslationTestCase.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/TranslationTestCase.java Wed Aug 16 15:50:25 2006
@@ -24,12 +24,8 @@
 
 import junit.framework.Assert;
 
-import org.apache.log4j.Logger;
-
 public class TranslationTestCase {
 
-    private static Logger logObj = Logger.getLogger(TranslationTestCase.class);
-
     protected Object tstObject;
     protected String sqlExp;
     protected String rootEntity;
@@ -65,7 +61,6 @@
 
         // strip column aliases
         String aliasSubstituted = trim("\\b\\w+\\.", translated);
-        logObj.warn(translated + " -> " + aliasSubstituted);
         Assert.assertEquals(
                 "Unexpected translation: " + translated + "....",
                 sqlExp,

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextExtrasTst.java Wed Aug 16 15:50:25 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import java.util.Collections;
@@ -25,8 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.art.Artist;
 import org.apache.art.Painting;
 import org.apache.cayenne.CayenneRuntimeException;
@@ -36,7 +33,6 @@
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.Persistent;
-import org.apache.cayenne.access.util.DefaultOperationObserver;
 import org.apache.cayenne.dba.JdbcAdapter;
 import org.apache.cayenne.dba.JdbcPkGenerator;
 import org.apache.cayenne.dba.PkGenerator;
@@ -232,10 +228,6 @@
 
         SQLTemplate q = new SQLTemplate(Artist.class, "SELECT * FROM NON_EXISTENT_TABLE");
 
-        // disable logging for thrown exceptions
-        Logger observerLogger = Logger.getLogger(DefaultOperationObserver.class);
-        Level oldLevel = observerLogger.getLevel();
-        observerLogger.setLevel(Level.ERROR);
         try {
             context.performGenericQuery(q);
             fail("Query was invalid and was supposed to fail.");
@@ -243,9 +235,7 @@
         catch (RuntimeException ex) {
             // exception expected
         }
-        finally {
-            observerLogger.setLevel(oldLevel);
-        }
+
     }
 
     public void testEntityResolver() {

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/DataContextSerializationTst.java Wed Aug 16 15:50:25 2006
@@ -19,10 +19,8 @@
 
 package org.apache.cayenne.access;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.apache.art.Artist;
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.conf.Configuration;
@@ -34,8 +32,6 @@
  */
 public class DataContextSerializationTst extends CayenneTestCase {
 
-    private static Logger logObj = Logger.getLogger(DataContextSerializationTst.class);
-
     protected void fixSharedConfiguration() {
         // for context to deserialize properly,
         // Configuration singleton must have the right default domain
@@ -148,12 +144,6 @@
         DataContext deserializedContext = (DataContext) Util
                 .cloneViaSerialization(context);
 
-        logObj.warn("registered domains: "
-                + new ArrayList(Configuration.getSharedConfiguration().getDomains()));
-        logObj.warn(" domains in question: "
-                + context.getParentDataDomain()
-                + "--"
-                + deserializedContext.getParentDataDomain());
         assertSame(context.getParentDataDomain(), deserializedContext
                 .getParentDataDomain());
 

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/ToManyListTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/ToManyListTst.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/ToManyListTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/ToManyListTst.java Wed Aug 16 15:50:25 2006
@@ -90,7 +90,6 @@
         assertTrue("List must be unresolved when removing an object...", list
                 .isFault());
         assertFalse(list.addedToUnresolved.contains(p1));
-        assertTrue(list.removedFromUnresolved.contains(p1));
 
         // now resolve
         int size = list.size();

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/trans/QualifierTranslatorTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/trans/QualifierTranslatorTst.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/trans/QualifierTranslatorTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/trans/QualifierTranslatorTst.java Wed Aug 16 15:50:25 2006
@@ -19,8 +19,8 @@
 
 package org.apache.cayenne.access.trans;
 
-import org.apache.log4j.Logger;
 import org.apache.art.Gallery;
+import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.ExpressionFactory;
@@ -37,8 +37,6 @@
 
 public class QualifierTranslatorTst extends CayenneTestCase {
 
-    private static Logger logObj = Logger.getLogger(QualifierTranslatorTst.class);
-
     protected TstQueryAssembler qa;
 
     protected void setUp() throws java.lang.Exception {
@@ -123,8 +121,7 @@
                     cases[i].assertTranslatedWell(translated);
                 }
                 catch (Exception ex) {
-                    logObj.error("Failed case: [" + i + "]: " + cases[i]);
-                    throw ex;
+                    throw new CayenneRuntimeException("Failed case: [" + i + "]: " + cases[i], ex);
                 }
             }
         }

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTst.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTst.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/access/util/DefaultOperationObserverTst.java Wed Aug 16 15:50:25 2006
@@ -17,11 +17,8 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access.util;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.unit.CayenneTestCase;
 
@@ -29,37 +26,22 @@
  * @author Andrus Adamchik
  */
 public class DefaultOperationObserverTst extends CayenneTestCase {
-	protected DefaultOperationObserver observer;
 
-	public void setUp() throws Exception {
-		observer = new DefaultOperationObserver();
-	}
-
-	public void testHasExceptions1() throws Exception {
-		Logger observerLogger = Logger.getLogger(DefaultOperationObserver.class);
-        Level oldLevel = observerLogger.getLevel();
-        observerLogger.setLevel(Level.ERROR);
-
-		try {
-			assertFalse(observer.hasExceptions());
-			observer.nextGlobalException(new Exception());
-			assertTrue(observer.hasExceptions());
-		} finally {
-			observerLogger.setLevel(oldLevel);
-		}
-	}
-
-	public void testHasExceptions2() throws Exception {
-		Logger observerLogger = Logger.getLogger(DefaultOperationObserver.class);
-        Level oldLevel = observerLogger.getLevel();
-        observerLogger.setLevel(Level.ERROR);
-
-		try {
-			assertFalse(observer.hasExceptions());
-			observer.nextQueryException(new SelectQuery(), new Exception());
-			assertTrue(observer.hasExceptions());
-		} finally {
-			observerLogger.setLevel(oldLevel);
-		}
-	}
+    protected DefaultOperationObserver observer;
+
+    public void setUp() throws Exception {
+        observer = new DefaultOperationObserver();
+    }
+
+    public void testHasExceptions1() throws Exception {
+        assertFalse(observer.hasExceptions());
+        observer.nextGlobalException(new Exception());
+        assertTrue(observer.hasExceptions());
+    }
+
+    public void testHasExceptions2() throws Exception {
+        assertFalse(observer.hasExceptions());
+        observer.nextQueryException(new SelectQuery(), new Exception());
+        assertTrue(observer.hasExceptions());
+    }
 }

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AbstractAccessStack.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AbstractAccessStack.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AbstractAccessStack.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AbstractAccessStack.java Wed Aug 16 15:50:25 2006
@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
@@ -43,6 +42,8 @@
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DerivedDbEntity;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Defines a set of algorithms useful for a generic AccessStack.
@@ -51,7 +52,7 @@
  */
 public abstract class AbstractAccessStack {
 
-    private static Logger logObj = Logger.getLogger(AbstractAccessStack.class);
+    private static Log logObj = LogFactory.getLog(AbstractAccessStack.class);
 
     // hardcoded dependent entities that should be excluded
     // if LOBs are not supported

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/AccessStackAdapter.java Wed Aug 16 15:50:25 2006
@@ -35,12 +35,13 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.Procedure;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Defines API and a common superclass for testing various database features. Different
@@ -52,7 +53,7 @@
  */
 public class AccessStackAdapter {
 
-    private static Logger logObj = Logger.getLogger(AccessStackAdapter.class);
+    private static Log logObj = LogFactory.getLog(AccessStackAdapter.class);
 
     protected DbAdapter adapter;
 

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/BasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/BasicTestCase.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/BasicTestCase.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/BasicTestCase.java Wed Aug 16 15:50:25 2006
@@ -23,8 +23,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.cayenne.conf.Configuration;
-
 /**
  * A test case that requires no DB access.
  * 
@@ -32,10 +30,6 @@
  * @author Andrus Adamchik
  */
 public abstract class BasicTestCase extends TestCase {
-
-    static {
-        Configuration.configureCommonLogging();
-    }
 
     /**
      * Returns directory that should be used by all test cases that perform file

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/CayenneTestResources.java Wed Aug 16 15:50:25 2006
@@ -26,16 +26,16 @@
 
 import javax.sql.DataSource;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.conf.Configuration;
 import org.apache.cayenne.conf.ConnectionProperties;
 import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.conn.PoolDataSource;
 import org.apache.cayenne.conn.PoolManager;
 import org.apache.cayenne.unit.util.SQLTemplateCustomizer;
 import org.apache.cayenne.util.Util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -50,7 +50,7 @@
 // TODO: switch to Spring
 public class CayenneTestResources implements BeanFactoryAware {
 
-    private static Logger logObj = Logger.getLogger(CayenneTestResources.class);
+    private static Log logObj = LogFactory.getLog(CayenneTestResources.class);
 
     public static final String TEST_RESOURCES_DESCRIPTOR = "spring-test-resources.xml";
 
@@ -66,7 +66,6 @@
     private static CayenneTestResources resources;
 
     static CayenneTestResources loadResources() {
-        Configuration.configureCommonLogging();
 
         InputStream in = Thread
                 .currentThread()

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/XMLDataSetFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/XMLDataSetFactory.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/XMLDataSetFactory.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4-core/src/test/java/org/apache/cayenne/unit/XMLDataSetFactory.java Wed Aug 16 15:50:25 2006
@@ -25,7 +25,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.query.ParameterizedQuery;
 import org.apache.cayenne.query.Query;
@@ -41,7 +40,7 @@
  */
 public class XMLDataSetFactory implements DataSetFactory {
 
-    private static Logger logObj = Logger.getLogger(XMLDataSetFactory.class);
+   
 
     protected String location;
     protected Map dataSets;
@@ -113,7 +112,6 @@
         }
 
         if (factory == null) {
-            logObj.error("DataSet resource not found: " + testCase.getName());
             throw new CayenneRuntimeException("DataSet resource not found: "
                     + testCase.getName());
         }

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.5-core/pom.xml Wed Aug 16 15:50:25 2006
@@ -15,8 +15,6 @@
 	limitations under the License.
 -->
 
-<!-- $Rev$ $Date$ -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -59,11 +57,6 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
 		</dependency>
 
 		<dependency>

Modified: incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java Wed Aug 16 15:50:25 2006
@@ -73,11 +73,7 @@
     public CjpaPersistenceProvider(boolean validateDescriptors) {
         super(validateDescriptors);
 
-        // hookup Cayenne logging...
-        Configuration.configureCommonLogging();
-
         this.logger = LogFactory.getLog(getClass());
-
         this.configuration = new LazyConfiguration();
 
         // set a singleton that may be used by Cayenne

Modified: incubator/cayenne/main/trunk/modeler/dvmodeler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/dvmodeler/pom.xml?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/dvmodeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/dvmodeler/pom.xml Wed Aug 16 15:50:25 2006
@@ -37,21 +37,6 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>ant</groupId>
-			<artifactId>ant</artifactId>
-		</dependency>
-
-		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 		</dependency>

Modified: incubator/cayenne/main/trunk/modeler/modeler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/pom.xml?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/pom.xml Wed Aug 16 15:50:25 2006
@@ -15,8 +15,6 @@
 	limitations under the License.
 -->
 
-<!-- $Rev$ $Date$ -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -38,21 +36,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>ant</groupId>
-			<artifactId>ant</artifactId>
 		</dependency>
 
 		<dependency>

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/FileClassLoadingService.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/FileClassLoadingService.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/FileClassLoadingService.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/FileClassLoadingService.java Wed Aug 16 15:50:25 2006
@@ -29,8 +29,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 /**
  * A default implementation of ClassLoadingService used in CayenneModeler.
  * 
@@ -39,8 +37,6 @@
  */
 public class FileClassLoadingService implements ClassLoadingService {
 
-    private static Logger logObj = Logger.getLogger(FileClassLoadingService.class);
-
     private FileClassLoader classLoader;
     protected List pathFiles;
 
@@ -95,13 +91,11 @@
                 classLoader.addURL(file.toURL());
             }
             catch (MalformedURLException ex) {
-                logObj.warn("Invalid classpath entry, ignoring: " + file);
                 return;
             }
         }
 
         pathFiles.add(file);
-        logObj.debug("Added CLASSPATH entry...: " + file.getAbsolutePath());
     }
 
     private synchronized FileClassLoader nonNullClassLoader() {

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/Main.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/Main.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/Main.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/Main.java Wed Aug 16 15:50:25 2006
@@ -29,12 +29,10 @@
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
 import org.apache.cayenne.conf.Configuration;
 import org.apache.cayenne.project.CayenneUserDir;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
 import com.jgoodies.looks.plastic.PlasticTheme;
@@ -47,7 +45,7 @@
  */
 public class Main {
 
-    private static Logger logObj = Logger.getLogger(Main.class);
+    private static Log logObj = LogFactory.getLog(Main.class);
 
     /**
      * Main method that starts the CayenneModeler.
@@ -128,9 +126,7 @@
      * Configures Log4J appenders to perform logging to $HOME/.cayenne/modeler.log.
      */
     protected void configureLogging() {
-        // read default Cayenne log configuration
-        Configuration.configureCommonLogging();
-
+ 
         // get preferences
         ModelerPreferences prefs = ModelerPreferences.getPreferences();
 
@@ -160,7 +156,6 @@
                         }
 
                         if (!logfile.createNewFile()) {
-                            logObj.warn("Can't create log file, ignoring.");
                             return;
                         }
                     }
@@ -168,20 +163,8 @@
                     // remember working path
                     prefs.setProperty(ModelerPreferences.EDITOR_LOGFILE, logfilePath);
 
-                    // replace appenders to just log to a file.
-                    Logger p1 = logObj;
-                    Logger p2 = null;
-                    while ((p2 = (Logger) p1.getParent()) != null) {
-                        p1 = p2;
-                    }
-
-                    Layout layout = new PatternLayout(
-                            "CayenneModeler %-5p [%t %d{MM-dd HH:mm:ss}] %c: %m%n");
-                    p1.removeAllAppenders();
-                    p1.addAppender(new FileAppender(
-                            layout,
-                            logfile.getCanonicalPath(),
-                            true));
+                    // TODO: andrus, 8/16/2006 - redirect STDOUT and STDERR to file??
+                    // TODO: andrus, 8/16/2006 - use Java logging API with comons-logging
                 }
             }
             catch (IOException ioex) {

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java Wed Aug 16 15:50:25 2006
@@ -24,9 +24,10 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.collections.ExtendedProperties;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.project.CayenneUserDir;
+import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * ModelerPreferences class supports persistent user preferences. Preferences are saved in
@@ -37,7 +38,7 @@
  */
 public class ModelerPreferences extends ExtendedProperties {
 
-    private static final Logger logObj = Logger.getLogger(ModelerPreferences.class);
+    private static final Log logObj = LogFactory.getLog(ModelerPreferences.class);
 
     /** Name of the preferences file. */
     public static final String PREFERENCES_NAME = "modeler.preferences";

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java Wed Aug 16 15:50:25 2006
@@ -34,7 +34,6 @@
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.map.DataMap;
@@ -73,6 +72,8 @@
 import org.apache.cayenne.project.Project;
 import org.apache.cayenne.property.PropertyUtils;
 import org.apache.cayenne.query.Query;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Panel displaying Cayenne project as a tree.
@@ -83,7 +84,7 @@
         DbEntityDisplayListener, QueryListener, QueryDisplayListener, ProcedureListener,
         ProcedureDisplayListener {
 
-    private static final Logger logObj = Logger.getLogger(ProjectTreeView.class);
+    private static final Log logObj = LogFactory.getLog(ProjectTreeView.class);
 
     protected ProjectController mediator;
     protected TreeSelectionListener treeSelectionListener;

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java Wed Aug 16 15:50:25 2006
@@ -26,7 +26,6 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.MapLoader;
@@ -36,6 +35,8 @@
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.apache.cayenne.project.NamedObjectFactory;
 import org.apache.cayenne.util.ResourceLocator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Modeler action that imports a DataMap into a project from an arbitrary location.
@@ -45,7 +46,7 @@
  */
 public class ImportDataMapAction extends CayenneAction {
 
-    private static Logger logObj = Logger.getLogger(ImportDataMapAction.class);
+    private static Log logObj = LogFactory.getLog(ImportDataMapAction.class);
 
     public static String getActionName() {
         return "Import DataMap";

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java Wed Aug 16 15:50:25 2006
@@ -33,8 +33,6 @@
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.conf.DriverDataSourceFactory;
@@ -61,6 +59,9 @@
 import org.apache.cayenne.project.ProjectPath;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.wocompat.EOModelProcessor;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Action handler for WebObjects EOModel import function.
@@ -69,7 +70,7 @@
  */
 public class ImportEOModelAction extends CayenneAction {
 
-    private static final Logger logObj = Logger.getLogger(ImportEOModelAction.class);
+    private static Log logObj = LogFactory.getLog(ImportEOModelAction.class);
 
     public static String getActionName() {
         return "Import EOModel";

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java Wed Aug 16 15:50:25 2006
@@ -27,7 +27,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.conf.Configuration;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
@@ -35,13 +34,15 @@
 import org.apache.cayenne.project.Project;
 import org.apache.cayenne.project.ProjectException;
 import org.apache.cayenne.swing.control.FileMenuItem;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @author Andrus Adamchik
  */
 public class OpenProjectAction extends ProjectAction {
 
-    private static Logger logObj = Logger.getLogger(OpenProjectAction.class);
+    private static Log logObj = LogFactory.getLog(OpenProjectAction.class);
 
     protected ProjectOpener fileChooser;
 

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java Wed Aug 16 15:50:25 2006
@@ -25,7 +25,6 @@
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.conf.Configuration;
 import org.apache.cayenne.modeler.Application;
@@ -35,6 +34,8 @@
 import org.apache.cayenne.project.DataMapProject;
 import org.apache.cayenne.project.Project;
 import org.apache.cayenne.project.ProjectFile;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * File chooser panel used to select a directory to store project files.
@@ -43,7 +44,7 @@
  */
 class ProjectOpener extends JFileChooser {
 
-    private static final Logger logObj = Logger.getLogger(ProjectOpener.class);
+    private static Log logObj = LogFactory.getLog(ProjectOpener.class);
 
     /**
      * Selects a directory to store the project.

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/CacheSyncConfigController.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/CacheSyncConfigController.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/CacheSyncConfigController.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/datadomain/CacheSyncConfigController.java Wed Aug 16 15:50:25 2006
@@ -22,11 +22,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataRowStore;
 import org.apache.cayenne.map.event.DomainEvent;
 import org.apache.cayenne.modeler.ProjectController;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.scopemvc.controller.basic.BasicController;
 import org.scopemvc.core.Control;
 import org.scopemvc.core.ControlException;
@@ -47,7 +48,7 @@
 public class CacheSyncConfigController extends BasicController implements
         ModelChangeListener {
 
-    private static Logger logObj = Logger.getLogger(CacheSyncConfigController.class);
+    private static Log logObj = LogFactory.getLog(CacheSyncConfigController.class);
 
     // using strings instead of the actioal factory classes, since we
     // JMS and JavaGroups libraries may not be around, and Modeler

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java Wed Aug 16 15:50:25 2006
@@ -29,7 +29,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DbLoader;
@@ -47,6 +46,8 @@
 import org.apache.cayenne.modeler.util.LongRunningTask;
 import org.apache.cayenne.project.NamedObjectFactory;
 import org.apache.cayenne.util.Util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Stateful helper class that encapsulates access to DbLoader.
@@ -55,7 +56,7 @@
  */
 public class DbLoaderHelper {
 
-    private static final Logger logObj = Logger.getLogger(DbLoaderHelper.class);
+    private static Log logObj = LogFactory.getLog(DbLoaderHelper.class);
 
     // TODO: this is a temp hack... need to delegate to DbAdapter, or configurable in
     // preferences...

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoController.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoController.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoController.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoController.java Wed Aug 16 15:50:25 2006
@@ -21,7 +21,6 @@
 
 import java.util.Collection;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.ObjRelationship;
@@ -39,8 +38,6 @@
  * @author Andrus Adamchik
  */
 public class ObjRelationshipInfoController extends BasicController {
-
-    static final Logger logObj = Logger.getLogger(ObjRelationshipInfoController.class);
 
     public static final String SAVE_CONTROL = "cayenne.modeler.mapObjRelationship.save.button";
     public static final String CANCEL_CONTROL = "cayenne.modeler.mapObjRelationship.cancel.button";

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoDialog.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoDialog.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoDialog.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoDialog.java Wed Aug 16 15:50:25 2006
@@ -31,7 +31,6 @@
 import javax.swing.JTable;
 import javax.swing.table.TableCellEditor;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.scopemvc.core.Selector;
 import org.scopemvc.view.swing.SAction;
@@ -57,7 +56,6 @@
  * @author Andrus Adamchik
  */
 public class ObjRelationshipInfoDialog extends SPanel {
-    static final Logger logObj = Logger.getLogger(ObjRelationshipInfoDialog.class);
 
     protected STable pathTable;
 

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java Wed Aug 16 15:50:25 2006
@@ -25,7 +25,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
@@ -43,28 +42,25 @@
 import org.scopemvc.model.collection.ListModel;
 
 /**
- * A Scope model for mapping an ObjRelationship to one or 
- * more DbRelationships.
+ * A Scope model for mapping an ObjRelationship to one or more DbRelationships.
  * 
  * @since 1.1
  * @author Andrus Adamchik
  */
 public class ObjRelationshipInfoModel extends BasicModel {
-    static final Logger logObj = Logger.getLogger(ObjRelationshipInfoModel.class);
 
-
-    public static final Selector DB_RELATIONSHIP_PATH_SELECTOR =
-        Selector.fromString("dbRelationshipPath");
-    public static final Selector SOURCE_ENTITY_NAME_SELECTOR =
-        Selector.fromString("relationship.sourceEntity.name");
-    public static final Selector SELECTED_PATH_COMPONENT_SELECTOR =
-        Selector.fromString("selectedPathComponent");
-    public static final Selector OBJECT_TARGET_SELECTOR =
-        Selector.fromString("objectTarget");
-    public static final Selector OBJECT_TARGETS_SELECTOR =
-        Selector.fromString("objectTargets");
-    public static final Selector RELATIONSHIP_NAME_SELECTOR =
-        Selector.fromString("relationshipName");
+    public static final Selector DB_RELATIONSHIP_PATH_SELECTOR = Selector
+            .fromString("dbRelationshipPath");
+    public static final Selector SOURCE_ENTITY_NAME_SELECTOR = Selector
+            .fromString("relationship.sourceEntity.name");
+    public static final Selector SELECTED_PATH_COMPONENT_SELECTOR = Selector
+            .fromString("selectedPathComponent");
+    public static final Selector OBJECT_TARGET_SELECTOR = Selector
+            .fromString("objectTarget");
+    public static final Selector OBJECT_TARGETS_SELECTOR = Selector
+            .fromString("objectTargets");
+    public static final Selector RELATIONSHIP_NAME_SELECTOR = Selector
+            .fromString("relationshipName");
 
     protected ObjRelationship relationship;
     protected ListModel dbRelationshipPath;
@@ -73,9 +69,7 @@
     protected List objectTargets;
     protected String relationshipName;
 
-    public ObjRelationshipInfoModel(
-        ObjRelationship relationship,
-        Collection objEntities) {
+    public ObjRelationshipInfoModel(ObjRelationship relationship, Collection objEntities) {
 
         this.relationship = relationship;
         this.relationshipName = relationship.getName();
@@ -95,7 +89,7 @@
         Collections.sort(objectTargets, Comparators.getNamedObjectComparator());
 
         // validate -
-        // current limitation is that an ObjRelationship must have source 
+        // current limitation is that an ObjRelationship must have source
         // and target entities present, with DbEntities chosen.
         validateCanMap();
 
@@ -130,8 +124,8 @@
             this.selectedPathComponent = selectedPathComponent;
             listenNewSubmodel(SELECTED_PATH_COMPONENT_SELECTOR);
             fireModelChange(
-                ModelChangeTypes.VALUE_CHANGED,
-                SELECTED_PATH_COMPONENT_SELECTOR);
+                    ModelChangeTypes.VALUE_CHANGED,
+                    SELECTED_PATH_COMPONENT_SELECTOR);
         }
     }
 
@@ -142,8 +136,8 @@
         return objectTarget;
     }
 
-    /** 
-     * Sets a new target 
+    /**
+     * Sets a new target
      */
     public void setObjectTarget(ObjEntity objectTarget) {
         if (this.objectTarget != objectTarget) {
@@ -152,12 +146,10 @@
             listenNewSubmodel(OBJECT_TARGET_SELECTOR);
             fireModelChange(ModelChangeTypes.VALUE_CHANGED, OBJECT_TARGET_SELECTOR);
 
-            // change the list of relationships 
+            // change the list of relationships
             breakChain(-1);
             connectEnds();
-            fireModelChange(
-                ModelChangeTypes.VALUE_CHANGED,
-                DB_RELATIONSHIP_PATH_SELECTOR);
+            fireModelChange(ModelChangeTypes.VALUE_CHANGED, DB_RELATIONSHIP_PATH_SELECTOR);
         }
     }
 
@@ -202,7 +194,7 @@
 
         // connect the ends
         connectEnds();
-        
+
         // must fire with null selector, or refresh won't happen
         dbRelationshipPath.fireModelChange(VALUE_CHANGED, null);
     }
@@ -218,8 +210,8 @@
                 if (oldPath.size() == dbRelationshipPath.size()) {
                     boolean hasChanges = false;
                     for (int i = 0; i < oldPath.size(); i++) {
-                        EntityRelationshipsModel next =
-                            (EntityRelationshipsModel) dbRelationshipPath.get(i);
+                        EntityRelationshipsModel next = (EntityRelationshipsModel) dbRelationshipPath
+                                .get(i);
                         if (oldPath.get(i) != next.getSelectedRelationship()) {
                             hasChanges = true;
                             break;
@@ -271,15 +263,15 @@
         }
     }
 
-    // Connects last selected DbRelationship in the path to the 
+    // Connects last selected DbRelationship in the path to the
     // last DbEntity, creating a dummy relationship if needed.
     private void connectEnds() {
         Relationship last = null;
 
         int size = dbRelationshipPath.size();
         if (size > 0) {
-            EntityRelationshipsModel wrapper =
-                (EntityRelationshipsModel) dbRelationshipPath.get(size - 1);
+            EntityRelationshipsModel wrapper = (EntityRelationshipsModel) dbRelationshipPath
+                    .get(size - 1);
             last = wrapper.getSelectedRelationship();
 
         }
@@ -293,10 +285,9 @@
             Relationship anyConnector = source.getAnyRelationship(target);
             EntityRelationshipsModel connector = null;
 
-            connector =
-                (anyConnector == null)
-                    ? new EntityRelationshipsModel(source, getEndEntity())
-                    : new EntityRelationshipsModel(anyConnector);
+            connector = (anyConnector == null) ? new EntityRelationshipsModel(
+                    source,
+                    getEndEntity()) : new EntityRelationshipsModel(anyConnector);
 
             dbRelationshipPath.makeActive(false);
             try {
@@ -310,19 +301,23 @@
 
     private void validateCanMap() {
         if (relationship.getSourceEntity() == null) {
-            throw new CayenneRuntimeException("Can't map relationship without source entity.");
+            throw new CayenneRuntimeException(
+                    "Can't map relationship without source entity.");
         }
 
         if (relationship.getTargetEntity() == null) {
-            throw new CayenneRuntimeException("Can't map relationship without target entity.");
+            throw new CayenneRuntimeException(
+                    "Can't map relationship without target entity.");
         }
 
         if (getStartEntity() == null) {
-            throw new CayenneRuntimeException("Can't map relationship without source DbEntity.");
+            throw new CayenneRuntimeException(
+                    "Can't map relationship without source DbEntity.");
         }
 
         if (getEndEntity() == null) {
-            throw new CayenneRuntimeException("Can't map relationship without target DbEntity.");
+            throw new CayenneRuntimeException(
+                    "Can't map relationship without target DbEntity.");
         }
     }
 

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java Wed Aug 16 15:50:25 2006
@@ -22,7 +22,6 @@
 
 import javax.swing.JFrame;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.map.Attribute;
@@ -35,6 +34,8 @@
 import org.apache.cayenne.project.ProjectPath;
 import org.apache.cayenne.project.validator.ValidationInfo;
 import org.apache.cayenne.query.Query;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /** 
  * Superclass of CayenneModeler validation messages.
@@ -43,7 +44,7 @@
  * @author Andrus Adamchik
  */
 public abstract class ValidationDisplayHandler {
-    private static Logger logObj = Logger.getLogger(ValidationDisplayHandler.class);
+    private static Log logObj = LogFactory.getLog(ValidationDisplayHandler.class);
 
     public static final int NO_ERROR = ValidationInfo.VALID;
     public static final int WARNING = ValidationInfo.WARNING;

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java Wed Aug 16 15:50:25 2006
@@ -23,7 +23,6 @@
 import java.util.Collections;
 import java.util.Comparator;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.dba.TypesMapping;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
@@ -51,7 +50,6 @@
     static final int DB_ATTRIBUTE_TYPE = 3;
     static final int LOCKING = 4;
 
-    static final Logger logObj = Logger.getLogger(ObjAttributeTableModel.class);
 
     protected ObjEntity entity;
     protected DbEntity dbEntity;

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java Wed Aug 16 15:50:25 2006
@@ -43,7 +43,6 @@
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableColumn;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DeleteRule;
 import org.apache.cayenne.map.Entity;
@@ -69,6 +68,8 @@
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
 import org.apache.cayenne.util.CayenneMapEntry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Displays ObjRelationships for the edited ObjEntity.
@@ -79,7 +80,7 @@
 public class ObjEntityRelationshipTab extends JPanel implements ObjEntityDisplayListener,
         ObjEntityListener, ObjRelationshipListener, ExistingSelectionProcessor {
 
-    private static final Logger logObj = Logger.getLogger(ObjEntityRelationshipTab.class);
+    private static Log logObj = LogFactory.getLog(ObjEntityRelationshipTab.class);
 
     private static final Object[] deleteRules = new Object[] {
             DeleteRule.deleteRuleName(DeleteRule.NO_ACTION),

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java Wed Aug 16 15:50:25 2006
@@ -34,7 +34,6 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.event.QueryEvent;
 import org.apache.cayenne.modeler.ProjectController;
@@ -44,6 +43,8 @@
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.QueryMetadata;
 import org.apache.cayenne.validation.ValidationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A panel that supports editing the properties of a GenericSelectQuery.
@@ -52,7 +53,7 @@
  */
 public abstract class SelectPropertiesPanel extends JPanel {
 
-    private static final Logger logObj = Logger.getLogger(SelectPropertiesPanel.class);
+    private static Log logObj = LogFactory.getLog(SelectPropertiesPanel.class);
 
     private static final Integer ZERO = new Integer(0);
 

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java Wed Aug 16 15:50:25 2006
@@ -35,12 +35,13 @@
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.FSPath;
 import org.apache.cayenne.pref.Domain;
 import org.apache.cayenne.swing.BoundComponent;
 import org.apache.cayenne.util.Util;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A superclass of CayenneModeler controllers.
@@ -49,7 +50,7 @@
  */
 public abstract class CayenneController implements BoundComponent {
 
-    private static final Logger logObj = Logger.getLogger(CayenneController.class);
+    private static Log logObj = LogFactory.getLog(CayenneController.class);
 
     protected CayenneController parent;
     protected Application application;

Modified: incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java (original)
+++ incubator/cayenne/main/trunk/modeler/modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java Wed Aug 16 15:50:25 2006
@@ -27,8 +27,9 @@
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A base class for monitoring progress of long running tasks. It can runshowing the exact
@@ -44,7 +45,7 @@
  */
 public abstract class LongRunningTask {
 
-    private static final Logger logObj = Logger.getLogger(LongRunningTask.class);
+    private static Log logObj = LogFactory.getLog(LongRunningTask.class);
 
     protected static final int DEFAULT_MS_TO_DECIDE_TO_POPUP = 500;
 

Modified: incubator/cayenne/main/trunk/other/cayenne-regression-profiler/src/main/java/org/apache/cayenne/profile/TestDataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/other/cayenne-regression-profiler/src/main/java/org/apache/cayenne/profile/TestDataSourceFactory.java?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/other/cayenne-regression-profiler/src/main/java/org/apache/cayenne/profile/TestDataSourceFactory.java (original)
+++ incubator/cayenne/main/trunk/other/cayenne-regression-profiler/src/main/java/org/apache/cayenne/profile/TestDataSourceFactory.java Wed Aug 16 15:50:25 2006
@@ -23,7 +23,6 @@
 import org.apache.cayenne.conf.DataSourceFactory;
 import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.conn.PoolManager;
-import org.apache.log4j.Level;
 
 /**
  * A DataSourceFactory that loads connection info from connection properties, the same way
@@ -58,31 +57,24 @@
                     + connectionSet
                     + "' is not configured");
         }
-        
+
         String minPool = System.getProperty(CONNECTION_POOL_MIN_SIZE_PROPERTY);
-        if(minPool != null) {
+        if (minPool != null) {
             dsi.setMinConnections(Integer.parseInt(minPool));
         }
-        
+
         String maxPool = System.getProperty(CONNECTION_POOL_MAX_SIZE_PROPERTY);
-        if(maxPool != null) {
+        if (maxPool != null) {
             dsi.setMaxConnections(Integer.parseInt(maxPool));
         }
-        
-        if(dsi.getMinConnections() > dsi.getMaxConnections()) {
+
+        if (dsi.getMinConnections() > dsi.getMaxConnections()) {
             dsi.setMaxConnections(dsi.getMinConnections());
         }
 
         return new PoolManager(dsi.getJdbcDriver(), dsi.getDataSourceUrl(), dsi
                 .getMinConnections(), dsi.getMaxConnections(), dsi.getUserName(), dsi
                 .getPassword());
-    }
-
-    /**
-     * @deprecated since 1.2 super is deprecated
-     */
-    public DataSource getDataSource(String location, Level logLevel) throws Exception {
-        return getDataSource(location);
     }
 
     public void initializeWithParentConfiguration(Configuration conf) {

Modified: incubator/cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/pom.xml?rev=432060&r1=432059&r2=432060&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/pom.xml (original)
+++ incubator/cayenne/main/trunk/pom.xml Wed Aug 16 15:50:25 2006
@@ -252,7 +252,29 @@
 			<dependency>
 				<groupId>commons-logging</groupId>
 				<artifactId>commons-logging</artifactId>
-				<version>1.0.4</version>
+				<version>1.1</version>
+				<exclusions>
+					<exclusion>
+						<groupId>log4j</groupId>
+						<artifactId>log4j</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>logkit</groupId>
+						<artifactId>logkit</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>avalon-framework</groupId>
+						<artifactId>avalon-framework</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 
 			<dependency>
@@ -365,12 +387,6 @@
 			</dependency>
 
 			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.8</version>
-			</dependency>
-
-			<dependency>
 				<groupId>mockrunner</groupId>
 				<artifactId>mockrunner</artifactId>
 				<version>0.3.7</version>
@@ -618,9 +634,6 @@
 							http://jakarta.apache.org/commons/pool/apidocs/
 						</link>
 						<link>http://www.junit.org/junit/javadoc/</link>
-						<link>
-							http://logging.apache.org/log4j/docs/api/
-						</link>
 						<link>
 							http://jakarta.apache.org/regexp/apidocs/
 						</link>



Mime
View raw message