You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/12 01:35:45 UTC
[3/7] incubator-usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Conflicts:
.gitignore
portal/README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/91ba3560
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/91ba3560
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/91ba3560
Branch: refs/heads/master
Commit: 91ba35606b5c0bd74f92cd025038dcc35d032017
Parents: 3c06eb1 dd636ed
Author: John D. Ament <jo...@apache.org>
Authored: Thu Nov 27 20:21:04 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Thu Nov 27 20:21:04 2014 -0500
----------------------------------------------------------------------
.gitattributes | 17 +
.gitignore | 3 +-
.usergridversion | 1 +
CHANGELOG | 3 +
README.txt | 37 +
docs/.gitignore | 2 +
docs/Makefile | 177 +
docs/README | 31 +
docs/_theme/sphinx_rtd_theme/__init__.py | 17 +
docs/_theme/sphinx_rtd_theme/breadcrumbs.html | 19 +
docs/_theme/sphinx_rtd_theme/footer.html | 33 +
docs/_theme/sphinx_rtd_theme/layout.html | 162 +
docs/_theme/sphinx_rtd_theme/layout_old.html | 205 +
docs/_theme/sphinx_rtd_theme/search.html | 50 +
docs/_theme/sphinx_rtd_theme/searchbox.html | 7 +
.../sphinx_rtd_theme/static/css/badge_only.css | 2 +
.../sphinx_rtd_theme/static/css/theme.css | 5 +
.../static/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes
.../static/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes
.../static/fonts/fontawesome-webfont.svg | 414 ++
.../static/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes
.../static/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes
docs/_theme/sphinx_rtd_theme/static/js/theme.js | 47 +
docs/_theme/sphinx_rtd_theme/theme.conf | 8 +
docs/_theme/sphinx_rtd_theme/versions.html | 37 +
docs/concepts/activity.md | 1121 +++++
docs/concepts/applications.md | 78 +
docs/concepts/assets.md | 20 +
docs/concepts/collections.md | 21 +
docs/concepts/events-and-counters.md | 268 +
docs/concepts/groups.md | 38 +
docs/concepts/query-language.md | 427 ++
docs/concepts/relationships.md | 100 +
docs/concepts/roles-and-permissions.md | 18 +
docs/concepts/users-devices.md | 108 +
docs/conf.py | 273 +
docs/contribute-code.md | 24 +
docs/deploy-local.md | 175 +
docs/getting-up-and-running-locally.md | 72 +
docs/index.md | 12 +
docs/lib/sphinxcontrib_markdown.py | 58 +
docs/make.bat | 242 +
docs/organizations-admins.md | 55 +
docs/presentations-and-videos.md | 7 +
docs/presentations-and-videos/presentations.md | 21 +
docs/presentations-and-videos/videos.md | 11 +
docs/upgrading.md | 3 +
docs/usage.md | 15 +
portal/README.md | 30 +-
portal/config.js | 4 +-
release/changelog.rb | 150 +
release/pom.xml | 65 -
release/release-candidate.sh | 292 ++
release/release.sh | 244 +
release/sign-release.sh | 30 -
release/src/main/assembly/source.xml | 57 -
sdks/android/.gitignore | 20 +
sdks/android/README.md | 33 +
sdks/android/README.txt | 2 -
sdks/android/build_release_zip.sh | 166 +
sdks/android/dependency-reduced-pom.xml | 109 +
sdks/android/dist/jackson-core-asl-1.9.1.jar | Bin 0 -> 228286 bytes
sdks/android/dist/jackson-mapper-asl-1.9.1.jar | Bin 0 -> 764465 bytes
.../dist/spring-android-core-1.0.0.M4.jar | Bin 0 -> 83065 bytes
.../spring-android-rest-template-1.0.0.M4.jar | Bin 0 -> 137368 bytes
.../0.0.6/usergrid-java-client-0.0.6.jar | Bin 0 -> 46389 bytes
.../0.0.6/usergrid-java-client-0.0.6.jar.sha1 | 1 +
.../0.0.6/usergrid-java-client-0.0.6.pom | 95 +
.../0.0.6/usergrid-java-client-0.0.6.pom.sha1 | 1 +
.../maven-metadata-local.xml | 12 +
sdks/android/pom.xml | 47 +-
.../apache/usergrid/android/client/Client.java | 1036 ----
.../client/callbacks/ApiResponseCallback.java | 26 -
.../client/callbacks/ClientAsyncTask.java | 54 -
.../client/callbacks/ClientCallback.java | 25 -
.../callbacks/DeviceRegistrationCallback.java | 25 -
.../callbacks/GroupsRetrievedCallback.java | 29 -
.../client/callbacks/QueryResultsCallback.java | 25 -
.../android/client/utils/DeviceUuidFactory.java | 170 -
.../android/client/utils/ObjectUtils.java | 36 -
.../usergrid/android/sdk/CounterIncrement.java | 53 +
.../sdk/DefaultURLConnectionFactory.java | 17 +
.../apache/usergrid/android/sdk/UGClient.java | 3160 ++++++++++++
.../android/sdk/URLConnectionFactory.java | 12 +
.../sdk/callbacks/ApiResponseCallback.java | 12 +
.../android/sdk/callbacks/ClientAsyncTask.java | 47 +
.../android/sdk/callbacks/ClientCallback.java | 12 +
.../sdk/callbacks/GroupsRetrievedCallback.java | 16 +
.../sdk/callbacks/QueryResultsCallback.java | 14 +
.../usergrid/android/sdk/entities/Activity.java | 1019 ++++
.../android/sdk/entities/Collection.java | 319 ++
.../usergrid/android/sdk/entities/Device.java | 103 +
.../usergrid/android/sdk/entities/Entity.java | 533 ++
.../usergrid/android/sdk/entities/Group.java | 132 +
.../usergrid/android/sdk/entities/Message.java | 140 +
.../usergrid/android/sdk/entities/User.java | 296 ++
.../android/sdk/exception/ClientException.java | 40 +
.../android/sdk/response/AggregateCounter.java | 39 +
.../sdk/response/AggregateCounterSet.java | 98 +
.../android/sdk/response/ApiResponse.java | 755 +++
.../sdk/response/ClientCredentialsInfo.java | 45 +
.../android/sdk/response/QueueInfo.java | 28 +
.../android/sdk/utils/DeviceUuidFactory.java | 154 +
.../usergrid/android/sdk/utils/JsonUtils.java | 166 +
.../usergrid/android/sdk/utils/MapUtils.java | 23 +
.../usergrid/android/sdk/utils/ObjectUtils.java | 20 +
.../usergrid/android/sdk/utils/UrlUtils.java | 108 +
sdks/php5/apache-usergrid/.gitignore | 12 +
.../Examples/collections/books.php | 130 +
.../Examples/collections/data.php | 38 +
.../Examples/collections/users.php | 101 +
sdks/php5/apache-usergrid/Examples/examples.md | 17 +
sdks/php5/apache-usergrid/Examples/examples.php | 246 +
.../Examples/management/management.php | 91 +
.../apache-usergrid/Examples/messages/data.php | 17 +
.../Examples/messages/messages.php | 62 +
.../Examples/notifications/data.php | 17 +
.../Examples/notifications/notifications.php | 86 +
.../Examples/notifications/notifiers.php | 78 +
sdks/php5/apache-usergrid/LICENSE | 202 +
sdks/php5/apache-usergrid/README.md | 195 +
sdks/php5/apache-usergrid/TODO.md | 2 +
sdks/php5/apache-usergrid/composer.json | 40 +
sdks/php5/apache-usergrid/composer.lock | 1116 +++++
sdks/php5/apache-usergrid/phpunit.xml | 29 +
.../src/Api/Exception/BadRequestException.php | 33 +
.../src/Api/Exception/InvalidIdException.php | 33 +
.../src/Api/Exception/NotFoundException.php | 32 +
.../src/Api/Exception/ServerErrorException.php | 32 +
.../src/Api/Exception/UnauthorizedException.php | 33 +
.../src/Api/Exception/UsergridException.php | 155 +
.../apache-usergrid/src/Api/Filters/Boolean.php | 44 +
.../apache-usergrid/src/Api/Filters/Date.php | 44 +
.../apache-usergrid/src/Api/Filters/Number.php | 48 +
.../apache-usergrid/src/Api/GuzzleClient.php | 64 +
.../src/Api/Models/Application.php | 35 +
.../src/Api/Models/BaseCollection.php | 100 +
.../src/Api/Models/Collection.php | 37 +
.../apache-usergrid/src/Api/Models/Device.php | 39 +
.../apache-usergrid/src/Api/Models/Entity.php | 36 +
.../apache-usergrid/src/Api/Models/Event.php | 35 +
.../src/Api/Models/GuzzleCommandTrait.php | 50 +
.../src/Api/Models/Organization.php | 60 +
.../apache-usergrid/src/Api/Models/User.php | 37 +
.../apache-usergrid/src/Api/QueryAggregator.php | 61 +
.../src/Api/ResourceIterator.php | 69 +
sdks/php5/apache-usergrid/src/Api/Usergrid.php | 445 ++
.../Oauth2/GrantType/AuthorizationCode.php | 77 +
.../Oauth2/GrantType/ClientCredentials.php | 74 +
.../Oauth2/GrantType/GrantTypeInterface.php | 41 +
.../GrantType/HWIOAuthBundleRefreshToken.php | 62 +
.../Oauth2/GrantType/PasswordCredentials.php | 74 +
.../Plugin/Oauth2/GrantType/RefreshToken.php | 75 +
.../src/Guzzle/Plugin/Oauth2/Oauth2Plugin.php | 204 +
.../Laravel/ApacheUsergridServiceProvider.php | 157 +
.../src/Laravel/Facades/Usergrid.php | 42 +
.../src/Manifests/1.0.0/Application.php | 979 ++++
.../src/Manifests/1.0.0/Errors.php | 60 +
.../src/Manifests/1.0.0/Management.php | 1076 ++++
.../src/Manifests/1.0.0/Manifest.php | 25 +
.../src/Manifests/1.0.0/Notification.php | 154 +
.../src/Manifests/1.0.1/Activities.php | 24 +
.../src/Manifests/1.0.1/Application.php | 1111 +++++
.../src/Manifests/1.0.1/Assets.php | 24 +
.../src/Manifests/1.0.1/Custom.php | 380 ++
.../src/Manifests/1.0.1/Devices.php | 381 ++
.../src/Manifests/1.0.1/Errors.php | 50 +
.../src/Manifests/1.0.1/Events.php | 24 +
.../src/Manifests/1.0.1/Groups.php | 485 ++
.../src/Manifests/1.0.1/Management.php | 1076 ++++
.../src/Manifests/1.0.1/Manifest.php | 24 +
.../src/Manifests/1.0.1/Messages.php | 19 +
.../src/Manifests/1.0.1/Notifications.php | 241 +
.../src/Manifests/1.0.1/Notifiers.php | 131 +
.../src/Manifests/1.0.1/Receipts.php | 24 +
.../src/Manifests/1.0.1/Roles.php | 380 ++
.../src/Manifests/1.0.1/Users.php | 380 ++
.../src/Manifests/Application.php | 985 ++++
.../src/Manifests/Management.php | 1381 ++++++
.../apache-usergrid/src/Manifests/Manifest.php | 23 +
.../apache-usergrid/src/Manifests/Usergrid.php | 4689 ++++++++++++++++++
.../src/Manifests/applications.json | 1262 +++++
.../src/Manifests/management.json | 1905 +++++++
.../src/Manifests/resources.json | 15 +
.../src/Native/ConfigRepository.php | 102 +
.../src/Native/Facades/Usergrid.php | 119 +
.../src/Native/UsergridBootstrapper.php | 151 +
sdks/php5/apache-usergrid/src/config/config.php | 65 +
.../tests/Api/ApplicationTest.php | 72 +
.../Api/Exception/BadRequestExceptionTest.php | 59 +
.../Api/Exception/InvalidIdExceptionTest.php | 58 +
.../Api/Exception/NotFoundExceptionTest.php | 57 +
.../Api/Exception/ServerErrorExceptionTest.php | 58 +
.../Api/Exception/UnauthorizedExceptionTest.php | 58 +
.../tests/Api/Filters/BooleanTest.php | 45 +
.../tests/Api/Filters/DateTest.php | 41 +
.../tests/Api/ManagementTest.php | 59 +
.../tests/Api/QueryAggregatorTest.php | 42 +
.../apache-usergrid/tests/Api/UsergridTest.php | 153 +
.../tests/Laravel/Facades/UsergridTest.php | 53 +
sdks/php5/apache-usergrid/tests/bootstrap.php | 73 +
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
.../apache/usergrid/batch/job/package-info.java | 17 -
.../usergrid/batch/repository/package-info.java | 17 -
.../usergrid/batch/service/package-info.java | 17 -
.../org/apache/usergrid/count/package-info.java | 18 -
.../org/apache/usergrid/utils/package-info.java | 17 -
.../apache/usergrid/batch/job/package-info.java | 17 -
.../org/apache/usergrid/utils/package-info.java | 17 -
stack/java-sdk-old/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
.../apache/usergrid/launcher/package-info.java | 17 -
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 2 +-
stack/rest/pom.xml | 2 +-
.../rest/management/users/UsersResource.java | 38 +-
stack/services/pom.xml | 2 +-
.../usergrid/management/ManagementService.java | 2 +
.../cassandra/ManagementServiceImpl.java | 20 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 2 +-
.../apache/usergrid/tools/ResetSuperUser.java | 18 +-
stack/websocket/pom.xml | 2 +-
225 files changed, 36405 insertions(+), 1803 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/91ba3560/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/91ba3560/portal/README.md
----------------------------------------------------------------------
diff --cc portal/README.md
index 5318229,e42451c..d131551
--- a/portal/README.md
+++ b/portal/README.md
@@@ -51,17 -47,20 +47,25 @@@ If you want to run the e2e tests
To version open a terminal and run 'npm version x.x.x' this will add a tag and increment the package.json.
+If you are building via maven:
+
+1. The maven profile supports the default install options currently, just run `mvn clean install` to create the bundle.
+2. To override to another option, run maven via `mvn clean install -Dbuild.mode=e2e` or `mvn clean install -Dbuild.mode=dev`.
+
- ##Using a different api location
- 1. You can use api from usergrid at any location by navigating to the portal and adding a querystring http://myurl/?api_url=http://someurl
- 2. Another option is to change the Usergrid.overrideUrl in config.js
+ ##Using a Different API location
+ You can change the API URL that the portal uses in several ways. For example, if your Usergrid is not running locally or if you have changed how it runs by default.
+
+ 1. Edit the config.js located in the root. Locate and change the following line to point to your Usergrid install:
+
+ Usergrid.overrideUrl = 'https://localhost:8080';
+
+ 2. Append the api_url query parameter to the end of the portal's URL path. In the example below, you are running the portal using the method above and it is running on http://localhost:3000
+
+ http://localhost:3000?api_url=http://path.to.another.usergrid.install
+
- ##Displaying API calls as cURL commands
- You can display the equivalent cURL syntax for each API call that is made 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.
+ ##Viewing API Calls as cURL Commands
+ You can view the equivalent cURL syntax for each API call that is made 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.
More information on cURL can be found here: