merge two-o, remove java-sdk old
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0db7f4c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0db7f4c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0db7f4c0 Branch: refs/heads/USERGRID-593 Commit: 0db7f4c09f38a3cb961cecd866580555175e1d4f Parents: 8f592dd 527ac86 Author: Shawn Feldman <sfeld...@apache.org> Authored: Fri Apr 17 14:54:11 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Fri Apr 17 14:54:11 2015 -0600 ---------------------------------------------------------------------- .gitattributes | 17 + .gitignore | 4 + .usergridversion | 1 + CHANGELOG | 31 + NOTICE | 17 +- 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 | 179 + 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 | 16 + portal/Gruntfile.js | 20 +- portal/README.md | 35 +- portal/build.sh | 1 + portal/config.js | 3 +- portal/css/main.css | 23 +- portal/img/sdk-sprites-large.png | Bin 14642 -> 15115 bytes portal/img/sdk-sprites.png | Bin 5027 -> 4401 bytes portal/index-template.html | 1 + portal/js/global/help-service.js | 2 +- portal/js/global/ug-service.js | 5 +- portal/package.json | 2 +- portal/pom.xml | 98 + release/README.txt | 43 + release/changelog.rb | 150 + release/pom.xml | 65 - release/release-candidate.sh | 296 + release/release.sh | 248 + release/sign-release.sh | 30 - release/src/main/assembly/source.xml | 57 - sdks/android/.gitignore | 20 + sdks/android/NOTICE | 12 + sdks/android/README.md | 33 + sdks/android/README.txt | 2 - sdks/android/assembly.xml | 55 + sdks/android/build_release_zip.sh | 10 + sdks/android/pom.xml | 76 +- .../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 | 72 + .../sdk/DefaultURLConnectionFactory.java | 36 + .../apache/usergrid/android/sdk/UGClient.java | 3179 +++++ .../android/sdk/URLConnectionFactory.java | 30 + .../sdk/callbacks/ApiResponseCallback.java | 31 + .../android/sdk/callbacks/ClientAsyncTask.java | 66 + .../android/sdk/callbacks/ClientCallback.java | 31 + .../sdk/callbacks/GroupsRetrievedCallback.java | 35 + .../sdk/callbacks/QueryResultsCallback.java | 33 + .../usergrid/android/sdk/entities/Activity.java | 1019 ++ .../android/sdk/entities/Collection.java | 338 + .../usergrid/android/sdk/entities/Device.java | 122 + .../usergrid/android/sdk/entities/Entity.java | 552 + .../usergrid/android/sdk/entities/Group.java | 151 + .../usergrid/android/sdk/entities/Message.java | 159 + .../usergrid/android/sdk/entities/User.java | 315 + .../android/sdk/exception/ClientException.java | 43 + .../android/sdk/response/AggregateCounter.java | 58 + .../sdk/response/AggregateCounterSet.java | 117 + .../android/sdk/response/ApiResponse.java | 774 ++ .../sdk/response/ClientCredentialsInfo.java | 64 + .../android/sdk/response/QueueInfo.java | 47 + .../android/sdk/utils/DeviceUuidFactory.java | 173 + .../usergrid/android/sdk/utils/JsonUtils.java | 185 + .../usergrid/android/sdk/utils/MapUtils.java | 42 + .../usergrid/android/sdk/utils/ObjectUtils.java | 39 + .../usergrid/android/sdk/utils/UrlUtils.java | 127 + sdks/dotnet/NOTICE | 56 + .../NSubstitute.1.6.0.0.nupkg | Bin 619760 -> 0 bytes .../NSubstitute.1.6.0.0.nuspec | 16 - .../packages/NSubstitute.1.6.0.0/README.txt | 0 .../NSubstitute.1.6.0.0/acknowledgements.txt | 14 - .../lib/NET35/NSubstitute.XML | 432 - .../lib/NET35/NSubstitute.dll | Bin 1039360 -> 0 bytes .../lib/NET40/NSubstitute.XML | 432 - .../lib/NET40/NSubstitute.dll | Bin 561152 -> 0 bytes .../packages/NUnit.2.6.2/NUnit.2.6.2.nupkg | Bin 94702 -> 0 bytes .../packages/NUnit.2.6.2/NUnit.2.6.2.nuspec | 16 - sdks/dotnet/packages/NUnit.2.6.2/README.txt | 3 - .../NUnit.2.6.2/lib/nunit.framework.dll | Bin 147456 -> 0 bytes .../NUnit.2.6.2/lib/nunit.framework.xml | 10915 ----------------- .../packages/Newtonsoft.Json.4.5.11/LICENSE.txt | 21 + .../Newtonsoft.Json.4.5.11.nupkg | Bin 1409718 -> 0 bytes .../Newtonsoft.Json.4.5.11.nuspec | 16 - .../packages/Newtonsoft.Json.4.5.11/README.txt | 3 - .../lib/net20/Newtonsoft.Json.dll | Bin 406016 -> 0 bytes .../lib/net20/Newtonsoft.Json.xml | 8542 ------------- .../lib/net35/Newtonsoft.Json.dll | Bin 366592 -> 0 bytes .../lib/net35/Newtonsoft.Json.xml | 7678 ------------ .../lib/net40/Newtonsoft.Json.dll | Bin 391680 -> 0 bytes .../lib/net40/Newtonsoft.Json.xml | 7921 ------------ .../Newtonsoft.Json.dll | Bin 315904 -> 0 bytes .../Newtonsoft.Json.xml | 7107 ----------- .../lib/sl3-wp/Newtonsoft.Json.dll | Bin 334336 -> 0 bytes .../lib/sl3-wp/Newtonsoft.Json.xml | 7228 ----------- .../lib/sl4-windowsphone71/Newtonsoft.Json.dll | Bin 334336 -> 0 bytes .../lib/sl4-windowsphone71/Newtonsoft.Json.xml | 7228 ----------- .../lib/sl4/Newtonsoft.Json.dll | Bin 337408 -> 0 bytes .../lib/sl4/Newtonsoft.Json.xml | 7250 ----------- .../lib/winrt45/Newtonsoft.Json.dll | Bin 367616 -> 0 bytes .../lib/winrt45/Newtonsoft.Json.xml | 7446 ----------- .../dotnet/packages/RestSharp.104.1/LICENSE.txt | 202 + .../RestSharp.104.1/RestSharp.104.1.nupkg | Bin 605731 -> 0 bytes .../RestSharp.104.1/RestSharp.104.1.nuspec | 16 - .../lib/net35-client/RestSharp.dll | Bin 146944 -> 0 bytes .../lib/net35-client/RestSharp.xml | 2627 ---- .../RestSharp.104.1/lib/net35/RestSharp.dll | Bin 146944 -> 0 bytes .../RestSharp.104.1/lib/net35/RestSharp.xml | 2627 ---- .../lib/net4-client/RestSharp.dll | Bin 150016 -> 0 bytes .../lib/net4-client/RestSharp.xml | 2696 ---- .../RestSharp.104.1/lib/net4/RestSharp.dll | Bin 150016 -> 0 bytes .../RestSharp.104.1/lib/net4/RestSharp.xml | 2696 ---- .../lib/sl4-wp71/RestSharp.WindowsPhone.dll | Bin 165376 -> 0 bytes .../lib/sl4-wp71/RestSharp.WindowsPhone.xml | 3510 ------ .../lib/sl4/RestSharp.Silverlight.dll | Bin 124928 -> 0 bytes .../lib/sl4/RestSharp.Silverlight.xml | 2445 ---- sdks/html5-javascript/lib/modules/Client.js | 29 +- sdks/nodejs/lib/usergrid.js | 31 +- sdks/php/lib/vendor/Apache/Usergrid/Client.php | 33 +- sdks/php5/apache-usergrid/.gitignore | 12 + .../Examples/attrubites/attributes.php | 122 + .../Examples/collections/books.php | 130 + .../Examples/collections/data.php | 38 + .../Examples/collections/users.php | 120 + sdks/php5/apache-usergrid/Examples/examples.md | 17 + sdks/php5/apache-usergrid/Examples/examples.php | 245 + .../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 | 79 + sdks/php5/apache-usergrid/LICENSE | 202 + sdks/php5/apache-usergrid/README.md | 219 + sdks/php5/apache-usergrid/TODO.md | 2 + sdks/php5/apache-usergrid/composer.json | 40 + sdks/php5/apache-usergrid/composer.lock | 1225 ++ sdks/php5/apache-usergrid/phpunit.xml | 29 + .../src/Api/Exception/BadRequestException.php | 34 + .../src/Api/Exception/InvalidIdException.php | 33 + .../src/Api/Exception/NotFoundException.php | 33 + .../src/Api/Exception/ServerErrorException.php | 33 + .../src/Api/Exception/UnauthorizedException.php | 34 + .../src/Api/Exception/UsergridException.php | 152 + .../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 | 116 + .../src/Api/Models/Collection.php | 37 + .../apache-usergrid/src/Api/Models/Device.php | 50 + .../apache-usergrid/src/Api/Models/Entity.php | 36 + .../apache-usergrid/src/Api/Models/Event.php | 35 + .../apache-usergrid/src/Api/Models/Group.php | 54 + .../src/Api/Models/GuzzleCommandTrait.php | 59 + .../apache-usergrid/src/Api/Models/Notifier.php | 36 + .../src/Api/Models/Organization.php | 38 + .../apache-usergrid/src/Api/Models/Receipt.php | 36 + .../apache-usergrid/src/Api/Models/Role.php | 54 + .../apache-usergrid/src/Api/Models/User.php | 77 + .../apache-usergrid/src/Api/QueryAggregator.php | 61 + .../src/Api/ResourceIterator.php | 69 + sdks/php5/apache-usergrid/src/Api/Usergrid.php | 452 + .../Oauth2/GrantType/AuthorizationCode.php | 77 + .../Oauth2/GrantType/ClientCredentials.php | 73 + .../Oauth2/GrantType/GrantTypeInterface.php | 41 + .../GrantType/HWIOAuthBundleRefreshToken.php | 62 + .../Oauth2/GrantType/PasswordCredentials.php | 75 + .../Plugin/Oauth2/GrantType/RefreshToken.php | 74 + .../src/Guzzle/Plugin/Oauth2/Oauth2Plugin.php | 212 + .../Laravel/ApacheUsergridServiceProvider.php | 159 + .../src/Laravel/Facades/Usergrid.php | 42 + .../src/Manifests/1.0.0/Application.php | 979 ++ .../src/Manifests/1.0.0/Errors.php | 53 + .../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 | 1108 ++ .../src/Manifests/1.0.1/Assets.php | 24 + .../src/Manifests/1.0.1/Custom.php | 381 + .../src/Manifests/1.0.1/Devices.php | 465 + .../src/Manifests/1.0.1/Errors.php | 50 + .../src/Manifests/1.0.1/Events.php | 24 + .../src/Manifests/1.0.1/Groups.php | 486 + .../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 | 166 + .../src/Manifests/1.0.1/Receipts.php | 24 + .../src/Manifests/1.0.1/Roles.php | 381 + .../src/Manifests/1.0.1/Users.php | 381 + .../Manifests/swagger-json/applications.json | 1262 ++ .../src/Manifests/swagger-json/management.json | 1905 +++ .../src/Manifests/swagger-json/resources.json | 15 + .../src/Native/ConfigRepository.php | 102 + .../src/Native/Facades/Usergrid.php | 118 + .../src/Native/UsergridBootstrapper.php | 150 + sdks/php5/apache-usergrid/src/config/config.php | 53 + .../tests/Api/ApplicationTest.php | 72 + .../apache-usergrid/tests/Api/AttributeTest.php | 59 + .../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 | 40 + .../apache-usergrid/tests/Api/UsergridTest.php | 153 + .../tests/Laravel/Facades/UsergridTest.php | 53 + sdks/php5/apache-usergrid/tests/bootstrap.php | 61 + stack/build-tools/pom.xml | 5 +- stack/config/pom.xml | 1 + .../main/resources/usergrid-default.properties | 37 +- stack/core/pom.xml | 1 + .../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 - .../java/org/apache/usergrid/utils/BCrypt.java | 627 - .../org/apache/usergrid/utils/package-info.java | 17 - .../main/resources/usergrid-core-context.xml | 41 +- .../apache/usergrid/batch/job/package-info.java | 17 - .../query/OrderByDiscardPagesPagingIT.java | 164 + .../org/apache/usergrid/utils/package-info.java | 17 - .../collection/util/EntityHelper.java | 2 +- stack/launcher/pom.xml | 8 + .../java/org/apache/usergrid/launcher/App.java | 7 +- .../launcher/ClasspathStaticHttpHandler.java | 321 - .../org/apache/usergrid/launcher/Server.java | 5 +- .../apache/usergrid/launcher/package-info.java | 17 - stack/mongo-emulator/pom.xml | 3 +- stack/pom.xml | 10 +- stack/rest/pom.xml | 1 - .../rest/applications/ServiceResource.java | 13 +- .../rest/management/users/UsersResource.java | 14 +- .../applications/assets/AssetResourceIT.java | 106 + stack/services/pom.xml | 6 + .../management/AccountCreationProps.java | 11 + .../usergrid/management/ManagementService.java | 2 + .../cassandra/AccountCreationPropsImpl.java | 8 + .../cassandra/ManagementServiceImpl.java | 30 +- .../security/crypto/command/BcryptCommand.java | 4 +- .../security/providers/AbstractProvider.java | 5 +- .../providers/PingIdentityProvider.java | 19 +- stack/tools/pom.xml | 1 + .../org/apache/usergrid/tools/ExportAdmins.java | 236 + .../org/apache/usergrid/tools/ImportAdmins.java | 451 + .../apache/usergrid/tools/ResetSuperUser.java | 18 +- stack/websocket/pom.xml | 1 + 297 files changed, 31810 insertions(+), 91701 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/portal/index-template.html ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/portal/js/global/ug-service.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/config/src/main/resources/usergrid-default.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/core/src/main/resources/usergrid-core-context.xml ---------------------------------------------------------------------- diff --cc stack/core/src/main/resources/usergrid-core-context.xml index 0be6d00,4424896..37a2530 --- a/stack/core/src/main/resources/usergrid-core-context.xml +++ b/stack/core/src/main/resources/usergrid-core-context.xml @@@ -158,7 -161,12 +161,9 @@@ </bean> - <bean id="indexBucketLocator" class="org.apache.usergrid.persistence.cassandra.SimpleIndexBucketLocatorImpl"> - <constructor-arg value="${usergrid.index.defaultbucketsize}"/> - </bean> + <bean id="entityManager" class="org.apache.usergrid.persistence.cassandra.EntityManagerImpl" scope="prototype"/> + <bean id="mailUtils" class="org.apache.usergrid.utils.MailUtils" /> <bean id="traceTagAspect" class="org.apache.usergrid.persistence.cassandra.util.TraceTagAspect"/> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/EntityHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/rest/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/services/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0db7f4c0/stack/services/src/main/java/org/apache/usergrid/security/providers/AbstractProvider.java ----------------------------------------------------------------------
