updated logging, jsonp support, misc changes

nethi · Nov 22, 2011 · 8a127bb · 8a127bb
1 parent 1e80fd2
commit 8a127bb
Show file tree

Hide file tree

Showing 160 changed files with 1,564 additions and 761 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -212,6 +212,12 @@
 			<groupId>org.apache.cassandra</groupId>
 			<artifactId>cassandra-all</artifactId>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cassandra</groupId>
@@ -238,14 +244,22 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
@@ -270,6 +284,12 @@
 			<artifactId>commons-beanutils</artifactId>
 			<type>jar</type>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
@@ -310,6 +330,12 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

diff --git a/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java b/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
@@ -18,7 +18,8 @@
  ******************************************************************************/
 package org.usergrid.clustering.hazelcast;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.Instance;
@@ -30,7 +31,7 @@
 public class HazelcastLifecycleMonitor implements InstanceListener,
 		MembershipListener {
 
-	private static final Logger logger = Logger
+	private static final Logger logger = LoggerFactory
 			.getLogger(HazelcastLifecycleMonitor.class);
 
 	public HazelcastLifecycleMonitor() {

diff --git a/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java b/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
@@ -22,10 +22,11 @@
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
 import org.scale7.networking.utility.NetworkAlgorithms;
 import org.scale7.zookeeper.cages.ZkSessionManager;
 import org.scale7.zookeeper.cages.ZkWriteLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.locking.LockManager;
 import org.usergrid.locking.LockPathBuilder;
 import org.usergrid.locking.exception.UGLockException;
@@ -82,7 +83,7 @@ public UGReentranLock getCreateLockInternal(String lockPath) {
 		return lock;
 	}
 
-	protected static final Logger logger = Logger
+	protected static final Logger logger = LoggerFactory
 			.getLogger(ZooKeeperLockManagerImpl.class);
 
 	/**

diff --git a/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java b/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
@@ -42,16 +42,17 @@
 import me.prettyprint.hector.api.beans.HColumn;
 import me.prettyprint.hector.api.mutation.Mutator;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ser.ArraySerializers.ByteArraySerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.mq.Message;
 import org.usergrid.mq.Queue;
 import org.usergrid.utils.ConversionUtils;
 import org.usergrid.utils.JsonUtils;
 
 public class CassandraMQUtils {
 
-	public static final Logger logger = Logger
+	public static final Logger logger = LoggerFactory
 			.getLogger(CassandraMQUtils.class);
 
 	public static final StringSerializer se = new StringSerializer();
@@ -62,7 +63,7 @@ public class CassandraMQUtils {
 	public static final LongSerializer le = new LongSerializer();
 
 	/** Logger for batch operations */
-	private static final Logger batch_logger = Logger
+	private static final Logger batch_logger = LoggerFactory
 			.getLogger(CassandraMQUtils.class.getPackage().getName() + ".BATCH");
 
 	public static void logBatchOperation(String operation, Object columnFamily,

diff --git a/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java b/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
@@ -26,15 +26,16 @@
 import me.prettyprint.cassandra.serializers.StringSerializer;
 import me.prettyprint.cassandra.serializers.UUIDSerializer;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ser.ArraySerializers.ByteArraySerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.mq.QueueManager;
 import org.usergrid.mq.QueueManagerFactory;
 import org.usergrid.persistence.cassandra.CassandraService;
 
 public class QueueManagerFactoryImpl implements QueueManagerFactory {
 
-	public static final Logger logger = Logger
+	public static final Logger logger = LoggerFactory
 			.getLogger(QueueManagerFactoryImpl.class);
 
 	public static String IMPLEMENTATION_DESCRIPTION = "Cassandra Queue Manager Factory 1.0";

diff --git a/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java b/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
@@ -106,8 +106,9 @@
 import me.prettyprint.hector.api.query.SliceCounterQuery;
 import me.prettyprint.hector.api.query.SliceQuery;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ser.ArraySerializers.ByteArraySerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.mq.Message;
 import org.usergrid.mq.Queue;
 import org.usergrid.mq.QueueManager;
@@ -136,7 +137,7 @@
 
 public class QueueManagerImpl implements QueueManager {
 
-	public static final Logger logger = Logger
+	public static final Logger logger = LoggerFactory
 			.getLogger(QueueManagerImpl.class);
 
 	public static final String DICTIONARY_SUBSCRIBER_INDEXES = "subscriber_indexes";

diff --git a/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java b/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
@@ -94,6 +94,7 @@ public void setValues(List<AggregateCounter> values) {
 		this.values = values;
 	}
 
+	@JsonSerialize(include = Inclusion.NON_NULL)
 	public UUID getQueue() {
 		return queue;
 	}

diff --git a/core/src/main/java/org/usergrid/persistence/CounterQuery.java b/core/src/main/java/org/usergrid/persistence/CounterQuery.java
@@ -29,13 +29,14 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Query.CounterFilterPredicate;
 import org.usergrid.utils.JsonUtils;
 
 public class CounterQuery {
 
-	public static final Logger logger = Logger.getLogger(CounterQuery.class);
+	public static final Logger logger = LoggerFactory.getLogger(CounterQuery.class);
 
 	public static final int DEFAULT_MAX_RESULTS = 10;
 

diff --git a/core/src/main/java/org/usergrid/persistence/EntityFactory.java b/core/src/main/java/org/usergrid/persistence/EntityFactory.java
@@ -20,15 +20,16 @@
 
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A factory for creating Entity objects.
  */
 public class EntityFactory {
 
 	/** The Constant logger. */
-	private static final Logger logger = Logger.getLogger(EntityFactory.class);
+	private static final Logger logger = LoggerFactory.getLogger(EntityFactory.class);
 
 	/**
 	 * New entity.

diff --git a/core/src/main/java/org/usergrid/persistence/Query.java b/core/src/main/java/org/usergrid/persistence/Query.java
@@ -51,15 +51,16 @@
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CommonTokenStream;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.Results.Level;
 import org.usergrid.persistence.query.QueryFilterLexer;
 import org.usergrid.persistence.query.QueryFilterParser;
 import org.usergrid.utils.JsonUtils;
 
 public class Query {
 
-	private static final Logger logger = Logger.getLogger(Query.class);
+	private static final Logger logger = LoggerFactory.getLogger(Query.class);
 
 	public static final int DEFAULT_LIMIT = 10;
 

diff --git a/core/src/main/java/org/usergrid/persistence/Schema.java b/core/src/main/java/org/usergrid/persistence/Schema.java
@@ -50,7 +50,8 @@
 
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.reflect.FieldUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
@@ -84,7 +85,7 @@
  */
 public class Schema {
 
-	private static final Logger logger = Logger.getLogger(Schema.class);
+	private static final Logger logger = LoggerFactory.getLogger(Schema.class);
 
 	public static final String SCAN_PATH = "org/usergrid/persistence/entities";
 	public static final String ENTITIES_PACKAGE = "org.usergrid.persistence.entities";

diff --git a/core/src/main/java/org/usergrid/persistence/cassandra/CassandraIndexedQueries.java b/core/src/main/java/org/usergrid/persistence/cassandra/CassandraIndexedQueries.java
@@ -19,8 +19,8 @@
 package org.usergrid.persistence.cassandra;
 
 import static me.prettyprint.hector.api.factory.HFactory.createIndexedSlicesQuery;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
 import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
+import static org.usergrid.persistence.Schema.PROPERTY_UUID;
 import static org.usergrid.utils.ConversionUtils.bytebuffer;
 
 import java.nio.ByteBuffer;
@@ -40,14 +40,15 @@
 import me.prettyprint.hector.api.beans.Row;
 import me.prettyprint.hector.api.query.QueryResult;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.persistence.DynamicEntity;
 import org.usergrid.persistence.Entity;
 import org.usergrid.persistence.Schema;
 
 public class CassandraIndexedQueries {
 
-	private static final Logger logger = Logger
+	private static final Logger logger = LoggerFactory
 			.getLogger(CassandraIndexedQueries.class);
 
 	public static final StringSerializer se = new StringSerializer();
@@ -98,7 +99,8 @@ public static List<Entity> findEntities(Keyspace ko, String entityType,
 		q.setRange(null, null, false, count);
 		// q.setColumnNames(PROPERTY_ID);
 		if ((propertyNames == null) || (propertyNames.length == 0)) {
-			propertyNames = Schema.getDefaultSchema().getAllPropertyNamesAsArray();
+			propertyNames = Schema.getDefaultSchema()
+					.getAllPropertyNamesAsArray();
 		}
 		q.setColumnNames(propertyNames);
 		q.addEqualsExpression(PROPERTY_TYPE, bytebuffer(entityType));
@@ -272,8 +274,8 @@ public static List<Entity> searchEntities(Keyspace ko, String entityType,
 		List<Entity> results = new ArrayList<Entity>();
 
 		doSearchEntityIndex(ko, entityType, null, results, propertyName,
-				propertyValue,
-				Schema.getDefaultSchema().getPropertyNamesAsArray(entityType));
+				propertyValue, Schema.getDefaultSchema()
+						.getPropertyNamesAsArray(entityType));
 
 		return results;
 	}

diff --git a/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java b/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
@@ -39,6 +39,7 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,15 +57,17 @@
 import me.prettyprint.hector.api.ddl.ColumnDefinition;
 import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition;
 import me.prettyprint.hector.api.ddl.ComparatorType;
+import me.prettyprint.hector.api.ddl.KeyspaceDefinition;
 import me.prettyprint.hector.api.factory.HFactory;
 import me.prettyprint.hector.api.mutation.MutationResult;
 import me.prettyprint.hector.api.mutation.Mutator;
 
 import org.apache.cassandra.thrift.ColumnDef;
 import org.apache.cassandra.thrift.IndexType;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.utils.JsonUtils;
 
 /**
@@ -73,11 +76,11 @@
  */
 public class CassandraPersistenceUtils {
 
-	private static final Logger logger = Logger
+	private static final Logger logger = LoggerFactory
 			.getLogger(CassandraPersistenceUtils.class);
 
 	/** Logger for batch operations */
-	private static final Logger batch_logger = Logger
+	private static final Logger batch_logger = LoggerFactory
 			.getLogger(CassandraPersistenceUtils.class.getPackage().getName()
 					+ ".BATCH");
 
@@ -476,4 +479,17 @@ public static List<ColumnFamilyDefinition> getCfDefs(
 		return cf_defs;
 	}
 
+	public static void validateKeyspace(CFEnum[] cf_enums,
+			KeyspaceDefinition ksDef) {
+		Map<String, ColumnFamilyDefinition> cfs = new HashMap<String, ColumnFamilyDefinition>();
+		for (ColumnFamilyDefinition cf : ksDef.getCfDefs()) {
+			cfs.put(cf.getName(), cf);
+		}
+		for (CFEnum c : cf_enums) {
+			if (!cfs.keySet().contains(c.getColumnFamily())) {
+
+			}
+		}
+	}
+
 }
diff --git a/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java b/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
@@ -68,8 +68,9 @@
 import me.prettyprint.hector.api.query.RangeSlicesQuery;
 import me.prettyprint.hector.api.query.SliceQuery;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ser.ArraySerializers.ByteArraySerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.usergrid.locking.LockManager;
 import org.usergrid.utils.JsonUtils;
 
@@ -97,10 +98,10 @@ public class CassandraService {
 	public static final UUID MANAGEMENT_APPLICATION_ID = new UUID(0, 1);
 	public static final UUID DEFAULT_APPLICATION_ID = new UUID(0, 16);
 
-	private static final Logger logger = Logger
+	private static final Logger logger = LoggerFactory
 			.getLogger(CassandraService.class);
 
-	private static final Logger db_logger = Logger
+	private static final Logger db_logger = LoggerFactory
 			.getLogger(CassandraService.class.getPackage().getName() + ".DB");
 
 	Cluster cluster;
@@ -126,7 +127,7 @@ public CassandraService(Properties properties, Cluster cluster,
 		this.cluster = cluster;
 		chc = cassandraHostConfigurator;
 		this.lockManager = lockManager;
-		db_logger.info(cluster.getKnownPoolHosts(false));
+		db_logger.info("" + cluster.getKnownPoolHosts(false));
 	}
 
 	public void init() throws Exception {