DO NOT MERGE YET - Usergrid 1260 #483

… unique set of appIds.

…/usergrid into 2.1-release

…2.1-release

…/usergrid into 2.1-release

…grid

…Should result in less ops to cassandra but not a major cause of pain.

…/usergrid

…rimental tests.

… tests that were once excluded via moms.

… the export-feature branch.

…ues.

Updated consistency test to have 2 read workers.

…and ignore test broken by disabled delete.

…rked version.

…ze prop is noted in our metadata object, not at the root fields level.

…rgrid

…used to do before the new framework conversion.

…for the one that is still ignored.

…fields before adding it to the Elasticsearch index document. This is to avoid rejected index requests due to number format exceptions.

…rgrid

…ling.

…n progress.

…vices to send notifications to.

…that represents "in progress".

…rgrid

…ller to pass in entity to em.updateProperties. Check if debug is enabled in many placesbefore calling logger.debug.

…for Usergrid to process the test documents into the index before asking Elasticsearch to refresh/flush the index.

…luster is being used.

…connections. Only service level verification

confirm/activate process still has issues with determining org for request, may need to add organization info to token

…uilt separately as it's not critical to the deployment/testing of the main Usergrid application.

…gration tests. Re-formatting stack/pom.xml.

…ould previously cause uncaught exception errors.

- made loggers static final

…ht occur.

…tion entities. Enhanced QueueListener thread naming and shutdown logic. Fixed all GCM push notification tests. Fixed matrix queries in notifications service.

…t for payloads containing nested json.

…grid

…1195 Conflicts: stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java

…tivation of admin users allows org-specific email templates and admin approval email addresses to be used

… exceptions but they get mapped to NotAllowed for whatever reason.

…he issue.

User DefaultURLConnectionFactory is not URLConnectionFactory is specified. use urlConnectionFactory.openConnection(urlAsString) instead of new URL(urlAsString).openConnection();

…for cleanliness.

…he notifier with details about the certificate. Fix APNS service tests. Fix scheduled notifications where a missing column family was not being created.

…grid into USERGRID-1203

…Add filename to the certInfo object.

…e valid cert for testing notifier creation (which tests the certificate utils).

…t separately when using.

…ctor.

…RID-144. Also, added fix to file not getting rid of text metadata and being properly replaced by image asset.

…asset call. Verified that previous assets re-write file metadata.

…n 404 and added AmazonException throwing for reading.

Fun fact time: The apache header adds 803 bytes unto every file. For the 251 files of apache rat checked files we use 201 KB on headers alone!

…grid into USERGRID-1047 # Via Dave Johnson (1) and George Reyes (1) * 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: Added apache header to testing text. Fun fact time: The apache header adds 803 bytes unto every file. For the 251 files of apache rat checked files we use 201 KB on headers alone! Added some comments and deleting found commented out code. Created a test that correctly emulates what occurs when running curl asset call. Added additional test file and test case to verify the issue in USERGRID-144. Also, added fix to file not getting rid of text metadata and being properly replaced by image asset.

…a for AWS binary assets. Also changed tests so they will run with properties set the way its done occasionally.

…red with guide instead of Spring.

…le UG code expects it to be. Remove all reference of Hector locks, changing its existing test to work with Astyanax.

…ething passed cannot be parsed to a valid consistency level.

… UUID is not provided (otherwise you overwrite existing app credentials).

… new index field type named "null" with value of null. Also changes to pass a Set to elasticsearch for fields to index instead of a non unique list. Conflicts: stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/FieldTypeName.java stack/corepersistence/model/src/test/java/org/apache/usergrid/persistence/model/entity/MapToEntityConverterTest.java stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java

…ch (before assumed duplicates were allowed).

…-merge from ImportAdmins.

…rgrid into release

* commit '19de00b5b72859ddceeea01bedc94c0cc2efaeb4': Fix tests to handle uniqueness of fields being indexed at Elasticsearch (before assumed duplicates were allowed). Initial work to support a typed null field for an entity, including a new index field type named "null" with value of null. Also changes to pass a Set to elasticsearch for fields to index instead of a non unique list.

* commit '4945b6f2d3a8a2d6e78c230bce6be09082dfa68c': Implement a minimum lock expiration time. Ensure the lock manager is injected as a singleton. Remove unused SingleNodeLockImpl and any references to this. Simplify the locks consistency level and default it to LQ in case something passed cannot be parsed to a valid consistency level. Fix Astyanax locking to be re-entrant as Hector locks were and possible UG code expects it to be. Remove all reference of Hector locks, changing its existing test to work with Astyanax. Remove commented, old Hector configuration from Spring context config. Fix new lock manager wiring issues in services layer. First commit of new implementation of Astyanax locks and having it wired with guide instead of Spring. Remove unused zookeeper lock manager. Fix typo in word 'tenant'.

…g. CassandraFig) will only use its default if there was no java prop set already.

