You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/28 23:22:08 UTC

[58/96] [abbrv] USERGRID-2 package namespace to org.apache.usergrid

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/UrlUtils.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/UrlUtils.html b/sdks/android/doc/org/usergrid/android/client/utils/UrlUtils.html
index 8ad714d..5291a91 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/UrlUtils.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/UrlUtils.html
@@ -55,7 +55,7 @@ function windowTitle()
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.usergrid.android.client.utils"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;NEXT CLASS</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../../index.html?org/usergrid/android/client/utils/UrlUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -88,12 +88,12 @@ DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&n
 <!-- ======== START OF CLASS DATA ======== -->
 <H2>
 <FONT SIZE="-1">
-org.usergrid.android.client.utils</FONT>
+org.apache.usergrid.android.client.utils</FONT>
 <BR>
 Class UrlUtils</H2>
 <PRE>
 java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>org.usergrid.android.client.utils.UrlUtils</B>
+  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>org.apache.usergrid.android.client.utils.UrlUtils</B>
 </PRE>
 <HR>
 <DL>
@@ -297,7 +297,7 @@ public static java.lang.String <B>addQueryParams</B>(java.lang.String&nbsp;url,
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.usergrid.android.client.utils"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;NEXT CLASS</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../../index.html?org/usergrid/android/client/utils/UrlUtils.html" target="_top"><B>FRAMES</B></A>  &nbsp;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/class-use/DeviceUuidFactory.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/class-use/DeviceUuidFactory.html b/sdks/android/doc/org/usergrid/android/client/utils/class-use/DeviceUuidFactory.html
index 5f85463..3e92925 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/class-use/DeviceUuidFactory.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/class-use/DeviceUuidFactory.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-Uses of Class org.usergrid.android.client.utils.DeviceUuidFactory
+Uses of Class org.apache.usergrid.android.client.utils.DeviceUuidFactory
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ Uses of Class org.usergrid.android.client.utils.DeviceUuidFactory
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.usergrid.android.client.utils.DeviceUuidFactory";
+        parent.document.title="Uses of Class org.apache.usergrid.android.client.utils.DeviceUuidFactory";
     }
 }
 </SCRIPT>
@@ -39,7 +39,7 @@ function windowTitle()
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -81,9 +81,9 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-<B>Uses of Class<br>org.usergrid.android.client.utils.DeviceUuidFactory</B></H2>
+<B>Uses of Class<br>org.apache.usergrid.android.client.utils.DeviceUuidFactory</B></H2>
 </CENTER>
-No usage of org.usergrid.android.client.utils.DeviceUuidFactory
+No usage of org.apache.usergrid.android.client.utils.DeviceUuidFactory
 <P>
 <HR>
 
@@ -99,7 +99,7 @@ No usage of org.usergrid.android.client.utils.DeviceUuidFactory
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/class-use/JsonUtils.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/class-use/JsonUtils.html b/sdks/android/doc/org/usergrid/android/client/utils/class-use/JsonUtils.html
index fe4cbf8..d3d1c0a 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/class-use/JsonUtils.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/class-use/JsonUtils.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-Uses of Class org.usergrid.android.client.utils.JsonUtils
+Uses of Class org.apache.usergrid.android.client.utils.JsonUtils
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ Uses of Class org.usergrid.android.client.utils.JsonUtils
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.usergrid.android.client.utils.JsonUtils";
+        parent.document.title="Uses of Class org.apache.usergrid.android.client.utils.JsonUtils";
     }
 }
 </SCRIPT>
@@ -39,7 +39,7 @@ function windowTitle()
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -81,9 +81,9 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-<B>Uses of Class<br>org.usergrid.android.client.utils.JsonUtils</B></H2>
+<B>Uses of Class<br>org.apache.usergrid.android.client.utils.JsonUtils</B></H2>
 </CENTER>
-No usage of org.usergrid.android.client.utils.JsonUtils
+No usage of org.apache.usergrid.android.client.utils.JsonUtils
 <P>
 <HR>
 
@@ -99,7 +99,7 @@ No usage of org.usergrid.android.client.utils.JsonUtils
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/class-use/MapUtils.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/class-use/MapUtils.html b/sdks/android/doc/org/usergrid/android/client/utils/class-use/MapUtils.html
index 8fe5aec..b5a94a0 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/class-use/MapUtils.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/class-use/MapUtils.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-Uses of Class org.usergrid.android.client.utils.MapUtils
+Uses of Class org.apache.usergrid.android.client.utils.MapUtils
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ Uses of Class org.usergrid.android.client.utils.MapUtils
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.usergrid.android.client.utils.MapUtils";
+        parent.document.title="Uses of Class org.apache.usergrid.android.client.utils.MapUtils";
     }
 }
 </SCRIPT>
@@ -39,7 +39,7 @@ function windowTitle()
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -81,9 +81,9 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-<B>Uses of Class<br>org.usergrid.android.client.utils.MapUtils</B></H2>
+<B>Uses of Class<br>org.apache.usergrid.android.client.utils.MapUtils</B></H2>
 </CENTER>
-No usage of org.usergrid.android.client.utils.MapUtils
+No usage of org.apache.usergrid.android.client.utils.MapUtils
 <P>
 <HR>
 
@@ -99,7 +99,7 @@ No usage of org.usergrid.android.client.utils.MapUtils
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/class-use/ObjectUtils.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/class-use/ObjectUtils.html b/sdks/android/doc/org/usergrid/android/client/utils/class-use/ObjectUtils.html
index 161fca8..2d19ee4 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/class-use/ObjectUtils.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/class-use/ObjectUtils.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-Uses of Class org.usergrid.android.client.utils.ObjectUtils
+Uses of Class org.apache.usergrid.android.client.utils.ObjectUtils
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ Uses of Class org.usergrid.android.client.utils.ObjectUtils
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.usergrid.android.client.utils.ObjectUtils";
+        parent.document.title="Uses of Class org.apache.usergrid.android.client.utils.ObjectUtils";
     }
 }
 </SCRIPT>
@@ -39,7 +39,7 @@ function windowTitle()
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -81,9 +81,9 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-<B>Uses of Class<br>org.usergrid.android.client.utils.ObjectUtils</B></H2>
+<B>Uses of Class<br>org.apache.usergrid.android.client.utils.ObjectUtils</B></H2>
 </CENTER>
-No usage of org.usergrid.android.client.utils.ObjectUtils
+No usage of org.apache.usergrid.android.client.utils.ObjectUtils
 <P>
 <HR>
 
