usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [01/26] Adding source code to the old Usergrid Java SDK v0.0.3 and removing all jars from our source code directories.
Date Mon, 25 Aug 2014 17:43:11 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/master 83fb154e0 -> aa85022ae


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/AggregateCounterSet.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/AggregateCounterSet.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/AggregateCounterSet.java
new file mode 100644
index 0000000..a6eab88
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/AggregateCounterSet.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.response;
+
+import static org.usergrid.java.client.utils.JsonUtils.toJsonString;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
+public class AggregateCounterSet {
+	private String name;
+	private UUID user;
+	private UUID group;
+	private UUID queue;
+	private String category;
+	private List<AggregateCounter> values;
+
+	public AggregateCounterSet(String name, UUID user, UUID group,
+			String category, List<AggregateCounter> values) {
+		this.name = name;
+		this.user = user;
+		this.group = group;
+		this.category = category;
+		this.values = values;
+	}
+
+	public AggregateCounterSet(String name, UUID queue, String category,
+			List<AggregateCounter> values) {
+		this.name = name;
+		setQueue(queue);
+		this.category = category;
+		this.values = values;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getUser() {
+		return user;
+	}
+
+	public void setUser(UUID user) {
+		this.user = user;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getGroup() {
+		return group;
+	}
+
+	public void setGroup(UUID group) {
+		this.group = group;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<AggregateCounter> getValues() {
+		return values;
+	}
+
+	public void setValues(List<AggregateCounter> values) {
+		this.values = values;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getQueue() {
+		return queue;
+	}
+
+	public void setQueue(UUID queue) {
+		this.queue = queue;
+	}
+
+	@Override
+	public String toString() {
+		return toJsonString(this);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ApiResponse.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ApiResponse.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ApiResponse.java
new file mode 100644
index 0000000..507d662
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ApiResponse.java
@@ -0,0 +1,422 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.response;
+
+import static org.usergrid.java.client.utils.JsonUtils.toJsonString;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.annotate.JsonAnyGetter;
+import org.codehaus.jackson.annotate.JsonAnySetter;
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import org.usergrid.java.client.entities.Entity;
+import org.usergrid.java.client.entities.Message;
+import org.usergrid.java.client.entities.User;
+
+public class ApiResponse {
+
+	private String accessToken;
+
+	private String error;
+	private String errorDescription;
+	private String errorUri;
+	private String exception;
+
+	private String path;
+	private String uri;
+	private String status;
+	private long timestamp;
+	private UUID application;
+	private List<Entity> entities;
+	private UUID next;
+	private String cursor;
+	private String action;
+	private List<Object> list;
+	private Object data;
+	private Map<String, UUID> applications;
+	private Map<String, JsonNode> metadata;
+	private Map<String, List<String>> params;
+	private List<AggregateCounterSet> counters;
+	private ClientCredentialsInfo credentials;
+
+	private List<Message> messages;
+	private List<QueueInfo> queues;
+	private UUID last;
+	private UUID queue;
+	private UUID consumer;
+
+	private User user;
+
+	private final Map<String, JsonNode> properties = new HashMap<String, JsonNode>();
+
+	public ApiResponse() {
+	}
+
+	@JsonAnyGetter
+	public Map<String, JsonNode> getProperties() {
+		return properties;
+	}
+
+	@JsonAnySetter
+	public void setProperty(String key, JsonNode value) {
+		properties.put(key, value);
+	}
+
+	@JsonProperty("access_token")
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getAccessToken() {
+		return accessToken;
+	}
+
+	@JsonProperty("access_token")
+	public void setAccessToken(String accessToken) {
+		this.accessToken = accessToken;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getError() {
+		return error;
+	}
+
+	public void setError(String error) {
+		this.error = error;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	@JsonProperty("error_description")
+	public String getErrorDescription() {
+		return errorDescription;
+	}
+
+	@JsonProperty("error_description")
+	public void setErrorDescription(String errorDescription) {
+		this.errorDescription = errorDescription;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	@JsonProperty("error_uri")
+	public String getErrorUri() {
+		return errorUri;
+	}
+
+	@JsonProperty("error_uri")
+	public void setErrorUri(String errorUri) {
+		this.errorUri = errorUri;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getException() {
+		return exception;
+	}
+
+	public void setException(String exception) {
+		this.exception = exception;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getUri() {
+		return uri;
+	}
+
+	public void setUri(String uri) {
+		this.uri = uri;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getApplication() {
+		return application;
+	}
+
+	public void setApplication(UUID application) {
+		this.application = application;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<Entity> getEntities() {
+		return entities;
+	}
+
+	public void setEntities(List<Entity> entities) {
+		this.entities = entities;
+	}
+
+	public int getEntityCount() {
+		if (entities == null) {
+			return 0;
+		}
+		return entities.size();
+	}
+
+	public Entity getFirstEntity() {
+		if ((entities != null) && (entities.size() > 0)) {
+			return entities.get(0);
+		}
+		return null;
+	}
+
+	public <T extends Entity> T getFirstEntity(Class<T> t) {
+		return Entity.toType(getFirstEntity(), t);
+	}
+
+	public Entity getLastEntity() {
+		if ((entities != null) && (entities.size() > 0)) {
+			return entities.get(entities.size() - 1);
+		}
+		return null;
+	}
+
+	public <T extends Entity> T getLastEntity(Class<T> t) {
+		return Entity.toType(getLastEntity(), t);
+	}
+
+	public <T extends Entity> List<T> getEntities(Class<T> t) {
+		return Entity.toType(entities, t);
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getNext() {
+		return next;
+	}
+
+	public void setNext(UUID next) {
+		this.next = next;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getCursor() {
+		return cursor;
+	}
+
+	public void setCursor(String cursor) {
+		this.cursor = cursor;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public String getAction() {
+		return action;
+	}
+
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<Object> getList() {
+		return list;
+	}
+
+	public void setList(List<Object> list) {
+		this.list = list;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public Object getData() {
+		return data;
+	}
+
+	public void setData(Object data) {
+		this.data = data;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public Map<String, UUID> getApplications() {
+		return applications;
+	}
+
+	public void setApplications(Map<String, UUID> applications) {
+		this.applications = applications;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public Map<String, JsonNode> getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Map<String, JsonNode> metadata) {
+		this.metadata = metadata;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public Map<String, List<String>> getParams() {
+		return params;
+	}
+
+	public void setParams(Map<String, List<String>> params) {
+		this.params = params;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<AggregateCounterSet> getCounters() {
+		return counters;
+	}
+
+	public void setCounters(List<AggregateCounterSet> counters) {
+		this.counters = counters;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public ClientCredentialsInfo getCredentials() {
+		return credentials;
+	}
+
+	public void setCredentials(ClientCredentialsInfo credentials) {
+		this.credentials = credentials;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+	@Override
+	public String toString() {
+		return toJsonString(this);
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<Message> getMessages() {
+		return messages;
+	}
+
+	public void setMessages(List<Message> messages) {
+		this.messages = messages;
+	}
+
+	@JsonIgnore
+	public int getMessageCount() {
+		if (messages == null) {
+			return 0;
+		}
+		return messages.size();
+	}
+
+	@JsonIgnore
+	public Message getFirstMessage() {
+		if ((messages != null) && (messages.size() > 0)) {
+			return messages.get(0);
+		}
+		return null;
+	}
+
+	@JsonIgnore
+	public Entity getLastMessage() {
+		if ((messages != null) && (messages.size() > 0)) {
+			return messages.get(messages.size() - 1);
+		}
+		return null;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getLast() {
+		return last;
+	}
+
+	public void setLast(UUID last) {
+		this.last = last;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public List<QueueInfo> getQueues() {
+		return queues;
+	}
+
+	public void setQueues(List<QueueInfo> queues) {
+		this.queues = queues;
+	}
+
+	@JsonIgnore
+	public QueueInfo getFirstQueue() {
+		if ((queues != null) && (queues.size() > 0)) {
+			return queues.get(0);
+		}
+		return null;
+	}
+
+	@JsonIgnore
+	public QueueInfo getLastQueue() {
+		if ((queues != null) && (queues.size() > 0)) {
+			return queues.get(queues.size() - 1);
+		}
+		return null;
+	}
+
+	@JsonIgnore
+	public UUID getLastQueueId() {
+		QueueInfo q = getLastQueue();
+		if (q != null) {
+			return q.getQueue();
+		}
+		return null;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getQueue() {
+		return queue;
+	}
+
+	public void setQueue(UUID queue) {
+		this.queue = queue;
+	}
+
+	@JsonSerialize(include = Inclusion.NON_NULL)
+	public UUID getConsumer() {
+		return consumer;
+	}
+
+	public void setConsumer(UUID consumer) {
+		this.consumer = consumer;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ClientCredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ClientCredentialsInfo.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ClientCredentialsInfo.java
new file mode 100644
index 0000000..b0d5f65
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/ClientCredentialsInfo.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.response;
+
+import static org.usergrid.java.client.utils.JsonUtils.toJsonString;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class ClientCredentialsInfo {
+
+	private String id;
+	private String secret;
+
+	public ClientCredentialsInfo(String id, String secret) {
+		this.id = id;
+		this.secret = secret;
+	}
+
+	@JsonProperty("client_id")
+	public String getId() {
+		return id;
+	}
+
+	@JsonProperty("client_id")
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	@JsonProperty("client_secret")
+	public String getSecret() {
+		return secret;
+	}
+
+	@JsonProperty("client_secret")
+	public void setSecret(String secret) {
+		this.secret = secret;
+	}
+
+	@Override
+	public String toString() {
+		return toJsonString(this);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/QueueInfo.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/QueueInfo.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/QueueInfo.java
new file mode 100644
index 0000000..20920d8
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/response/QueueInfo.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.response;
+
+import java.util.UUID;
+
+public class QueueInfo {
+
+	String path;
+	UUID queue;
+
+	public QueueInfo() {
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public UUID getQueue() {
+		return queue;
+	}
+
+	public void setQueue(UUID queue) {
+		this.queue = queue;
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/JsonUtils.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/JsonUtils.java
new file mode 100644
index 0000000..8197f8f
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/JsonUtils.java
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.utils;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.UUID;
+
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.node.JsonNodeFactory;
+import org.usergrid.java.client.exception.ClientException;
+
+public class JsonUtils {
+
+
+	static ObjectMapper mapper = new ObjectMapper();
+
+	public static String getStringProperty(Map<String, JsonNode> properties,
+			String name) {
+		JsonNode value = properties.get(name);
+		if (value != null) {
+			return value.asText();
+		}
+		return null;
+	}
+
+	public static void setStringProperty(Map<String, JsonNode> properties,
+			String name, String value) {
+		if (value == null) {
+			properties.remove(name);
+		} else {
+			properties.put(name, JsonNodeFactory.instance.textNode(value));
+		}
+	}
+
+	public static Long getLongProperty(Map<String, JsonNode> properties,
+			String name) {
+		JsonNode value = properties.get(name);
+		if (value != null) {
+			return value.asLong(0);
+		}
+		return null;
+	}
+
+	public static void setLongProperty(Map<String, JsonNode> properties,
+			String name, Long value) {
+		if (value == null) {
+			properties.remove(name);
+		} else {
+			properties.put(name, JsonNodeFactory.instance.numberNode(value));
+		}
+	}
+
+	public static void setFloatProperty(Map<String, JsonNode> properties, String name, Float value){
+	    if(value == null){
+	        properties.remove(name);
+	    }else{
+	        properties.put(name, JsonNodeFactory.instance.numberNode(value));
+	    }
+	}
+	
+	public static Boolean getBooleanProperty(Map<String, JsonNode> properties,
+			String name) {
+		JsonNode value = properties.get(name);
+		if (value != null) {
+			return value.asBoolean();
+		}
+		return false;
+	}
+
+	public static void setBooleanProperty(Map<String, JsonNode> properties,
+			String name, Boolean value) {
+		if (value == null) {
+			properties.remove(name);
+		} else {
+			properties.put(name, JsonNodeFactory.instance.booleanNode(value));
+		}
+	}
+
+	public static UUID getUUIDProperty(Map<String, JsonNode> properties,
+			String name) {
+		JsonNode value = properties.get(name);
+		if (value != null) {
+			UUID uuid = null;
+			try {
+				uuid = UUID.fromString(value.asText());
+			} catch (Exception e) {
+			}
+			return uuid;
+		}
+		return null;
+	}
+
+	public static void setUUIDProperty(Map<String, JsonNode> properties,
+			String name, UUID value) {
+		if (value == null) {
+			properties.remove(name);
+		} else {
+			properties.put(name,
+					JsonNodeFactory.instance.textNode(value.toString()));
+		}
+	}
+
+	public static String toJsonString(Object obj) {
+		try {
+			return mapper.writeValueAsString(obj);
+		} catch (JsonGenerationException e) {
+			throw new ClientException("Unable to generate json", e);
+		} catch (JsonMappingException e) {
+		    throw new ClientException("Unable to map json", e);
+		} catch (IOException e) {
+		    throw new ClientException("IO error", e);
+		}
+	}
+
+	public static <T> T parse(String json, Class<T> c) {
+		try {
+			return mapper.readValue(json, c);
+		} catch (JsonGenerationException e) {
+            throw new ClientException("Unable to generate json", e);
+        } catch (JsonMappingException e) {
+            throw new ClientException("Unable to map json", e);
+        } catch (IOException e) {
+            throw new ClientException("IO error", e);
+        }
+	}
+
+	public static JsonNode toJsonNode(Object obj) {
+		return mapper.convertValue(obj, JsonNode.class);
+	}
+
+	public static <T> T fromJsonNode(JsonNode json, Class<T> c) {
+		try {
+			return mapper.readValue(json, c);
+		} catch (JsonGenerationException e) {
+            throw new ClientException("Unable to generate json", e);
+        } catch (JsonMappingException e) {
+            throw new ClientException("Unable to map json", e);
+        } catch (IOException e) {
+            throw new ClientException("IO error", e);
+        }
+	}
+
+	public static <T> T getObjectProperty(Map<String, JsonNode> properties,
+			String name, Class<T> c) {
+		JsonNode value = properties.get(name);
+		if (value != null) {
+			return fromJsonNode(value, c);
+		}
+		return null;
+	}
+
+	public static void setObjectProperty(Map<String, JsonNode> properties,
+			String name, Object value) {
+		if (value == null) {
+			properties.remove(name);
+		} else {
+			properties.put(name,
+					JsonNodeFactory.instance.textNode(value.toString()));
+		}
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/MapUtils.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/MapUtils.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/MapUtils.java
new file mode 100644
index 0000000..1ed5fe0
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/MapUtils.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.utils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MapUtils {
+
+	public static <T> Map<String, T> newMapWithoutKeys(Map<String, T> map,
+			List<String> keys) {
+		Map<String, T> newMap = null;
+		if (map != null) {
+			newMap = new HashMap<String, T>(map);
+		} else {
+			newMap = new HashMap<String, T>();
+		}
+		for (String key : keys) {
+			newMap.remove(key);
+		}
+		return newMap;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/ObjectUtils.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/ObjectUtils.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/ObjectUtils.java
new file mode 100644
index 0000000..67749ab
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/ObjectUtils.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.utils;
+
+import java.util.Map;
+
+public class ObjectUtils {
+
+	public static boolean isEmpty(Object s) {
+		if (s == null) {
+			return true;
+		}
+		if ((s instanceof String) && (((String) s).trim().length() == 0)) {
+			return true;
+		}
+		if (s instanceof Map) {
+			return ((Map<?, ?>) s).isEmpty();
+		}
+		return false;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/UrlUtils.java
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/UrlUtils.java b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/UrlUtils.java
new file mode 100644
index 0000000..dc1ecbb
--- /dev/null
+++ b/stack/java-sdk-old/src/main/java/org/usergrid/java/client/utils/UrlUtils.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.usergrid.java.client.utils;
+
+import static java.net.URLEncoder.encode;
+import static org.usergrid.java.client.utils.ObjectUtils.isEmpty;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.usergrid.java.client.exception.ClientException;
+
+public class UrlUtils {
+
+   
+    public static URL url(String s) {
+        try {
+            return new URL(s);
+        } catch (MalformedURLException e) {
+            throw new ClientException("Incorrect URL format", e);
+        }
+    }
+
+    public static URL url(URL u, String s) {
+        try {
+            return new URL(u, s);
+        } catch (MalformedURLException e) {
+            throw new ClientException("Incorrect URL format", e);
+        }
+    }
+
+    public static String path(Object... segments) {
+        String path = "";
+        boolean first = true;
+        for (Object segment : segments) {
+            if (segment instanceof Object[]) {
+                segment = path((Object[]) segment);
+            }
+            if (!isEmpty(segment)) {
+                if (first) {
+                    path = segment.toString();
+                    first = false;
+                } else {
+                    if (!path.endsWith("/")) {
+                        path += "/";
+                    }
+                    path += segment.toString();
+                }
+            }
+        }
+        return path;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static String encodeParams(Map<String, Object> params) {
+        if (params == null) {
+            return "";
+        }
+        boolean first = true;
+        StringBuilder results = new StringBuilder();
+        for (Entry<String, Object> entry : params.entrySet()) {
+            if (entry.getValue() instanceof List) {
+                for (Object o : (List) entry.getValue()) {
+                    if (!isEmpty(o)) {
+                        if (!first) {
+                            results.append('&');
+                        }
+                        first = false;
+                        results.append(entry.getKey());
+                        results.append("=");
+                        try {
+                            results.append(encode(o.toString(), "UTF-8"));
+                        } catch (UnsupportedEncodingException e) {
+                            throw new ClientException("Unknown encoding", e);
+                        }
+                    }
+                }
+            } else if (!isEmpty(entry.getValue())) {
+                if (!first) {
+                    results.append('&');
+                }
+                first = false;
+                results.append(entry.getKey());
+                results.append("=");
+                try {
+                    results.append(encode(entry.getValue().toString(), "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    throw new ClientException("Unsupported string encoding", e);
+                }
+            }
+        }
+        return results.toString();
+    }
+
+    public static String addQueryParams(String url, Map<String, Object> params) {
+        if (params == null) {
+            return url;
+        }
+        if (!url.contains("?")) {
+            url += "?";
+        }
+        url += encodeParams(params);
+        return url;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.jar b/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.jar
deleted file mode 100644
index 9b35e94..0000000
Binary files a/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.pom b/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.pom
deleted file mode 100644
index 684d623..0000000
--- a/stack/m2/repository/com/apple/AppleJavaExtensions/1.5.4/AppleJavaExtensions-1.5.4.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.apple</groupId>
-  <artifactId>AppleJavaExtensions</artifactId>
-  <version>1.5.4</version>
-  <description>POM was created from install:install-file</description>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml b/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml
deleted file mode 100644
index f4855bd..0000000
--- a/stack/m2/repository/com/apple/AppleJavaExtensions/maven-metadata-local.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metadata>
-  <groupId>com.apple</groupId>
-  <artifactId>AppleJavaExtensions</artifactId>
-  <versioning>
-    <release>1.5.4</release>
-    <versions>
-      <version>1.5.4</version>
-    </versions>
-    <lastUpdated>20140302191835</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar b/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar
deleted file mode 100644
index 03460d7..0000000
Binary files a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom b/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom
deleted file mode 100644
index 00b06b5..0000000
--- a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>net.tanesha.recaptcha4j</groupId>
-  <artifactId>recaptcha4j</artifactId>
-  <version>0.0.8</version>
-  <description>POM was created from install:install-file</description>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml b/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml
deleted file mode 100644
index 02932e8..0000000
--- a/stack/m2/repository/net/tanesha/recaptcha4j/recaptcha4j/maven-metadata-local.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metadata>
-  <groupId>net.tanesha.recaptcha4j</groupId>
-  <artifactId>recaptcha4j</artifactId>
-  <versioning>
-    <release>0.0.8</release>
-    <versions>
-      <version>0.0.8</version>
-    </versions>
-    <lastUpdated>20140422214610</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar b/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar
deleted file mode 100644
index 142fa24..0000000
Binary files a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.lastUpdated
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.lastUpdated b/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.lastUpdated
deleted file mode 100644
index 2c1610e..0000000
--- a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.lastUpdated
+++ /dev/null
@@ -1,5 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Thu Feb 06 17:53:51 EST 2014
-http\://repo.maven.apache.org/maven2/.lastUpdated=1391727231651
-https\://usergrid-maven.s3.amazonaws.com/dependencies/.lastUpdated=1391727228444
-https\://usergrid-maven.s3.amazonaws.com/dependencies/.error=

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.sha1
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.sha1 b/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.sha1
deleted file mode 100644
index 2e95784..0000000
--- a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50c2262025dd244593d2e48b6452ec94821d420f
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom b/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom
deleted file mode 100644
index e197af8..0000000
--- a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom
+++ /dev/null
@@ -1,87 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<bundle.symbolicName>org.usergrid</bundle.symbolicName>
-		<bundle.namespace>org.usergrid</bundle.namespace>
-		<spring-java-version>1.0.0.M4</spring-java-version>
-		<jackson-version>1.9.2</jackson-version>
-	</properties>
-	
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
-	</parent>
-	
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.usergrid</groupId>
-	<artifactId>usergrid-java-client</artifactId>
-	<version>0.0.3</version>
-	<packaging>jar</packaging>
-	<description>A simple java client for usergrid</description>
-	<url>https://github.com/apigee/usergrid-stack-internal</url>
-	
-	<licenses>
-		<license>
-			<name>The Apache Software License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<developers>
-		<developer>
-			<id>eanuff</id>
-			<name>Ed Anuff</name>
-		</developer>
-		<developer>
-			<id>tnine</id>
-			<name>Todd Nine</name>
-		</developer>
-	</developers>
-	<dependencies>
-		<!-- <dependency> <groupId>com.google.android</groupId> <artifactId>android</artifactId> 
-			<version>2.2.1</version> <scope>provided</scope> </dependency> -->
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>${jackson-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.android</groupId>
-			<artifactId>spring-android-rest-template</artifactId>
-			<version>${spring-java-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.android</groupId>
-			<artifactId>spring-android-core</artifactId>
-			<version>${spring-java-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.6.4</version>
-		</dependency>
-	</dependencies>
-	<repositories>
-		<repository>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<id>springsource-milestone</id>
-			<name>Spring Framework Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-	</repositories>
-	<scm>
-		<connection>scm:git:git@github.com:apigee/usergrid-java-sdk.git</connection>
-		<developerConnection>scm:git:git@github.com:apigee/usergrid-java-sdk.git</developerConnection>
-		<url>git@github.com:apigee/usergrid-java-sdk.git</url>
-	</scm>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.lastUpdated
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.lastUpdated b/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.lastUpdated
deleted file mode 100644
index 93a1993..0000000
--- a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.lastUpdated
+++ /dev/null
@@ -1,5 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Thu Feb 06 17:53:46 EST 2014
-http\://repo.maven.apache.org/maven2/.lastUpdated=1391727226090
-https\://usergrid-maven.s3.amazonaws.com/dependencies/.lastUpdated=1391727226019
-https\://usergrid-maven.s3.amazonaws.com/dependencies/.error=

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.sha1
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.sha1 b/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.sha1
deleted file mode 100644
index 7b59387..0000000
--- a/stack/m2/repository/org/usergrid/usergrid-java-client/0.0.3/usergrid-java-client-0.0.3.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69b2ce2d315a3fa17e63ba459aee97c48747be5a
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml b/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
deleted file mode 100644
index f0ebe32..0000000
--- a/stack/m2/repository/org/usergrid/usergrid-java-client/maven-metadata-local.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metadata>
-  <groupId>org.usergrid</groupId>
-  <artifactId>usergrid-java-client</artifactId>
-  <versioning>
-    <release>0.0.6</release>
-    <versions>
-      <version>0.0.9-SNAPSHOT</version>
-      <version>0.0.6</version>
-    </versions>
-    <lastUpdated>20140207142624</lastUpdated>
-  </versioning>
-</metadata>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index eb2417d..6c50106 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -180,6 +180,7 @@
   </distributionManagement>
 
   <modules>
+    <module>java-sdk-old</module>
     <module>config</module>
     <module>core</module>
     <module>services</module>
@@ -832,9 +833,8 @@
       </dependency>
 
       <dependency>
-        <groupId>net.tanesha.recaptcha4j</groupId>
+        <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
         <artifactId>recaptcha4j</artifactId>
-        <!-- included as local dependency -->
         <version>0.0.8</version>
       </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa85022a/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 524bfbf..ef80fab 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -446,10 +446,10 @@
       <artifactId>jersey-client</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>net.tanesha.recaptcha4j</groupId>
-      <artifactId>recaptcha4j</artifactId>
-    </dependency>
+      <dependency>
+        <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
+        <artifactId>recaptcha4j</artifactId>
+      </dependency>
 
     <dependency>
       <groupId>com.sun.jersey</groupId>


Mime
View raw message