You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ti...@apache.org on 2014/02/10 06:47:07 UTC
svn commit: r1566508 [1/11] - in /incubator/usergrid/site: content/ layouts/
lib/ publish/ publish/community/ publish/docs/ publish/docs/access-token/
publish/docs/activity/ publish/docs/admin-portal/ publish/docs/admin-user/
publish/docs/app-security/...
Author: timanglade
Date: Mon Feb 10 05:47:06 2014
New Revision: 1566508
URL: http://svn.apache.org/r1566508
Log:
Bring site in compliance with Apache guidelines
Modified:
incubator/usergrid/site/content/index.html
incubator/usergrid/site/layouts/default.html
incubator/usergrid/site/layouts/footer.html
incubator/usergrid/site/lib/helpers_.rb
incubator/usergrid/site/publish/community/index.html
incubator/usergrid/site/publish/docs/access-token/index.html
incubator/usergrid/site/publish/docs/activity/index.html
incubator/usergrid/site/publish/docs/admin-portal/index.html
incubator/usergrid/site/publish/docs/admin-user/index.html
incubator/usergrid/site/publish/docs/app-security/index.html
incubator/usergrid/site/publish/docs/application/index.html
incubator/usergrid/site/publish/docs/applications/index.html
incubator/usergrid/site/publish/docs/assets/index.html
incubator/usergrid/site/publish/docs/authenticating-users-and-application-clients/index.html
incubator/usergrid/site/publish/docs/authentication-and-access-app-services-0/index.html
incubator/usergrid/site/publish/docs/client-authorization/index.html
incubator/usergrid/site/publish/docs/collections/index.html
incubator/usergrid/site/publish/docs/creating-collections/index.html
incubator/usergrid/site/publish/docs/creating-custom-data-entities/index.html
incubator/usergrid/site/publish/docs/creating-new-application-admin-console/index.html
incubator/usergrid/site/publish/docs/data-model/index.html
incubator/usergrid/site/publish/docs/data-query-overview/index.html
incubator/usergrid/site/publish/docs/default-data-entities/index.html
incubator/usergrid/site/publish/docs/deleting-collections/index.html
incubator/usergrid/site/publish/docs/deleting-data-entities/index.html
incubator/usergrid/site/publish/docs/device/index.html
incubator/usergrid/site/publish/docs/displaying-app-services-api-calls-curl-commands/index.html
incubator/usergrid/site/publish/docs/events-and-counters 2/index.html
incubator/usergrid/site/publish/docs/events-and-counters/index.html
incubator/usergrid/site/publish/docs/facebook-sign/index.html
incubator/usergrid/site/publish/docs/features/index.html
incubator/usergrid/site/publish/docs/folder/index.html
incubator/usergrid/site/publish/docs/geolocation/index.html
incubator/usergrid/site/publish/docs/getting-up-and-running-locally/index.html
incubator/usergrid/site/publish/docs/group 2/index.html
incubator/usergrid/site/publish/docs/group/index.html
incubator/usergrid/site/publish/docs/groups/index.html
incubator/usergrid/site/publish/docs/html-5-example-messagee/index.html
incubator/usergrid/site/publish/docs/index.html
incubator/usergrid/site/publish/docs/managing-access-defining-permission-rules/index.html
incubator/usergrid/site/publish/docs/messagee-example/index.html
incubator/usergrid/site/publish/docs/nodejs-module/index.html
incubator/usergrid/site/publish/docs/organization/index.html
incubator/usergrid/site/publish/docs/organizations-admins 2/index.html
incubator/usergrid/site/publish/docs/organizations-admins/index.html
incubator/usergrid/site/publish/docs/overview/index.html
incubator/usergrid/site/publish/docs/query-language/index.html
incubator/usergrid/site/publish/docs/querying-data-admin-portal/index.html
incubator/usergrid/site/publish/docs/querying-your-app-services-data/index.html
incubator/usergrid/site/publish/docs/relationships/index.html
incubator/usergrid/site/publish/docs/rest-api/index.html
incubator/usergrid/site/publish/docs/rest-endpoints/index.html
incubator/usergrid/site/publish/docs/retrieving-collections/index.html
incubator/usergrid/site/publish/docs/retrieving-data-entities/index.html
incubator/usergrid/site/publish/docs/role/index.html
incubator/usergrid/site/publish/docs/roles-and-permissions/index.html
incubator/usergrid/site/publish/docs/ruby-gem/index.html
incubator/usergrid/site/publish/docs/securing-your-app/index.html
incubator/usergrid/site/publish/docs/security-model/index.html
incubator/usergrid/site/publish/docs/updating-collections/index.html
incubator/usergrid/site/publish/docs/updating-data-entities/index.html
incubator/usergrid/site/publish/docs/upgrading/index.html
incubator/usergrid/site/publish/docs/uploading-files-and-assets/index.html
incubator/usergrid/site/publish/docs/user/index.html
incubator/usergrid/site/publish/docs/users-devices/index.html
incubator/usergrid/site/publish/docs/using-api/index.html
incubator/usergrid/site/publish/docs/using-sandbox-application/index.html
incubator/usergrid/site/publish/index.html
Modified: incubator/usergrid/site/content/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/content/index.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/content/index.html (original)
+++ incubator/usergrid/site/content/index.html Mon Feb 10 05:47:06 2014
@@ -14,7 +14,7 @@ title: the BaaS not made for Hipsters
<div class="btn-wrapper">
<iframe class="social-btn" src="/static/github-btn.html?user=usergrid&repo=usergrid&type=watch&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
<iframe class="social-btn" src="/static/github-btn.html?user=usergrid&repo=usergrid&type=fork&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="85" height="30"></iframe>
- <p><span class="or">or</span> <a href="<%= releases[-1]["zipball_url"]%>">Download Usergrid <%= releases[-1]["tag_name"]%></a></p>
+ <!--<p><span class="or">or</span> <a href="#">Download Usergrid</a></p>-->
</div>
</div>
@@ -74,7 +74,7 @@ title: the BaaS not made for Hipsters
<div class="container">
<div class="row">
- <div class="col-md-8 text-left">
+ <div class="col-md-12 text-left">
<h2>About the Project</h2>
<p>Apache Usergrid is currently undergoing Incubation at the Apache Software Foundation. Itâs an open-source Backend-as-a-Service (âBaaSâ or âmBaaSâ) composed of an integrated distributed NoSQL database, application layer and client tier with SDKs for developers looking to rapidly build web and/or mobile applications. It provides elementary services (user registration & management, data storage, file storage, queues) and retrieval features (full text search, geolocation search, joins) to power common app features.</p>
@@ -82,14 +82,13 @@ title: the BaaS not made for Hipsters
<p>For architects and back-end teams, it aims to provide a distributed, easily extendable, operationally predictable and highly scalable solution. For front-end developers, it aims to simplify the development process by enabling them to rapidly build and operate mobile and web applications without requiring backend expertise.</p>
</div>
+ <!--
<div class="col-md-4 text-left">
<h2>Recent Releases</h2>
- <% releases[-5..-1].reverse_each do |release| %>
- <!--<h3><%= release["name"]%> <small><%= release["tag_name"]%></small></h3>-->
- <p><strong><%= release["tag_name"]%></strong> â <em><%= DateTime.parse(release["created_at"]).strftime("%B %-d, %Y")%></em><br/>
- <a href="<%= releases[0]["zipball_url"]%>">Download</a> or <a href="https://github.com/usergrid/usergrid/releases/tag/<%= release["tag_name"] %>" target="_blank">See Github for details</a>.</p>
- <% end %>
+
+
</div>
+ -->
</div>
</div>
Modified: incubator/usergrid/site/layouts/default.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/layouts/default.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/layouts/default.html (original)
+++ incubator/usergrid/site/layouts/default.html Mon Feb 10 05:47:06 2014
@@ -40,7 +40,7 @@
<li class="nav-header"><span>Usage</span></li>
- <li>REST API â Coming Soon</li>
+ <!-- <li>REST API â Coming Soon</li> -->
<li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
<li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
<li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
@@ -51,17 +51,16 @@
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
- <li class="nav-header"><span>Internals</span></li>
+ <!--<li class="nav-header"><span>Internals</span></li>
<li>Design & Goals â Coming Soon</li>
<li>Java Architecture â Coming Soon</li>
- <li>Cassandra Schema â Coming Soon</li>
- <li><a href="/docs/contributing/">Contributing</a></li>
+ <li>Cassandra Schema â Coming Soon</li>-->
<li class="nav-header"><span>Operations</span></li>
- <li>Deploying â Coming Soon</li>
- <li>Monitoring â Coming Soon</li>
+ <!--<li>Deploying â Coming Soon</li>-->
+ <!-- <li>Monitoring â Coming Soon</li> -->
<li><a href="/docs/upgrading/">Upgrading</a></li>
- <li>Security â Coming Soon</li>
+ <!-- <li>Security â Coming Soon</li> -->
</ul>
</div>
</div>
Modified: incubator/usergrid/site/layouts/footer.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/layouts/footer.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/layouts/footer.html (original)
+++ incubator/usergrid/site/layouts/footer.html Mon Feb 10 05:47:06 2014
@@ -32,18 +32,26 @@
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
- <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
- <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
- <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
- <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+ <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+ <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+ <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
+ <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+ <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+ </ul>
+ </div>
+ <div class="col-md-2">
+ <ul class="nav nav-list">
+ <li class="nav-header">Apache</li>
+ <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
</ul>
</div>
- <div class="col-md-2"></div>
<div class="col-md-4">
<a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976" data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
Modified: incubator/usergrid/site/lib/helpers_.rb
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/lib/helpers_.rb?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/lib/helpers_.rb (original)
+++ incubator/usergrid/site/lib/helpers_.rb Mon Feb 10 05:47:06 2014
@@ -1 +0,0 @@
-include ReleaseHelper
Modified: incubator/usergrid/site/publish/community/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/community/index.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/publish/community/index.html (original)
+++ incubator/usergrid/site/publish/community/index.html Mon Feb 10 05:47:06 2014
@@ -349,6 +349,10 @@
<p>Alberto Leal</p>
</div>
<div class="col-md-2 text-center">
+ <img src="/img/alex.png" />
+ <p>Alex Karasulu</p>
+ </div>
+ <div class="col-md-2 text-center">
<img src="/img/dave.jpg" />
<p>Dave Johnson</p>
</div>
@@ -426,18 +430,26 @@
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
- <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
- <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
- <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
- <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+ <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+ <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+ <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
+ <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+ <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+ </ul>
+ </div>
+ <div class="col-md-2">
+ <ul class="nav nav-list">
+ <li class="nav-header">Apache</li>
+ <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
</ul>
</div>
- <div class="col-md-2"></div>
<div class="col-md-4">
<a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976" data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
Modified: incubator/usergrid/site/publish/docs/access-token/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/access-token/index.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/access-token/index.html (original)
+++ incubator/usergrid/site/publish/docs/access-token/index.html Mon Feb 10 05:47:06 2014
@@ -96,7 +96,7 @@
<li class="nav-header"><span>Usage</span></li>
- <li>REST API â Coming Soon</li>
+ <!-- <li>REST API â Coming Soon</li> -->
<li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
<li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
<li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
@@ -107,17 +107,16 @@
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
- <li class="nav-header"><span>Internals</span></li>
+ <!--<li class="nav-header"><span>Internals</span></li>
<li>Design & Goals â Coming Soon</li>
<li>Java Architecture â Coming Soon</li>
- <li>Cassandra Schema â Coming Soon</li>
- <li><a href="/docs/contributing/">Contributing</a></li>
+ <li>Cassandra Schema â Coming Soon</li>-->
<li class="nav-header"><span>Operations</span></li>
- <li>Deploying â Coming Soon</li>
- <li>Monitoring â Coming Soon</li>
+ <!--<li>Deploying â Coming Soon</li>-->
+ <!-- <li>Monitoring â Coming Soon</li> -->
<li><a href="/docs/upgrading/">Upgrading</a></li>
- <li>Security â Coming Soon</li>
+ <!-- <li>Security â Coming Soon</li> -->
</ul>
</div>
</div>
@@ -146,12 +145,12 @@
</li>
</ul>
</div>
-<h1 id="access-token"><a href="#access-token">Access token</a></h1>
+<h1 id="access-token">Access token</h1>
<p><a href="/docs/usergrid/content/management-resources">See all management resources</a><a href="/docs/usergrid/content/management-resources"><img src="/docs/sites/docs/files/learnmore%20arrow_0.png"></a></p>
<p>An access token carries the credentials and authorization information needed to access other resources through the Apache Usergrid API. Using the API, you can obtain an access token.</p>
-<h2 id="requesting-an-access-token"><a href="#requesting-an-access-token">Requesting an access token</a></h2>
+<h2 id="requesting-an-access-token">Requesting an access token</h2>
<p>Use the POST method to obtain an access token.</p>
-<h3 id="request-uri"><a href="#request-uri">Request URI</a></h3>
+<h3 id="request-uri">Request URI</h3>
<p>The request URL depends on the access type:</p>
<table>
<thead><tr class="header">
@@ -177,7 +176,7 @@
</tr>
</tbody>
</table><p>See <a href="/authenticating-users-and-application-clients">Authenticating users and application clients</a> for further details about access types.</p>
-<h3 id="parameters"><a href="#parameters">Parameters</a></h3>
+<h3 id="parameters">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter Name</th>
@@ -213,7 +212,7 @@
</tr>
</tbody>
</table><p>Â </p>
-<h3 id="example---request-application-user"><a href="#example---request-application-user">Example - Request (Application user)</a></h3>
+<h3 id="example---request-application-user">Example - Request (Application user)</h3>
<ul>
<li><a href="#curl_get_token_appuser">cURL</a></li>
<li><a href="#javascript_get_token_appuser">JavaScript (HTML5)</a></li>
@@ -250,7 +249,7 @@ client.login(username, password,
}
}
);</code></pre>
-<h3 id="example---response"><a href="#example---response">Example - Response</a></h3>
+<h3 id="example---response">Example - Response</h3>
<pre><code>{
"access_token": "5wuGd-lcEeCUBwBQVsAACA:F8zeMOlcEeCUBwBQVsAACA:YXU6AAABMq0hdy4Lh0ewmmnOWOR-DaepCrpWx9oPmw",
"expires_in": 3600,
@@ -263,7 +262,7 @@ client.login(username, password,
"created": 1317164604367013,
"modified": 1317164604367013
}</code></pre>
-<h3 id="example---request-admin-user"><a href="#example---request-admin-user">Example - Request (Admin user)</a></h3>
+<h3 id="example---request-admin-user">Example - Request (Admin user)</h3>
<ul>
<li><a href="#curl_get_token_adminuser">cURL</a></li>
<li><a href="#javascript_get_token_adminuser">JavaScript (HTML5)</a></li>
@@ -289,7 +288,7 @@ client.login(username, password,
}
}
);</code></pre>
-<h3 id="example---response-1"><a href="#example---response-1">Example - Response</a></h3>
+<h3 id="example---response-1">Example - Response</h3>
<pre><code>{
"access_token": "f_GUbelXEeCfRgBQVsAACA:YWQ6AAABMqz_xUyYeErOkKjnzN7YQXXlpgmL69fvaA",
"expires_in": 3600,
@@ -375,18 +374,26 @@ client.login(username, password,
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
- <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
- <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
- <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
- <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+ <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+ <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+ <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
+ <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+ <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+ </ul>
+ </div>
+ <div class="col-md-2">
+ <ul class="nav nav-list">
+ <li class="nav-header">Apache</li>
+ <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
</ul>
</div>
- <div class="col-md-2"></div>
<div class="col-md-4">
<a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976" data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
Modified: incubator/usergrid/site/publish/docs/activity/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/activity/index.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/activity/index.html (original)
+++ incubator/usergrid/site/publish/docs/activity/index.html Mon Feb 10 05:47:06 2014
@@ -96,7 +96,7 @@
<li class="nav-header"><span>Usage</span></li>
- <li>REST API â Coming Soon</li>
+ <!-- <li>REST API â Coming Soon</li> -->
<li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
<li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
<li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
@@ -107,17 +107,16 @@
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
- <li class="nav-header"><span>Internals</span></li>
+ <!--<li class="nav-header"><span>Internals</span></li>
<li>Design & Goals â Coming Soon</li>
<li>Java Architecture â Coming Soon</li>
- <li>Cassandra Schema â Coming Soon</li>
- <li><a href="/docs/contributing/">Contributing</a></li>
+ <li>Cassandra Schema â Coming Soon</li>-->
<li class="nav-header"><span>Operations</span></li>
- <li>Deploying â Coming Soon</li>
- <li>Monitoring â Coming Soon</li>
+ <!--<li>Deploying â Coming Soon</li>-->
+ <!-- <li>Monitoring â Coming Soon</li> -->
<li><a href="/docs/upgrading/">Upgrading</a></li>
- <li>Security â Coming Soon</li>
+ <!-- <li>Security â Coming Soon</li> -->
</ul>
</div>
</div>
@@ -194,7 +193,7 @@
</li>
</ul>
</div>
-<h1 id="activity"><a href="#activity">Activity</a></h1>
+<h1 id="activity">Activity</h1>
<p>Most modern applications struggle to manage data streams, such as those that contain an ongoing list of comments, activities, and tweets. In particular, mobile applications are prone to generating very large amounts of data in a data stream. Beyond that, additions to a data stream must often be routed automatically to subscribers or filtered or counted.</p>
<p>App services provides an activity entity that is specifically designed for data streams. An activity is an entity type that represents activity stream actions (see the <a href="http://activitystrea.ms/specs/json/1.0/">JSON Activity Streams 1.0 specification</a> for more information about these actions).</p>
<p>When a user creates an activity, it creates a relationship between the activity and the user who created it. Because this relationship exists, the activity will appear in the feed of any of the userâs followers. Think of the Activities endpoint (/users/{uuid|username}/activities) as an âoutboxâ of news items created by the user. Think of the Feed endpoint (/users/{uuid|username}/feed) as an âinboxâ of news items meant to be seen or consumed by the user.</p>
@@ -202,11 +201,11 @@
<p>Activity entities are particularly useful in applications that enable users to post content to activity streams (also called feeds) and to display activity streams. Some examples of these applications are Twitter, foursquare, and Pinterest. For example, when a Twitter user posts a short, 140-character or less, âtweetâ, that activity gets added to the userâs activity stream for display as well as to the activity streams of any of the userâs followers.</p>
<p>Using App services APIs you can create, retrieve, update, and delete activity entities. See You do not have access to view this node for descriptions of these APIs.</p>
<p><strong>Note:</strong>Â Although not shown in the API examples below, you need to provide a valid access token with each API call. See <a href="/authenticating-users-and-application-clients">Authenticating users and application clients</a> for details.</p>
-<h2 id="creating-an-activity" dir="ltr"><a href="#creating-an-activity">Creating an activity</a></h2>
+<h2 id="creating-an-activity" dir="ltr">Creating an activity</h2>
<p>Use the  POST method to create an activity in the activities collection.</p>
-<h3 id="request-uri"><a href="#request-uri">Request URI</a></h3>
+<h3 id="request-uri">Request URI</h3>
<p>POST /{org_id}/{app_id}/users/{uuid|username}/activities {request body}</p>
-<h3 id="parameters"><a href="#parameters">Parameters</a></h3>
+<h3 id="parameters">Parameters</h3>
<table>
<col width="50%">
<col width="50%">
@@ -236,7 +235,7 @@
</td>
</tr>
</tbody>
-</table><h3 id="example---request"><a href="#example---request">Example - Request</a></h3>
+</table><h3 id="example---request">Example - Request</h3>
<ul>
<li><a href="#curl_create_activity">cURL</a></li>
<li><a href="#javascript_create_activity">JavaScript (HTML5)</a></li>
@@ -296,7 +295,7 @@ client.request(options, function (err, d
// success â POST worked. Data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response"><a href="#example---response">Example - Response</a></h3>
+<h3 id="example---response">Example - Response</h3>
<pre><code>{
 "action" : "post",
 "application" : "5111c463-6a42-11e1-b6dd-1231380a0284",
@@ -339,11 +338,11 @@ client.request(options, function (err, d
<p>When you create an activity it creates a relationship between the activity and the user who created it. In other words, the newly created activity above belongs to john.doe. Another way of saying this is the user âownsâ the activity. And because this relationship exists, the activity will appear in the feed of any of the userâs followers (in this example, anyone who is following john.doe). However, it will not appear in the feed of people the user follows. The activity is accessible at the /activites endpoint to users who have the permission to read that endpoint.</p>
<p>Notice the properties specified in the request body in the previous example are <em>actor</em>, <em>verb</em>, and <em>content</em>. The <em>actor</em>, <em>verb</em>, and <em>content</em> properties are built into the Activity entity (see <a href="#properties">System-defined activity properties</a>). The actor property specifies properties of the entity that performs the action (here, user john.doe). The gravatar URL is used to create an icon for the activity. And because an Activity is simply an Apache Usergrid entity, you can also create custom properties.</p>
<p>The <em>verb</em> parameter is descriptive. You can use it to indicate what type of activity is posted, for example, an image versus text. The value<em>post</em> is defined in the JSON Activity Streams specification as âthe act of authoring an object and then publishing it online.â</p>
-<h2 id="posting-an-activity-to-a-group" dir="ltr"><a href="#posting-an-activity-to-a-group">Posting an activity to a group</a></h2>
+<h2 id="posting-an-activity-to-a-group" dir="ltr">Posting an activity to a group</h2>
<p>Use the POST method to post an activity to a specific group. In this case the activity is created in the activities collection and is accessible at the /activities endpoint to users who have the permission to read that endpoint. In addition, a relationship is established between the activity and the group, and because of that, the activity will appear in the groupâs feed. The group âownsâ the activity. Also, the activity will be published in the feed of all users that are members of the group.</p>
<p>Request URI</p>
<p>POST /{org_id}/{app_id}/groups/{uuid|groupname}/activities {request body}</p>
-<h3 id="parameters-1"><a href="#parameters-1">Parameters</a></h3>
+<h3 id="parameters-1">Parameters</h3>
<table>
<col width="50%">
<col width="50%">
@@ -377,7 +376,7 @@ client.request(options, function (err, d
</td>
</tr>
</tbody>
-</table><h3 id="example---request-1"><a href="#example---request-1">Example - Request</a></h3>
+</table><h3 id="example---request-1">Example - Request</h3>
<ul>
<li><a href="#curl_post_activity_group">cURL</a></li>
<li><a href="#javascript_post_activity_group">JavaScript (HTML5)</a></li>
@@ -438,7 +437,7 @@ client.request(options, function (err, d
}
});</code></pre>
<p>Because this relationship exists, this activity will appear in the feed of all users who are members of mygroup. It wonât appear in the feeds of the group membersâ followers or in feeds of users they follow.</p>
-<h3 id="example---response-1"><a href="#example---response-1">Example - Response</a></h3>
+<h3 id="example---response-1">Example - Response</h3>
<pre><code>{
"action": "post",
"application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
@@ -475,16 +474,16 @@ client.request(options, function (err, d
"duration": 81,
"organization": "my-org",
"applicationName": "my-app"</code></pre>
-<h2 id="creating-an-activity-for-a-users-followers-in-a-group" dir="ltr"><a href="#creating-an-activity-for-a-users-followers-in-a-group">Creating an activity for a userâs followers in a group</a></h2>
+<h2 id="creating-an-activity-for-a-users-followers-in-a-group" dir="ltr">Creating an activity for a userâs followers in a group</h2>
<p>Use the POST method to create an activity that will be published only in the feeds of users who (1) follow you, and (2) are in the same group to which you posted the activity. This is useful if you want to create specific groups of friends (for example, acquaintances or colleagues) and publish content to them with more precise privacy settings. This allows you to re-create a privacy model similar to Google+âs Circles or Facebook current privacy system.</p>
<p>When you create an activity for a userâs followers in a group:</p>
<ul>
<li>The activity is accessible at the /activities endpoint to users who have the permission to read that endpoint. The activity will not be cross-posted to the groupâs activity endpoint (/groups/{uuid|groupname}/activities)</li>
<li>A relationship is automatically created between the activity entity that was just created and the user within that group (/groups/{uuid|groupname}/users/{uuid|username})</li>
<li>The user within the group (/groups/{uuid|groupname}/users/{uuid|username}) becomes the owner of the activity (through the owner property in the activity).</li>
-</ul><h3 id="request-uri-1"><a href="#request-uri-1">Request URI</a></h3>
+</ul><h3 id="request-uri-1">Request URI</h3>
<p>POST /{org_id}/{app_id}/groups/{uuid|groupname}/users/{uuid|username}/activities {request body}</p>
-<h3 id="parameters-2"><a href="#parameters-2">Parameters</a></h3>
+<h3 id="parameters-2">Parameters</h3>
<table>
<col width="50%">
<col width="50%">
@@ -522,7 +521,7 @@ client.request(options, function (err, d
</td>
</tr>
</tbody>
-</table><h3 id="example---request-2"><a href="#example---request-2">Example - Request</a></h3>
+</table><h3 id="example---request-2">Example - Request</h3>
<ul>
<li><a href="#curl_post_activity_user_group">cURL</a></li>
<li><a href="#javascript_post_activity_user_group">JavaScript (HTML5)</a></li>
@@ -583,7 +582,7 @@ client.request(options, function (err, d
}
});</code></pre>
<p>Because this relationship exists, this activity will appear in the feed of all users who are members of mygroup. It wonât appear in the feeds of the group membersâ followers or in feeds of users they follow.</p>
-<h3 id="example---response-2"><a href="#example---response-2">Example - Response</a></h3>
+<h3 id="example---response-2">Example - Response</h3>
<pre><code>{
"action" : "post",
"application" : "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
@@ -619,11 +618,11 @@ client.request(options, function (err, d
"duration" : 95,
"organization" : "my-org",
"applicationName" : "my-app"</code></pre>
-<h2 id="getting-a-users-activities" dir="ltr"><a href="#getting-a-users-activities">Getting a userâs activities</a></h2>
+<h2 id="getting-a-users-activities" dir="ltr">Getting a userâs activities</h2>
<p>Use the GET method to retrieve a userâs activities. This returns the activities posted on the user (that is, to /users/{uuid|username}/activities), but not the activities of the people that user follows. To retrieve the userâs activities and activities of the users he follows, you need to get the userâs feed.</p>
-<h3 id="request-uri-2"><a href="#request-uri-2">Request URI</a></h3>
+<h3 id="request-uri-2">Request URI</h3>
<p>GET /{org_id}/{app_id}/users/{uuid|username}/activities</p>
-<h3 id="parameters-3"><a href="#parameters-3">Parameters</a></h3>
+<h3 id="parameters-3">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -643,7 +642,7 @@ client.request(options, function (err, d
<td align="left">UUID or name of the user</td>
</tr>
</tbody>
-</table><h3 id="example---request-3"><a href="#example---request-3">Example - Request</a></h3>
+</table><h3 id="example---request-3">Example - Request</h3>
<ul>
<li><a href="#curl_get_user_activities">cURL</a></li>
<li><a href="#javascript_get_user_activities">JavaScript (HTML5)</a></li>
@@ -677,7 +676,7 @@ client.request(options, function (err, d
//success GET worked. Data will contain raw results from API call.
}
});</code></pre>
-<h3 id="example---response-3"><a href="#example---response-3">Example - Response</a></h3>
+<h3 id="example---response-3">Example - Response</h3>
<pre><code>{
"action" : "get",
"application" : "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
@@ -712,11 +711,11 @@ client.request(options, function (err, d
"duration" : 39,
"organization" : "my-org",
"applicationName" : "my-app"}</code></pre>
-<h2 id="getting-a-groups-activities" dir="ltr"><a href="#getting-a-groups-activities">Getting a groupâs activities</a></h2>
+<h2 id="getting-a-groups-activities" dir="ltr">Getting a groupâs activities</h2>
<p>Use the GET method to retrieve a groupâs activities. This returns the activities created on or by the group (that is, to /groups/{uuid|groupname}/activities), but not the activities of followers of group members. To retrieve the groupâs activities and activities of followers, you need to get the groupâs feed.</p>
-<h3 id="request-uri-3"><a href="#request-uri-3">Request URI</a></h3>
+<h3 id="request-uri-3">Request URI</h3>
<p>GET /{org_id}/{app_id}/groups/{uuid|groupname}/activities</p>
-<h3 id="parameters-4"><a href="#parameters-4">Parameters</a></h3>
+<h3 id="parameters-4">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -736,7 +735,7 @@ client.request(options, function (err, d
<td align="left">UUID or name of the group</td>
</tr>
</tbody>
-</table><h3 id="example---request-4"><a href="#example---request-4">Example - Request</a></h3>
+</table><h3 id="example---request-4">Example - Request</h3>
<ul>
<li><a href="#curl_get_group_activities">cURL</a></li>
<li><a href="#javascript_get_group_activities">JavaScript (HTML5)</a></li>
@@ -770,7 +769,7 @@ client.request(options, function (err, d
//success GET worked. Data will contain raw results from API call.
}
});</code></pre>
-<h3 id="example---response-4"><a href="#example---response-4">Example - Response</a></h3>
+<h3 id="example---response-4">Example - Response</h3>
<pre><code>{
"action" : "get",
"application" : "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
@@ -838,11 +837,11 @@ client.request(options, function (err, d
"organization" : "my-org",
"applicationName" : "my-app"
}</code></pre>
-<h2 id="getting-a-users-feed" dir="ltr"><a href="#getting-a-users-feed">Getting a userâs feed</a></h2>
+<h2 id="getting-a-users-feed" dir="ltr">Getting a userâs feed</h2>
<p>Use the GET method to retrieve a userâs feed.</p>
-<h3 id="request-uri-4"><a href="#request-uri-4">Request URI</a></h3>
+<h3 id="request-uri-4">Request URI</h3>
<p>GET /{org_id}/{app_id}/users/{uuid|username}/feed</p>
-<h3 id="parameters-5"><a href="#parameters-5">Parameters</a></h3>
+<h3 id="parameters-5">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -862,7 +861,7 @@ client.request(options, function (err, d
<td align="left">UUID or name of the user</td>
</tr>
</tbody>
-</table><h3 id="example---request-5"><a href="#example---request-5">Example - Request</a></h3>
+</table><h3 id="example---request-5">Example - Request</h3>
<ul>
<li><a href="#curl_get_user_feed">cURL</a></li>
<li><a href="#javascript_get_user_feed">JavaScript (HTML5)</a></li>
@@ -896,7 +895,7 @@ client.request(options, function (err, d
//success GET worked. Data will contain raw results from API call.
}
});</code></pre>
-<h3 id="example---response-5"><a href="#example---response-5">Example - Response</a></h3>
+<h3 id="example---response-5">Example - Response</h3>
<pre><code>{
"action" : "get",
"application" : "5111c463-6a42-11e1-b6dd-1231380a0284",
@@ -961,11 +960,11 @@ client.request(options, function (err, d
}</code></pre>
<p>When a user creates an activity, a relationship is established between the activity and the user who created it. The activities in the userâs feed are based on this relationship as well as  any following relationships that the user has, and any groups in which the user belongs. So when a user asks to get his feed, what he gets is a list of (1) all the activities that the user owns, (2) all the activities posted by any users this user is following, and (3) any activities owned by any groups in which this user belongs.</p>
<p>The user john.doeâs feed includes activities posted by user moab because john.doe follows moab.</p>
-<h2 id="getting-a-groups-feed" dir="ltr"><a href="#getting-a-groups-feed">Getting a groupâs feed</a></h2>
+<h2 id="getting-a-groups-feed" dir="ltr">Getting a groupâs feed</h2>
<p>Use the GET method to retrieve the feed for a group. This gets a list of all the activities that have been posted to this group, that is, the activities for which this group has a relationship (owns).</p>
-<h3 id="request-uri-5"><a href="#request-uri-5">Request URI</a></h3>
+<h3 id="request-uri-5">Request URI</h3>
<p>GET /{org_id}/{app_id}/groups/{uuid|groupname}/feed</p>
-<h3 id="parameters-6"><a href="#parameters-6">Parameters</a></h3>
+<h3 id="parameters-6">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -985,7 +984,7 @@ client.request(options, function (err, d
<td align="left">UUID or name of the group</td>
</tr>
</tbody>
-</table><h3 id="example---request-6"><a href="#example---request-6">Example - Request</a></h3>
+</table><h3 id="example---request-6">Example - Request</h3>
<ul>
<li><a href="#curl_get_group_feed">cURL</a></li>
<li><a href="#javascript_get_group_feed">JavaScript (HTML5)</a></li>
@@ -1019,7 +1018,7 @@ client.request(options, function (err, d
//success â GET worked. Data will contain raw results from API call.
}
});</code></pre>
-<h3 id="example---response-6"><a href="#example---response-6">Example - Response</a></h3>
+<h3 id="example---response-6">Example - Response</h3>
<pre><code>{
"action": "get",
"application": "3400ba10-cd0c-11e1-bcf7-12313d1c4491",
@@ -1057,7 +1056,7 @@ client.request(options, function (err, d
"duration": 29,
"organization": "my-org",
"applicationName": "my-app"</code></pre>
-<h2 id="activity-properties"><a href="#activity-properties">Activity properties</a></h2>
+<h2 id="activity-properties">Activity properties</h2>
<p>The following are the system-defined properties for activity entities. You can create application-specific properties for an activity entity in addition to the system-defined properties. The system-defined properties are reserved. You cannot use these names to create other properties for an activity entity. In addition the activities name is reserved for the activities collection â you canât use it to name another collection.</p>
<table>
<thead><tr class="header">
@@ -1130,7 +1129,7 @@ client.request(options, function (err, d
<td align="left">Title or headline for the activity</td>
</tr>
</tbody>
-</table><h2 id="set-property"><a href="#set-property">Set property </a></h2>
+</table><h2 id="set-property">Set property </h2>
<p>Activities have the following set property.</p>
<table>
<thead><tr class="header">
@@ -1144,7 +1143,7 @@ client.request(options, function (err, d
<td align="left">Set of connections for the activity</td>
</tr></tbody>
</table><p>Â </p>
-<h2 id="sample-app"><a href="#sample-app">Sample app</a></h2>
+<h2 id="sample-app">Sample app</h2>
<p>The Messagee sample app is a simple Twitter-style messaging application that leverages the activity stream functionality of App services. The source for the application is available in HTML5 (JavaScript), iOS, and Android. You can download the source from github at:</p>
<ul>
<li>
@@ -1202,18 +1201,26 @@ client.request(options, function (err, d
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
- <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
- <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
- <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
- <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+ <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+ <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+ <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
+ <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+ <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+ </ul>
+ </div>
+ <div class="col-md-2">
+ <ul class="nav nav-list">
+ <li class="nav-header">Apache</li>
+ <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
</ul>
</div>
- <div class="col-md-2"></div>
<div class="col-md-4">
<a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976" data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
Modified: incubator/usergrid/site/publish/docs/admin-portal/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/admin-portal/index.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/admin-portal/index.html (original)
+++ incubator/usergrid/site/publish/docs/admin-portal/index.html Mon Feb 10 05:47:06 2014
@@ -96,7 +96,7 @@
<li class="nav-header"><span>Usage</span></li>
- <li>REST API â Coming Soon</li>
+ <!-- <li>REST API â Coming Soon</li> -->
<li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
<li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
<li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
@@ -107,17 +107,16 @@
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
- <li class="nav-header"><span>Internals</span></li>
+ <!--<li class="nav-header"><span>Internals</span></li>
<li>Design & Goals â Coming Soon</li>
<li>Java Architecture â Coming Soon</li>
- <li>Cassandra Schema â Coming Soon</li>
- <li><a href="/docs/contributing/">Contributing</a></li>
+ <li>Cassandra Schema â Coming Soon</li>-->
<li class="nav-header"><span>Operations</span></li>
- <li>Deploying â Coming Soon</li>
- <li>Monitoring â Coming Soon</li>
+ <!--<li>Deploying â Coming Soon</li>-->
+ <!-- <li>Monitoring â Coming Soon</li> -->
<li><a href="/docs/upgrading/">Upgrading</a></li>
- <li>Security â Coming Soon</li>
+ <!-- <li>Security â Coming Soon</li> -->
</ul>
</div>
</div>
@@ -153,11 +152,11 @@
</li>
</ul>
</div>
-<h1 id="admin-portal"><a href="#admin-portal">Admin portal</a></h1>
+<h1 id="admin-portal">Admin portal</h1>
<p>The <em>admin portal</em> is the primary administrative user interface for working with App services. The portal is also the most complete reference application that demonstrates how to incorporate App services with JavaScript.</p>
<p>The admin portal is available online at <a href="https://apigee.com/usergrid/">https://apigee.com/usergrid/</a>. The portal source code is fully open source and forkable, available for download on GitHub at <a href="https://github.com/usergrid/portal">https://github.com/usergrid/portal</a>. You can easily extend the portal, embed it into your own applications, or inspect the code to learn best practices associated with the App services API. The App services JavaScript client is also part of the GitHub portal project.</p>
<p>The portal opens in your default web browser, either Safari, Firefox, or Google Chrome. The article <a href="/messagee-example">Messagee Example</a> describes how to use the portal to run a sample application, whereas this section describes portal components in more detail and highlights App services features.</p>
-<h2 id="account-home-page"><a href="#account-home-page">Account Home page</a></h2>
+<h2 id="account-home-page">Account Home page</h2>
<p>When you log in to the portal, you are presented with a Home page for managing applications and data for your organization. The Home page displays:</p>
<ul>
<li>Applications associated with the currently selected organization</li>
@@ -165,18 +164,18 @@
<li>API credentials for the organization</li>
<li>Activities performed recently by administrators</li>
<li>A menu for building, organizing, and managing application content</li>
-</ul><h2 id="applications"><a href="#applications">Applications</a></h2>
+</ul><h2 id="applications">Applications</h2>
<p>For every app that you build, you need a defined application space within App services. Â By default, a test application called âsandboxâ is created for you automatically. For ease of use, this default app has all authentication disabled and should be used for learning / testing purposes only. You may also create as many additional applications as needed.</p>
<p>This unique application space allows each app to have its own private infrastructure to store its objects and data. In some cases, if you have multiple apps that share much of the same data and users, you might represent them in App services as a single application, which would allow those apps to share the same data space.</p>
-<h3 id="application-dashboard"><a href="#application-dashboard">Application Dashboard</a></h3>
+<h3 id="application-dashboard">Application Dashboard</h3>
<p>The Dashboard shows a variety of statistical data for the selected application. You can see the activity level, the total number of entities, entities created in the last day, week, and month, and other vital statistics for monitoring application health as well as quota limits.</p>
-<h3 id="administration-for-multiple-organizations"><a href="#administration-for-multiple-organizations">Administration for multiple organizations</a></h3>
+<h3 id="administration-for-multiple-organizations">Administration for multiple organizations</h3>
<p>The portal is designed to let you work within the context of a single organization at any one point in time. Because it is possible to be an administrator for multiple organizations, you can switch between organizations using the menu in the upper right corner.</p>
-<h2 id="authentication-credentials"><a href="#authentication-credentials">Authentication credentials</a></h2>
+<h2 id="authentication-credentials">Authentication credentials</h2>
<p>The portal provides a convenient way to set and retrieve credentials for API access. If you click your email address at the top of the Home page, you can set your password for both the portal and for OAuth2 username/password Admin-level access. On the Home page for the selected organization, you can see OAuth2 client credentials for organization-wide access to applications owned by that organization. Clicking the Settings button (on the left sidebar) displays OAuth2 credentials for the selected application. See the discussion on the <a href="/app-services-security-model">App services security model</a> for more information on specifying credentials and authentication.</p>
-<h2 id="exploring-the-api-using-the-shell"><a href="#exploring-the-api-using-the-shell">Exploring the API using the shell</a></h2>
+<h2 id="exploring-the-api-using-the-shell">Exploring the API using the shell</h2>
<p>When you first create a new Organization account, there are no applications associated with the account. To create an application, click New Application in your organizationâs Home page. You are presented with a dialog box that prompts you for the information needed to create a new app. When the app is created, a number of options are enabled in the left sidebar for viewing and administering that applicationâs data. Before you get started with the high-level tools, create a new application, go to the left sidebar, and click the Shell button to try out a few basic API commands.</p>
-<h3 id="entering-api-requests-in-the-shell"><a href="#entering-api-requests-in-the-shell">Entering API requests in the shell</a></h3>
+<h3 id="entering-api-requests-in-the-shell">Entering API requests in the shell</h3>
<p>The shell interface is a simple way to get started using the App services API. It provides a command-line environment within your web browser for trying out interactive commands. One thing to keep in mind when using the shell is that App services API endpoints usually take the form of:</p>
<pre><code>https://api.usergrid.com/my-org-id/my-app-id/users</code></pre>
<p>where my-org-id is the organization identifier(uuid), my-app-id is your application identifier(uuid) and users refers to the collection of user objects defined for your application. Refer to the <a href="/using-api">Using the API</a> section for more information on constructing API requests.</p>
@@ -385,7 +384,7 @@
"duration": 107
}
></code></pre>
-<h3 id="adding-properties-using-the-shell"><a href="#adding-properties-using-the-shell">Adding properties using the shell</a></h3>
+<h3 id="adding-properties-using-the-shell">Adding properties using the shell</h3>
<p>Now, letâs add some information (entity properties) for the user jane.doe. You can assign application-specific or system-defined properties to user entities. (See the You do not have access to view this node for a list of predefined properties for each system-defined entity type.) As an example of adding an application-specific property, letâs add the property city to the user jane.doe by typing:</p>
<pre><code>put /users/jane.doe {"city" : "san francisco" }</code></pre>
<p>You should see results similar to this:</p>
@@ -486,11 +485,11 @@
></code></pre>
<p>You can now click the Collections button in the sidebar to see all of the collections in your application. There are two entities in the users collection and one in the cats collection. Feel free to look around and see how the portal provides a high-level alternative to the API for viewing and manipulating application objects.</p>
<p>Subsequent sections give details about using the API to access and modify application entities. If youâre ready to start using the App services API, see the You do not have access to view this node for details and examples for each API endpoint.</p>
-<h2 id="analytics"><a href="#analytics">Analytics</a></h2>
+<h2 id="analytics">Analytics</h2>
<p>On the left sidebar, click Analytics to explore this functionality. You can specify parameters for data collection, including what data points youâd like to collect, over what time period, and at what resolution. When you click the Generate button, the results are displayed in tabular form and graphically in the lower portion of the window.</p>
-<h2 id="creating-a-sandbox-app"><a href="#creating-a-sandbox-app">Creating a sandbox app</a></h2>
+<h2 id="creating-a-sandbox-app">Creating a sandbox app</h2>
<p>When you create a new Apache Usergrid account, an app named sandbox is automatically created. In some cases you may want to create (or re-create) the sandbox app. For example, you may want to create a sandbox app for another organization or you may want to create another app for testing purposes. See <a href="/using-sandbox-application">Using a Sandbox Application</a> for details.</p>
-<h2 id="displaying-api-calls-as-curl-commands"><a href="#displaying-api-calls-as-curl-commands">Displaying API calls as cURL commands</a></h2>
+<h2 id="displaying-api-calls-as-curl-commands">Displaying API calls as cURL commands</h2>
<p>You can display the equivalent cURL syntax for each API call that you make through the admin portal. The calls are displayed in the console area of any of the following browsers: Chrome, Internet Explorer (in the debugger), Firefox (in Firebug), and Safari. For details, see <a href="/displaying-app-services-api-calls-curl-commands">Displaying Apache Usergrid API calls as Curl commands</a>.</p>
</div>
</div>
@@ -540,18 +539,26 @@
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
- <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
- <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
- <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
- <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+ <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+ <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+ <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
+ <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+ <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+ </ul>
+ </div>
+ <div class="col-md-2">
+ <ul class="nav nav-list">
+ <li class="nav-header">Apache</li>
+ <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
</ul>
</div>
- <div class="col-md-2"></div>
<div class="col-md-4">
<a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976" data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
Modified: incubator/usergrid/site/publish/docs/admin-user/index.html
URL: http://svn.apache.org/viewvc/incubator/usergrid/site/publish/docs/admin-user/index.html?rev=1566508&r1=1566507&r2=1566508&view=diff
==============================================================================
--- incubator/usergrid/site/publish/docs/admin-user/index.html (original)
+++ incubator/usergrid/site/publish/docs/admin-user/index.html Mon Feb 10 05:47:06 2014
@@ -96,7 +96,7 @@
<li class="nav-header"><span>Usage</span></li>
- <li>REST API â Coming Soon</li>
+ <!-- <li>REST API â Coming Soon</li> -->
<li><a class="icns-apple" href="https://github.com/usergrid/usergrid/tree/master/sdks/ios">iOS SDK</a></li>
<li><a class="icns-android" href="https://github.com/usergrid/usergrid/tree/master/sdks/android">Android SDK</a></li>
<li><a class="icns-html5" href="">HTML5 / JavaScript SDK</a></li>
@@ -107,17 +107,16 @@
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/php">PHP library</a></li>
<li><a href="https://github.com/usergrid/usergrid/tree/master/sdks/java">Java library</a></li>
- <li class="nav-header"><span>Internals</span></li>
+ <!--<li class="nav-header"><span>Internals</span></li>
<li>Design & Goals â Coming Soon</li>
<li>Java Architecture â Coming Soon</li>
- <li>Cassandra Schema â Coming Soon</li>
- <li><a href="/docs/contributing/">Contributing</a></li>
+ <li>Cassandra Schema â Coming Soon</li>-->
<li class="nav-header"><span>Operations</span></li>
- <li>Deploying â Coming Soon</li>
- <li>Monitoring â Coming Soon</li>
+ <!--<li>Deploying â Coming Soon</li>-->
+ <!-- <li>Monitoring â Coming Soon</li> -->
<li><a href="/docs/upgrading/">Upgrading</a></li>
- <li>Security â Coming Soon</li>
+ <!-- <li>Security â Coming Soon</li> -->
</ul>
</div>
</div>
@@ -205,16 +204,16 @@
</li>
</ul>
</div>
-<h1 id="admin-user"><a href="#admin-user">Admin user</a></h1>
+<h1 id="admin-user">Admin user</h1>
<p><a href="/docs/usergrid/content/management-resources">See all management resources</a><a href="/docs/usergrid/content/management-resources"><img src="/docs/sites/docs/files/learnmore%20arrow_0.png"></a></p>
<p>An admin user has full access to perform any operation on all organization accounts of which the admin user is a member. Using the App services API, you can create, update, or retrieve an admin user. You can also set or reset an admin userâs password, activite or reactivate an admin user, and get an admin userâs activity feed.</p>
<p>In addition, you can add, Â retrieve, or remove an admin user from an organization. For information on these organization-related operations, see <a href="/organization">Organization</a>.</p>
<p><strong>Note:</strong>Â Although not shown in the API examples below, you need to provide a valid access token with each API call. See <a href="/authenticating-users-and-application-clients">Authenticating users and application clients</a> for details.</p>
-<h2 id="creating-an-admin-user"><a href="#creating-an-admin-user">Creating an admin user</a></h2>
+<h2 id="creating-an-admin-user">Creating an admin user</h2>
<p>Use the POST method to create an admin user.</p>
-<h3 id="request-uri"><a href="#request-uri">Request URI</a></h3>
+<h3 id="request-uri">Request URI</h3>
<p>POST /management/organizations/{org}/users {request body}</p>
-<h3 id="parameters"><a href="#parameters">Parameters</a></h3>
+<h3 id="parameters">Parameters</h3>
<table>
<col width="50%">
<col width="50%">
@@ -233,7 +232,7 @@
</td>
</tr></tbody>
</table><p>Â </p>
-<h3 id="example---request"><a href="#example---request">Example - Request</a></h3>
+<h3 id="example---request">Example - Request</h3>
<ul>
<li><a href="#curl_create_admin_user">cURL</a></li>
<li><a href="#javascript_create_admin_user">JavaScript (HTML5)</a></li>
@@ -260,7 +259,7 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response"><a href="#example---response">Example - Response</a></h3>
+<h3 id="example---response">Example - Response</h3>
<pre><code>{
"action": "post",
"status": "ok",
@@ -281,11 +280,11 @@ client.request(options, function (err, d
"timestamp": 1349390189106,
"duration": 11808
}</code></pre>
-<h2 id="updating-an-admin-user"><a href="#updating-an-admin-user">Updating an admin user</a></h2>
+<h2 id="updating-an-admin-user">Updating an admin user</h2>
<p>Use the PUT method to update an admin user.</p>
-<h3 id="request-uri-1"><a href="#request-uri-1">Request URI</a></h3>
+<h3 id="request-uri-1">Request URI</h3>
<p>PUT /management/organizations/{org}/users/{user|username|email|uuid} {request body}</p>
-<h3 id="parameters-1"><a href="#parameters-1">Parameters</a></h3>
+<h3 id="parameters-1">Parameters</h3>
<table>
<col width="50%">
<col width="50%">
@@ -310,7 +309,7 @@ client.request(options, function (err, d
</tr>
</tbody>
</table><p>Â </p>
-<h3 id="example---request-1"><a href="#example---request-1">Example - Request</a></h3>
+<h3 id="example---request-1">Example - Request</h3>
<ul>
<li><a href="#curl_update_admin_user">cURL</a></li>
<li><a href="#javascript_update_admin_user">JavaScript (HTML5)</a></li>
@@ -338,17 +337,17 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-1"><a href="#example---response-1">Example - Response</a></h3>
+<h3 id="example---response-1">Example - Response</h3>
<pre><code>{
"action": "update user info",
"timestamp": 1349479321874,
"duration": 0
}</code></pre>
-<h2 id="getting-an-admin-user"><a href="#getting-an-admin-user">Getting an admin user</a></h2>
+<h2 id="getting-an-admin-user">Getting an admin user</h2>
<p>Use the GET method to retrieve details about an admin user.</p>
-<h3 id="request-uri-2"><a href="#request-uri-2">Request URI</a></h3>
+<h3 id="request-uri-2">Request URI</h3>
<p>GET /management/organizations/{org}/users/{user|username|email|uuid}</p>
-<h3 id="parameters-2"><a href="#parameters-2">Parameters</a></h3>
+<h3 id="parameters-2">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -359,7 +358,7 @@ client.request(options, function (err, d
<td align="left">Admin username, name, email address, or UUID.</td>
</tr></tbody>
</table><p>Â </p>
-<h3 id="example---request-2"><a href="#example---request-2">Example - Request</a></h3>
+<h3 id="example---request-2">Example - Request</h3>
<ul>
<li><a href="#curl_get_admin_user">cURL</a></li>
<li><a href="#javascript_get_admin_user">JavaScript (HTML5)</a></li>
@@ -383,7 +382,7 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-2"><a href="#example---response-2">Example - Response</a></h3>
+<h3 id="example---response-2">Example - Response</h3>
<pre><code>{
"action": "get admin user",
"status": "ok",
@@ -417,11 +416,11 @@ client.request(options, function (err, d
"disabled": false
},
"timestamp": 1349480786906,</code></pre>
-<h2 id="setting-an-admin-users-password"><a href="#setting-an-admin-users-password">Setting an admin userâs password</a></h2>
+<h2 id="setting-an-admin-users-password">Setting an admin userâs password</h2>
<p>Use the PUT method to update an admin userâs password.</p>
-<h3 id="request-uri-3"><a href="#request-uri-3">Request URI</a></h3>
+<h3 id="request-uri-3">Request URI</h3>
<p>PUT /management/organizations/{org}/users/{user|username|email|uuid}/password {request body}</p>
-<h3 id="parameters-3"><a href="#parameters-3">Parameters</a></h3>
+<h3 id="parameters-3">Parameters</h3>
<table>
<col width="50%">
<col width="50%">
@@ -445,7 +444,7 @@ client.request(options, function (err, d
</tr>
</tbody>
</table><p>Â </p>
-<h3 id="example---request-3"><a href="#example---request-3">Example - Request</a></h3>
+<h3 id="example---request-3">Example - Request</h3>
<ul>
<li><a href="#curl_set_admin_pw">cURL</a></li>
<li><a href="#javascript_set_admin_pw">JavaScript (HTML5)</a></li>
@@ -473,19 +472,19 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-3"><a href="#example---response-3">Example - Response</a></h3>
+<h3 id="example---response-3">Example - Response</h3>
<pre><code>{
"action": "set user password",
"timestamp": 1349714010142,
"duration": 0
}</code></pre>
-<h2 id="resetting-an-admin-users-password"><a href="#resetting-an-admin-users-password">Resetting an admin userâs password</a></h2>
+<h2 id="resetting-an-admin-users-password">Resetting an admin userâs password</h2>
<p>Resetting an admin userâs password is a two step process. In the first step, you initiate the password reset. This returns a browser page. The page includes a field for the user to enter his or her email address, and a field to enter a response to a Captcha challenge. In the second step, you handle the userâs responses from the form.</p>
-<h3 id="initiating-a-password-reset"><a href="#initiating-a-password-reset">Initiating a password reset</a></h3>
+<h3 id="initiating-a-password-reset">Initiating a password reset</h3>
<p>Use the GET method to initiate the password reset.</p>
-<h3 id="request-uri-4"><a href="#request-uri-4">Request URI</a></h3>
+<h3 id="request-uri-4">Request URI</h3>
<p>GET /management/organizations/{org}/users/resetpw</p>
-<h3 id="example---request-4"><a href="#example---request-4">Example - Request</a></h3>
+<h3 id="example---request-4">Example - Request</h3>
<ul>
<li><a href="#curl_init_pw_reset">cURL</a></li>
<li><a href="#javascript_init_pw_reset">JavaScript (HTML5)</a></li>
@@ -509,7 +508,7 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-4"><a href="#example---response-4">Example - Response</a></h3>
+<h3 id="example---response-4">Example - Response</h3>
<pre><code><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
@@ -545,11 +544,11 @@ client.request(options, function (err, d
</form>
</div>
</pre></code></pre>
-<h3 id="completing-a-password-reset"><a href="#completing-a-password-reset">Completing a password reset</a></h3>
+<h3 id="completing-a-password-reset">Completing a password reset</h3>
<p>Use the POST method to complete the password reset.</p>
-<h3 id="request-uri-5"><a href="#request-uri-5">Request URI</a></h3>
+<h3 id="request-uri-5">Request URI</h3>
<p>POST /management/organizations/{org}/users/resetpw {request body}</p>
-<h3 id="parameters-4"><a href="#parameters-4">Parameters</a></h3>
+<h3 id="parameters-4">Parameters</h3>
<table>
<col width="50%">
<col width="50%">
@@ -567,7 +566,7 @@ client.request(options, function (err, d
</td>
</tr></tbody>
</table><p>Â </p>
-<h3 id="example---request-5"><a href="#example---request-5">Example - Request</a></h3>
+<h3 id="example---request-5">Example - Request</h3>
<ul>
<li><a href="#curl_complete_pw_reset">cURL</a></li>
<li><a href="#javascript_complete_pw_reset">JavaScript (HTML5)</a></li>
@@ -598,17 +597,17 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-5"><a href="#example---response-5">Example - Response</a></h3>
+<h3 id="example---response-5">Example - Response</h3>
<pre><code>{
"action": "reset user password",
"timestamp": 13546154010321,
"duration": 0
}</code></pre>
-<h2 id="activating-an-admin-user"><a href="#activating-an-admin-user">Activating an admin user</a></h2>
+<h2 id="activating-an-admin-user">Activating an admin user</h2>
<p>Use the GET method to activate an admin user from a link provided in an email notification.</p>
-<h3 id="request-uri-6"><a href="#request-uri-6">Request URI</a></h3>
+<h3 id="request-uri-6">Request URI</h3>
<p>GET /management/organizations/{org}/users/{user|username|email|uuid}/activate?token={token}&confirm={confirm_email}</p>
-<h3 id="parameters-5"><a href="#parameters-5">Parameters</a></h3>
+<h3 id="parameters-5">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -629,7 +628,7 @@ client.request(options, function (err, d
</tr>
</tbody>
</table><p>Â </p>
-<h3 id="example---request-6"><a href="#example---request-6">Example - Request</a></h3>
+<h3 id="example---request-6">Example - Request</h3>
<ul>
<li><a href="#curl_activate_admin_user">cURL</a></li>
<li><a href="#javascript_activate_admin_user">JavaScript (HTML5)</a></li>
@@ -654,17 +653,17 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-6"><a href="#example---response-6">Example - Response</a></h3>
+<h3 id="example---response-6">Example - Response</h3>
<pre><code>{
"action": "activate user",
"timestamp": 1349718021324,
"duration": 0
}</code></pre>
-<h2 id="reactivating-an-admin-user"><a href="#reactivating-an-admin-user">Reactivating an admin user</a></h2>
+<h2 id="reactivating-an-admin-user">Reactivating an admin user</h2>
<p>Use the GET method to reactivate an admin user.</p>
-<h3 id="request-uri-7"><a href="#request-uri-7">Request URI</a></h3>
+<h3 id="request-uri-7">Request URI</h3>
<p>GET /management/organizations/{org}/users/{user|username|email|uuid}/reactivate</p>
-<h3 id="parameters-6"><a href="#parameters-6">Parameters</a></h3>
+<h3 id="parameters-6">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -675,7 +674,7 @@ client.request(options, function (err, d
<td align="left">Admin username, name, email address, or UUID.</td>
</tr></tbody>
</table><p>Â </p>
-<h3 id="example---request-7"><a href="#example---request-7">Example - Request</a></h3>
+<h3 id="example---request-7">Example - Request</h3>
<ul>
<li><a href="#curl_reactivate_admin_user">cURL</a></li>
<li><a href="#javascript_reactivate_admin_user">JavaScript (HTML5)</a></li>
@@ -699,17 +698,17 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-7"><a href="#example---response-7">Example - Response</a></h3>
+<h3 id="example---response-7">Example - Response</h3>
<pre><code>{
"action": "reactivate user",
"timestamp": 1349735217217,
"duration": 3541
}</code></pre>
-<h2 id="getting-an-admin-users-activity-feed"><a href="#getting-an-admin-users-activity-feed">Getting an admin userâs activity feed</a></h2>
+<h2 id="getting-an-admin-users-activity-feed">Getting an admin userâs activity feed</h2>
<p>Use the GET method to retrieve an admin userâs activity feed.</p>
-<h3 id="request-uri-8"><a href="#request-uri-8">Request URI</a></h3>
+<h3 id="request-uri-8">Request URI</h3>
<p>GET /management/organizations/{org}/users/{user|username|email|uuid}/feed</p>
-<h3 id="parameters-7"><a href="#parameters-7">Parameters</a></h3>
+<h3 id="parameters-7">Parameters</h3>
<table>
<thead><tr class="header">
<th align="left">Parameter</th>
@@ -719,7 +718,7 @@ client.request(options, function (err, d
<td align="left">string user|string username|string email|arg uuid</td>
<td align="left">Admin username, name, email address, or UUID.</td>
</tr></tbody>
-</table><h3 id="example---request-8"><a href="#example---request-8">Example - Request</a></h3>
+</table><h3 id="example---request-8">Example - Request</h3>
<ul>
<li><a href="#curl_get_user_feed">cURL</a></li>
<li><a href="#javascript_get_user_feed">JavaScript (HTML5)</a></li>
@@ -743,7 +742,7 @@ client.request(options, function (err, d
//success â data will contain raw results from API call
}
});</code></pre>
-<h3 id="example---response-8"><a href="#example---response-8">Example - Response</a></h3>
+<h3 id="example---response-8">Example - Response</h3>
<pre><code>{
"action": "get admin user feed",
"status": "ok",
@@ -821,18 +820,26 @@ client.request(options, function (err, d
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
- <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
- <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
- <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
- <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
- <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/LICENSE" target="_blank">License</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
- <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#contributing" target="_blank">Contribution Guidelines</a></li>
+ <li><a href="http://github.com/usergrid/usergrid" target="_blank">GitHub Code</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/USERGRID" target="_blank">JIRA Bug Tracker</a></li>
+ <li><a href="http://stackoverflow.com/search?q=usergrid" target="_blank">StackOverflow</a></li>
+ <li><a href="http://webchat.freenode.net/?channels=%23usergrid&uio=d4">IRC</a></li>
+ <li><a href="https://twitter.com/usergrid" target="_blank">Twitter</a></li>
+ <li><a href="http://incubator.apache.org/projects/usergrid.html" target="_blank">Podling Listing</a></li>
+ <li><a href="https://github.com/usergrid/usergrid/blob/master/stack#requirements" target="_blank">Getting Started</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/usergrid/GitHub+Based+Contribution+Workflow" target="_blank">Contribution Guidelines</a></li>
+ </ul>
+ </div>
+ <div class="col-md-2">
+ <ul class="nav nav-list">
+ <li class="nav-header">Apache</li>
+ <li><a href="http://www.apache.org/licenses/" target="_blank">License</a></li>
+ <li><a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">Sponsorship</a></li>
+ <li><a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a></li>
+ <li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://www.apache.org/" target="_blank">Apache Foundation</a></li>
</ul>
</div>
- <div class="col-md-2"></div>
<div class="col-md-4">
<a class="twitter-timeline" href="https://twitter.com/search?q=%23usergrid" data-widget-id="401499136807038976" data-related="usergrid" height="400px" style="overflow:hidden">Tweets about "usergrid"</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>