@@ -99,7 +99,7 @@ No usage of org.usergrid.android.client.utils.ObjectUtils
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/class-use/UrlUtils.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/class-use/UrlUtils.html b/sdks/android/doc/org/usergrid/android/client/utils/class-use/UrlUtils.html
index eed0b13..302784e 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/class-use/UrlUtils.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/class-use/UrlUtils.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-Uses of Class org.usergrid.android.client.utils.UrlUtils
+Uses of Class org.apache.usergrid.android.client.utils.UrlUtils
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ Uses of Class org.usergrid.android.client.utils.UrlUtils
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.usergrid.android.client.utils.UrlUtils";
+        parent.document.title="Uses of Class org.apache.usergrid.android.client.utils.UrlUtils";
     }
 }
 </SCRIPT>
@@ -39,7 +39,7 @@ function windowTitle()
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/UrlUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/UrlUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -81,9 +81,9 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-<B>Uses of Class<br>org.usergrid.android.client.utils.UrlUtils</B></H2>
+<B>Uses of Class<br>org.apache.usergrid.android.client.utils.UrlUtils</B></H2>
 </CENTER>
-No usage of org.usergrid.android.client.utils.UrlUtils
+No usage of org.apache.usergrid.android.client.utils.UrlUtils
 <P>
 <HR>
 
@@ -99,7 +99,7 @@ No usage of org.usergrid.android.client.utils.UrlUtils
   <TR ALIGN="center" VALIGN="top">
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/UrlUtils.html" title="class in org.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/usergrid/android/client/utils/UrlUtils.html" title="class in org.apache.usergrid.android.client.utils"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/package-frame.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/package-frame.html b/sdks/android/doc/org/usergrid/android/client/utils/package-frame.html
index 2924edf..bbffdf3 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/package-frame.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/package-frame.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-org.usergrid.android.client.utils
+org.apache.usergrid.android.client.utils
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -16,22 +16,22 @@ org.usergrid.android.client.utils
 
 <BODY BGCOLOR="white">
 <FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../org/usergrid/android/client/utils/package-summary.html" target="classFrame">org.usergrid.android.client.utils</A></FONT>
+<A HREF="../../../../../org/usergrid/android/client/utils/package-summary.html" target="classFrame">org.apache.usergrid.android.client.utils</A></FONT>
 <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
 <TR>
 <TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
 Classes</FONT>&nbsp;
 <FONT CLASS="FrameItemFont">
 <BR>
-<A HREF="DeviceUuidFactory.html" title="class in org.usergrid.android.client.utils" target="classFrame">DeviceUuidFactory</A>
+<A HREF="DeviceUuidFactory.html" title="class in org.apache.usergrid.android.client.utils" target="classFrame">DeviceUuidFactory</A>
 <BR>
-<A HREF="JsonUtils.html" title="class in org.usergrid.android.client.utils" target="classFrame">JsonUtils</A>
+<A HREF="JsonUtils.html" title="class in org.apache.usergrid.android.client.utils" target="classFrame">JsonUtils</A>
 <BR>
-<A HREF="MapUtils.html" title="class in org.usergrid.android.client.utils" target="classFrame">MapUtils</A>
+<A HREF="MapUtils.html" title="class in org.apache.usergrid.android.client.utils" target="classFrame">MapUtils</A>
 <BR>
-<A HREF="ObjectUtils.html" title="class in org.usergrid.android.client.utils" target="classFrame">ObjectUtils</A>
+<A HREF="ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils" target="classFrame">ObjectUtils</A>
 <BR>
-<A HREF="UrlUtils.html" title="class in org.usergrid.android.client.utils" target="classFrame">UrlUtils</A></FONT></TD>
+<A HREF="UrlUtils.html" title="class in org.apache.usergrid.android.client.utils" target="classFrame">UrlUtils</A></FONT></TD>
 </TR>
 </TABLE>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/package-summary.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/package-summary.html b/sdks/android/doc/org/usergrid/android/client/utils/package-summary.html
index 9954aa1..d9e1fec 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/package-summary.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/package-summary.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-org.usergrid.android.client.utils
+org.apache.usergrid.android.client.utils
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ org.usergrid.android.client.utils
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="org.usergrid.android.client.utils";
+        parent.document.title="org.apache.usergrid.android.client.utils";
     }
 }
 </SCRIPT>
@@ -80,7 +80,7 @@ function windowTitle()
 
 <HR>
 <H2>
-Package org.usergrid.android.client.utils
+Package org.apache.usergrid.android.client.utils
 </H2>
 
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -89,24 +89,24 @@ Package org.usergrid.android.client.utils
 <B>Class Summary</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.usergrid.android.client.utils">DeviceUuidFactory</A></B></TD>
+<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.apache.usergrid.android.client.utils">DeviceUuidFactory</A></B></TD>
 <TD>Tries to get the device ID as a UUID and fallsback to a generated UUID value
  if it doesn't work.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.usergrid.android.client.utils">JsonUtils</A></B></TD>
+<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.apache.usergrid.android.client.utils">JsonUtils</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.usergrid.android.client.utils">MapUtils</A></B></TD>
+<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.apache.usergrid.android.client.utils">MapUtils</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.usergrid.android.client.utils">ObjectUtils</A></B></TD>
+<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils">ObjectUtils</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/UrlUtils.html" title="class in org.usergrid.android.client.utils">UrlUtils</A></B></TD>
+<TD WIDTH="15%"><B><A HREF="../../../../../org/usergrid/android/client/utils/UrlUtils.html" title="class in org.apache.usergrid.android.client.utils">UrlUtils</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 </TABLE>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/package-tree.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/package-tree.html b/sdks/android/doc/org/usergrid/android/client/utils/package-tree.html
index 487313a..cbb1863 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/package-tree.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/package-tree.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-org.usergrid.android.client.utils Class Hierarchy
+org.apache.usergrid.android.client.utils Class Hierarchy
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ org.usergrid.android.client.utils Class Hierarchy
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="org.usergrid.android.client.utils Class Hierarchy";
+        parent.document.title="org.apache.usergrid.android.client.utils Class Hierarchy";
     }
 }
 </SCRIPT>
@@ -81,7 +81,7 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-Hierarchy For Package org.usergrid.android.client.utils
+Hierarchy For Package org.apache.usergrid.android.client.utils
 </H2>
 </CENTER>
 <DL>
@@ -92,7 +92,7 @@ Class Hierarchy
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.usergrid.android.client.utils"><B>DeviceUuidFactory</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.usergrid.android.client.utils"><B>JsonUtils</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.usergrid.android.client.utils"><B>MapUtils</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.usergrid.android.client.utils"><B>ObjectUtils</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/UrlUtils.html" title="class in org.usergrid.android.client.utils"><B>UrlUtils</B>
 </A></UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.apache.usergrid.android.client.utils"><B>DeviceUuidFactory</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/JsonUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>JsonUtils</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/MapUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>MapUtils</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>ObjectUtils</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="../../../../../org/usergrid/android/client/utils/UrlUtils.html" tit
 le="class in org.apache.usergrid.android.client.utils"><B>UrlUtils</B></A></UL>
 </UL>
 <HR>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/org/usergrid/android/client/utils/package-use.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/org/usergrid/android/client/utils/package-use.html b/sdks/android/doc/org/usergrid/android/client/utils/package-use.html
