gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject git commit: GORA-351 Multiple Slf4j logging implementations in parent pom.xml
Date Thu, 26 Jun 2014 23:34:14 GMT
Repository: gora
Updated Branches:
  refs/heads/master da19993d2 -> 3c30e6166


GORA-351 Multiple Slf4j logging implementations in parent pom.xml


Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/3c30e616
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/3c30e616
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/3c30e616

Branch: refs/heads/master
Commit: 3c30e6166d4f2c897cfe67eec23c7f52e21fe3b0
Parents: da19993
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Thu Jun 26 16:33:45 2014 -0700
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Thu Jun 26 16:33:45 2014 -0700

----------------------------------------------------------------------
 .../gora/cassandra/store/CassandraClient.java   |  1 -
 .../apache/gora/mongodb/store/MongoStore.java   |  6 +++--
 gora-solr/pom.xml                               |  1 -
 .../org/apache/gora/solr/store/SolrStore.java   |  4 +++
 pom.xml                                         | 26 +++++++++++++++-----
 5 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/3c30e616/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
----------------------------------------------------------------------
diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
index 50ec240..3df6517 100644
--- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
+++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
@@ -54,7 +54,6 @@ import org.apache.gora.cassandra.serializers.GoraSerializerTypeInferer;
 import org.apache.gora.mapreduce.GoraRecordReader;
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.gora.query.Query;
-import org.apache.gora.store.DataStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/gora/blob/3c30e616/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoStore.java
----------------------------------------------------------------------
diff --git a/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoStore.java b/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoStore.java
index f160b78..c2b6b35 100644
--- a/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoStore.java
+++ b/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoStore.java
@@ -635,6 +635,7 @@ public class MongoStore<K, T extends PersistentBase> extends
     return result;
   }
 
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   private Object fromMongoRecord(final Schema fieldSchema, final String docf,
       final DBObject rec) {
     Object result;
@@ -680,7 +681,7 @@ public class MongoStore<K, T extends PersistentBase> extends
           "item", new BSONDecorator(new BasicDBObject("item", item)));
       rlist.add(o);
     }
-    return new DirtyListWrapper(rlist);
+    return new DirtyListWrapper<Object>(rlist);
   }
 
   private Object fromMongoMap(final String docf, final Schema fieldSchema,
@@ -699,7 +700,7 @@ public class MongoStore<K, T extends PersistentBase> extends
           new BSONDecorator(map));
       rmap.put(new Utf8(decodedMapKey), o);
     }
-    return new DirtyMapWrapper(rmap);
+    return new DirtyMapWrapper<Utf8, Object>(rmap);
   }
 
   private Object fromMongoString(final DocumentFieldType storeType,
@@ -790,6 +791,7 @@ public class MongoStore<K, T extends PersistentBase> extends
     return result;
   }
 
+  @SuppressWarnings("unchecked")
   private Object toDBObject(final String docf, final Schema fieldSchema,
       final Type fieldType, final DocumentFieldType storeType,
       final Object value) {

http://git-wip-us.apache.org/repos/asf/gora/blob/3c30e616/gora-solr/pom.xml
----------------------------------------------------------------------
diff --git a/gora-solr/pom.xml b/gora-solr/pom.xml
index 7ea5db1..a2a3a76 100644
--- a/gora-solr/pom.xml
+++ b/gora-solr/pom.xml
@@ -65,7 +65,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>${maven-jar-plugin.version}</version>
         <executions>
           <execution>
             <goals>

http://git-wip-us.apache.org/repos/asf/gora/blob/3c30e616/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
----------------------------------------------------------------------
diff --git a/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java b/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
index 0b8fe4d..bee3d43 100644
--- a/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
+++ b/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
@@ -273,6 +273,10 @@ public class SolrStore<K, T extends PersistentBase> extends DataStoreBase<K,
T>
           }
           break;
         }
+        LOG.warn("Check that 'keyClass' and 'name' parameters in gora-solr-mapping.xml "
+            + "match with intended values. A mapping mismatch has been found therefore "
+            + "no mapping has been initialized for class mapping at position " 
+            + classes.indexOf(classElement) + " in mapping file.");
       }
     } catch (Exception ex) {
       throw new IOException(ex);

http://git-wip-us.apache.org/repos/asf/gora/blob/3c30e616/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a799001..68e13e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,8 +404,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-            </plugin>
+                </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -596,7 +595,7 @@
         <module>gora-accumulo</module>
         <module>gora-cassandra</module>
         <module>gora-hbase</module>
-        <!--module>gora-lucene</module-->
+        <!-- module>gora-lucene</module -->
         <!--module>gora-dynamodb</module-->
         <!--module>gora-sql</module-->
         <module>gora-mongodb</module>
@@ -625,8 +624,6 @@
         <lucene-solr.version>4.8.1</lucene-solr.version>
         <solr-solrj.version>4.8.1</solr-solrj.version>
         <jetty.version>8.1.8.v20121106</jetty.version>
-        <slf4j.version>1.6.6</slf4j.version>
-        <log4j.version>1.2.16</log4j.version>
         <tika.version>1.5</tika.version>
         <httpcomponents.version>4.2.3</httpcomponents.version>
         <commons-io.version>1.3.2</commons-io.version>
@@ -640,8 +637,8 @@
         <mysql.version>5.1.18</mysql.version>
         <xerces.version>2.9.1</xerces.version>
         <!-- Logging Dependencies -->
-        <slf4j.version>1.5.8</slf4j.version>
         <log4j.version>1.2.16</log4j.version>
+        <slf4j.version>1.6.6</slf4j.version>
 
         <!-- Testing Dependencies -->
         <junit.version>4.10</junit.version>
@@ -1222,6 +1219,23 @@
               <artifactId>randomizedtesting-runner</artifactId>
               <version>2.0.10</version>
             </dependency>
+            
+            <!-- Lucene Dependencies -->
+            <dependency>
+              <groupId>org.apache.lucene</groupId>
+              <artifactId>lucene-core</artifactId>
+              <version>${lucene-solr.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.lucene</groupId>
+              <artifactId>lucene-analyzers-common</artifactId>
+              <version>${lucene-solr.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.lucene</groupId>
+              <artifactId>lucene-queries</artifactId>
+              <version>${lucene-solr.version}</version>
+            </dependency>
               
             <!-- Amazon Dependencies -->
             <dependency>


Mime
View raw message