svn commit: r1585088 - in /cayenne/main/trunk/cayenne-server/src: main/java/org/apache/cayenne/map/MapLoader.java test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java

[aa...@apache.org]

Author: aadamchik
Date: Sat Apr  5 12:53:26 2014
New Revision: 1585088

URL: http://svn.apache.org/r1585088
Log:
cleanup

* unused logger
* typos in var names

Modified:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java?rev=1585088&r1=1585087&r2=1585088&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java Sat Apr  5 12:53:26 2014
@@ -27,8 +27,6 @@ import org.apache.cayenne.CayenneRuntime
 import org.apache.cayenne.dba.TypesMapping;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -45,8 +43,6 @@ public class MapLoader extends DefaultHa
     final static String _1_2_PACKAGE_PREFIX = "org.objectstyle.cayenne.";
     final static String _2_0_PACKAGE_PREFIX = "org.apache.cayenne.";
 
-    private static Log logger = LogFactory.getLog(MapLoader.class);
-
     public static final String DATA_MAP_TAG = "data-map";
     public static final String PROPERTY_TAG = "property";
 

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java?rev=1585088&r1=1585087&r2=1585088&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java Sat Apr  5 12:53:26 2014
@@ -68,10 +68,11 @@ public class SchemaBuilder {
 
     public static final String SKIP_SCHEMA_KEY = "cayenne.test.schema.skip";
 
-    private static String[] DATA_MAPS_REQUIREING_SCHEMA_SETUP = { "tstmap.map.xml", "people.map.xml",
-            "locking.map.xml", "relationships.map.xml", "relationships1.map.xml", "multi-tier.map.xml", "generic.map.xml", "map-db1.map.xml",
-            "map-db2.map.xml", "embeddable.map.xml", "qualified.map.xml", "quoted-identifiers.map.xml",
-            "inheritance-single-table1.map.xml", "inheritance-vertical.map.xml", "oneway-rels.map.xml" };
+    private static String[] MAPS_REQUIRING_SCHEMA_SETUP = { "tstmap.map.xml", "people.map.xml",
+            "locking.map.xml", "relationships.map.xml", "relationships1.map.xml", "multi-tier.map.xml",
+            "generic.map.xml", "map-db1.map.xml", "map-db2.map.xml", "embeddable.map.xml", "qualified.map.xml",
+            "quoted-identifiers.map.xml", "inheritance-single-table1.map.xml", "inheritance-vertical.map.xml",
+            "oneway-rels.map.xml" };
 
     // hardcoded dependent entities that should be excluded
     // if LOBs are not supported
@@ -104,15 +105,14 @@ public class SchemaBuilder {
 
         // generate schema combining all DataMaps that require schema support.
         // Schema generation is done like that instead of per DataMap on demand
-        // to avoid
-        // conflicts when dropping and generating PK objects.
+        // to avoid conflicts when dropping and generating PK objects.
 
-        DataMap[] maps = new DataMap[DATA_MAPS_REQUIREING_SCHEMA_SETUP.length];
+        DataMap[] maps = new DataMap[MAPS_REQUIRING_SCHEMA_SETUP.length];
 
         for (int i = 0; i < maps.length; i++) {
-            InputStream stream = getClass().getClassLoader().getResourceAsStream(DATA_MAPS_REQUIREING_SCHEMA_SETUP[i]);
+            InputStream stream = getClass().getClassLoader().getResourceAsStream(MAPS_REQUIRING_SCHEMA_SETUP[i]);
             InputSource in = new InputSource(stream);
-            in.setSystemId(DATA_MAPS_REQUIREING_SCHEMA_SETUP[i]);
+            in.setSystemId(MAPS_REQUIRING_SCHEMA_SETUP[i]);
             maps[i] = new MapLoader().loadDataMap(in);
         }