index bb730c9..4627ccb 100644
--- a/sdks/android/doc/org/usergrid/android/client/utils/package-use.html
+++ b/sdks/android/doc/org/usergrid/android/client/utils/package-use.html
@@ -4,7 +4,7 @@
 <HEAD>
 <!-- Generated by javadoc (build 1.6.0_29) on Fri Mar 09 16:00:54 PST 2012 -->
 <TITLE>
-Uses of Package org.usergrid.android.client.utils
+Uses of Package org.apache.usergrid.android.client.utils
 </TITLE>
 
 <META NAME="date" CONTENT="2012-03-09">
@@ -15,7 +15,7 @@ Uses of Package org.usergrid.android.client.utils
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Package org.usergrid.android.client.utils";
+        parent.document.title="Uses of Package org.apache.usergrid.android.client.utils";
     }
 }
 </SCRIPT>
@@ -81,9 +81,9 @@ function windowTitle()
 <HR>
 <CENTER>
 <H2>
-<B>Uses of Package<br>org.usergrid.android.client.utils</B></H2>
+<B>Uses of Package<br>org.apache.usergrid.android.client.utils</B></H2>
 </CENTER>
-No usage of org.usergrid.android.client.utils
+No usage of org.apache.usergrid.android.client.utils
 <P>
 <HR>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/overview-frame.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/overview-frame.html b/sdks/android/doc/overview-frame.html
index 6d87b2d..95171aa 100644
--- a/sdks/android/doc/overview-frame.html
+++ b/sdks/android/doc/overview-frame.html
@@ -30,15 +30,15 @@ Overview List
 <FONT size="+1" CLASS="FrameHeadingFont">
 Packages</FONT>
 <BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/package-frame.html" target="packageFrame">org.usergrid.android.client</A></FONT>
+<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/package-frame.html" target="packageFrame">org.apache.usergrid.android.client</A></FONT>
 <BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/callbacks/package-frame.html" target="packageFrame">org.usergrid.android.client.callbacks</A></FONT>
+<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/callbacks/package-frame.html" target="packageFrame">org.apache.usergrid.android.client.callbacks</A></FONT>
 <BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/entities/package-frame.html" target="packageFrame">org.usergrid.android.client.entities</A></FONT>
+<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/entities/package-frame.html" target="packageFrame">org.apache.usergrid.android.client.entities</A></FONT>
 <BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/response/package-frame.html" target="packageFrame">org.usergrid.android.client.response</A></FONT>
+<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/response/package-frame.html" target="packageFrame">org.apache.usergrid.android.client.response</A></FONT>
 <BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/utils/package-frame.html" target="packageFrame">org.usergrid.android.client.utils</A></FONT>
+<FONT CLASS="FrameItemFont"><A HREF="org/usergrid/android/client/utils/package-frame.html" target="packageFrame">org.apache.usergrid.android.client.utils</A></FONT>
 <BR>
 </TD>
 </TR>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/overview-summary.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/overview-summary.html b/sdks/android/doc/overview-summary.html
index f45beca..fea6208 100644
--- a/sdks/android/doc/overview-summary.html
+++ b/sdks/android/doc/overview-summary.html
@@ -86,23 +86,23 @@ function windowTitle()
 <B>Packages</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/package-summary.html">org.usergrid.android.client</A></B></TD>
+<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/package-summary.html">org.apache.usergrid.android.client</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/callbacks/package-summary.html">org.usergrid.android.client.callbacks</A></B></TD>
+<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/callbacks/package-summary.html">org.apache.usergrid.android.client.callbacks</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/entities/package-summary.html">org.usergrid.android.client.entities</A></B></TD>
+<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/entities/package-summary.html">org.apache.usergrid.android.client.entities</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/response/package-summary.html">org.usergrid.android.client.response</A></B></TD>
+<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/response/package-summary.html">org.apache.usergrid.android.client.response</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/utils/package-summary.html">org.usergrid.android.client.utils</A></B></TD>
+<TD WIDTH="20%"><B><A HREF="org/usergrid/android/client/utils/package-summary.html">org.apache.usergrid.android.client.utils</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
 </TABLE>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/overview-tree.html
----------------------------------------------------------------------
diff --git a/sdks/android/doc/overview-tree.html b/sdks/android/doc/overview-tree.html
index ca637d6..2df8305 100644
--- a/sdks/android/doc/overview-tree.html
+++ b/sdks/android/doc/overview-tree.html
@@ -84,25 +84,25 @@ function windowTitle()
 Hierarchy For All Packages</H2>
 </CENTER>
 <DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="org/usergrid/android/client/package-tree.html">org.usergrid.android.client</A>, <A HREF="org/usergrid/android/client/callbacks/package-tree.html">org.usergrid.android.client.callbacks</A>, <A HREF="org/usergrid/android/client/entities/package-tree.html">org.usergrid.android.client.entities</A>, <A HREF="org/usergrid/android/client/response/package-tree.html">org.usergrid.android.client.response</A>, <A HREF="org/usergrid/android/client/utils/package-tree.html">org.usergrid.android.client.utils</A></DL>
+<DT><B>Package Hierarchies:</B><DD><A HREF="org/usergrid/android/client/package-tree.html">org.apache.usergrid.android.client</A>, <A HREF="org/usergrid/android/client/callbacks/package-tree.html">org.apache.usergrid.android.client.callbacks</A>, <A HREF="org/usergrid/android/client/entities/package-tree.html">org.apache.usergrid.android.client.entities</A>, <A HREF="org/usergrid/android/client/response/package-tree.html">org.apache.usergrid.android.client.response</A>, <A HREF="org/usergrid/android/client/utils/package-tree.html">org.apache.usergrid.android.client.utils</A></DL>
 <HR>
 <H2>
 Class Hierarchy
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.ActivityCollection.html" title="class in org.usergrid.android.client.entities"><B>Activity.ActivityCollection</B></A><LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.ActivityObject.html" title="class in org.usergrid.android.client.entities"><B>Activity.ActivityObject</B></A><LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.MediaLink.html" title="class in org.usergrid.android.client.entities"><B>Activity.MediaLink</B></A><LI TYPE="circle">org.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/AggregateCounter.html" title="class in org.usergrid.android.client.response"><B>AggregateCounter</B></A><LI TYPE="circle">org.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/AggregateCounterSet.html" title="cla
 ss in org.usergrid.android.client.response"><B>AggregateCounterSet</B></A><LI TYPE="circle">org.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/ApiResponse.html" title="class in org.usergrid.android.client.response"><B>ApiResponse</B></A><LI TYPE="circle">android.os.AsyncTask&lt;Params,Progress,Result&gt;<UL>
