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 2015/08/04 22:20:14 UTC
[3/3] incubator-usergrid git commit: Removing more Apigee & Apigee
product references.
Removing more Apigee & Apigee product references.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3046c0a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3046c0a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3046c0a7
Branch: refs/heads/ug2-doc-update
Commit: 3046c0a7a62e32f65d7678057a36948a3a866072
Parents: 5770cbc
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Aug 4 16:17:17 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Aug 4 16:17:17 2015 -0400
----------------------------------------------------------------------
docs/data-queries/query-language.md | 2 +-
docs/entity-connections/relationships.md | 2 +-
docs/user-management/activity.md | 4 ++--
docs/user-management/messagee-example.md | 31 +++++++++++++++------------
docs/user-management/user-connections.md | 2 +-
docs/user-management/user-management.md | 2 +-
6 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3046c0a7/docs/data-queries/query-language.md
----------------------------------------------------------------------
diff --git a/docs/data-queries/query-language.md b/docs/data-queries/query-language.md
index 9b96f28..a491740 100644
--- a/docs/data-queries/query-language.md
+++ b/docs/data-queries/query-language.md
@@ -281,7 +281,7 @@ determine the user's position and then use this data to further enhance
the user's experience. For example, apps can capture the exact location
where a picture was taken or a message was created.
-App services support geolocation on any entity, both built in (e.g.,
+Usergrid support geolocation on any entity, both built in (e.g.,
users, groups) and user defined.
To add a location to any entity, include the following member to the
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3046c0a7/docs/entity-connections/relationships.md
----------------------------------------------------------------------
diff --git a/docs/entity-connections/relationships.md b/docs/entity-connections/relationships.md
index 5946640..73bc6c3 100644
--- a/docs/entity-connections/relationships.md
+++ b/docs/entity-connections/relationships.md
@@ -2,7 +2,7 @@
## Creating connections between entities
-One of the most useful features of App services is the ability to create
+One of the most useful features of Usergrid is the ability to create
connections between entities. A simple example of this is the
Twitter-like use of *following*, where one user forms a connection with
another by subscribing to any tweets they post. [Messagee
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3046c0a7/docs/user-management/activity.md
----------------------------------------------------------------------
diff --git a/docs/user-management/activity.md b/docs/user-management/activity.md
index 0534e64..2703ab8 100644
--- a/docs/user-management/activity.md
+++ b/docs/user-management/activity.md
@@ -7,7 +7,7 @@ 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.
-App services provides an activity entity that is specifically designed
+Usergrid provides an activity entity that is specifically designed
for data streams. An activity is an entity type that represents activity
stream actions (see the [JSON Activity Streams 1.0
specification](http://activitystrea.ms/specs/json/1.0/) for more
@@ -35,7 +35,7 @@ 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.
-Using App services APIs you can create, retrieve, update, and delete
+Using Usergrid 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.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3046c0a7/docs/user-management/messagee-example.md
----------------------------------------------------------------------
diff --git a/docs/user-management/messagee-example.md b/docs/user-management/messagee-example.md
index c258745..eb3e560 100644
--- a/docs/user-management/messagee-example.md
+++ b/docs/user-management/messagee-example.md
@@ -1,23 +1,25 @@
# App Example - Messagee
-Messagee is a simple Twitter-style messaging application that leverages the extensive functionality of App services. This section describes some of the features of Messagee.
+Messagee is a simple Twitter-style messaging application that leverages the extensive functionality of Usergrid. This section describes some of the features of Messagee.
There are three client versions of Messagee:
-* An iOS client
-* An Android client
-* An HTML5 client
+* [An iOS client version](https://github.com/apigee/usergrid-sample-ios-messagee)
+* [An Android client version](https://github.com/apigee/usergrid-sample-android-messagee)
+* [An HTML5 client](https://github.com/apigee/usergrid-sample-html5-messagee)
-The sections below describe how to create a new app, enter some test users, and run the app. You also learn how to use the App services admin portal, a user interface that streamlines data and application management in the App services system. The portal is also a reference application that shows how to incorporate App services APIs with JavaScript. For a more detailed discussion of the portal's functionality, see Admin portal.
+The sections below describe how to create a new app, enter some test users, and run the app. You also learn how to use the Usergrid admin portal, a user interface that streamlines data and application management in the Usergrid system. The portal is also a reference application that shows how to incorporate Usergrid APIs with JavaScript. For a more detailed discussion of the portal's functionality, see Admin portal.
-## Creating a user account in App services
-Go to [https://apigee.com/appservices/#!/] to access the login screen for the App services admin portal. If you are new to App services, sign up for an account to access the portal, specifying an organization (e.g., the name of your company or project team) and a username and password that you can use to authenticate. Because App services are designed for use by development teams, the same username can be associated with one or more organizations.
+## Creating a user account in Usergrid
+
+Go to the Usergrid portal and login. If you are new to Usergrid, sign up for an account, specifying an organization (e.g., the name of your company or project team) and a username and password that you can use to authenticate. Because Usergrid are designed for use by development teams, the same username can be associated with one or more organizations.
If you create a new account, you receive a confirmation email that contains a URL that you must click to activate the account. After this, simply log in to the portal with your username and password.
.. image:: login.png
## Creating an app and users
+
When you have logged in, you need to create a new application.
.. image:: portal1.png
@@ -58,7 +60,7 @@ To continue with the example, follow the instructions for a client app (iOS clie
## iOS client
-Messagee is available as an iPhone app that uses App Services and RestKit. The source for the iOS version of Messagee is available in the /samples/messagee directory of the App Services iOS SDK
+Messagee is available as an iPhone app that uses Usergrid and RestKit. The source for the iOS version of Messagee is available in the /samples/messagee directory of the Usergrid iOS SDK
Here are the steps to run the Messagee app on iOS:
@@ -119,16 +121,17 @@ Because test-user-1 follows test-user-2, you should see the message sent by test
.. image:: iOS10seeusermsg.jpg
## iOS SDK
-If you want to write iOS applications that connect to App services, [download the App Services iOS SDK].
-__Note__: The Messagee iOS application uses RestKit, a popular REST framework for iOS, to communicate with App services. Because App services use a REST API, you can use any REST framework to talk with the service. However, the official App services iOS SDK provides a more convenient communication mechanism that you should use unless you're already using RestKit or some other framework in your project.
+If you want to write iOS applications that connect to Usergrid, [download the Usergrid iOS SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/ios).
+
+__Note__: The Messagee iOS application uses RestKit, a popular REST framework for iOS, to communicate with Usergrid. Because Usergrid use a REST API, you can use any REST framework to talk with the service. However, the official Usergrid iOS SDK provides a more convenient communication mechanism that you should use unless you're already using RestKit or some other framework in your project.
## Android client and SDK
-Messagee is available as a sample Android app that acts as a App services client. The source for the Android version is packaged with the App Services Android SDK in the /samples/messagee directory.
+Messagee is available as a sample Android app that acts as a Usergrid client. The source for the Android version is packaged with the Usergrid Android SDK in the /samples/messagee directory.
-[Download the App Services Android SDK]
+[Download the Usergrid Android SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/android)
## Javascript/HTML5 client and SDK
-Messagee is also available as a sample HTML5 app that behaves in much the same way as the two previous examples. The source for the HTML5 version is packaged with the App Services Javascript/HTML5 SDK in the /samples/messagee directory.
+Messagee is also available as a sample HTML5 app that behaves in much the same way as the two previous examples. The source for the HTML5 version is packaged with the Usergrid Javascript/HTML5 SDK in the /samples/messagee directory.
-[Download the App Services Javascript/HTML5 SDK]
+[Download the Usergrid Javascript/HTML5 SDK](https://github.com/apache/incubator-usergrid/tree/master/sdks/html5-javascript)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3046c0a7/docs/user-management/user-connections.md
----------------------------------------------------------------------
diff --git a/docs/user-management/user-connections.md b/docs/user-management/user-connections.md
index fa3087e..aef082d 100644
--- a/docs/user-management/user-connections.md
+++ b/docs/user-management/user-connections.md
@@ -1,6 +1,6 @@
# Social Graph Connections
-One of the most useful features of Apigee's API BaaS is the ability to create connections between entities, which allow you to model arbitrary relationships between entities. This feature is particularly powerful when applied to user entities by allowing you to model complex social graphs between users as well as groups of users.
+One of the most useful features of Usergrid is the ability to create connections between entities, which allow you to model arbitrary relationships between entities. This feature is particularly powerful when applied to user entities by allowing you to model complex social graphs between users as well as groups of users.
## Following/followers
To make the social graph possibilities of entity connections even easier to achieve, API BaaS also has special support for a default following/followers relationship, which offers these additional features:
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3046c0a7/docs/user-management/user-management.md
----------------------------------------------------------------------
diff --git a/docs/user-management/user-management.md b/docs/user-management/user-management.md
index 6d1b363..9c8881b 100644
--- a/docs/user-management/user-management.md
+++ b/docs/user-management/user-management.md
@@ -1,5 +1,5 @@
# User management & social graph
-Whether you're developing apps for mobile or the Web, it's almost certain that you will need to be able to handle user management, as well as offer the types of social features users have come to expect from a rich app experience. Apigee's API BaaS makes all of this easy with default entity types and functionality available right out of the box. From user registration and profiles to login and authentication to activity feeds and social graph, you can create a social experience quickly and easily with just a few types of API calls.
+Whether you're developing apps for mobile or the Web, it's almost certain that you will need to be able to handle user management, as well as offer the types of social features users have come to expect from a rich app experience. Usergrid makes all of this easy with default entity types and functionality available right out of the box. From user registration and profiles to login and authentication to activity feeds and social graph, you can create a social experience quickly and easily with just a few types of API calls.
## User management
The default user entity in API BaaS is designed to model app users, meaning registering users and managing their profiles is as simple as sending and updating JSON via the API. Used in conjunction with our available social graph, as well as our OAuth 2.0 authentication and token authorization features, you have all the tools you need to manage your user base.