cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r885090 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration: CayenneModule.java XMLDataChannelLoader.java
Date Sat, 28 Nov 2009 12:40:45 GMT
Author: aadamchik
Date: Sat Nov 28 12:40:45 2009
New Revision: 885090

URL: http://svn.apache.org/viewvc?rev=885090&view=rev
Log:
CAY-1319 Switch Cayenne configuration loading to cayenne-di container

* code cleanup

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelLoader.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java?rev=885090&r1=885089&r2=885090&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/CayenneModule.java
Sat Nov 28 12:40:45 2009
@@ -46,6 +46,7 @@
                 RuntimeProperties.CAYENNE_RUNTIME_NAME,
                 runtimeName);
 
+        // configure various services
         binder.bind(DataChannelLoader.class).to(XMLDataChannelLoader.class).in(
                 Scopes.SINGLETON);
         binder.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class).in(

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelLoader.java?rev=885090&r1=885089&r2=885090&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelLoader.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelLoader.java
Sat Nov 28 12:40:45 2009
@@ -43,10 +43,6 @@
     @Inject
     private ResourceLocator resourceLocator;
 
-    public XMLDataChannelLoader() {
-
-    }
-
     protected String getResourceName(String runtimeName) {
         if (runtimeName == null) {
             throw new NullPointerException("Null rumtimeName");
@@ -100,9 +96,9 @@
                 }
             }
             catch (IOException ioex) {
-                logger.info(String.format(
-                        "failure closing input stream for %s, ignoring",
-                        configurationURL), ioex);
+                logger.info("failure closing input stream for "
+                        + configurationURL
+                        + ", ignoring", ioex);
             }
         }
 



Mime
View raw message