-<LI TYPE="circle">org.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/ClientAsyncTask.html" title="class in org.usergrid.android.client.callbacks"><B>ClientAsyncTask</B></A>&lt;T&gt;</UL>
-<LI TYPE="circle">org.usergrid.android.client.<A HREF="org/usergrid/android/client/Client.html" title="class in org.usergrid.android.client"><B>Client</B></A><LI TYPE="circle">org.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/ClientCredentialsInfo.html" title="class in org.usergrid.android.client.response"><B>ClientCredentialsInfo</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.usergrid.android.client.utils"><B>DeviceUuidFactory</B></A><LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Entity.html" title="class in org.usergrid.android.client.entities"><B>Entity</B></A><UL>
-<LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.html" title="class in org.usergrid.android.client.entities"><B>Activity</B></A><LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Device.html" title="class in org.usergrid.android.client.entities"><B>Device</B></A><LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Group.html" title="class in org.usergrid.android.client.entities"><B>Group</B></A><LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Message.html" title="class in org.usergrid.android.client.entities"><B>Message</B></A><LI TYPE="circle">org.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/User.html" title="class in org.usergrid.android.client.entities"><B>User</B></A></UL>
-<LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/JsonUtils.html" title="class in org.usergrid.android.client.utils"><B>JsonUtils</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/MapUtils.html" title="class in org.usergrid.android.client.utils"><B>MapUtils</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.usergrid.android.client.utils"><B>ObjectUtils</B></A><LI TYPE="circle">org.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/QueueInfo.html" title="class in org.usergrid.android.client.response"><B>QueueInfo</B></A><LI TYPE="circle">org.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/UrlUtils.html" title="class in org.usergrid.android.client.utils"><B>UrlUtils</B></A></UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.ActivityCollection.html" title="class in org.apache.usergrid.android.client.entities"><B>Activity.ActivityCollection</B></A><LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.ActivityObject.html" title="class in org.apache.usergrid.android.client.entities"><B>Activity.ActivityObject</B></A><LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.MediaLink.html" title="class in org.apache.usergrid.android.client.entities"><B>Activity.MediaLink</B></A><LI TYPE="circle">org.apache.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/AggregateCounter.html" title="class in org.apache.usergrid.android.client.response"><B>AggregateCounter</B></A><LI TYPE="circle">org.apache.usergrid.android.client.response.<A HREF="org/usergr
 id/android/client/response/AggregateCounterSet.html" title="class in org.apache.usergrid.android.client.response"><B>AggregateCounterSet</B></A><LI TYPE="circle">org.apache.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/ApiResponse.html" title="class in org.apache.usergrid.android.client.response"><B>ApiResponse</B></A><LI TYPE="circle">android.os.AsyncTask&lt;Params,Progress,Result&gt;<UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/ClientAsyncTask.html" title="class in org.apache.usergrid.android.client.callbacks"><B>ClientAsyncTask</B></A>&lt;T&gt;</UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.<A HREF="org/usergrid/android/client/Client.html" title="class in org.apache.usergrid.android.client"><B>Client</B></A><LI TYPE="circle">org.apache.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/ClientCredentialsInfo.html" title="class in org.apache.usergrid.android.client.response"><B>ClientCredentialsInfo</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/DeviceUuidFactory.html" title="class in org.apache.usergrid.android.client.utils"><B>DeviceUuidFactory</B></A><LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Entity.html" title="class in org.apache.usergrid.android.client.entities"><B>Entity</B></A><UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Activity.html" title="class in org.apache.usergrid.android.client.entities"><B>Activity</B></A><LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Device.html" title="class in org.apache.usergrid.android.client.entities"><B>Device</B></A><LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Group.html" title="class in org.apache.usergrid.android.client.entities"><B>Group</B></A><LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/Message.html" title="class in org.apache.usergrid.android.client.entities"><B>Message</B></A><LI TYPE="circle">org.apache.usergrid.android.client.entities.<A HREF="org/usergrid/android/client/entities/User.html" title="class in org.apache.usergrid.android.client.entities"><B>User</B></A></
 UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/JsonUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>JsonUtils</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/MapUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>MapUtils</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/ObjectUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>ObjectUtils</B></A><LI TYPE="circle">org.apache.usergrid.android.client.response.<A HREF="org/usergrid/android/client/response/QueueInfo.html" title="class in org.apache.usergrid.android.client.response"><B>QueueInfo</B></A><LI TYPE="circle">org.apache.usergrid.android.client.utils.<A HREF="org/usergrid/android/client/utils/UrlUtils.html" title="class in org.apache.usergrid.android.client.utils"><B>UrlUtils</B></A></UL>
 </UL>
 <H2>
 Interface Hierarchy
 </H2>
 <UL>
-<LI TYPE="circle">org.usergrid.android.client.<A HREF="org/usergrid/android/client/Client.Query.html" title="interface in org.usergrid.android.client"><B>Client.Query</B></A><LI TYPE="circle">org.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/ClientCallback.html" title="interface in org.usergrid.android.client.callbacks"><B>ClientCallback</B></A>&lt;T&gt;<UL>
-<LI TYPE="circle">org.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/ApiResponseCallback.html" title="interface in org.usergrid.android.client.callbacks"><B>ApiResponseCallback</B></A><LI TYPE="circle">org.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/DeviceRegistrationCallback.html" title="interface in org.usergrid.android.client.callbacks"><B>DeviceRegistrationCallback</B></A><LI TYPE="circle">org.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/GroupsRetrievedCallback.html" title="interface in org.usergrid.android.client.callbacks"><B>GroupsRetrievedCallback</B></A><LI TYPE="circle">org.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/QueryResultsCallback.html" title="interface in org.usergrid.android.client.callbacks"><B>QueryResultsCallback</B></A></UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.<A HREF="org/usergrid/android/client/Client.Query.html" title="interface in org.apache.usergrid.android.client"><B>Client.Query</B></A><LI TYPE="circle">org.apache.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/ClientCallback.html" title="interface in org.apache.usergrid.android.client.callbacks"><B>ClientCallback</B></A>&lt;T&gt;<UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/ApiResponseCallback.html" title="interface in org.apache.usergrid.android.client.callbacks"><B>ApiResponseCallback</B></A><LI TYPE="circle">org.apache.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/DeviceRegistrationCallback.html" title="interface in org.apache.usergrid.android.client.callbacks"><B>DeviceRegistrationCallback</B></A><LI TYPE="circle">org.apache.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/GroupsRetrievedCallback.html" title="interface in org.apache.usergrid.android.client.callbacks"><B>GroupsRetrievedCallback</B></A><LI TYPE="circle">org.apache.usergrid.android.client.callbacks.<A HREF="org/usergrid/android/client/callbacks/QueryResultsCallback.html" title="interface in org.apache.usergrid.android.client.callbacks"><B>QueryResultsCallback</B></A></UL>
 </UL>
 <H2>
 Enum Hierarchy
@@ -111,7 +111,7 @@ Enum Hierarchy
 <LI TYPE="circle">java.lang.Object<UL>
 <LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <UL>