1. Add usergrid.api.url.base property (defaults to http://localhost:8080/ROOT) that can be overridden for an org. 2. The confirmation and activation properties are hardcoded paths and don't need org overrides. Example: usergrid.admin.activation.url is built by concatenating usergrid.api.url.base and "/management/users/%s/activate" 3. swagger.basepath removed and replaced by usergrid.api.url.base. 4. Refactor orgconfig to return system defaults if not configurable by org.

…quest is not for a migration.

1. Fix copying of Properties object (requires constructor + putAll() ) 2. Fix property retrieval for org-configurable properties (take from org properties first, then config file properties, then org property defaults. 3. Added 2 tests for new org config functionality.

…icate edges in our graph results.

This reverts commit e5ebb37.

…rgrid into release

…ions.

…sented as a top-level entity NullField instead of a null value.

…ded a new UnsupportedRestException error that is to be used in the rest tier. Confirmed it is now thrown in the correct cases

…grid into USERGRID-1047 # By Michael Russo (19) and Dave Johnson (4) # Via Michael Russo (4) and others * 'master' of https://git-wip-us.apache.org/repos/asf/usergrid: (23 commits) Fix issue with null values nested in an entity list field being represented as a top-level entity NullField instead of a null value. Fix inheritance issue. Fix issue with multiple types within a list causing class cast exceptions. Revert ""port" tools from master" "port" tools from master Cleanup duplicate edges at the end of addToCollection and filter duplicate edges in our graph results. Only reset roles and application secrets if the create application request is not for a migration. Fix the default consistency level settings in properties. The fig (e.g. CassandraFig) will only use its default if there was no java prop set already. Implement a minimum lock expiration time. Ensure the lock manager is injected as a singleton. Fixes to allow ImportAdmin to run in distributed env, also remove org-merge from ImportAdmins. Fix tests to handle uniqueness of fields being indexed at Elasticsearch (before assumed duplicates were allowed). Initial work to support a typed null field for an entity, including a new index field type named "null" with value of null. Also changes to pass a Set to elasticsearch for fields to index instead of a non unique list. Remove unused SingleNodeLockImpl and any references to this. Only create new client secrets during app creation if the application UUID is not provided (otherwise you overwrite existing app credentials). Simplify the locks consistency level and default it to LQ in case something passed cannot be parsed to a valid consistency level. Fix Astyanax locking to be re-entrant as Hector locks were and possible UG code expects it to be. Remove all reference of Hector locks, changing its existing test to work with Astyanax. Remove commented, old Hector configuration from Spring context config. Fix new lock manager wiring issues in services layer. First commit of new implementation of Astyanax locks and having it wired with guide instead of Spring. ...

…it gets caught without needing the other catch. Also removed other 500 catch in tests and verified that they pass locally.

… the Usergrid artifact and dependencies specified.

…grid

…y for 2.1.0.

…grid into USERGRID-1241

…xes needed for Usergrid. Also fix serialization issue when loading a batch of entities. Ensure the buffered entities are being loaded instead of the full set.

…g is used in the client configuration.

…go with the 2.1.0 release.

…or user creation

…iles in the process.

…ing the dependency from usergrid-services.

…e log

…grid into USERGRID-1243

… to time. Remove unused dependencies. Remove CountMinSketch depedency and leverage RX distinct to filter duplicated devices from being emitted.

…Nanoc 4.

…grid

…able of contents (that's why so many files changed)

Conflicts: README.md docs/installation/deployment-guide.md website/lib/default.rb website/nanoc.yaml website/run.sh

…al or SNS queue manager impls for the same exact queue. Enhance the node.js integration tests.

…s to 'null' anyways.

…grid into USERGRID-1260

Commits on Feb 10, 2016

Minor README corrections.

snoopdave committed Feb 10, 2016

Configuration menu

View commit details

Copy full SHA for dad3aba

Browse repository at this point

Copy the full SHA

dad3aba View commit details

Browse the repository at this point in the history

DO NOT MERGE YET - Usergrid 1260 #483

Are you sure you want to change the base?

DO NOT MERGE YET - Usergrid 1260 #483

Commits on Nov 12, 2015

Commits on Nov 13, 2015

Commits on Nov 14, 2015

Commits on Nov 15, 2015

Commits on Nov 16, 2015

Commits on Nov 17, 2015

Commits on Nov 18, 2015

Commits on Nov 19, 2015

Commits on Nov 20, 2015

Commits on Nov 23, 2015

Commits on Nov 24, 2015

Commits on Nov 25, 2015

Commits on Dec 1, 2015

Commits on Dec 4, 2015

Commits on Dec 5, 2015

Commits on Dec 8, 2015

Commits on Dec 17, 2015

Commits on Dec 18, 2015

Commits on Dec 23, 2015

Commits on Dec 29, 2015

Commits on Dec 30, 2015

Commits on Dec 31, 2015

Commits on Jan 4, 2016

Commits on Jan 6, 2016

Commits on Jan 7, 2016

Commits on Jan 8, 2016

Commits on Jan 9, 2016

Commits on Jan 11, 2016

Commits on Jan 12, 2016

Commits on Jan 13, 2016

Commits on Jan 14, 2016

Commits on Jan 15, 2016

Commits on Jan 16, 2016

Commits on Jan 18, 2016

Commits on Jan 19, 2016

Commits on Jan 20, 2016

Commits on Jan 21, 2016

Commits on Jan 22, 2016

Commits on Jan 23, 2016

Commits on Jan 24, 2016

Commits on Jan 25, 2016

Commits on Jan 26, 2016

Commits on Jan 27, 2016

Commits on Jan 28, 2016

Commits on Jan 29, 2016

Commits on Jan 30, 2016

Commits on Jan 31, 2016

Commits on Feb 1, 2016

Commits on Feb 2, 2016

Commits on Feb 4, 2016

Commits on Feb 5, 2016

Commits on Feb 6, 2016

Commits on Feb 8, 2016

Commits on Feb 9, 2016

Commits on Feb 10, 2016

Commits on Feb 12, 2016