apache · mdunker · Nov 12, 2015 · Nov 12, 2015 · Nov 12, 2015 · Nov 12, 2015
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,17 @@
+target/ export-ignore
+*.log export-ignore
+.idea/ export-ignore
+._* export-ignore
+._*/ export-ignore
+.repository/ export-ignore
+.classpath export-ignore
+.project export-ignore
+.settings/ export-ignore
+bower_compoments/ export-ignore
+node_modules/ export-ignore
+dist/ export-ignore
+dist_cov/ export-ignore
+portal/index.html</> export-ignore
+portal/index-debug.html export-ignore
+*.nupkg export-ignore
+*.dll export-ignore
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ target
 # Icon must ends with two \r.
 Icon
 
+/website/tmp
 
 # Thumbnails
 ._*
@@ -32,7 +33,9 @@ Icon
 .settings/
 .metadata/
 #Webstorm artifacts
+#Webstorm/IntelliJ artifacts
 .idea/
+*.iml
 stack/corepersistence/collection/nbactions.xml
 stack/corepersistence/graph/nbactions.xml
 stack/corepersistence/model/nbactions.xml
@@ -56,6 +59,7 @@ usergrid-UNIT.properties
 /portal/js/templates.js
 /portal/index.html
 /portal/index-debug.html
+/portal/dist/*
 /portal/dist/usergrid-portal/
 /portal/dist/appsvc-ui/
 /portal/nbproject/project.properties
@@ -82,3 +86,8 @@ portal/js/templates.js
 !/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties
 *.iml
 sdks/dotnet/samples/notifications/packages/*
+/sdks/html5-javascript/node_modules/
+
+
+/stack/rest_integration_tests/node_modules
+/stack/rest_integration_tests/config/override.js
diff --git a/.usergridversion b/.usergridversion
@@ -0,0 +1 @@
+2.0.0-SNAPSHOT
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,65 @@
+
+Usergrid 2.1.0
+--------------------------------------------------------------------------------
+
+Usergrid 2.1.0 is a major release of Usergrid with a completely rewritten 
+persistence, index and query engine based on Cassandra and ElasticSearch.
+The REST API remains the same as in Usergrid 1.x but with the addition of some
+new system APIs for managing the query index and data migrations.
+
+Usergrid 2.1.0 will not work with a Usergrid 1.x database and currently
+there is no migration tool for upgrading a 1.x system to 2.1.
+
+
+Usergrid 1.0.2
+--------------------------------------------------------------------------------
+
+Usergrid 1.0.2 is a minor release with bug fixes and small improvements.
+Here are the highlights:
+
+Bugs fixed
+
+* S3 upload fails on OpenJDK and Java 8 (fixed by JClouds upgrade)
+* Asset data deleted when connection to Asset deleted
+* Portal stores app password as clear-text
+
+Improvements
+
+* Cassandra key-space names are now configurable
+
+New features
+
+* ExportAdmins: a new tool to export Admin Users, credentials and organizations
+* ImportAdmins: a new tool to import Admin Users, credentials and organizations
+* Central SSO: Usergrid-Usergrid SSO via new /management/externaltoken end-point
+
+Here's the full list of JIRA issues resolved:
+https://issues.apache.org/jira/issues/?jql=project%3Dusergrid%20and%20fixVersion%3D1.0.2
+
+
+Usergrid 1.0.1
+--------------------------------------------------------------------------------
+
+Except for our shiny new PHP5 SDK, Usergrid 1.0.1 is mostly a bug fix release.
+Here are the highlights:
+
+* New PHP5 SDK - new SDK is a Guzzle Web service descriptor so any Usergrid API 
+  calls can be added with ease.
+
+* Original PHP SDK - added URL endpoint update functionality.
+
+* Node.js SDK - Bug fix: calcTimeDiff changed to return seconds correctly
+* Node.js SDK - Bug fix: getOnExist was sending wrong data value to server.
+
+* Android SDK Updated from Apigee source. Numerous bug fixes and enhancements.
+
+* Docs moved to readthedocs.org: http://usergrid.readthedocs.org/en/latest/.
+
+* Admin portal - Changed default config to point to localhost.
+* Admin portal - Build now created as zip file during build process.
+
+* Stack - Bug fix: Launcher now works, uses Admin portal hosted on ASF Infra.
+* Stack - Bug fix: reset password will now work with or without reCaptcha keys.
+* Stack - Build now works with latest versions of Maven.
+* Stack - Build now supports property for configurable argline parameters. 
+* Stack - Build now sets java.awt.headless to prevent forkedbooter popups.
diff --git a/DISCLAIMER b/DISCLAIMER
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,6 @@
 
+Apache Usergrid itself is licensed under the terms of the Apache License:
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -201,6 +203,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+------------------------------------------------------------------------------
 
 USERGRID SUBCOMPONENTS
 
@@ -213,7 +216,7 @@ IOS SDK
 -------
 For the SBJson component:
 
- Copyright (C) 2009-2011 Stig Brautaset. All rights reserved.
+ Copyright (c) Stig Brautaset. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -240,10 +243,10 @@ For the SBJson component:
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 For the SSKeychain component:
+-----------------------------
 
- Copyright (c) 2010-2014 Sam Soffes, http://soff.es
+ Copyright (c) Sam Soffes, http://soff.es
 
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -264,28 +267,61 @@ For the SSKeychain component:
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Other components:
+-----------------
+
+This product bundles angular.js
+Copyright(c) Google, Inc. Released under the MIT license.
+
+This product bundles angular-scenario.js, part of jQuery JavaScript Library
+which Includes Sizzle.js Copyright (c) jQuery Foundation, Inc. and others.
+Released under the MIT license.
+
+This product bundles Bootstrap Copyright (c) Twitter, Inc
+Licensed under the MIT license.
+
+The product bundles Intro.js (MIT licensed)
+Copyright (c) usabli.ca - A weekend project by Afshin Mehrabani (@afshinmeh)
+
+This product bundles jQuery
+Licensed under MIT license.
+
+This product bundles jQuery-UI
+Licensed under MIT license.
+
+This product bundles jQuery Sparklines (New BSD License)
+Copyright (c) Splunk Inc.
+
+This product bundles Mocha. 
+All rights reserved. Licensed under MIT.
+Copyright (c) TJ Holowaychuk <[email protected]>
+
+This product bundles NewtonSoft.Json under MIT license 
+
+This product bundles NPM MD5 (BSD-3 licensed)
+Copyright (c) Paul Vorbach and Copyright (C), Jeff Mott.
+
+This product bundles NSubsttute under BSD license 
 
 This product bundles SBJson, which is available under a "3-clause BSD" license.
 For details, see sdks/ios/UGAPI/SBJson/ .
 
+This product bundles Sphinx under BSD license 
+
 This product bundles SSKeychain, which is available under a "MIT/X11" license.
 For details, see sdks/ios/UGAPI/SSKeychain/.
 
-This product bundles angular-senario.js, part of jQuery JavaScript Library v1.10.2
-which Includes Sizzle.js Copyright 2005, 2013 jQuery Foundation, Inc. and
-other contributors. Released under the MIT license.
+This product bundles SSToolkit.
+Copyright (c) Sam Soffes. All rights reserved.
+These files can be located within the /sdks/ios package.
+
+This product bundles Entypo, CC by SA license
 
-This product bundles angular.js, specifically AngularJS v1.2.5 (c) 2010-2014
-Google, Inc. Released under the MIT license.
+This product bundles date.min.js, MIT license
 
-This product bundles Bootstrap v2.3.2 Copyright 2012 Twitter, Inc
-Licensed under the Apache License v2.0
+This product bundles jquery.ui.timepicker.min.js, MIT license
 
-This product bundles jquery-ui-1.8.9. Licensed under MIT license.
+This product bundles blanket_mocha.min.js, MIT license
 
-This product bundles jquery-1.9.1 Licensed under MIT license.
+This product bundles FontAwesome, SIL Open Font License 
 
-This product bundles mocha. All rights reserved. Licensed under MIT.
-Copyright (c) 2011-2014 TJ Holowaychuk <[email protected]>
diff --git a/NOTICE b/NOTICE
@@ -1,6 +1,5 @@
-Apache Usergrid_
-Copyright 2014 The Apache Software Foundation.
+Apache Usergrid 
+Copyright 2015 The Apache Software Foundation.
 
-This product bundles SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.
-These files can be located within the /sdks/ios package.
-
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/README-Docs.md b/README-Docs.md
@@ -0,0 +1,13 @@
+Apache Usergrid Website and Docs
+================================
+
+Usergrid docs and website can be found in these directories:
+
+* __website__: This is the source for the website, it is written in Markdown and uses Pandoc to generate HTML.
+* __docs__: This is the source for the documentation, it is written in Markdown and uses Sphinx to generate HTML.
+* __contents__: This is the target directory for our website and docs generation tools. 
+
+Refer to the README files in the __website__ and __docs__ directories for instructions on how to add and modify
+the website and docs, how to run the generators and how to ensure that the __contents__ directory gets published
+to __usergrid.apache.org__.
+
diff --git a/README.md b/README.md
@@ -1,32 +1,28 @@
 Apache Usergrid
 ===============
 
-
-__WARNING__: This is the __two-dot-o__ branch and work is underway here on a new persistence system for Usergrid. Not everything is working in this branch. If you want stability, you should be working against the master branch or a tag. We refer to the new persistence system as Core Persistence and you can find its modules in the stack/corepersistence directory. 
-
-
 Overview
 --------
 
-**Apache Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile applications, based on RESTful APIs. It is [currently incubating at the Apache Software Foundation](http://usergrid.incubator.apache.org/).**
+**Usergrid is a multi-tenant Backend-as-a-Service stack for web & mobile apps, based on RESTful APIs.**
 
-##Contributing
-We accept all contributions via our GitHub, so you can fork our repo (apache/incubator-usergrid) and then submit a PR back to us for approval. For larger PRs you'll need to have an ICLA form on file with Apache. For more information see our [Contribution Workflow Policy](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+Contribution+Workflow), and specifically our [External Contributors Guide](https://cwiki.apache.org/confluence/display/usergrid/Usergrid+External+Contributors+Guide).
+## Contributing
 
-##Build awesome apps with Usergrid!
+We accept all contributions via our GitHub, so you can fork our repo (apache/usergrid) and then submit a PR back to us for approval. For larger PRs you'll need to have an ICLA form on file with Apache. For more information see [How to Contribute Code & Docs](http://usergrid.apache.org/docs/reference/contribute-code.html).
 
-Apache Usergrid provides all code necessary to build and power modern mobile applications.  This includes the the server stack, administrative portal website, SDKs in most popular languages, as well as command line tools. 
+## Build awesome apps with Usergrid!
 
-Look for much more detailed README files in their corresponding subdirectories, or check out [our website](http://usergrid.incubator.apache.org/) for more info.
+Apache Usergrid provides all code necessary to build and power modern mobile applications.  This includes the server stack, administrative portal website, SDKs in most popular languages, as well as command line tools. 
 
-* The server-side stack, a Java 7 + Cassandra codebase that powers all of the features, is located under [`/stack`](stack). You can install dependencies and compile it with maven. See [stack/README.md](stack#requirements) for instructions.
+* The server-side stack, a Java 8 + Cassandra + ElasticSearch codebase that powers all of the features, is located under [`/stack`](stack). You can install dependencies and compile it with maven. See [stack/README.md](stack#requirements) for instructions.
 
 * The admin portal is a pure HTML5+JavaScript app allowing you to register developers and let them manage their apps in a multi-tenant cluster. Located under [`/portal`](portal)
 
 * SDKs for [iOS](sdks/ios), [Android](sdks/android), [HTML5/JavaScript](sdks/html5-javascript), [node.js](sdks/nodejs), [Ruby on Rails](ruby-on-rails), [pure Ruby](sdks/ruby), [PHP](sdks/php), (server-side) [Java](sdks/java), [.Net / Windows](sdks/dotnet), and [Perl](sdks/perl), located in their respective subdirectories under [`/sdks`](sdks).
 
 * a command-line client “ugc” allowing you to complete most maintenance tasks, as well as queries in a manner similar to the mysql or the mongo shell, located under [`/ugc`](ugc). You can install it on your machine with a simple `sudo gem install ugc`
 
-##For more information
-See the [Apache Usergrid web site](http://usergrid.incubator.apache.org/).
+## For more information
+
+See the Apache Usergrid [web site](http://usergrid.apache.org) and [documentation](http://usergrid.apache.org).
 
diff --git a/content/README.md b/content/README.md
@@ -0,0 +1,7 @@
+# Generated Website and Docs Content
+
+__DO NOT EDIT FILES IN THIS DIRECTORY__
+
+The files here were generated by tools in the ``/docs`` and ``/website`` directories.
+
+See the README files there for information about updating the docs and website.
diff --git a/content/bootstrap/bootstrap.min.css b/content/bootstrap/bootstrap.min.css