-<LI TYPE="circle">org.usergrid.android.client.<A HREF="org/usergrid/android/client/Client.QueuePosition.html" title="enum in org.usergrid.android.client"><B>Client.QueuePosition</B></A></UL>
+<LI TYPE="circle">org.apache.usergrid.android.client.<A HREF="org/usergrid/android/client/Client.QueuePosition.html" title="enum in org.apache.usergrid.android.client"><B>Client.QueuePosition</B></A></UL>
 </UL>
 </UL>
 <HR>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/doc/package-list
----------------------------------------------------------------------
diff --git a/sdks/android/doc/package-list b/sdks/android/doc/package-list
index eb07ee9..0860ea0 100644
--- a/sdks/android/doc/package-list
+++ b/sdks/android/doc/package-list
@@ -1,5 +1,5 @@
-org.usergrid.android.client
-org.usergrid.android.client.callbacks
-org.usergrid.android.client.entities
-org.usergrid.android.client.response
-org.usergrid.android.client.utils
+org.apache.usergrid.android.client
+org.apache.usergrid.android.client.callbacks
+org.apache.usergrid.android.client.entities
+org.apache.usergrid.android.client.response
+org.apache.usergrid.android.client.utils

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/android/pom.xml b/sdks/android/pom.xml
index fd23c10..9cfb996 100644
--- a/sdks/android/pom.xml
+++ b/sdks/android/pom.xml
@@ -12,13 +12,13 @@
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.usergrid</groupId>
+	<groupId>org.apache.usergrid</groupId>
 	<artifactId>usergrid-android-client</artifactId>
 	<version>0.0.7-SNAPSHOT</version>
 	
 	<packaging>jar</packaging>
-	<description>A simple java client for usergrid</description>
-	<url>https://github.com/apigee/usergrid-stack-internal</url>
+	<description>A simple android client for Apache Usergrid</description>
+	<url>https://github.com/usergrid/usergrid</url>
 	
 	<licenses>
 		<license>
@@ -42,11 +42,6 @@
 			<name>Scott Ganyo</name>
 		</developer>
 	</developers>
-	<scm>
-		<connection>scm:git:git@github.com:apigee/usergrid-android-sdk.git</connection>
-		<developerConnection>scm:git:git@github.com:apigee/usergrid-android-sdk.git</developerConnection>
-		<url>git@github.com:apigee/usergrid-android-sdk.git</url>
-	</scm>
 	
 	<dependencies>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java
new file mode 100644
index 0000000..fb30277
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/Client.java
@@ -0,0 +1,591 @@
+package org.apache.usergrid.android.client;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.usergrid.android.client.callbacks.ApiResponseCallback;
+import org.apache.usergrid.android.client.callbacks.ClientAsyncTask;
+import org.apache.usergrid.android.client.callbacks.DeviceRegistrationCallback;
+import org.apache.usergrid.android.client.callbacks.GroupsRetrievedCallback;
+import org.apache.usergrid.android.client.callbacks.QueryResultsCallback;
+import org.apache.usergrid.android.client.utils.DeviceUuidFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.client.RestTemplate;
+import org.usergrid.java.client.entities.Device;
+import org.usergrid.java.client.entities.Entity;
+import org.usergrid.java.client.entities.Group;
+import org.usergrid.java.client.entities.User;
+import org.usergrid.java.client.response.ApiResponse;
+
+import android.content.Context;
+import android.location.Location;
+
+/**
+ * The Client class for accessing the Usergrid API. Start by instantiating this
+ * class though the appropriate constructor.
+ * 
+ */
+public class Client extends org.usergrid.java.client.Client {
+
+	private static final String TAG = "UsergridClient";
+
+	public static boolean FORCE_PUBLIC_API = false;
+
+	// Public API
+	public static String PUBLIC_API_URL = "http://api.usergrid.com";
+
+	// Local API of standalone server
+	public static String LOCAL_STANDALONE_API_URL = "http://localhost:8080";
+
+	// Local API of Tomcat server in Eclipse
+	public static String LOCAL_TOMCAT_API_URL = "http://localhost:8080/ROOT";
+
+	// Local API
+	public static String LOCAL_API_URL = LOCAL_STANDALONE_API_URL;
+
+	
+	static RestTemplate restTemplate = new RestTemplate(true);
+
+	/**
+	 * Default constructor for instantiating a client.
+	 */
+	public Client() {
+		init();
+	}
+
+	/**
+	 * Instantiate client for a specific app
+	 * 
+	 * @param applicationId
+	 *            the application id or name
+	 */
+	public Client(String organizationId, String applicationId) {
+		super(organizationId, applicationId);
+	}
+
+
+	/**
+	 * Log the user in and get a valid access token. Executes asynchronously in
+	 * background and the callbacks are called in the UI thread.
+	 * 
+	 * @param email
+	 * @param password
+	 * @param callback
+	 */
+	public void authorizeAppUserAsync(final String email,
+			final String password, final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return authorizeAppUser(email, password);
+			}
+		}).execute();
+	}
+
+	
+
+	/**
+	 * Log the user in with their numeric pin-code and get a valid access token.
+	 * Executes asynchronously in background and the callbacks are called in the
+	 * UI thread.
+	 * 
+	 * @param email
+	 * @param pin
+	 * @param callback
+	 */
+	public void authorizeAppUserViaPinAsync(final String email,
+			final String pin, final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return authorizeAppUserViaPin(email, pin);
+			}
+		}).execute();
+	}
+
+
+	/**
+	 * Log the user in with their numeric pin-code and get a valid access token.
+	 * Executes asynchronously in background and the callbacks are called in the
+	 * UI thread.
+	 * 
+	 * @param email
+	 * @param pin
+	 * @param callback
+	 */
+	public void authorizeAppUserViaFacebookAsync(final String fb_access_token,
+			final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return authorizeAppUserViaFacebook(fb_access_token);
+			}
+		}).execute();
+	}
+
+	
+
+	/**
+	 * Log the app in with it's client id and client secret key. Not recommended
+	 * for production apps. Executes asynchronously in background and the
+	 * callbacks are called in the UI thread.
+	 * 
+	 * @param clientId
+	 * @param clientSecret
+	 * @param callback
+	 */
+	public void authorizeAppClientAsync(final String clientId,
+			final String clientSecret, final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+
+			@Override
+			public ApiResponse doTask() {
+				return authorizeAppClient(clientId, clientSecret);
+			}
+		}).execute();
+	}
+
+	
+	/**
+	 * Registers a device using the device's unique device ID. Executes
+	 * asynchronously in background and the callbacks are called in the UI
+	 * thread.
+	 * 
+	 * @param context
+	 * @param properties
+	 * @param callback
+	 */
+	public void registerDeviceAsync(final Context context,
+			final Map<String, Object> properties,
+			final DeviceRegistrationCallback callback) {
+		(new ClientAsyncTask<Device>(callback) {
+			@Override
+			public Device doTask() {
+			    UUID deviceId = new DeviceUuidFactory(context).getDeviceUuid();
+		        
+				return registerDevice(deviceId, properties);
+			}
+		}).execute();
+	}
+
+
+  /**
+   * Registers a device using the device's unique device ID. Executes
+   * asynchronously in background and the callbacks are called in the UI
+   * thread.
+   *
+   * @param context
+   * @param properties
+   * @param callback
+   */
+  public void registerDeviceForPushAsync(final Context context,
+                                         final String notifier,
+                                         final String token,
+                                         final Map<String, Object> properties,
+                                         final DeviceRegistrationCallback callback) {
+    (new ClientAsyncTask<Device>(callback) {
+      @Override
+      public Device doTask() {
+        UUID deviceId = new DeviceUuidFactory(context).getDeviceUuid();
+
+        return registerDeviceForPush(deviceId, notifier, token, properties);
+      }
+    }).execute();
+  }
+
+
+  /**
+	 * Create a new entity on the server. Executes asynchronously in background
+	 * and the callbacks are called in the UI thread.
+	 * 
+	 * @param entity
+	 * @param callback
+	 */
+	public void createEntityAsync(final Entity entity,
+			final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return createEntity(entity);
+			}
+		}).execute();
+	}
+
+	
+	/**
+	 * Create a new entity on the server from a set of properties. Properties
+	 * must include a "type" property. Executes asynchronously in background and
+	 * the callbacks are called in the UI thread.
+	 * 
+	 * @param properties
+	 * @param callback
+	 */
+	public void createEntityAsync(final Map<String, Object> properties,
+			final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return createEntity(properties);
+			}
+		}).execute();
+	}
+
+
+	/**
+	 * Creates a user. Executes asynchronously in background and the callbacks
+	 * are called in the UI thread.
+	 * 
+	 * @param username
+	 * @param name
+	 * @param email
+	 * @param password
+	 * @param callback
+	 */
+	public void createUserAsync(final String username, final String name,
+			final String email, final String password,
+			final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return createUser(username, name, email, password);
+			}
+		}).execute();
+	}
+
+
+
+	/**
+	 * Get the groups for the user. Executes asynchronously in background and
+	 * the callbacks are called in the UI thread.
+	 * 
+	 * @param userId
+	 * @param callback
+	 */
+	public void getGroupsForUserAsync(final String userId,
+			final GroupsRetrievedCallback callback) {
+		(new ClientAsyncTask<Map<String, Group>>(callback) {
+			@Override
+			public Map<String, Group> doTask() {
+				return getGroupsForUser(userId);
+			}
+		}).execute();
+	}
+
+	/**
+	 * Get a user's activity feed. Returned as a query to ease paging. Executes
+	 * asynchronously in background and the callbacks are called in the UI
+	 * thread.
+	 * 
+	 * 
+	 * @param userId
+	 * @param callback
+	 */
+	public void queryActivityFeedForUserAsync(final String userId, final QueryResultsCallback callback) {
+		(new ClientAsyncTask<Query>(callback) {
+			@Override
+			public Query doTask() {
+				return queryActivityFeedForUser(userId);
+			}
+		}).execute();
+	}
+
+	
+	/**
+	 * Creates and posts an activity to a user. Executes asynchronously in
+	 * background and the callbacks are called in the UI thread.
+	 * 
+	 * @param verb
+	 * @param title
+	 * @param content
+	 * @param category
+	 * @param user
+	 * @param object
+	 * @param objectType
+	 * @param objectName
+	 * @param objectContent
+	 * @param callback
+	 */
+	public void postUserActivityAsync(final String verb, final String title,
+			final String content, final String category, final User user,
+			final Entity object, final String objectType,
+			final String objectName, final String objectContent,
+			final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return postUserActivity(verb, title, content, category, user,
+						object, objectType, objectName, objectContent);
+			}
+		}).execute();
+	}
+
+	
+	/**
+	 * Creates and posts an activity to a group. Executes asynchronously in
+	 * background and the callbacks are called in the UI thread.
+	 * 
+	 * @param groupId
+	 * @param verb
+	 * @param title
+	 * @param content
+	 * @param category
+	 * @param user
+	 * @param object
+	 * @param objectType
+	 * @param objectName
+	 * @param objectContent
+	 * @param callback
+	 */
+	public void postGroupActivityAsync(final String groupId, final String verb, final String title,
+			final String content, final String category, final User user,
+			final Entity object, final String objectType,
+			final String objectName, final String objectContent,
+			final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return postGroupActivity(groupId, verb, title, content, category, user,
+						object, objectType, objectName, objectContent);
+			}
+		}).execute();
+	}
+
+
+	/**
+	 * Get a group's activity feed. Returned as a query to ease paging. Executes
+	 * asynchronously in background and the callbacks are called in the UI
+	 * thread.
+	 * 
+	 * 
+	 * @param userId
+	 * @param callback
+	 */
+	public void queryActivityFeedForGroupAsync(final String groupId,
+			final QueryResultsCallback callback) {
+		(new ClientAsyncTask<Query>(callback) {
+			@Override
+			public Query doTask() {
+				return queryActivityFeedForGroup(groupId);
+			}
+		}).execute();
+	}
+
+
+	/**
+	 * Perform a query request and return a query object. The Query object
+	 * provides a simple way of dealing with result sets that need to be
+	 * iterated or paged through. Executes asynchronously in background and the
+	 * callbacks are called in the UI thread.
+	 * 
+	 * @param callback
+	 * @param method
+	 * @param params
+	 * @param data
+	 * @param segments
+	 */
+	public void queryEntitiesRequestAsync(final QueryResultsCallback callback,
+			final HttpMethod method, final Map<String, Object> params,
+			final Object data, final String... segments) {
+		(new ClientAsyncTask<Query>(callback) {
+			@Override
+			public Query doTask() {
+				return queryEntitiesRequest(method, params, data, segments);
+			}
+		}).execute();
+	}
+
+
+	/**
+	 * Perform a query of the users collection. Executes asynchronously in
+	 * background and the callbacks are called in the UI thread.
+	 * 
+	 * @param callback
+	 */
+	public void queryUsersAsync(QueryResultsCallback callback) {
+		queryEntitiesRequestAsync(callback, HttpMethod.GET, null, null,
+				getApplicationId(), "users");
+	}
+
+	/**
+	 * Perform a query of the users collection using the provided query command.
+	 * For example: "name contains 'ed'". Executes asynchronously in background
+	 * and the callbacks are called in the UI thread.
+	 * 
+	 * @param ql
+	 * @param callback
+	 */
+	public void queryUsersAsync(String ql, QueryResultsCallback callback) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("ql", ql);
+		queryEntitiesRequestAsync(callback, HttpMethod.GET, params, null,
+				getApplicationId(), "users");
+	}
+
+	
+	/**
+	 * Queries the users for the specified group. Executes asynchronously in
+	 * background and the callbacks are called in the UI thread.
+	 * 
+	 * @param groupId
+	 * @param callback
+	 */
+	public void queryUsersForGroupAsync(String groupId,
+			QueryResultsCallback callback) {
+		queryEntitiesRequestAsync(callback, HttpMethod.GET, null, null,
+				getApplicationId(), "groups", groupId, "users");
+	}
+
+	/**
+	 * Adds a user to the specified groups. Executes asynchronously in
+	 * background and the callbacks are called in the UI thread.
+	 * 
+	 * @param userId
+	 * @param groupId
+	 * @param callback
+	 */
+	public void addUserToGroupAsync(final String userId, final String groupId,
+			final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return addUserToGroup(userId, groupId);
+			}
+		}).execute();
+	}
+
+
+	/**
+	 * Creates a group with the specified group path. Group paths can be slash
+	 * ("/") delimited like file paths for hierarchical group relationships.
+	 * Executes asynchronously in background and the callbacks are called in the
+	 * UI thread.
+	 * 
+	 * @param groupPath
+	 * @param callback
+	 */
+	public void createGroupAsync(String groupPath,
+			final ApiResponseCallback callback) {
+		createGroupAsync(groupPath, null);
+	}
+
+	
+
+	/**
+	 * Creates a group with the specified group path and group title. Group
+	 * paths can be slash ("/") deliminted like file paths for hierarchical
+	 * group relationships. Executes asynchronously in background and the
+	 * callbacks are called in the UI thread.
+	 * 
+	 * @param groupPath
+	 * @param groupTitle
+	 * @param callback
+	 */
+	public void createGroupAsync(final String groupPath,
+			final String groupTitle, final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return createGroup(groupPath, groupTitle);
+			}
+		}).execute();
+	}
+
+	
+	/**
+	 * Connect two entities together. Executes asynchronously in background and
+	 * the callbacks are called in the UI thread.
+	 * 
+	 * @param connectingEntityType
+	 * @param connectingEntityId
+	 * @param connectionType
+	 * @param connectedEntityId
+	 * @param callback
+	 */
+	public void connectEntitiesAsync(final String connectingEntityType,
+			final String connectingEntityId, final String connectionType,
+			final String connectedEntityId, final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return connectEntities(connectingEntityType,
+						connectingEntityId, connectionType, connectedEntityId);
+			}
+		}).execute();
+	}
+
+
+
+	/**
+	 * Disconnect two entities. Executes asynchronously in background and the
+	 * callbacks are called in the UI thread.
+	 * 
+	 * @param connectingEntityType
+	 * @param connectingEntityId
+	 * @param connectionType
+	 * @param connectedEntityId
+	 * @param callback
+	 */
+	public void disconnectEntitiesAsync(final String connectingEntityType,
+			final String connectingEntityId, final String connectionType,
+			final String connectedEntityId, final ApiResponseCallback callback) {
+		(new ClientAsyncTask<ApiResponse>(callback) {
+			@Override
+			public ApiResponse doTask() {
+				return connectEntities(connectingEntityType,
+						connectingEntityId, connectionType, connectedEntityId);
+			}
+		}).execute();
+	}
+
+
+
+	/**
+	 * Query the connected entities. Executes asynchronously in background and
+	 * the callbacks are called in the UI thread.
+	 * 
+	 * @param connectingEntityType
+	 * @param connectingEntityId
+	 * @param connectionType
+	 * @param ql
+	 * @param callback
+	 */
+	public void queryEntityConnectionsAsync(String connectingEntityType,
+			String connectingEntityId, String connectionType, String ql,
+			QueryResultsCallback callback) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("ql", ql);
+		queryEntitiesRequestAsync(callback, HttpMethod.GET, params, null,
+				getApplicationId(), connectingEntityType, connectingEntityId,
+				connectionType);
+	}
+
+
+	/**
+	 * Query the connected entities within distance of a specific point. .
+	 * Executes asynchronously in background and the callbacks are called in the
+	 * UI thread.
+	 * 
+	 * @param connectingEntityType
+	 * @param connectingEntityId
+	 * @param connectionType
+	 * @param distance
+	 * @param latitude
+	 * @param longitude
+	 * @param callback
+	 */
+	public void queryEntityConnectionsWithinLocationAsync(
+			String connectingEntityType, String connectingEntityId,
+			String connectionType, float distance, Location location,
+			String ql, QueryResultsCallback callback) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("ql", makeLocationQL(distance, location.getLatitude(), location.getLongitude(), ql));
+		params.put("ql", ql);
+		queryEntitiesRequestAsync(callback, HttpMethod.GET, params, null,
+				getApplicationId(), connectingEntityType, connectingEntityId,
+				connectionType);
+	}
+
+	
+	
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java
new file mode 100644
index 0000000..59d58b6
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ApiResponseCallback.java
@@ -0,0 +1,10 @@
+package org.apache.usergrid.android.client.callbacks;
+
+import org.usergrid.java.client.response.ApiResponse;
+
+
+public interface ApiResponseCallback extends ClientCallback<ApiResponse> {
+
+	public void onResponse(ApiResponse response);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java
new file mode 100644
index 0000000..e4d4d82
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientAsyncTask.java
@@ -0,0 +1,38 @@
+package org.apache.usergrid.android.client.callbacks;
+
+import android.os.AsyncTask;
+
+public abstract class ClientAsyncTask<T> extends AsyncTask<Void, Exception, T> {
+
+	ClientCallback<T> callback;
+
+	public ClientAsyncTask(ClientCallback<T> callback) {
+		this.callback = callback;
+	}
+
+	@Override
+	protected T doInBackground(Void... v) {
+		try {
+			return doTask();
+		} catch (Exception e) {
+			this.publishProgress(e);
+		}
+		return null;
+	}
+
+	public abstract T doTask();
+
+	@Override
+	protected void onPostExecute(T response) {
+		if (callback != null) {
+			callback.onResponse(response);
+		}
+	}
+
+	@Override
+	protected void onProgressUpdate(Exception... e) {
+		if ((callback != null) && (e != null) && (e.length > 0)) {
+			callback.onException(e[0]);
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java
new file mode 100644
index 0000000..559b3b9
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/ClientCallback.java
@@ -0,0 +1,9 @@
+package org.apache.usergrid.android.client.callbacks;
+
+public interface ClientCallback<T> {
+
+	public void onResponse(T response);
+
+	public void onException(Exception e);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java
new file mode 100644
index 0000000..66ded57
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/DeviceRegistrationCallback.java
@@ -0,0 +1,9 @@
+package org.apache.usergrid.android.client.callbacks;
+
+import org.usergrid.java.client.entities.Device;
+
+public interface DeviceRegistrationCallback extends ClientCallback<Device> {
+
+	public void onDeviceRegistration(Device device);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java
new file mode 100644
index 0000000..4558cf6
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/GroupsRetrievedCallback.java
@@ -0,0 +1,13 @@
+package org.apache.usergrid.android.client.callbacks;
+
+import java.util.Map;
+
+import org.usergrid.java.client.entities.Group;
+
+
+public interface GroupsRetrievedCallback extends
+		ClientCallback<Map<String, Group>> {
+
+	public void onGroupsRetrieved(Map<String, Group> groups);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java
new file mode 100644
index 0000000..13f325e
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/callbacks/QueryResultsCallback.java
@@ -0,0 +1,9 @@
+package org.apache.usergrid.android.client.callbacks;
+
+import org.usergrid.java.client.Client.Query;
+
+public interface QueryResultsCallback extends ClientCallback<Query> {
+
+	public void onQueryResults(Query query);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java
new file mode 100644
index 0000000..1eec3c3
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/DeviceUuidFactory.java
@@ -0,0 +1,154 @@
+package org.apache.usergrid.android.client.utils;
+
+import static org.apache.usergrid.android.client.utils.ObjectUtils.isEmpty;
+
+import java.io.UnsupportedEncodingException;
+import java.util.UUID;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.provider.Settings.Secure;
+import android.telephony.TelephonyManager;
+
+/**
+ * Tries to get the device ID as a UUID and fallsback to a generated UUID value
+ * if it doesn't work.
+ * 
+ * @see http 
+ *      ://stackoverflow.com/questions/2785485/is-there-a-unique-android-device
+ *      -id
+ * 
+ */
+public class DeviceUuidFactory {
+	protected static final String PREFS_FILE = "device_id.xml";
+	protected static final String PREFS_DEVICE_ID = "device_id";
+
+	protected static UUID uuid;
+
+	public DeviceUuidFactory(Context context) {
+
+		if (uuid == null) {
+			synchronized (DeviceUuidFactory.class) {
+				if (uuid == null) {
+					final SharedPreferences prefs = context
+							.getSharedPreferences(PREFS_FILE, 0);
+					final String id = prefs.getString(PREFS_DEVICE_ID, null);
+
+					if (id != null) {
+						// Use the ids previously computed and stored in the
+						// prefs file
+						uuid = UUID.fromString(id);
+
+					} else {
+
+						final String androidId = Secure
+								.getString(context.getContentResolver(),
+										Secure.ANDROID_ID);
+
+						// Use the Android ID unless it's broken, in which case
+						// fallback on deviceId,
+						// unless it's not available, then fallback on a random
+						// number which we store
+						// to a prefs file
+						try {
+							if (!"9774d56d682e549c".equals(androidId)) {
+								uuid = UUID.nameUUIDFromBytes(androidId
+										.getBytes("utf8"));
+							} else {
+								final String deviceId = ((TelephonyManager) context
+										.getSystemService(Context.TELEPHONY_SERVICE))
+										.getDeviceId();
+								uuid = deviceId != null ? UUID
+										.nameUUIDFromBytes(deviceId
+												.getBytes("utf8"))
+										: generateDeviceUuid(context);
+							}
+						} catch (UnsupportedEncodingException e) {
+							throw new RuntimeException(e);
+						}
+
+						// Write the value out to the prefs file
+						prefs.edit()
+								.putString(PREFS_DEVICE_ID, uuid.toString())
+								.commit();
+
+					}
+
+				}
+			}
+		}
+
+	}
+
+	private UUID generateDeviceUuid(Context context) {
+
+		// Get some of the hardware information
+		String buildParams = Build.BOARD + Build.BRAND + Build.CPU_ABI
+				+ Build.DEVICE + Build.DISPLAY + Build.FINGERPRINT + Build.HOST
+				+ Build.ID + Build.MANUFACTURER + Build.MODEL + Build.PRODUCT
+				+ Build.TAGS + Build.TYPE + Build.USER;
+
+		// Requires READ_PHONE_STATE
+		TelephonyManager tm = (TelephonyManager) context
+				.getSystemService(Context.TELEPHONY_SERVICE);
+
+		// gets the imei (GSM) or MEID/ESN (CDMA)
+		String imei = tm.getDeviceId();
+
+		// gets the android-assigned id
+		String androidId = Secure.getString(context.getContentResolver(),
+				Secure.ANDROID_ID);
+
+		// requires ACCESS_WIFI_STATE
+		WifiManager wm = (WifiManager) context
+				.getSystemService(Context.WIFI_SERVICE);
+
+		// gets the MAC address
+		String mac = wm.getConnectionInfo().getMacAddress();
+
+		// if we've got nothing, return a random UUID
+		if (isEmpty(imei) && isEmpty(androidId) && isEmpty(mac)) {
+			return UUID.randomUUID();
+		}
+
+		// concatenate the string
+		String fullHash = buildParams.toString() + imei + androidId + mac;
+
+		return UUID.nameUUIDFromBytes(fullHash.getBytes());
+	}
+
+	/**
+	 * Returns a unique UUID for the current android device. As with all UUIDs,
+	 * this unique ID is "very highly likely" to be unique across all Android
+	 * devices. Much more so than ANDROID_ID is.
+	 * 
+	 * The UUID is generated by using ANDROID_ID as the base key if appropriate,
+	 * falling back on TelephonyManager.getDeviceID() if ANDROID_ID is known to
+	 * be incorrect, and finally falling back on a random UUID that's persisted
+	 * to SharedPreferences if getDeviceID() does not return a usable value.
+	 * 
+	 * In some rare circumstances, this ID may change. In particular, if the
+	 * device is factory reset a new device ID may be generated. In addition, if
+	 * a user upgrades their phone from certain buggy implementations of Android
+	 * 2.2 to a newer, non-buggy version of Android, the device ID may change.
+	 * Or, if a user uninstalls your app on a device that has neither a proper
+	 * Android ID nor a Device ID, this ID may change on reinstallation.
+	 * 
+	 * Note that if the code falls back on using TelephonyManager.getDeviceId(),
+	 * the resulting ID will NOT change after a factory reset. Something to be
+	 * aware of.
+	 * 
+	 * Works around a bug in Android 2.2 for many devices when using ANDROID_ID
+	 * directly.
+	 * 
+	 * @see http://code.google.com/p/android/issues/detail?id=10603
+	 * 
+	 * @return a UUID that may be used to uniquely identify your device for most
+	 *         purposes.
+	 */
+	public UUID getDeviceUuid() {
+		return uuid;
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ccbfd8a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java
----------------------------------------------------------------------
diff --git a/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java
new file mode 100644
index 0000000..964dd9d
--- /dev/null
+++ b/sdks/android/src/main/java/org/apache/usergrid/android/client/utils/ObjectUtils.java
@@ -0,0 +1,20 @@
+package org.apache.usergrid.android.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;
+	}
+
+}
\ No newline at end of file