You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/22 22:42:47 UTC
[01/13] git commit: Added test to prove size hint issue still exists
Repository: incubator-usergrid
Updated Branches:
refs/heads/master a367a5fb5 -> 7131c5a89
refs/heads/two-dot-o a3ba3494e -> d183fbebf
Added test to prove size hint issue still exists
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/12e7abe6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/12e7abe6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/12e7abe6
Branch: refs/heads/master
Commit: 12e7abe63667fb7a022c85cd387f9a95f69bc27a
Parents: bfedb3e
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Jul 2 11:28:37 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Jul 2 11:39:34 2014 -0600
----------------------------------------------------------------------
.../query/OrderByDiscardPagesPagingIT.java | 164 +++++++++++++++++++
1 file changed, 164 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12e7abe6/stack/core/src/test/java/org/apache/usergrid/persistence/query/OrderByDiscardPagesPagingIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/query/OrderByDiscardPagesPagingIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/query/OrderByDiscardPagesPagingIT.java
new file mode 100644
index 0000000..b36927d
--- /dev/null
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/query/OrderByDiscardPagesPagingIT.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.persistence.query;
+
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.usergrid.persistence.Entity;
+import org.apache.usergrid.persistence.Query;
+import org.apache.usergrid.persistence.Results;
+import org.apache.usergrid.persistence.cassandra.QueryProcessor;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+
+/**
+ *
+ */
+public class OrderByDiscardPagesPagingIT extends AbstractIteratingQueryIT {
+
+ private static final Logger LOG = LoggerFactory.getLogger( OrderByDiscardPagesPagingIT.class );
+
+ private static final String search = "select * where field1 = true AND field2 = true order by ordinal";
+
+ private static final int PAGE_SIZE = 300;
+
+
+ @Test
+ public void testUnionPagingCollection() throws Exception {
+
+
+ final CollectionIoHelper collectionIoHelper = new CollectionIoHelper( app );
+
+ Set<UUID> created = performSetup( collectionIoHelper );
+
+
+ testUnionPaging( collectionIoHelper, search, created );
+ }
+
+
+ @Test
+ public void testUnionPagingConnection() throws Exception {
+
+ final ConnectionHelper connectionHelper = new ConnectionHelper( app );
+
+ Set<UUID> created = performSetup( connectionHelper );
+
+
+ testUnionPaging( connectionHelper, search, created );
+ }
+
+
+ private Set<UUID> performSetup( final IoHelper io ) throws Exception {
+ io.doSetup();
+
+ int size = ( int ) ( QueryProcessor.PAGE_SIZE * 2.5 );
+
+ long start = System.currentTimeMillis();
+
+ LOG.info( "Writing {} entities.", size );
+
+ Set<UUID> entites = new HashSet<UUID>( size );
+
+ for ( int i = 0; i < size; i++ ) {
+
+ Map<String, Object> entity = new HashMap<String, Object>();
+
+ entity.put( "ordinal", i );
+
+ int segment = i / PAGE_SIZE;
+
+ boolean shouldBeReturned = segment % 2 != 0;
+
+ if ( shouldBeReturned ) {
+
+ entity.put( "field1", true );
+ entity.put( "field2", true );
+ }
+ else {
+ entity.put( "field1", false );
+ entity.put( "field2", false );
+ }
+
+
+ Entity saved = io.writeEntity( entity );
+
+ LOG.info( "Writing entity with id '{}'", saved.getUuid() );
+
+ if ( shouldBeReturned ) {
+ entites.add( saved.getUuid() );
+ }
+ }
+
+ long stop = System.currentTimeMillis();
+
+ LOG.info( "Writes took {} ms", stop - start );
+
+ return entites ;
+ }
+
+
+ private void testUnionPaging( final IoHelper io, final String queryString, final Set<UUID> expectedResults )
+ throws Exception {
+
+ //our field1Or has a result size < our page size, so it shouldn't blow up when the cursor is getting created
+ //the leaf iterator should insert it's own "no value left" into the cursor
+ Query query = Query.fromQL( queryString );
+ query.setLimit( PAGE_SIZE );
+
+ Results results;
+
+ long start = System.currentTimeMillis();
+
+ do {
+
+ // now do simple ordering, should be returned in order
+ results = io.getResults( query );
+
+ final List<Entity> entities = results.getEntities();
+
+ for ( int i = 0; i < entities.size(); i++ ) {
+ final UUID uuid = entities.get( i ).getUuid();
+
+ assertTrue( "Value should not be returned twice", expectedResults.contains( uuid ) );
+
+ expectedResults.remove( uuid );
+ }
+
+ query.setCursor( results.getCursor() );
+ }
+ while ( results.getCursor() != null );
+
+ long stop = System.currentTimeMillis();
+
+ LOG.info( "Query took {} ms to return {} entities", stop - start, expectedResults.size() );
+
+ assertEquals( "All entities returned", 0, expectedResults.size() );
+ }
+}
[07/13] git commit: Fixed issue and added onto previous test so that
the issue can be tested.
Posted by to...@apache.org.
Fixed issue and added onto previous test so that the issue can be tested.
Signed-off-by: grey <gr...@apigee.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c78e0a41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c78e0a41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c78e0a41
Branch: refs/heads/master
Commit: c78e0a41a9b5774b3fc8524a12b3b386186e1751
Parents: 2bfbe41
Author: grey <gr...@apigee.com>
Authored: Mon Jul 21 17:15:26 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Jul 25 13:40:08 2014 -0700
----------------------------------------------------------------------
.../cassandra/ManagementServiceImpl.java | 13 ++++++------
.../apache/usergrid/management/EmailFlowIT.java | 22 +++++++++++++-------
2 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c78e0a41/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 8b45dd0..1b9bbc5 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -31,6 +31,11 @@ import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.shiro.UnavailableSecurityManagerException;
+
import org.apache.usergrid.locking.Lock;
import org.apache.usergrid.locking.LockManager;
import org.apache.usergrid.management.AccountCreationProps;
@@ -91,10 +96,6 @@ import org.apache.usergrid.utils.MailUtils;
import org.apache.usergrid.utils.StringUtils;
import org.apache.usergrid.utils.UUIDUtils;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
-import org.apache.shiro.UnavailableSecurityManagerException;
-
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
@@ -2256,8 +2257,8 @@ public class ManagementServiceImpl implements ManagementService {
public void sendAdminUserConfirmedAwaitingActivationEmail( UserInfo user ) throws Exception {
- sendAdminUserEmail( user, "User Account Confirmed",
- properties.getProperty( PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION ) );
+ sendAdminUserEmail(user, "User Account Confirmed",
+ emailMsg( hashMap("confirmed_email",user.getEmail() ),PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION ) );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c78e0a41/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
index b4a7023..ab4b34c 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java
@@ -35,6 +35,10 @@ import org.junit.rules.TestName;
import org.jvnet.mock_javamail.Mailbox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.text.StrSubstitutor;
+
import org.apache.usergrid.ServiceITSetup;
import org.apache.usergrid.ServiceITSetupImpl;
import org.apache.usergrid.cassandra.CassandraResource;
@@ -46,15 +50,7 @@ import org.apache.usergrid.persistence.cassandra.CassandraService;
import org.apache.usergrid.persistence.entities.Application;
import org.apache.usergrid.persistence.entities.User;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED;
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION;
@@ -76,6 +72,11 @@ import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYS
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL;
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL;
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
/**
@@ -165,6 +166,11 @@ public class EmailFlowIT {
assertEquals( ActivationState.CONFIRMED_AWAITING_ACTIVATION, state );
confirmation = user_inbox.get( 1 );
+ String body = ( ( MimeMultipart ) confirmation.getContent() ).getBodyPart( 0 ).getContent().toString();
+ Boolean subbedEmailed = StringUtils.contains( body, "$" );
+
+ assertFalse( subbedEmailed );
+
assertEquals( "User Account Confirmed", confirmation.getSubject() );
List<Message> sysadmin_inbox = Mailbox.get( "sysadmin-2@mockserver.com" );
[12/13] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Posted by to...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7131c5a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7131c5a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7131c5a8
Branch: refs/heads/master
Commit: 7131c5a892b7295fe4c2783955292ca32f8ca794
Parents: 28e2c35 a367a5f
Author: Ubuntu <ub...@ip-10-18-140-7.us-west-2.compute.internal>
Authored: Tue Oct 21 17:54:32 2014 +0000
Committer: Ubuntu <ub...@ip-10-18-140-7.us-west-2.compute.internal>
Committed: Tue Oct 21 17:54:32 2014 +0000
----------------------------------------------------------------------
.gitignore | 17 +-
DISCLAIMER | 9 +
LICENSE | 26 +
NOTICE | 11 +-
bower.json | 39 -
portal/Gruntfile.js | 136 +-
portal/README.md | 20 +-
portal/archive/coming_soon.html | 31 -
portal/archive/config.js | 72 -
.../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin 251 -> 0 bytes
.../images/ui-bg_flat_100_deedf7_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_100_e4f1fb_40x100.png | Bin 213 -> 0 bytes
.../images/ui-bg_flat_100_f2f5f7_40x100.png | Bin 212 -> 0 bytes
.../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin 181 -> 0 bytes
.../images/ui-bg_flat_50_3baae3_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_80_d7ebf9_40x100.png | Bin 183 -> 0 bytes
.../ui-bg_highlight-hard_70_000000_1x100.png | Bin 118 -> 0 bytes
.../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin 153 -> 0 bytes
.../images/ui-icons_000000_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_2694e8_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_3d80b3_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_72a7cf_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes
.../css/custom-theme/jquery-ui-1.8.9.custom.css | 573 -
portal/archive/css/jquery-ui-timepicker.css | 53 -
portal/archive/css/jquery.ui.statusbar.css | 25 -
portal/archive/css/prettify.css | 52 -
portal/archive/css/usergrid-stripped.css | 5199 ---
portal/archive/css/usergrid.css | 5203 ---
portal/archive/dash/README.md | 3 -
.../archive/dash/config/testacular-e2e.conf.js | 22 -
portal/archive/dash/config/testacular.conf.js | 20 -
portal/archive/dash/test/e2e/runner.html | 10 -
portal/archive/dash/test/e2e/scenarios.js | 45 -
.../dash/test/lib/angular/angular-mocks.js | 1764 -
.../dash/test/lib/angular/angular-scenario.js | 26195 -------------
.../archive/dash/test/lib/angular/version.txt | 1 -
.../archive/dash/test/unit/controllersSpec.js | 31 -
portal/archive/dash/test/unit/directivesSpec.js | 19 -
portal/archive/dash/test/unit/filtersSpec.js | 19 -
portal/archive/dash/test/unit/servicesSpec.js | 14 -
portal/archive/images/APNS_cert_upload.png | Bin 33956 -> 0 bytes
portal/archive/images/APNS_certification.png | Bin 16855 -> 0 bytes
portal/archive/images/android-notification.png | Bin 41629 -> 0 bytes
portal/archive/images/android-sdk-download.png | Bin 4848 -> 0 bytes
portal/archive/images/api-activity.gif | Bin 10819 -> 0 bytes
portal/archive/images/apigee-logo.png | Bin 3647 -> 0 bytes
portal/archive/images/apigeetopbar.png | Bin 4658 -> 0 bytes
portal/archive/images/background_one_col.png | Bin 3126 -> 0 bytes
portal/archive/images/btn-copyCurl-up.png | Bin 2762 -> 0 bytes
portal/archive/images/clippy-bg.png | Bin 561 -> 0 bytes
portal/archive/images/close.gif | Bin 718 -> 0 bytes
portal/archive/images/dotnet-sdk-download.png | Bin 7149 -> 0 bytes
portal/archive/images/down_arrow.png | Bin 1285 -> 0 bytes
portal/archive/images/error.png | Bin 2009 -> 0 bytes
portal/archive/images/faviconApigee.ico | Bin 1150 -> 0 bytes
.../images/glyphicons-halflings-white.png | Bin 4352 -> 0 bytes
portal/archive/images/glyphicons-halflings.png | Bin 4352 -> 0 bytes
.../glyphicons_halflings_135_wrench-white2.pdn | Bin 5400 -> 0 bytes
.../glyphicons_halflings_135_wrench-white2.png | Bin 296 -> 0 bytes
.../images/glyphicons_halflings_135_wrench.png | Bin 228 -> 0 bytes
.../glyphicons_halflings_135_wrench_white.png | Bin 251 -> 0 bytes
.../glyphicons_halflings_wrench_white.png | Bin 1016 -> 0 bytes
portal/archive/images/google_api_key.png | Bin 98118 -> 0 bytes
portal/archive/images/green_dot.png | Bin 3472 -> 0 bytes
portal/archive/images/grid.png | Bin 166 -> 0 bytes
portal/archive/images/icons.png | Bin 13132 -> 0 bytes
portal/archive/images/ios-sdk-download.png | Bin 4886 -> 0 bytes
portal/archive/images/iphone_message.png | Bin 90307 -> 0 bytes
.../archive/images/javascript-sdk-download.png | Bin 4618 -> 0 bytes
portal/archive/images/left_arrow.png | Bin 1257 -> 0 bytes
portal/archive/images/logo-white.png | Bin 2014 -> 0 bytes
portal/archive/images/menuActiveTriangle.png | Bin 315 -> 0 bytes
portal/archive/images/nodejs-sdk-download.png | Bin 5273 -> 0 bytes
portal/archive/images/notice.png | Bin 2112 -> 0 bytes
portal/archive/images/orange-arrow.png | Bin 242 -> 0 bytes
.../archive/images/push_notifications_icon.png | Bin 338 -> 0 bytes
portal/archive/images/red_dot.png | Bin 3482 -> 0 bytes
portal/archive/images/right_arrow.png | Bin 1251 -> 0 bytes
portal/archive/images/ruby-sdk-download.png | Bin 6343 -> 0 bytes
portal/archive/images/step_1.png | Bin 1953 -> 0 bytes
portal/archive/images/step_2.png | Bin 2117 -> 0 bytes
portal/archive/images/step_3.png | Bin 2162 -> 0 bytes
portal/archive/images/success.png | Bin 1863 -> 0 bytes
portal/archive/images/swish_arrow.png | Bin 220 -> 0 bytes
portal/archive/images/topbackground.png | Bin 2890 -> 0 bytes
portal/archive/images/up_arrow.png | Bin 1292 -> 0 bytes
portal/archive/images/user-photo.png | Bin 3849 -> 0 bytes
portal/archive/images/user_profile.png | Bin 3775 -> 0 bytes
portal/archive/images/usergrid_200.png | Bin 6397 -> 0 bytes
portal/archive/images/usergrid_400.png | Bin 8746 -> 0 bytes
portal/archive/images/warning.png | Bin 1179 -> 0 bytes
portal/archive/images/yellow_dot.png | Bin 3475 -> 0 bytes
portal/archive/index-stripped2.html | 1795 -
portal/archive/index.html | 1932 -
portal/archive/js/app/app.js | 131 -
portal/archive/js/app/console.js | 5397 ---
portal/archive/js/app/helpers.js | 241 -
portal/archive/js/app/navigation.js | 251 -
portal/archive/js/app/pages.js | 161 -
portal/archive/js/app/params.js | 30 -
portal/archive/js/app/quickLogin.js | 30 -
portal/archive/js/app/session.js | 176 -
portal/archive/js/app/sso.js | 135 -
portal/archive/js/app/status.js | 37 -
portal/archive/js/app/ui/collections.entity.js | 320 -
portal/archive/js/app/ui/collections.user.js | 120 -
portal/archive/js/app/ui/ui.js | 415 -
portal/archive/js/app/usergrid.appSDK.js | 2097 --
portal/archive/js/app/usergrid.appSDK.orig.js | 2070 --
portal/archive/js/lib/MD5.min.js | 1 -
portal/archive/js/lib/backbone.js | 1431 -
portal/archive/js/lib/bootstrap.min.js | 7 -
portal/archive/js/lib/date.min.js | 2 -
portal/archive/js/lib/jquery-1.7.2.min.js | 4 -
portal/archive/js/lib/jquery-ui-1.8.18.min.js | 15 -
portal/archive/js/lib/jquery.dataset.min.js | 1 -
portal/archive/js/lib/jquery.dform-0.1.3.min.js | 16 -
portal/archive/js/lib/jquery.jsonp-2.3.1.min.js | 3 -
portal/archive/js/lib/jquery.tmpl.min.js | 10 -
.../archive/js/lib/jquery.ui.statusbar.min.js | 1 -
.../archive/js/lib/jquery.ui.timepicker.min.js | 1 -
portal/archive/js/lib/prettify.js | 1477 -
portal/archive/js/lib/underscore-min.js | 5 -
portal/archive/js/spec/client-tests.js | 159 -
portal/archive/js/spec/index.html | 20 -
portal/archive/js/spec/qunit-git.css | 238 -
portal/archive/js/spec/qunit-git.js | 1865 -
portal/archive/js/unit-tests/appSDK-tests.js | 255 -
portal/archive/js/unit-tests/ie-jquery-tests.js | 191 -
portal/archive/js/unit-tests/qunit.css | 231 -
portal/archive/js/unit-tests/qunit.js | 1934 -
portal/archive/loading.html | 9 -
portal/archive/max/index.html | 0
portal/archive/planned_outage.html | 48 -
portal/archive/push/index.html | 34 -
portal/archive/service_down.html | 48 -
.../apigee.ui.activities.table_rows.html | 14 -
.../templates/apigee.ui.admins.table_rows.html | 8 -
.../apigee.ui.applications.table_rows.html | 4 -
.../apigee.ui.collection.table_rows.html | 67 -
.../apigee.ui.collections.query.indexes.html | 5 -
.../apigee.ui.collections.table_rows.html | 9 -
.../apigee.ui.collections.user.header.html | 21 -
.../templates/apigee.ui.curl.detail.html | 11 -
.../templates/apigee.ui.feed.table_rows.html | 15 -
.../templates/apigee.ui.groups.table_rows.html | 14 -
.../apigee.ui.panels.group.activities.html | 28 -
.../apigee.ui.panels.group.details.html | 97 -
.../apigee.ui.panels.group.memberships.html | 40 -
.../apigee.ui.panels.group.permissions.html | 99 -
...pigee.ui.panels.notifications.configure.html | 14 -
.../apigee.ui.panels.role.permissions.html | 58 -
.../templates/apigee.ui.panels.role.users.html | 38 -
.../apigee.ui.panels.user.activities.html | 40 -
.../templates/apigee.ui.panels.user.graph.html | 80 -
.../apigee.ui.panels.user.memberships.html | 40 -
.../apigee.ui.panels.user.permissions.html | 105 -
.../apigee.ui.panels.user.profile.html | 113 -
.../apigee.ui.role.groups.table_rows.html | 44 -
.../templates/apigee.ui.roles.table_rows.html | 15 -
.../templates/apigee.ui.users.table_rows.html | 18 -
portal/archive/templates/test/modalForm2.html | 32 -
portal/archive/test/autocomplete.html | 25 -
portal/archive/test/modalForm.html | 32 -
portal/bower.json | 4 -
portal/build.sh | 24 +-
portal/config.js | 49 +-
portal/css/apigeeGlobalNavigation.css | 291 -
portal/css/dash.min.css | 1 -
portal/css/main.css | 94 +-
portal/css/main.min.css | 1 +
.../usergrid-portal/archive/coming_soon.html | 31 -
portal/dist/usergrid-portal/archive/config.js | 72 -
.../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin 251 -> 0 bytes
.../images/ui-bg_flat_100_deedf7_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_100_e4f1fb_40x100.png | Bin 213 -> 0 bytes
.../images/ui-bg_flat_100_f2f5f7_40x100.png | Bin 212 -> 0 bytes
.../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin 181 -> 0 bytes
.../images/ui-bg_flat_50_3baae3_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_80_d7ebf9_40x100.png | Bin 183 -> 0 bytes
.../ui-bg_highlight-hard_70_000000_1x100.png | Bin 118 -> 0 bytes
.../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin 153 -> 0 bytes
.../images/ui-icons_000000_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_2694e8_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_3d80b3_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_72a7cf_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes
.../css/custom-theme/jquery-ui-1.8.9.custom.css | 573 -
.../archive/css/jquery-ui-timepicker.css | 53 -
.../archive/css/jquery.ui.statusbar.css | 25 -
.../usergrid-portal/archive/css/prettify.css | 52 -
.../archive/css/usergrid-stripped.css | 5199 ---
.../usergrid-portal/archive/css/usergrid.css | 5203 ---
.../dist/usergrid-portal/archive/dash/README.md | 3 -
.../archive/dash/config/testacular-e2e.conf.js | 22 -
.../archive/dash/config/testacular.conf.js | 20 -
.../archive/dash/test/e2e/runner.html | 10 -
.../archive/dash/test/e2e/scenarios.js | 45 -
.../dash/test/lib/angular/angular-mocks.js | 1764 -
.../dash/test/lib/angular/angular-scenario.js | 26195 -------------
.../archive/dash/test/lib/angular/version.txt | 1 -
.../archive/dash/test/unit/controllersSpec.js | 31 -
.../archive/dash/test/unit/directivesSpec.js | 19 -
.../archive/dash/test/unit/filtersSpec.js | 19 -
.../archive/dash/test/unit/servicesSpec.js | 14 -
.../archive/images/APNS_cert_upload.png | Bin 33956 -> 0 bytes
.../archive/images/APNS_certification.png | Bin 16855 -> 0 bytes
.../archive/images/android-notification.png | Bin 41629 -> 0 bytes
.../archive/images/android-sdk-download.png | Bin 4848 -> 0 bytes
.../archive/images/api-activity.gif | Bin 10819 -> 0 bytes
.../archive/images/apigee-logo.png | Bin 3647 -> 0 bytes
.../archive/images/apigeetopbar.png | Bin 4658 -> 0 bytes
.../archive/images/background_one_col.png | Bin 3126 -> 0 bytes
.../archive/images/btn-copyCurl-up.png | Bin 2762 -> 0 bytes
.../archive/images/clippy-bg.png | Bin 561 -> 0 bytes
.../usergrid-portal/archive/images/close.gif | Bin 718 -> 0 bytes
.../archive/images/dotnet-sdk-download.png | Bin 7149 -> 0 bytes
.../archive/images/down_arrow.png | Bin 1285 -> 0 bytes
.../usergrid-portal/archive/images/error.png | Bin 2009 -> 0 bytes
.../archive/images/faviconApigee.ico | Bin 1150 -> 0 bytes
.../images/glyphicons-halflings-white.png | Bin 4352 -> 0 bytes
.../archive/images/glyphicons-halflings.png | Bin 4352 -> 0 bytes
.../glyphicons_halflings_135_wrench-white2.pdn | Bin 5400 -> 0 bytes
.../glyphicons_halflings_135_wrench-white2.png | Bin 296 -> 0 bytes
.../images/glyphicons_halflings_135_wrench.png | Bin 228 -> 0 bytes
.../glyphicons_halflings_135_wrench_white.png | Bin 251 -> 0 bytes
.../glyphicons_halflings_wrench_white.png | Bin 1016 -> 0 bytes
.../archive/images/google_api_key.png | Bin 98118 -> 0 bytes
.../archive/images/green_dot.png | Bin 3472 -> 0 bytes
.../usergrid-portal/archive/images/grid.png | Bin 166 -> 0 bytes
.../usergrid-portal/archive/images/icons.png | Bin 13132 -> 0 bytes
.../archive/images/ios-sdk-download.png | Bin 4886 -> 0 bytes
.../archive/images/iphone_message.png | Bin 90307 -> 0 bytes
.../archive/images/javascript-sdk-download.png | Bin 4618 -> 0 bytes
.../archive/images/left_arrow.png | Bin 1257 -> 0 bytes
.../archive/images/logo-white.png | Bin 2014 -> 0 bytes
.../archive/images/menuActiveTriangle.png | Bin 315 -> 0 bytes
.../archive/images/nodejs-sdk-download.png | Bin 5273 -> 0 bytes
.../usergrid-portal/archive/images/notice.png | Bin 2112 -> 0 bytes
.../archive/images/orange-arrow.png | Bin 242 -> 0 bytes
.../archive/images/push_notifications_icon.png | Bin 338 -> 0 bytes
.../usergrid-portal/archive/images/red_dot.png | Bin 3482 -> 0 bytes
.../archive/images/right_arrow.png | Bin 1251 -> 0 bytes
.../archive/images/ruby-sdk-download.png | Bin 6343 -> 0 bytes
.../usergrid-portal/archive/images/step_1.png | Bin 1953 -> 0 bytes
.../usergrid-portal/archive/images/step_2.png | Bin 2117 -> 0 bytes
.../usergrid-portal/archive/images/step_3.png | Bin 2162 -> 0 bytes
.../usergrid-portal/archive/images/success.png | Bin 1863 -> 0 bytes
.../archive/images/swish_arrow.png | Bin 220 -> 0 bytes
.../archive/images/topbackground.png | Bin 2890 -> 0 bytes
.../usergrid-portal/archive/images/up_arrow.png | Bin 1292 -> 0 bytes
.../archive/images/user-photo.png | Bin 3849 -> 0 bytes
.../archive/images/user_profile.png | Bin 3775 -> 0 bytes
.../archive/images/usergrid_200.png | Bin 6397 -> 0 bytes
.../archive/images/usergrid_400.png | Bin 8746 -> 0 bytes
.../usergrid-portal/archive/images/warning.png | Bin 1179 -> 0 bytes
.../archive/images/yellow_dot.png | Bin 3475 -> 0 bytes
.../archive/index-stripped2.html | 1795 -
portal/dist/usergrid-portal/archive/index.html | 1932 -
.../dist/usergrid-portal/archive/js/app/app.js | 131 -
.../usergrid-portal/archive/js/app/console.js | 5397 ---
.../usergrid-portal/archive/js/app/helpers.js | 241 -
.../archive/js/app/navigation.js | 251 -
.../usergrid-portal/archive/js/app/pages.js | 161 -
.../usergrid-portal/archive/js/app/params.js | 30 -
.../archive/js/app/quickLogin.js | 30 -
.../usergrid-portal/archive/js/app/session.js | 176 -
.../dist/usergrid-portal/archive/js/app/sso.js | 135 -
.../usergrid-portal/archive/js/app/status.js | 37 -
.../archive/js/app/ui/collections.entity.js | 320 -
.../archive/js/app/ui/collections.user.js | 120 -
.../usergrid-portal/archive/js/app/ui/ui.js | 415 -
.../archive/js/app/usergrid.appSDK.js | 2097 --
.../archive/js/app/usergrid.appSDK.orig.js | 2070 --
.../usergrid-portal/archive/js/lib/MD5.min.js | 1 -
.../usergrid-portal/archive/js/lib/backbone.js | 1431 -
.../archive/js/lib/bootstrap.min.js | 7 -
.../usergrid-portal/archive/js/lib/date.min.js | 2 -
.../archive/js/lib/jquery-1.7.2.min.js | 4 -
.../archive/js/lib/jquery-ui-1.8.18.min.js | 15 -
.../archive/js/lib/jquery.dataset.min.js | 1 -
.../archive/js/lib/jquery.dform-0.1.3.min.js | 16 -
.../archive/js/lib/jquery.jsonp-2.3.1.min.js | 3 -
.../archive/js/lib/jquery.tmpl.min.js | 10 -
.../archive/js/lib/jquery.ui.statusbar.min.js | 1 -
.../archive/js/lib/jquery.ui.timepicker.min.js | 1 -
.../usergrid-portal/archive/js/lib/prettify.js | 1477 -
.../archive/js/lib/underscore-min.js | 5 -
.../archive/js/spec/client-tests.js | 159 -
.../usergrid-portal/archive/js/spec/index.html | 20 -
.../archive/js/spec/qunit-git.css | 238 -
.../archive/js/spec/qunit-git.js | 1865 -
.../archive/js/unit-tests/appSDK-tests.js | 255 -
.../archive/js/unit-tests/ie-jquery-tests.js | 191 -
.../archive/js/unit-tests/qunit.css | 231 -
.../archive/js/unit-tests/qunit.js | 1934 -
.../dist/usergrid-portal/archive/loading.html | 9 -
.../dist/usergrid-portal/archive/max/index.html | 0
.../usergrid-portal/archive/planned_outage.html | 48 -
.../usergrid-portal/archive/push/index.html | 34 -
.../usergrid-portal/archive/service_down.html | 48 -
.../apigee.ui.activities.table_rows.html | 14 -
.../templates/apigee.ui.admins.table_rows.html | 8 -
.../apigee.ui.applications.table_rows.html | 4 -
.../apigee.ui.collection.table_rows.html | 67 -
.../apigee.ui.collections.query.indexes.html | 5 -
.../apigee.ui.collections.table_rows.html | 9 -
.../apigee.ui.collections.user.header.html | 21 -
.../templates/apigee.ui.curl.detail.html | 11 -
.../templates/apigee.ui.feed.table_rows.html | 15 -
.../templates/apigee.ui.groups.table_rows.html | 14 -
.../apigee.ui.panels.group.activities.html | 28 -
.../apigee.ui.panels.group.details.html | 97 -
.../apigee.ui.panels.group.memberships.html | 40 -
.../apigee.ui.panels.group.permissions.html | 99 -
...pigee.ui.panels.notifications.configure.html | 14 -
.../apigee.ui.panels.role.permissions.html | 58 -
.../templates/apigee.ui.panels.role.users.html | 38 -
.../apigee.ui.panels.user.activities.html | 40 -
.../templates/apigee.ui.panels.user.graph.html | 80 -
.../apigee.ui.panels.user.memberships.html | 40 -
.../apigee.ui.panels.user.permissions.html | 105 -
.../apigee.ui.panels.user.profile.html | 113 -
.../apigee.ui.role.groups.table_rows.html | 44 -
.../templates/apigee.ui.roles.table_rows.html | 15 -
.../templates/apigee.ui.users.table_rows.html | 18 -
.../archive/templates/test/modalForm2.html | 32 -
.../archive/test/autocomplete.html | 25 -
.../usergrid-portal/archive/test/modalForm.html | 32 -
.../angular-intro.js/Gruntfile.js | 40 -
.../bower_components/angular-intro.js/LICENSE | 20 -
.../angular-intro.js/bower.json | 20 -
.../angular-intro.js/build/angular-intro.min.js | 2 -
.../angular-intro.js/example/app.js | 61 -
.../angular-intro.js/package.json | 36 -
.../angular-intro.js/src/angular-intro.js | 60 -
.../bower_components/angular/README.md | 48 -
.../bower_components/angular/angular-csp.css | 13 -
.../bower_components/angular/angular.js | 22775 ------------
.../bower_components/angular/angular.min.js | 220 -
.../angular/angular.min.js.gzip | Bin 40453 -> 0 bytes
.../bower_components/angular/angular.min.js.map | 8 -
.../bower_components/angular/bower.json | 7 -
.../bower_components/angularitics/Gruntfile.js | 62 -
.../bower_components/angularitics/LICENSE | 22 -
.../bower_components/angularitics/README.md | 115 -
.../bower_components/angularitics/bower.json | 12 -
.../dist/angulartics-chartbeat.min.js | 7 -
.../dist/angulartics-ga-cordova.min.js | 6 -
.../angularitics/dist/angulartics-ga.min.js | 7 -
.../dist/angulartics-google-analytics.min.js | 7 -
.../dist/angulartics-kissmetrics.min.js | 6 -
.../dist/angulartics-mixpanel.min.js | 7 -
.../angularitics/dist/angulartics-scroll.min.js | 14 -
.../dist/angulartics-segmentio.min.js | 6 -
.../angularitics/dist/angulartics.min.js | 6 -
.../bower_components/angularitics/karma.conf.js | 22 -
.../bower_components/angularitics/package.json | 43 -
.../angularitics/samples/chartbeat.html | 79 -
.../angularitics/samples/google-analytics.html | 68 -
.../angularitics/samples/kissmetrics.html | 75 -
.../angularitics/samples/mixpanel.html | 65 -
.../angularitics/samples/partials/a.tpl.html | 1 -
.../angularitics/samples/partials/b.tpl.html | 1 -
.../angularitics/samples/partials/c.tpl.html | 1 -
.../angularitics/samples/partials/root.tpl.html | 1 -
.../angularitics/samples/scroll.html | 82 -
.../angularitics/samples/segmentio.html | 65 -
.../angularitics/src/angulartics-chartbeat.js | 29 -
.../angularitics/src/angulartics-ga-cordova.js | 91 -
.../angularitics/src/angulartics-ga.js | 32 -
.../angularitics/src/angulartics-kissmetrics.js | 29 -
.../angularitics/src/angulartics-mixpanel.js | 29 -
.../angularitics/src/angulartics-scroll.js | 47 -
.../angularitics/src/angulartics-segmentio.js | 24 -
.../angularitics/src/angulartics.js | 132 -
.../angularitics/test/angularticsSpec.js | 38 -
.../bower_components/apigee-sdk/apigee.js | 3260 --
.../bower_components/apigee-sdk/apigee.min.js | 3 -
.../bower_components/apigee-sdk/bower.json | 13 -
.../apigee-sdk/samples/books/index.html | 139 -
.../samples/collections/css/apigee.min.css | 213 -
.../collections/css/jquery.mobile.icons.min.css | 3 -
.../samples/collections/css/theme.min.css | 213 -
.../apigee-sdk/samples/collections/index.html | 91 -
.../apigee-sdk/samples/collections/js/index.js | 360 -
.../entities/css/jquery.mobile.icons.min.css | 3 -
.../samples/entities/css/theme.min.css | 213 -
.../apigee-sdk/samples/entities/index.html | 86 -
.../apigee-sdk/samples/entities/js/index.js | 228 -
.../geolocation/css/jquery.mobile.icons.min.css | 3 -
.../samples/geolocation/css/theme.min.css | 213 -
.../apigee-sdk/samples/geolocation/index.html | 75 -
.../apigee-sdk/samples/geolocation/js/index.js | 133 -
.../apigee-sdk/samples/messagee/app.js | 634 -
.../apigee-sdk/samples/messagee/index.html | 176 -
.../samples/messagee/usergrid.validation.js | 249 -
.../apigee-sdk/samples/monitoring/index.html | 113 -
.../samples/push/android/AndroidManifest.xml | 79 -
.../samples/push/android/ant.properties | 17 -
.../push/android/assets/www/PushNotification.js | 65 -
.../push/android/assets/www/cordova-2.7.0.js | 6836 ----
.../push/android/assets/www/css/index.css | 115 -
.../push/android/assets/www/img/cordova.png | Bin 19932 -> 0 bytes
.../push/android/assets/www/img/logo.png | Bin 21814 -> 0 bytes
.../samples/push/android/assets/www/index.html | 51 -
.../samples/push/android/assets/www/js/index.js | 241 -
.../samples/push/android/assets/www/main.js | 165 -
.../samples/push/android/assets/www/master.css | 116 -
.../screen/android/screen-hdpi-landscape.png | Bin 218302 -> 0 bytes
.../res/screen/android/screen-hdpi-portrait.png | Bin 222148 -> 0 bytes
.../screen/android/screen-ldpi-landscape.png | Bin 42616 -> 0 bytes
.../res/screen/android/screen-ldpi-portrait.png | Bin 42034 -> 0 bytes
.../screen/android/screen-mdpi-landscape.png | Bin 92347 -> 0 bytes
.../res/screen/android/screen-mdpi-portrait.png | Bin 90555 -> 0 bytes
.../screen/android/screen-xhdpi-landscape.png | Bin 489604 -> 0 bytes
.../screen/android/screen-xhdpi-portrait.png | Bin 504508 -> 0 bytes
.../samples/push/android/assets/www/spec.html | 68 -
.../push/android/assets/www/spec/helper.js | 33 -
.../push/android/assets/www/spec/index.js | 67 -
.../www/spec/lib/jasmine-1.2.0/MIT.LICENSE | 20 -
.../www/spec/lib/jasmine-1.2.0/jasmine-html.js | 616 -
.../www/spec/lib/jasmine-1.2.0/jasmine.css | 81 -
.../www/spec/lib/jasmine-1.2.0/jasmine.js | 2529 --
.../apigee-sdk/samples/push/android/build.xml | 92 -
.../samples/push/android/cordova/appinfo.jar | Bin 1574 -> 0 bytes
.../samples/push/android/cordova/build | 24 -
.../samples/push/android/cordova/clean | 24 -
.../samples/push/android/cordova/cordova | 159 -
.../apigee-sdk/samples/push/android/cordova/log | 24 -
.../samples/push/android/cordova/release | 24 -
.../apigee-sdk/samples/push/android/cordova/run | 24 -
.../push/android/libs/android-support-v13.jar | Bin 402581 -> 0 bytes
.../samples/push/android/libs/cordova-2.7.0.jar | Bin 256941 -> 0 bytes
.../samples/push/android/libs/gcm.jar | Bin 13662 -> 0 bytes
.../samples/push/android/proguard-project.txt | 20 -
.../samples/push/android/project.properties | 14 -
.../android/res/drawable-hdpi/ic_launcher.png | Bin 9397 -> 0 bytes
.../push/android/res/drawable-hdpi/icon.png | Bin 6080 -> 0 bytes
.../android/res/drawable-ldpi/ic_launcher.png | Bin 2729 -> 0 bytes
.../push/android/res/drawable-ldpi/icon.png | Bin 3096 -> 0 bytes
.../android/res/drawable-mdpi/ic_launcher.png | Bin 5237 -> 0 bytes
.../push/android/res/drawable-mdpi/icon.png | Bin 4090 -> 0 bytes
.../android/res/drawable-xhdpi/ic_launcher.png | Bin 14383 -> 0 bytes
.../push/android/res/drawable-xhdpi/icon.png | Bin 7685 -> 0 bytes
.../samples/push/android/res/drawable/icon.png | Bin 7685 -> 0 bytes
.../samples/push/android/res/layout/main.xml | 13 -
.../samples/push/android/res/values/strings.xml | 4 -
.../samples/push/android/res/xml/config.xml | 62 -
.../plugin/gcm/CordovaGCMBroadcastReceiver.java | 19 -
.../src/com/plugin/gcm/GCMIntentService.java | 163 -
.../src/com/plugin/gcm/PushHandlerActivity.java | 66 -
.../android/src/com/plugin/gcm/PushPlugin.java | 216 -
.../src/me/mdob/android/androidpush.java | 36 -
.../samples/push/ios/CordovaLib/Classes/CDV.h | 57 -
.../ios/CordovaLib/Classes/CDVAccelerometer.h | 39 -
.../ios/CordovaLib/Classes/CDVAccelerometer.m | 128 -
.../ios/CordovaLib/Classes/CDVAvailability.h | 87 -
.../push/ios/CordovaLib/Classes/CDVBattery.h | 40 -
.../push/ios/CordovaLib/Classes/CDVBattery.m | 152 -
.../push/ios/CordovaLib/Classes/CDVCamera.h | 92 -
.../push/ios/CordovaLib/Classes/CDVCamera.m | 570 -
.../push/ios/CordovaLib/Classes/CDVCapture.h | 118 -
.../push/ios/CordovaLib/Classes/CDVCapture.m | 847 -
.../ios/CordovaLib/Classes/CDVCommandDelegate.h | 54 -
.../CordovaLib/Classes/CDVCommandDelegateImpl.h | 33 -
.../CordovaLib/Classes/CDVCommandDelegateImpl.m | 145 -
.../ios/CordovaLib/Classes/CDVCommandQueue.h | 40 -
.../ios/CordovaLib/Classes/CDVCommandQueue.m | 169 -
.../ios/CordovaLib/Classes/CDVConfigParser.h | 28 -
.../ios/CordovaLib/Classes/CDVConfigParser.m | 70 -
.../push/ios/CordovaLib/Classes/CDVConnection.h | 34 -
.../push/ios/CordovaLib/Classes/CDVConnection.m | 132 -
.../push/ios/CordovaLib/Classes/CDVContact.h | 136 -
.../push/ios/CordovaLib/Classes/CDVContact.m | 1752 -
.../push/ios/CordovaLib/Classes/CDVContacts.h | 151 -
.../push/ios/CordovaLib/Classes/CDVContacts.m | 593 -
.../push/ios/CordovaLib/Classes/CDVDebug.h | 25 -
.../ios/CordovaLib/Classes/CDVDebugConsole.h | 28 -
.../ios/CordovaLib/Classes/CDVDebugConsole.m | 37 -
.../push/ios/CordovaLib/Classes/CDVDevice.h | 30 -
.../push/ios/CordovaLib/Classes/CDVDevice.m | 90 -
.../push/ios/CordovaLib/Classes/CDVEcho.h | 23 -
.../push/ios/CordovaLib/Classes/CDVEcho.m | 61 -
.../push/ios/CordovaLib/Classes/CDVExif.h | 43 -
.../push/ios/CordovaLib/Classes/CDVFile.h | 106 -
.../push/ios/CordovaLib/Classes/CDVFile.m | 1409 -
.../ios/CordovaLib/Classes/CDVFileTransfer.h | 74 -
.../ios/CordovaLib/Classes/CDVFileTransfer.m | 625 -
.../ios/CordovaLib/Classes/CDVGlobalization.h | 150 -
.../ios/CordovaLib/Classes/CDVGlobalization.m | 790 -
.../ios/CordovaLib/Classes/CDVInAppBrowser.h | 88 -
.../ios/CordovaLib/Classes/CDVInAppBrowser.m | 581 -
.../CordovaLib/Classes/CDVInvokedUrlCommand.h | 57 -
.../CordovaLib/Classes/CDVInvokedUrlCommand.m | 140 -
.../push/ios/CordovaLib/Classes/CDVJSON.h | 30 -
.../push/ios/CordovaLib/Classes/CDVJSON.m | 77 -
.../CordovaLib/Classes/CDVJpegHeaderWriter.h | 62 -
.../CordovaLib/Classes/CDVJpegHeaderWriter.m | 522 -
.../ios/CordovaLib/Classes/CDVLocalStorage.h | 50 -
.../ios/CordovaLib/Classes/CDVLocalStorage.m | 485 -
.../push/ios/CordovaLib/Classes/CDVLocation.h | 104 -
.../push/ios/CordovaLib/Classes/CDVLocation.m | 623 -
.../push/ios/CordovaLib/Classes/CDVLogger.h | 26 -
.../push/ios/CordovaLib/Classes/CDVLogger.m | 38 -
.../ios/CordovaLib/Classes/CDVNotification.h | 37 -
.../ios/CordovaLib/Classes/CDVNotification.m | 126 -
.../push/ios/CordovaLib/Classes/CDVPlugin.h | 64 -
.../push/ios/CordovaLib/Classes/CDVPlugin.m | 152 -
.../ios/CordovaLib/Classes/CDVPluginResult.h | 68 -
.../ios/CordovaLib/Classes/CDVPluginResult.m | 224 -
.../ios/CordovaLib/Classes/CDVReachability.h | 85 -
.../ios/CordovaLib/Classes/CDVReachability.m | 260 -
.../Classes/CDVScreenOrientationDelegate.h | 28 -
.../push/ios/CordovaLib/Classes/CDVSound.h | 116 -
.../push/ios/CordovaLib/Classes/CDVSound.m | 699 -
.../ios/CordovaLib/Classes/CDVSplashScreen.h | 33 -
.../ios/CordovaLib/Classes/CDVSplashScreen.m | 225 -
.../ios/CordovaLib/Classes/CDVURLProtocol.h | 29 -
.../ios/CordovaLib/Classes/CDVURLProtocol.m | 230 -
.../ios/CordovaLib/Classes/CDVUserAgentUtil.h | 27 -
.../ios/CordovaLib/Classes/CDVUserAgentUtil.m | 120 -
.../ios/CordovaLib/Classes/CDVViewController.h | 73 -
.../ios/CordovaLib/Classes/CDVViewController.m | 931 -
.../ios/CordovaLib/Classes/CDVWebViewDelegate.h | 37 -
.../ios/CordovaLib/Classes/CDVWebViewDelegate.m | 171 -
.../push/ios/CordovaLib/Classes/CDVWhitelist.h | 36 -
.../push/ios/CordovaLib/Classes/CDVWhitelist.m | 192 -
.../CordovaLib/Classes/NSArray+Comparisons.h | 26 -
.../CordovaLib/Classes/NSArray+Comparisons.m | 41 -
.../push/ios/CordovaLib/Classes/NSData+Base64.h | 33 -
.../push/ios/CordovaLib/Classes/NSData+Base64.m | 281 -
.../Classes/NSDictionary+Extensions.h | 35 -
.../Classes/NSDictionary+Extensions.m | 159 -
.../Classes/NSMutableArray+QueueAdditions.h | 29 -
.../Classes/NSMutableArray+QueueAdditions.m | 58 -
.../CordovaLib/Classes/UIDevice+Extensions.h | 31 -
.../CordovaLib/Classes/UIDevice+Extensions.m | 47 -
.../Classes/compatibility/0.9.6/CDV.h | 30 -
.../Classes/compatibility/0.9.6/CDVPlugin.h | 46 -
.../Classes/compatibility/0.9.6/CDVPlugin.m | 29 -
.../Classes/compatibility/1.5.0/CDV.h | 32 -
.../Classes/compatibility/1.5.0/CDVPlugin.h | 23 -
.../CordovaLib/Classes/compatibility/README.txt | 23 -
.../CordovaLib.xcodeproj/project.pbxproj | 667 -
.../push/ios/CordovaLib/CordovaLib_Prefix.pch | 22 -
.../samples/push/ios/CordovaLib/VERSION | 1 -
.../apigee-sdk/samples/push/ios/cordova/build | 51 -
.../apigee-sdk/samples/push/ios/cordova/emulate | 55 -
.../apigee-sdk/samples/push/ios/cordova/log | 23 -
.../apigee-sdk/samples/push/ios/cordova/release | 51 -
.../apigee-sdk/samples/push/ios/cordova/run | 58 -
.../push/ios/iospush.xcodeproj/project.pbxproj | 623 -
.../push/ios/iospush/Classes/AppDelegate.h | 42 -
.../push/ios/iospush/Classes/AppDelegate.m | 122 -
.../ios/iospush/Classes/MainViewController.h | 40 -
.../ios/iospush/Classes/MainViewController.m | 174 -
.../ios/iospush/Classes/MainViewController.xib | 138 -
.../iospush/Plugins/AppDelegate+notification.h | 20 -
.../iospush/Plugins/AppDelegate+notification.m | 119 -
.../push/ios/iospush/Plugins/PushPlugin.h | 54 -
.../push/ios/iospush/Plugins/PushPlugin.m | 248 -
.../samples/push/ios/iospush/Plugins/README | 20 -
.../Resources/Capture.bundle/controls_bg.png | Bin 955 -> 0 bytes
.../Resources/Capture.bundle/controls_bg@2x.png | Bin 971 -> 0 bytes
.../Capture.bundle/controls_bg@2x~ipad.png | Bin 2858 -> 0 bytes
.../Capture.bundle/controls_bg~ipad.png | Bin 969 -> 0 bytes
.../microphone-568h@2x~iphone.png | Bin 531673 -> 0 bytes
.../Resources/Capture.bundle/microphone.png | Bin 72226 -> 0 bytes
.../Resources/Capture.bundle/microphone@2x.png | Bin 282409 -> 0 bytes
.../Capture.bundle/microphone@2x~ipad.png | Bin 911582 -> 0 bytes
.../Capture.bundle/microphone~ipad.png | Bin 393975 -> 0 bytes
.../Resources/Capture.bundle/record_button.png | Bin 5852 -> 0 bytes
.../Capture.bundle/record_button@2x.png | Bin 13875 -> 0 bytes
.../Capture.bundle/record_button@2x~ipad.png | Bin 15822 -> 0 bytes
.../Capture.bundle/record_button~ipad.png | Bin 7547 -> 0 bytes
.../Resources/Capture.bundle/recording_bg.png | Bin 973 -> 0 bytes
.../Capture.bundle/recording_bg@2x.png | Bin 990 -> 0 bytes
.../Capture.bundle/recording_bg@2x~ipad.png | Bin 1026 -> 0 bytes
.../Capture.bundle/recording_bg~ipad.png | Bin 996 -> 0 bytes
.../Resources/Capture.bundle/stop_button.png | Bin 5514 -> 0 bytes
.../Resources/Capture.bundle/stop_button@2x.png | Bin 12965 -> 0 bytes
.../Capture.bundle/stop_button@2x~ipad.png | Bin 14474 -> 0 bytes
.../Capture.bundle/stop_button~ipad.png | Bin 7119 -> 0 bytes
.../Resources/de.lproj/Localizable.strings | 26 -
.../Resources/en.lproj/Localizable.strings | 25 -
.../Resources/es.lproj/Localizable.strings | 25 -
.../ios/iospush/Resources/icons/icon-72.png | Bin 4944 -> 0 bytes
.../ios/iospush/Resources/icons/icon-72@2x.png | Bin 11706 -> 0 bytes
.../push/ios/iospush/Resources/icons/icon.png | Bin 3902 -> 0 bytes
.../ios/iospush/Resources/icons/icon@2x.png | Bin 7869 -> 0 bytes
.../Resources/se.lproj/Localizable.strings | 26 -
.../Resources/splash/Default-568h@2x~iphone.png | Bin 34225 -> 0 bytes
.../splash/Default-Landscape@2x~ipad.png | Bin 77300 -> 0 bytes
.../Resources/splash/Default-Landscape~ipad.png | Bin 34935 -> 0 bytes
.../splash/Default-Portrait@2x~ipad.png | Bin 76546 -> 0 bytes
.../Resources/splash/Default-Portrait~ipad.png | Bin 34278 -> 0 bytes
.../Resources/splash/Default@2x~iphone.png | Bin 29475 -> 0 bytes
.../iospush/Resources/splash/Default~iphone.png | Bin 10394 -> 0 bytes
.../samples/push/ios/iospush/config.xml | 65 -
.../samples/push/ios/iospush/iospush-Info.plist | 78 -
.../samples/push/ios/iospush/iospush-Prefix.pch | 26 -
.../apigee-sdk/samples/push/ios/iospush/main.m | 35 -
.../samples/push/ios/www/PushNotification.js | 65 -
.../samples/push/ios/www/cordova-2.6.0.js | 6433 ----
.../samples/push/ios/www/css/index.css | 115 -
.../samples/push/ios/www/img/logo.png | Bin 21814 -> 0 bytes
.../apigee-sdk/samples/push/ios/www/index.html | 48 -
.../apigee-sdk/samples/push/ios/www/js/index.js | 217 -
.../res/screen/ios/screen-ipad-landscape-2x.png | Bin 1534088 -> 0 bytes
.../res/screen/ios/screen-ipad-landscape.png | Bin 407370 -> 0 bytes
.../res/screen/ios/screen-ipad-portrait-2x.png | Bin 1610434 -> 0 bytes
.../www/res/screen/ios/screen-ipad-portrait.png | Bin 422441 -> 0 bytes
.../screen/ios/screen-iphone-landscape-2x.png | Bin 339639 -> 0 bytes
.../res/screen/ios/screen-iphone-landscape.png | Bin 92301 -> 0 bytes
.../screen/ios/screen-iphone-portrait-2x.png | Bin 350593 -> 0 bytes
.../res/screen/ios/screen-iphone-portrait.png | Bin 93897 -> 0 bytes
.../apigee-sdk/samples/push/ios/www/spec.html | 68 -
.../samples/push/ios/www/spec/helper.js | 33 -
.../samples/push/ios/www/spec/index.js | 67 -
.../ios/www/spec/lib/jasmine-1.2.0/MIT.LICENSE | 20 -
.../www/spec/lib/jasmine-1.2.0/jasmine-html.js | 616 -
.../ios/www/spec/lib/jasmine-1.2.0/jasmine.css | 81 -
.../ios/www/spec/lib/jasmine-1.2.0/jasmine.js | 2529 --
.../apigee-sdk/samples/readmeSample/index.html | 64 -
.../samples/usersAndGroups/README.txt | 22 -
.../usersAndGroups/css/codiqa.ext.min.css | 1 -
.../usersAndGroups/css/images/ajax-loader.gif | Bin 7825 -> 0 bytes
.../css/images/icons-18-black.png | Bin 1968 -> 0 bytes
.../css/images/icons-18-white.png | Bin 1988 -> 0 bytes
.../css/images/icons-36-black.png | Bin 3859 -> 0 bytes
.../css/images/icons-36-white.png | Bin 3861 -> 0 bytes
.../css/jquery.mobile-1.3.1.min.css | 3 -
.../samples/usersAndGroups/index.html | 159 -
.../samples/usersAndGroups/js/codiqa.ext.min.js | 6 -
.../samples/usersAndGroups/js/index.js | 345 -
.../usersAndGroups/js/jquery-1.9.1.min.js | 5 -
.../js/jquery.mobile-1.3.1.min.js | 7 -
.../bower_components/intro.js/BUILD/BUILD.js | 43 -
.../bower_components/intro.js/Makefile | 6 -
.../bower_components/intro.js/README.md | 487 -
.../bower_components/intro.js/bower.json | 9 -
.../bower_components/intro.js/component.json | 13 -
.../intro.js/example/RTL/index.html | 81 -
.../assets/css/bootstrap-responsive.min.css | 9 -
.../example/assets/css/bootstrap.min.css | 9 -
.../intro.js/example/assets/css/demo.css | 36 -
.../assets/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
.../example/assets/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes
.../intro.js/example/custom-class/index.html | 84 -
.../intro.js/example/hello-world/index.html | 72 -
.../example/hello-world/withoutBullets.html | 72 -
.../example/hello-world/withoutButtons.html | 72 -
.../intro.js/example/html-tooltip/index.html | 108 -
.../intro.js/example/index.html | 35 -
.../intro.js/example/multi-page/index.html | 73 -
.../intro.js/example/multi-page/second.html | 75 -
.../intro.js/example/programmatic/index.html | 107 -
.../bower_components/intro.js/intro.js | 940 -
.../bower_components/intro.js/introjs-rtl.css | 22 -
.../bower_components/intro.js/introjs.css | 248 -
.../intro.js/minified/intro.min.js | 24 -
.../intro.js/minified/introjs-rtl.min.css | 1 -
.../intro.js/minified/introjs.min.css | 1 -
.../bower_components/intro.js/package.json | 17 -
.../jquery-waypoints/CHANGELOG.md | 102 -
.../jquery-waypoints/README.markdown | 47 -
.../jquery-waypoints/bower.json | 19 -
.../jquery-waypoints/licenses.txt | 23 -
.../jquery-waypoints/package.json | 19 -
.../infinite-scroll/waypoints-infinite.js | 70 -
.../infinite-scroll/waypoints-infinite.min.js | 8 -
.../sticky-elements/waypoints-sticky.js | 65 -
.../sticky-elements/waypoints-sticky.min.js | 8 -
.../jquery-waypoints/waypoints.js | 517 -
.../jquery-waypoints/waypoints.min.js | 8 -
.../bower_components/jquery/MIT-LICENSE.txt | 21 -
.../bower_components/jquery/bower.json | 27 -
.../bower_components/jquery/dist/jquery.js | 9190 -----
.../bower_components/jquery/dist/jquery.min.js | 5 -
.../bower_components/jquery/dist/jquery.min.map | 1 -
.../bower_components/jquery/src/ajax.js | 806 -
.../bower_components/jquery/src/ajax/jsonp.js | 89 -
.../bower_components/jquery/src/ajax/load.js | 75 -
.../jquery/src/ajax/parseJSON.js | 13 -
.../jquery/src/ajax/parseXML.js | 28 -
.../bower_components/jquery/src/ajax/script.js | 64 -
.../jquery/src/ajax/var/nonce.js | 5 -
.../jquery/src/ajax/var/rquery.js | 3 -
.../bower_components/jquery/src/ajax/xhr.js | 135 -
.../bower_components/jquery/src/attributes.js | 11 -
.../jquery/src/attributes/attr.js | 143 -
.../jquery/src/attributes/classes.js | 158 -
.../jquery/src/attributes/prop.js | 96 -
.../jquery/src/attributes/support.js | 35 -
.../jquery/src/attributes/val.js | 163 -
.../bower_components/jquery/src/callbacks.js | 205 -
.../bower_components/jquery/src/core.js | 498 -
.../bower_components/jquery/src/core/access.js | 60 -
.../bower_components/jquery/src/core/init.js | 123 -
.../jquery/src/core/parseHTML.js | 39 -
.../bower_components/jquery/src/core/ready.js | 97 -
.../jquery/src/core/var/rsingleTag.js | 4 -
.../bower_components/jquery/src/css.js | 451 -
.../jquery/src/css/addGetHookIf.js | 24 -
.../bower_components/jquery/src/css/curCSS.js | 57 -
.../jquery/src/css/defaultDisplay.js | 70 -
.../jquery/src/css/hiddenVisibleSelectors.js | 15 -
.../bower_components/jquery/src/css/support.js | 91 -
.../bower_components/jquery/src/css/swap.js | 28 -
.../jquery/src/css/var/cssExpand.js | 3 -
.../jquery/src/css/var/getStyles.js | 5 -
.../jquery/src/css/var/isHidden.js | 13 -
.../jquery/src/css/var/rmargin.js | 3 -
.../jquery/src/css/var/rnumnonpx.js | 5 -
.../bower_components/jquery/src/data.js | 179 -
.../bower_components/jquery/src/data/Data.js | 181 -
.../bower_components/jquery/src/data/accepts.js | 20 -
.../jquery/src/data/var/data_priv.js | 5 -
.../jquery/src/data/var/data_user.js | 5 -
.../bower_components/jquery/src/deferred.js | 149 -
.../bower_components/jquery/src/deprecated.js | 13 -
.../bower_components/jquery/src/dimensions.js | 50 -
.../bower_components/jquery/src/effects.js | 649 -
.../jquery/src/effects/Tween.js | 114 -
.../jquery/src/effects/animatedSelector.js | 13 -
.../bower_components/jquery/src/event.js | 868 -
.../bower_components/jquery/src/event/alias.js | 39 -
.../jquery/src/event/support.js | 9 -
.../bower_components/jquery/src/exports/amd.js | 24 -
.../jquery/src/exports/global.js | 32 -
.../bower_components/jquery/src/intro.js | 44 -
.../bower_components/jquery/src/jquery.js | 36 -
.../bower_components/jquery/src/manipulation.js | 582 -
.../jquery/src/manipulation/_evalUrl.js | 18 -
.../jquery/src/manipulation/support.js | 31 -
.../src/manipulation/var/rcheckableType.js | 3 -
.../bower_components/jquery/src/offset.js | 204 -
.../bower_components/jquery/src/outro.js | 1 -
.../bower_components/jquery/src/queue.js | 142 -
.../bower_components/jquery/src/queue/delay.js | 22 -
.../jquery/src/selector-native.js | 172 -
.../jquery/src/selector-sizzle.js | 14 -
.../bower_components/jquery/src/selector.js | 1 -
.../bower_components/jquery/src/serialize.js | 111 -
.../jquery/src/sizzle/dist/sizzle.js | 2044 --
.../jquery/src/sizzle/dist/sizzle.min.js | 3 -
.../jquery/src/sizzle/dist/sizzle.min.map | 1 -
.../bower_components/jquery/src/traversing.js | 200 -
.../jquery/src/traversing/findFilter.js | 100 -
.../jquery/src/traversing/var/rneedsContext.js | 6 -
.../bower_components/jquery/src/var/arr.js | 3 -
.../jquery/src/var/class2type.js | 4 -
.../bower_components/jquery/src/var/concat.js | 5 -
.../bower_components/jquery/src/var/hasOwn.js | 5 -
.../bower_components/jquery/src/var/indexOf.js | 5 -
.../bower_components/jquery/src/var/pnum.js | 3 -
.../bower_components/jquery/src/var/push.js | 5 -
.../jquery/src/var/rnotwhite.js | 3 -
.../bower_components/jquery/src/var/slice.js | 5 -
.../jquery/src/var/strundefined.js | 3 -
.../bower_components/jquery/src/var/support.js | 4 -
.../bower_components/jquery/src/var/toString.js | 5 -
.../bower_components/jquery/src/wrap.js | 78 -
.../bower_components/sizzle/dist/sizzle.js | 2015 -
.../bower_components/sizzle/dist/sizzle.min.js | 3 -
.../bower_components/sizzle/dist/sizzle.min.map | 1 -
.../bower_components/sizzle/tasks/commit.js | 10 -
.../bower_components/sizzle/tasks/compile.js | 34 -
.../bower_components/sizzle/tasks/dist.js | 35 -
.../bower_components/sizzle/tasks/release.js | 43 -
.../bower_components/sizzle/tasks/tag.js | 9 -
.../bower_components/sizzle/tasks/version.js | 35 -
.../bower_components/sizzle/test/data/empty.js | 0
.../sizzle/test/data/mixed_sort.html | 22 -
.../sizzle/test/data/testinit.js | 136 -
.../bower_components/sizzle/test/index.html | 242 -
.../bower_components/sizzle/test/jquery.js | 9597 -----
.../sizzle/test/libs/qunit/qunit.css | 244 -
.../sizzle/test/libs/qunit/qunit.js | 2212 --
.../sizzle/test/unit/extending.js | 95 -
.../sizzle/test/unit/selector.js | 1138 -
.../sizzle/test/unit/utilities.js | 169 -
portal/dist/usergrid-portal/config.js | 72 -
.../css/apigeeGlobalNavigation.css | 291 -
.../css/arsmarquette/ARSMaquettePro-Light.otf | Bin 184600 -> 0 bytes
.../css/arsmarquette/ARSMaquettePro-Medium.otf | Bin 188020 -> 0 bytes
.../css/arsmarquette/ARSMaquettePro-Regular.otf | Bin 188096 -> 0 bytes
portal/dist/usergrid-portal/css/dash.min.css | 1 -
.../dist/usergrid-portal/css/entypo/entypo.eot | Bin 35540 -> 0 bytes
.../dist/usergrid-portal/css/entypo/entypo.svg | 13 -
.../dist/usergrid-portal/css/entypo/entypo.ttf | Bin 35392 -> 0 bytes
.../dist/usergrid-portal/css/entypo/entypo.woff | Bin 21916 -> 0 bytes
portal/dist/usergrid-portal/css/main.css | 1998 -
portal/dist/usergrid-portal/favicon.ico | Bin 1150 -> 0 bytes
.../img/appswitcher/apiPlatform_lg.png | Bin 2397 -> 0 bytes
.../img/appswitcher/appServices_lg.png | Bin 2295 -> 0 bytes
.../img/appswitcher/console_lg.png | Bin 1453 -> 0 bytes
.../usergrid-portal/img/appswitcher/home_lg.png | Bin 1522 -> 0 bytes
.../img/appswitcher/logo_color.png | Bin 3459 -> 0 bytes
.../usergrid-portal/img/appswitcher/max_lg.png | Bin 1970 -> 0 bytes
.../img/appswitcher/triangleMenuItem_right.png | Bin 1158 -> 0 bytes
.../triangleMenuItem_right_hover.png | Bin 1169 -> 0 bytes
portal/dist/usergrid-portal/img/blue-bars.png | Bin 3635 -> 0 bytes
portal/dist/usergrid-portal/img/blue-bolt.png | Bin 3942 -> 0 bytes
portal/dist/usergrid-portal/img/blue-carat.png | Bin 1006 -> 0 bytes
portal/dist/usergrid-portal/img/green_dot.png | Bin 3472 -> 0 bytes
.../img/introjs_arrow_step_next.png | Bin 219 -> 0 bytes
.../img/introjs_arrow_step_next_disabled.png | Bin 220 -> 0 bytes
.../img/introjs_arrow_step_prev.png | Bin 217 -> 0 bytes
.../img/introjs_arrow_step_prev_disabled.png | Bin 218 -> 0 bytes
.../dist/usergrid-portal/img/introjs_close.png | Bin 274 -> 0 bytes
portal/dist/usergrid-portal/img/logo.gif | Bin 2279 -> 0 bytes
portal/dist/usergrid-portal/img/nav-device.gif | Bin 2184 -> 0 bytes
portal/dist/usergrid-portal/img/nav-sprites.png | Bin 7953 -> 0 bytes
portal/dist/usergrid-portal/img/no-data1.png | Bin 45300 -> 0 bytes
portal/dist/usergrid-portal/img/phone-small.gif | Bin 1300 -> 0 bytes
.../img/push/APNS_cert_upload.png | Bin 33956 -> 0 bytes
.../img/push/APNS_certification.png | Bin 16855 -> 0 bytes
.../img/push/android-notification.png | Bin 41629 -> 0 bytes
.../usergrid-portal/img/push/google_api_key.png | Bin 98118 -> 0 bytes
.../usergrid-portal/img/push/iphone_message.png | Bin 90307 -> 0 bytes
portal/dist/usergrid-portal/img/push/step_1.png | Bin 1953 -> 0 bytes
portal/dist/usergrid-portal/img/push/step_2.png | Bin 2117 -> 0 bytes
portal/dist/usergrid-portal/img/push/step_3.png | Bin 2162 -> 0 bytes
portal/dist/usergrid-portal/img/red_dot.png | Bin 3482 -> 0 bytes
.../usergrid-portal/img/sdk-sprites-large.png | Bin 14642 -> 0 bytes
portal/dist/usergrid-portal/img/sdk-sprites.png | Bin 5027 -> 0 bytes
.../dist/usergrid-portal/img/tablet-small.gif | Bin 1390 -> 0 bytes
portal/dist/usergrid-portal/img/user-photo.png | Bin 3849 -> 0 bytes
.../dist/usergrid-portal/img/user_profile.png | Bin 3775 -> 0 bytes
portal/dist/usergrid-portal/img/verify.png | Bin 22934 -> 0 bytes
portal/dist/usergrid-portal/img/yellow_dot.png | Bin 3475 -> 0 bytes
portal/dist/usergrid-portal/index-debug.html | 168 -
portal/dist/usergrid-portal/index-template.html | 173 -
portal/dist/usergrid-portal/index.html | 168 -
.../usergrid-portal/js/charts/highcharts.json | 329 -
.../js/libs/Highcharts-2.3.5/index.htm | 79 -
.../js/adapters/mootools-adapter.js | 13 -
.../js/adapters/mootools-adapter.src.js | 328 -
.../js/adapters/prototype-adapter.js | 16 -
.../js/adapters/prototype-adapter.src.js | 385 -
.../libs/Highcharts-2.3.5/js/highcharts-more.js | 35 -
.../Highcharts-2.3.5/js/highcharts-more.src.js | 1581 -
.../js/libs/Highcharts-2.3.5/js/highcharts.js | 250 -
.../libs/Highcharts-2.3.5/js/highcharts.src.js | 15281 --------
.../Highcharts-2.3.5/js/modules/canvas-tools.js | 133 -
.../js/modules/canvas-tools.src.js | 3113 --
.../js/libs/Highcharts-2.3.5/js/modules/data.js | 14 -
.../Highcharts-2.3.5/js/modules/data.src.js | 512 -
.../Highcharts-2.3.5/js/modules/exporting.js | 23 -
.../js/modules/exporting.src.js | 752 -
.../Highcharts-2.3.5/js/themes/dark-blue.js | 263 -
.../Highcharts-2.3.5/js/themes/dark-green.js | 263 -
.../js/libs/Highcharts-2.3.5/js/themes/gray.js | 262 -
.../js/libs/Highcharts-2.3.5/js/themes/grid.js | 95 -
.../js/libs/Highcharts-2.3.5/js/themes/skies.js | 89 -
portal/dist/usergrid-portal/js/libs/MD5.min.js | 1 -
.../js/libs/angular-1.0.5/angular-cookies.js | 183 -
.../libs/angular-1.0.5/angular-cookies.min.js | 7 -
.../js/libs/angular-1.0.5/angular-loader.js | 276 -
.../js/libs/angular-1.0.5/angular-loader.min.js | 7 -
.../js/libs/angular-1.0.5/angular-mocks.js | 1886 -
.../js/libs/angular-1.0.5/angular-resource.js | 445 -
.../libs/angular-1.0.5/angular-resource.min.js | 10 -
.../js/libs/angular-1.0.5/angular-sanitize.js | 535 -
.../libs/angular-1.0.5/angular-sanitize.min.js | 13 -
.../js/libs/angular-1.0.5/angular.js | 14733 --------
.../js/libs/angular-1.0.5/angular.min.js | 161 -
.../js/libs/angular-1.0.5/version.txt | 1 -
.../js/libs/angular-1.1.5/angular-1.1.5.js | 16876 ---------
.../js/libs/angular-1.1.5/angular-merge.min.js | 8 -
.../angular-1.1.5/angular-resource-1.1.5.js | 537 -
.../js/libs/angular-1.2.5/angular-animate.js | 1323 -
.../libs/angular-1.2.5/angular-animate.min.js | 23 -
.../angular-1.2.5/angular-animate.min.js.map | 8 -
.../js/libs/angular-1.2.5/angular-cookies.js | 202 -
.../libs/angular-1.2.5/angular-cookies.min.js | 8 -
.../angular-1.2.5/angular-cookies.min.js.map | 8 -
.../js/libs/angular-1.2.5/angular-csp.css | 24 -
.../js/libs/angular-1.2.5/angular-loader.js | 410 -
.../js/libs/angular-1.2.5/angular-loader.min.js | 9 -
.../angular-1.2.5/angular-loader.min.js.map | 8 -
.../js/libs/angular-1.2.5/angular-mocks.js | 2116 --
.../js/libs/angular-1.2.5/angular-resource.js | 565 -
.../libs/angular-1.2.5/angular-resource.min.js | 13 -
.../angular-1.2.5/angular-resource.min.js.map | 8 -
.../js/libs/angular-1.2.5/angular-route.js | 911 -
.../js/libs/angular-1.2.5/angular-route.min.js | 14 -
.../libs/angular-1.2.5/angular-route.min.js.map | 8 -
.../js/libs/angular-1.2.5/angular-sanitize.js | 622 -
.../libs/angular-1.2.5/angular-sanitize.min.js | 14 -
.../angular-1.2.5/angular-sanitize.min.js.map | 8 -
.../js/libs/angular-1.2.5/angular-scenario.js | 32374 -----------------
.../js/libs/angular-1.2.5/angular-touch.js | 563 -
.../js/libs/angular-1.2.5/angular-touch.min.js | 13 -
.../libs/angular-1.2.5/angular-touch.min.js.map | 8 -
.../js/libs/angular-1.2.5/angular.js | 20369 -----------
.../js/libs/angular-1.2.5/angular.min.js | 201 -
.../js/libs/angular-1.2.5/angular.min.js.map | 8 -
.../js/libs/angular-1.2.5/errors.json | 1 -
.../js/libs/angular-1.2.5/version.json | 1 -
.../js/libs/angular-1.2.5/version.txt | 1 -
.../angularitics-0.8.5-google-analytics.js | 7 -
.../js/libs/angularitics/angularitics-0.8.5.js | 6 -
.../libs/bootstrap/css/bootstrap-responsive.css | 1345 -
.../bootstrap/css/bootstrap-responsive.min.css | 1245 -
.../js/libs/bootstrap/css/bootstrap.css | 6169 ----
.../js/libs/bootstrap/css/bootstrap.min.css | 5469 ---
.../js/libs/bootstrap/custom/css/bootstrap.css | 6316 ----
.../libs/bootstrap/custom/css/bootstrap.min.css | 9 -
.../custom/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
.../custom/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes
.../js/libs/bootstrap/custom/js/bootstrap.js | 2291 --
.../libs/bootstrap/custom/js/bootstrap.min.js | 7 -
.../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
.../libs/bootstrap/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes
.../js/libs/bootstrap/js/bootstrap.js | 2117 --
.../js/libs/bootstrap/js/bootstrap.min.js | 644 -
.../usergrid-portal/js/libs/google-viz-api.js | 49 -
.../js/libs/jquery/jquery-1.9.1.min.js | 5 -
.../js/libs/jquery/jquery-migrate-1.1.1.min.js | 3 -
.../js/libs/jquery/jquery.sparkline.min.js | 5 -
.../js/libs/jqueryui/date.min.js | 2 -
.../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin 251 -> 0 bytes
.../images/ui-bg_flat_100_deedf7_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_100_e4f1fb_40x100.png | Bin 213 -> 0 bytes
.../images/ui-bg_flat_100_f2f5f7_40x100.png | Bin 212 -> 0 bytes
.../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin 181 -> 0 bytes
.../images/ui-bg_flat_50_3baae3_40x100.png | Bin 182 -> 0 bytes
.../images/ui-bg_flat_80_d7ebf9_40x100.png | Bin 183 -> 0 bytes
.../ui-bg_highlight-hard_70_000000_1x100.png | Bin 118 -> 0 bytes
.../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin 153 -> 0 bytes
.../jqueryui/images/ui-icons_000000_256x240.png | Bin 4369 -> 0 bytes
.../jqueryui/images/ui-icons_2694e8_256x240.png | Bin 4369 -> 0 bytes
.../jqueryui/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
.../jqueryui/images/ui-icons_3d80b3_256x240.png | Bin 4369 -> 0 bytes
.../jqueryui/images/ui-icons_72a7cf_256x240.png | Bin 4369 -> 0 bytes
.../jqueryui/images/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes
.../js/libs/jqueryui/jquery-ui-1.8.18.min.js | 15 -
.../js/libs/jqueryui/jquery-ui-1.8.9.custom.css | 1 -
.../js/libs/jqueryui/jquery-ui-timepicker.css | 1 -
.../libs/jqueryui/jquery.ui.timepicker.min.js | 1 -
.../ui-bootstrap-custom-0.3.0.min.js | 1 -
.../ui-bootstrap-custom-tpls-0.3.0.min.js | 1 -
.../js/libs/usergrid-libs.min.js | 41 -
.../usergrid-portal/js/libs/usergrid.sdk.js | 2490 --
.../dist/usergrid-portal/js/usergrid-dev.min.js | 5048 ---
portal/dist/usergrid-portal/js/usergrid.min.js | 25 -
.../dist/usergrid-portal/sdk/usergrid.0.10.4.js | 1402 -
.../dist/usergrid-portal/sdk/usergrid.0.10.5.js | 1755 -
.../dist/usergrid-portal/sdk/usergrid.0.10.7.js | 2265 --
portal/favicon.ico | Bin 1150 -> 3989 bytes
portal/helpJson.json | 47 +
portal/img/green_dot.png | Bin 3472 -> 0 bytes
portal/img/logo.gif | Bin 2279 -> 0 bytes
portal/img/logo.png | Bin 0 -> 7758 bytes
portal/img/push/APNS_cert_upload.png | Bin 33956 -> 0 bytes
portal/img/push/APNS_certification.png | Bin 16855 -> 0 bytes
portal/img/push/android-notification.png | Bin 41629 -> 0 bytes
portal/img/push/google_api_key.png | Bin 98118 -> 0 bytes
portal/img/push/iphone_message.png | Bin 90307 -> 0 bytes
portal/img/push/step_1.png | Bin 1953 -> 0 bytes
portal/img/push/step_2.png | Bin 2117 -> 0 bytes
portal/img/push/step_3.png | Bin 2162 -> 0 bytes
portal/img/red_dot.png | Bin 3482 -> 0 bytes
portal/img/yellow_dot.png | Bin 3475 -> 0 bytes
portal/index-template.html | 44 +-
portal/js/activities/activities.html | 56 +-
.../js/app-overview/app-overview-controller.js | 61 +-
portal/js/app-overview/app-overview.html | 60 +-
.../js/app-overview/doc-includes/android.html | 401 +-
portal/js/app-overview/doc-includes/ios.html | 364 +-
.../app-overview/doc-includes/javascript.html | 216 +-
portal/js/app-overview/doc-includes/net.html | 16 +
portal/js/app-overview/doc-includes/node.html | 16 +
portal/js/app-overview/doc-includes/ruby.html | 16 +
.../app-overview/getting-started-controller.js | 107 -
portal/js/app-overview/getting-started.html | 119 -
portal/js/app.js | 21 +-
portal/js/charts/chart-controller.js | 6 -
portal/js/charts/chart-directives.js | 141 -
portal/js/charts/chart-service.js | 494 -
portal/js/charts/highcharts.json | 329 -
portal/js/charts/sparklines.js | 2 -
portal/js/data/data.html | 261 +-
portal/js/data/display-generic.html | 168 +-
portal/js/data/display-groups.html | 16 +
portal/js/data/display-roles.html | 18 +-
portal/js/data/display-users.html | 257 +-
portal/js/data/entity.html | 31 +-
portal/js/dialogs/modal.html | 49 +-
portal/js/global/app-switcher-directive.js | 53 -
portal/js/global/appswitcher-template.html | 34 -
portal/js/global/help-service.js | 22 +-
portal/js/global/insecure-banner.html | 30 +-
portal/js/global/page-controller.js | 17 +-
portal/js/global/page-title.html | 44 +-
portal/js/global/ug-service.js | 32 +-
portal/js/groups/groups-activities.html | 44 +-
portal/js/groups/groups-details.html | 83 +-
portal/js/groups/groups-members.html | 101 +-
portal/js/groups/groups-roles.html | 247 +-
portal/js/groups/groups-tabs.html | 45 +-
portal/js/groups/groups.html | 196 +-
portal/js/libs/Highcharts-2.3.5/index.htm | 79 -
.../js/adapters/mootools-adapter.js | 13 -
.../js/adapters/mootools-adapter.src.js | 328 -
.../js/adapters/prototype-adapter.js | 16 -
.../js/adapters/prototype-adapter.src.js | 385 -
.../libs/Highcharts-2.3.5/js/highcharts-more.js | 35 -
.../Highcharts-2.3.5/js/highcharts-more.src.js | 1581 -
.../js/libs/Highcharts-2.3.5/js/highcharts.js | 250 -
.../libs/Highcharts-2.3.5/js/highcharts.src.js | 15281 --------
.../Highcharts-2.3.5/js/modules/canvas-tools.js | 133 -
.../js/modules/canvas-tools.src.js | 3113 --
.../js/libs/Highcharts-2.3.5/js/modules/data.js | 14 -
.../Highcharts-2.3.5/js/modules/data.src.js | 512 -
.../Highcharts-2.3.5/js/modules/exporting.js | 23 -
.../js/modules/exporting.src.js | 752 -
.../Highcharts-2.3.5/js/themes/dark-blue.js | 263 -
.../Highcharts-2.3.5/js/themes/dark-green.js | 263 -
.../js/libs/Highcharts-2.3.5/js/themes/gray.js | 262 -
.../js/libs/Highcharts-2.3.5/js/themes/grid.js | 95 -
.../js/libs/Highcharts-2.3.5/js/themes/skies.js | 89 -
portal/js/libs/angular-1.0.5/angular-cookies.js | 183 -
.../libs/angular-1.0.5/angular-cookies.min.js | 7 -
portal/js/libs/angular-1.0.5/angular-loader.js | 276 -
.../js/libs/angular-1.0.5/angular-loader.min.js | 7 -
portal/js/libs/angular-1.0.5/angular-mocks.js | 1886 -
.../js/libs/angular-1.0.5/angular-resource.js | 445 -
.../libs/angular-1.0.5/angular-resource.min.js | 10 -
.../js/libs/angular-1.0.5/angular-sanitize.js | 535 -
.../libs/angular-1.0.5/angular-sanitize.min.js | 13 -
portal/js/libs/angular-1.0.5/angular.js | 14733 --------
portal/js/libs/angular-1.0.5/angular.min.js | 161 -
portal/js/libs/angular-1.0.5/version.txt | 1 -
portal/js/libs/angular-1.1.5/angular-1.1.5.js | 16876 ---------
.../js/libs/angular-1.1.5/angular-merge.min.js | 8 -
.../angular-1.1.5/angular-resource-1.1.5.js | 537 -
portal/js/libs/angular-1.2.5/LICENSE.txt | 22 +
.../angularitics-0.8.5-google-analytics.js | 7 -
.../js/libs/angularitics/angularitics-0.8.5.js | 6 -
portal/js/libs/bootstrap/LICENSE.txt | 21 +
portal/js/libs/jquery/LICENSE.txt | 37 +
portal/js/libs/jqueryui/LICENSE.txt | 45 +
portal/js/login/forgot-password.html | 27 +-
portal/js/login/loading.html | 20 +-
portal/js/login/login.html | 114 +-
portal/js/login/logout.html | 18 +-
portal/js/login/register.html | 80 +-
portal/js/menu.html | 32 +-
portal/js/menus/appMenu.html | 88 +-
portal/js/menus/orgMenu.html | 39 +-
portal/js/org-overview/org-overview.html | 269 +-
portal/js/profile/account.html | 31 +-
portal/js/profile/organizations.html | 136 +-
portal/js/profile/profile.html | 105 +-
portal/js/roles/roles-groups.html | 99 +-
portal/js/roles/roles-settings.html | 173 +-
portal/js/roles/roles-tabs.html | 48 +-
portal/js/roles/roles-users.html | 100 +-
portal/js/roles/roles.html | 184 +-
portal/js/shell/shell.html | 37 +-
portal/js/users/users-activities.html | 75 +-
portal/js/users/users-feed.html | 63 +-
portal/js/users/users-graph.html | 125 +-
portal/js/users/users-groups.html | 116 +-
portal/js/users/users-profile.html | 154 +-
portal/js/users/users-roles.html | 258 +-
portal/js/users/users-tabs.html | 17 +-
portal/js/users/users.html | 272 +-
portal/package.json | 7 +-
portal/scripts/e2e-test.bat | 15 +
portal/scripts/e2e-test.sh | 15 +
portal/scripts/test.bat | 15 +
portal/scripts/test.sh | 15 +
portal/scripts/watchr.rb | 15 +
portal/scripts/web-server.js | 19 +
portal/sdk/usergrid.0.10.4.js | 1402 -
portal/sdk/usergrid.0.10.5.js | 1755 -
portal/sdk/usergrid.0.10.7.js | 2265 --
portal/server.js | 19 +
portal/tests/karma.conf.js | 23 +-
portal/tests/protractor-ignore/profile.spec.js | 97 +
portal/tests/protractor/applications.spec.js | 20 +
portal/tests/protractor/data.spec.js | 20 +
portal/tests/protractor/forgotPassword.spec.js | 20 +
portal/tests/protractor/login.spec.js | 20 +
portal/tests/protractor/organization.spec.js | 20 +
portal/tests/protractor/profile.spec.js | 77 -
portal/tests/protractor/roles.spec.js | 20 +
portal/tests/protractor/shell.spec.js | 20 +
portal/tests/protractor/users.spec.js | 20 +
portal/tests/protractor/util.js | 24 +-
portal/tests/protractorConf.js | 24 +-
portal/tests/selenium/chromedriver | Bin 22034760 -> 0 bytes
.../selenium-server-standalone-2.37.0.jar | Bin 34730734 -> 0 bytes
portal/tests/unit/sample.spec.js | 19 +
release/pom.xml | 65 +
release/sign-release.sh | 30 +
release/src/main/assembly/source.xml | 57 +
sdks/android/.gitignore | 20 -
sdks/android/README.txt | 2 +
sdks/android/dist/jackson-core-asl-1.9.1.jar | Bin 228286 -> 0 bytes
sdks/android/dist/jackson-mapper-asl-1.9.1.jar | Bin 764465 -> 0 bytes
.../dist/spring-android-core-1.0.0.M4.jar | Bin 83065 -> 0 bytes
.../spring-android-rest-template-1.0.0.M4.jar | Bin 137368 -> 0 bytes
sdks/android/doc/allclasses-frame.html | 27 -
sdks/android/doc/allclasses-noframe.html | 27 -
sdks/android/doc/constant-values.html | 153 -
sdks/android/doc/deprecated-list.html | 117 -
sdks/android/doc/help-doc.html | 222 -
sdks/android/doc/index-all.html | 371 -
sdks/android/doc/index.html | 68 -
.../apache/usergrid/android/client/Client.html | 989 -
.../client/callbacks/ApiResponseCallback.html | 224 -
.../client/callbacks/ClientAsyncTask.html | 338 -
.../client/callbacks/ClientCallback.html | 227 -
.../callbacks/DeviceRegistrationCallback.html | 220 -
.../callbacks/GroupsRetrievedCallback.html | 220 -
.../client/callbacks/QueryResultsCallback.html | 220 -
.../class-use/ApiResponseCallback.html | 282 -
.../callbacks/class-use/ClientAsyncTask.html | 117 -
.../callbacks/class-use/ClientCallback.html | 180 -
.../class-use/DeviceRegistrationCallback.html | 171 -
.../class-use/GroupsRetrievedCallback.html | 160 -
.../class-use/QueryResultsCallback.html | 219 -
.../android/client/callbacks/package-frame.html | 28 -
.../client/callbacks/package-summary.html | 166 -
.../android/client/callbacks/package-tree.html | 145 -
.../android/client/callbacks/package-use.html | 178 -
.../android/client/class-use/Client.html | 117 -
.../usergrid/android/client/package-frame.html | 20 -
.../android/client/package-summary.html | 137 -
.../usergrid/android/client/package-tree.html | 134 -
.../usergrid/android/client/package-use.html | 117 -
.../android/client/utils/DeviceUuidFactory.html | 352 -
.../android/client/utils/ObjectUtils.html | 258 -
.../utils/class-use/DeviceUuidFactory.html | 117 -
.../client/utils/class-use/ObjectUtils.html | 117 -
.../android/client/utils/package-frame.html | 21 -
.../android/client/utils/package-summary.html | 142 -
.../android/client/utils/package-tree.html | 131 -
.../android/client/utils/package-use.html | 117 -
sdks/android/doc/overview-frame.html | 23 -
sdks/android/doc/overview-summary.html | 139 -
sdks/android/doc/overview-tree.html | 154 -
sdks/android/doc/package-list | 3 -
sdks/android/doc/resources/background.gif | Bin 2313 -> 0 bytes
sdks/android/doc/resources/tab.gif | Bin 291 -> 0 bytes
sdks/android/doc/resources/titlebar.gif | Bin 10701 -> 0 bytes
sdks/android/doc/resources/titlebar_end.gif | Bin 849 -> 0 bytes
sdks/android/doc/stylesheet.css | 474 -
.../0.0.6/usergrid-java-client-0.0.6.jar | Bin 46389 -> 0 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 | 43 +-
.../apache/usergrid/android/client/Client.java | 24 +-
.../client/callbacks/ApiResponseCallback.java | 16 +
.../client/callbacks/ClientAsyncTask.java | 16 +
.../client/callbacks/ClientCallback.java | 16 +
.../callbacks/DeviceRegistrationCallback.java | 16 +
.../callbacks/GroupsRetrievedCallback.java | 16 +
.../client/callbacks/QueryResultsCallback.java | 16 +
.../android/client/utils/DeviceUuidFactory.java | 16 +
.../android/client/utils/ObjectUtils.java | 16 +
.../NSubstitute.1.6.0.0/BreakingChanges.txt | 131 -
.../packages/NSubstitute.1.6.0.0/CHANGELOG.txt | 103 -
.../packages/NSubstitute.1.6.0.0/README.txt | 119 -
sdks/dotnet/packages/NUnit.2.6.2/README.txt | 3 +
.../packages/Newtonsoft.Json.4.5.11/README.txt | 3 +
sdks/dotnet/packages/RestSharp.104.1/README.txt | 3 +
sdks/dotnet/packages/RestSharp.104.1/readme.txt | 19 -
.../LocationDotNetSample/Form1.cs | 18 +-
.../packages/Geocoder.0.1.0.0/README.txt | 3 +
.../examples/all-calls/all-calls.html | 18 +-
sdks/html5-javascript/examples/all-calls/app.js | 19 +-
sdks/html5-javascript/examples/dogs/app.js | 17 +
sdks/html5-javascript/examples/dogs/dogs.html | 19 +-
sdks/html5-javascript/examples/facebook/app.js | 17 +
.../examples/facebook/facebook.html | 19 +-
.../examples/facebook/guide.html | 17 +
.../examples/persistence/test.html | 19 +-
.../examples/persistence/test.js | 17 +
sdks/html5-javascript/examples/test/test.html | 19 +-
.../extensions/usergrid.validation.js | 30 +-
sdks/html5-javascript/index.html | 17 +
sdks/html5-javascript/lib/Module.js | 19 +-
sdks/html5-javascript/lib/Usergrid.js | 36 +-
sdks/html5-javascript/tests/mocha/index.html | 25 +-
sdks/html5-javascript/tests/mocha/test.js | 17 +
.../tests/qunit/apigee_test.html | 17 +
sdks/html5-javascript/tests/qunit/tests.js | 17 +
sdks/html5-javascript/tests/test.html | 17 +
sdks/html5-javascript/tests/test.js | 17 +
sdks/html5-javascript/usergrid.js | 31 +-
sdks/html5-javascript/usergrid.min.js | 31 +-
sdks/ios/Nukefile | 17 +
sdks/ios/UGAPI/v2/UGConnection.h | 16 +
sdks/ios/UGAPI/v2/UGConnection.m | 18 +-
sdks/ios/UGAPI/v2/UGHTTPClient.h | 16 +
sdks/ios/UGAPI/v2/UGHTTPClient.m | 16 +
sdks/ios/UGAPI/v2/UGHTTPHelpers.h | 19 +-
sdks/ios/UGAPI/v2/UGHTTPHelpers.m | 17 +-
sdks/ios/UGAPI/v2/UGHTTPResult.h | 16 +
sdks/ios/UGAPI/v2/UGHTTPResult.m | 16 +
.../samples/Books/books/AddBookViewController.h | 31 +
.../samples/Books/books/AddBookViewController.m | 17 +
sdks/ios/samples/Books/books/AppDelegate.h | 31 +
sdks/ios/samples/Books/books/AppDelegate.m | 17 +
.../samples/Books/books/BooksViewController.h | 31 +
.../samples/Books/books/BooksViewController.m | 17 +
.../Books/books/UGSignInViewController.h | 14 +
.../Books/books/UGSignInViewController.m | 17 +
sdks/ios/samples/Books/books/books-Info.plist | 18 +
sdks/ios/samples/Books/books/books-Prefix.pch | 17 +
.../Books/books/en.lproj/InfoPlist.strings | 19 +
sdks/ios/samples/Books/books/main.m | 17 +
.../ios/samples/Browser/browser/UGAppDelegate.h | 14 +
.../ios/samples/Browser/browser/UGAppDelegate.m | 17 +
.../Browser/browser/UGAppViewController.h | 14 +
.../Browser/browser/UGAppViewController.m | 17 +
.../browser/UGCollectionViewController.h | 14 +
.../browser/UGCollectionViewController.m | 17 +
.../Browser/browser/UGEntityViewController.h | 14 +
.../Browser/browser/UGEntityViewController.m | 17 +
.../Browser/browser/UGSignInViewController.h | 14 +
.../Browser/browser/UGSignInViewController.m | 17 +
.../Browser/browser/UGTextViewController.h | 14 +
.../Browser/browser/UGTextViewController.m | 17 +
.../samples/Browser/browser/browser-Info.plist | 18 +
sdks/ios/samples/Browser/browser/main.m | 17 +
sdks/ios/samples/parties/parties/AppDelegate.h | 14 +-
sdks/ios/samples/parties/parties/AppDelegate.m | 17 +
.../parties/parties/PartiesViewController.h | 14 +-
.../parties/parties/PartiesViewController.m | 17 +
.../parties/parties/PartyViewController.h | 14 +-
.../parties/parties/PartyViewController.m | 17 +
sdks/ios/samples/parties/parties/main.m | 17 +
.../samples/parties/parties/parties-Info.plist | 18 +
sdks/ios/test/test_client.nu | 17 +
sdks/ios/test/test_connection.nu | 17 +
sdks/java/.gitignore | 20 -
sdks/java/dist/jackson-core-asl-1.9.1.jar | Bin 228286 -> 0 bytes
sdks/java/dist/jackson-mapper-asl-1.9.1.jar | Bin 764465 -> 0 bytes
sdks/java/dist/spring-android-core-1.0.0.M4.jar | Bin 83065 -> 0 bytes
.../spring-android-rest-template-1.0.0.M4.jar | Bin 137368 -> 0 bytes
.../usergrid-android-client-0.0.1-SNAPSHOT.jar | Bin 66123 -> 0 bytes
sdks/java/doc/allclasses-frame.html | 40 -
sdks/java/doc/allclasses-noframe.html | 40 -
sdks/java/doc/constant-values.html | 731 -
sdks/java/doc/deprecated-list.html | 117 -
sdks/java/doc/help-doc.html | 222 -
sdks/java/doc/index-all.html | 1299 -
sdks/java/doc/index.html | 68 -
.../usergrid/java/client/Client.Query.html | 238 -
.../java/client/Client.QueuePosition.html | 381 -
.../org/apache/usergrid/java/client/Client.html | 1652 -
.../java/client/class-use/Client.Query.html | 246 -
.../client/class-use/Client.QueuePosition.html | 192 -
.../usergrid/java/client/class-use/Client.html | 175 -
.../entities/Activity.ActivityCollection.html | 408 -
.../entities/Activity.ActivityObject.html | 720 -
.../client/entities/Activity.MediaLink.html | 434 -
.../usergrid/java/client/entities/Activity.html | 1449 -
.../usergrid/java/client/entities/Device.html | 387 -
.../usergrid/java/client/entities/Entity.html | 599 -
.../usergrid/java/client/entities/Group.html | 427 -
.../usergrid/java/client/entities/Message.html | 641 -
.../usergrid/java/client/entities/User.html | 707 -
.../class-use/Activity.ActivityCollection.html | 117 -
.../class-use/Activity.ActivityObject.html | 231 -
.../entities/class-use/Activity.MediaLink.html | 191 -
.../client/entities/class-use/Activity.html | 203 -
.../java/client/entities/class-use/Device.html | 169 -
.../java/client/entities/class-use/Entity.html | 415 -
.../java/client/entities/class-use/Group.html | 159 -
.../java/client/entities/class-use/Message.html | 183 -
.../java/client/entities/class-use/User.html | 248 -
.../java/client/entities/package-frame.html | 28 -
.../java/client/entities/package-summary.html | 169 -
.../java/client/entities/package-tree.html | 141 -
.../java/client/entities/package-use.html | 219 -
.../java/client/exception/ClientException.html | 263 -
.../exception/class-use/ClientException.html | 117 -
.../java/client/exception/package-frame.html | 20 -
.../java/client/exception/package-summary.html | 137 -
.../java/client/exception/package-tree.html | 142 -
.../java/client/exception/package-use.html | 117 -
.../usergrid/java/client/package-frame.html | 28 -
.../usergrid/java/client/package-summary.html | 167 -
.../usergrid/java/client/package-tree.html | 146 -
.../usergrid/java/client/package-use.html | 158 -
.../java/client/response/AggregateCounter.html | 316 -
.../client/response/AggregateCounterSet.html | 444 -
.../java/client/response/ApiResponse.html | 1148 -
.../client/response/ClientCredentialsInfo.html | 316 -
.../java/client/response/QueueInfo.html | 297 -
.../response/class-use/AggregateCounter.html | 191 -
.../response/class-use/AggregateCounterSet.html | 170 -
.../client/response/class-use/ApiResponse.html | 365 -
.../class-use/ClientCredentialsInfo.html | 170 -
.../client/response/class-use/QueueInfo.html | 187 -
.../java/client/response/package-frame.html | 24 -
.../java/client/response/package-summary.html | 151 -
.../java/client/response/package-tree.html | 134 -
.../java/client/response/package-use.html | 178 -
.../usergrid/java/client/utils/JsonUtils.html | 480 -
.../usergrid/java/client/utils/MapUtils.html | 260 -
.../usergrid/java/client/utils/ObjectUtils.html | 258 -
.../usergrid/java/client/utils/UrlUtils.html | 314 -
.../java/client/utils/class-use/JsonUtils.html | 117 -
.../java/client/utils/class-use/MapUtils.html | 117 -
.../client/utils/class-use/ObjectUtils.html | 117 -
.../java/client/utils/class-use/UrlUtils.html | 117 -
.../java/client/utils/package-frame.html | 23 -
.../java/client/utils/package-summary.html | 147 -
.../java/client/utils/package-tree.html | 133 -
.../usergrid/java/client/utils/package-use.html | 117 -
sdks/java/doc/overview-frame.html | 25 -
sdks/java/doc/overview-summary.html | 147 -
sdks/java/doc/overview-tree.html | 184 -
sdks/java/doc/package-list | 5 -
sdks/java/doc/resources/background.gif | Bin 2313 -> 0 bytes
sdks/java/doc/resources/tab.gif | Bin 291 -> 0 bytes
sdks/java/doc/resources/titlebar.gif | Bin 10701 -> 0 bytes
sdks/java/doc/resources/titlebar_end.gif | Bin 849 -> 0 bytes
sdks/java/doc/serialized-form.html | 134 -
sdks/java/doc/stylesheet.css | 474 -
sdks/java/pom.xml | 27 +-
sdks/nodejs/.gitignore | 2 -
sdks/nodejs/.npmignore | 1 -
sdks/nodejs/lib/usergrid.js | 37 +-
sdks/nodejs/test.js | 17 +
sdks/nodejs/test/client.js | 18 +
sdks/nodejs/test/collection.js | 17 +
sdks/nodejs/test/entity.js | 17 +
sdks/perl/.travis.yml | 1 -
sdks/perl/Build.PL | 16 +
sdks/perl/Makefile.PL | 16 +
sdks/perl/examples/books.pl | 16 +
sdks/perl/t/01_init.t | 16 +
sdks/perl/t/02_login.t | 16 +
sdks/perl/t/03_update.t | 16 +
sdks/perl/t/04_collection.t | 16 +
sdks/perl/t/05_query.t | 16 +
sdks/perl/t/06_batch_update.t | 16 +
sdks/perl/t/07_batch_delete.t | 16 +
sdks/perl/t/08_connections.t | 16 +
sdks/perl/t/09_paging.t | 16 +
sdks/perl/t/10_auto_paging.t | 16 +
sdks/php/kessel/config.ini | 18 -
sdks/php/kessel/kessel.rb | 188 -
sdks/ruby-on-rails/.gitignore | 18 -
sdks/ruby-on-rails/.rspec | 1 -
sdks/ruby-on-rails/.rvmrc | 2 -
sdks/usergrid-java-sdk-0.0.6/README.txt | 5 +
sdks/usergrid-java-sdk-0.0.6/pom.xml | 114 +
.../java/org/usergrid/java/client/Client.java | 1292 +
.../usergrid/java/client/entities/Activity.java | 626 +
.../usergrid/java/client/entities/Device.java | 68 +
.../usergrid/java/client/entities/Entity.java | 191 +
.../usergrid/java/client/entities/Group.java | 79 +
.../usergrid/java/client/entities/Message.java | 148 +
.../org/usergrid/java/client/entities/User.java | 158 +
.../java/client/exception/ClientException.java | 42 +
.../java/client/response/AggregateCounter.java | 52 +
.../client/response/AggregateCounterSet.java | 111 +
.../java/client/response/ApiResponse.java | 421 +
.../client/response/ClientCredentialsInfo.java | 58 +
.../java/client/response/QueueInfo.java | 44 +
.../usergrid/java/client/utils/JsonUtils.java | 182 +
.../usergrid/java/client/utils/MapUtils.java | 39 +
.../usergrid/java/client/utils/ObjectUtils.java | 36 +
.../usergrid/java/client/utils/UrlUtils.java | 124 +
stack/README.md | 12 +-
stack/build-tools/pom.xml | 3 +-
stack/cloudbees.xml | 18 +
stack/config/pom.xml | 3 +-
.../main/resources/usergrid-default.properties | 22 +-
stack/config/src/test/resources/cassandra.yaml | 25 +-
.../src/test/resources/usergrid-test.properties | 14 +
stack/core/pom.xml | 10 +-
.../usergrid/persistence/query/tree/.gitignore | 2 -
.../usergrid/batch/job/SchedulerRuntime3IT.java | 1 -
stack/core/src/test/resources/cassandra.yaml | 16 +-
.../core/src/test/resources/project.properties | 14 +
.../usergrid-scheduler-test.properties | 15 +
.../test/resources/usergrid-test-context.xml | 16 +
.../src/main/java/CpQueryFilter.tokens | 47 +
.../index/query/tree/CpQueryFilterLexer.java | 3123 ++
.../index/query/tree/CpQueryFilterParser.java | 2501 ++
stack/java-sdk-old/README.txt | 4 +
stack/java-sdk-old/pom.xml | 102 +
.../java/org/usergrid/java/client/Client.java | 1261 +
.../usergrid/java/client/entities/Activity.java | 626 +
.../usergrid/java/client/entities/Device.java | 69 +
.../usergrid/java/client/entities/Entity.java | 192 +
.../usergrid/java/client/entities/Group.java | 80 +
.../usergrid/java/client/entities/Message.java | 149 +
.../org/usergrid/java/client/entities/User.java | 159 +
.../java/client/exception/ClientException.java | 42 +
.../java/client/response/AggregateCounter.java | 53 +
.../client/response/AggregateCounterSet.java | 112 +
.../java/client/response/ApiResponse.java | 422 +
.../client/response/ClientCredentialsInfo.java | 59 +
.../java/client/response/QueueInfo.java | 45 +
.../usergrid/java/client/utils/JsonUtils.java | 181 +
.../usergrid/java/client/utils/MapUtils.java | 40 +
.../usergrid/java/client/utils/ObjectUtils.java | 37 +
.../usergrid/java/client/utils/UrlUtils.java | 125 +
stack/launcher/pom.xml | 3 +-
.../apache/usergrid/launcher/AppleUtils.java | 21 +-
.../launcher/src/main/resources/cassandra.yaml | 25 +-
.../1.5.4/AppleJavaExtensions-1.5.4.jar | Bin 23531 -> 0 bytes
.../1.5.4/AppleJavaExtensions-1.5.4.pom | 9 -
.../maven-metadata-local.xml | 12 -
.../recaptcha4j/0.0.8/recaptcha4j-0.0.8.jar | Bin 10344 -> 0 bytes
.../recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom | 9 -
.../recaptcha4j/maven-metadata-local.xml | 12 -
.../0.0.3/usergrid-java-client-0.0.3.jar | Bin 45750 -> 0 bytes
.../usergrid-java-client-0.0.3.jar.lastUpdated | 5 -
.../0.0.3/usergrid-java-client-0.0.3.jar.sha1 | 1 -
.../0.0.3/usergrid-java-client-0.0.3.pom | 87 -
.../usergrid-java-client-0.0.3.pom.lastUpdated | 5 -
.../0.0.3/usergrid-java-client-0.0.3.pom.sha1 | 1 -
.../maven-metadata-local.xml | 13 -
stack/mongo-emulator/pom.xml | 5 +-
.../test/resources/usergrid-test-context.xml | 18 +-
stack/pom.xml | 38 +-
stack/query-validator/pom.xml | 5 +-
stack/rest/pom.xml | 57 +-
.../exceptions/JsonParseExceptionMapper.java | 35 +
.../rest/src/test/resources/project.properties | 15 +
.../resources/usergrid-custom-test.properties | 15 +
.../resources/usergrid-rest-deploy-context.xml | 16 +
.../test/resources/usergrid-test-context.xml | 16 +
stack/services/pom.xml | 13 +-
stack/test-utils/pom.xml | 5 +-
.../src/main/resources/cassandra.yaml | 25 +-
.../src/test/resources/project.properties | 21 +-
stack/tools/pom.xml | 6 +-
.../src/main/resources/apidoc/applications.yaml | 21 +-
.../src/main/resources/apidoc/management.yaml | 21 +-
stack/websocket/pom.xml | 5 +-
ugc/features/step_definitions/ugc_steps.rb | 23 +-
ugc/features/support/env.rb | 23 +-
ugc/lib/ugc.rb | 23 +-
ugc/lib/ugc/application.rb | 23 +-
ugc/lib/ugc/commands/delete.rb | 23 +-
ugc/lib/ugc/commands/get.rb | 23 +-
ugc/lib/ugc/commands/logout.rb | 16 +
ugc/lib/ugc/commands/post.rb | 23 +-
ugc/lib/ugc/commands/profile.rb | 23 +-
ugc/lib/ugc/commands/put.rb | 23 +-
ugc/lib/ugc/commands/query.rb | 23 +-
ugc/lib/ugc/commands/target.rb | 23 +-
ugc/lib/ugc/helpers/curl.rb | 23 +-
ugc/lib/ugc/helpers/format.rb | 23 +-
ugc/lib/ugc/helpers/history.rb | 23 +-
ugc/lib/ugc/helpers/parse.rb | 23 +-
ugc/lib/ugc/helpers/rest.rb | 23 +-
ugc/lib/ugc/management.rb | 23 +-
ugc/lib/ugc/settings.rb | 23 +-
ugc/lib/ugc/version.rb | 23 +-
ugc/test/default_test.rb | 23 +-
ugc/test/test_helper.rb | 23 +-
1473 files changed, 20194 insertions(+), 500389 deletions(-)
----------------------------------------------------------------------
[02/13] git commit: Fixes issue with order by intersection paging and
hints
Posted by to...@apache.org.
Fixes issue with order by intersection paging and hints
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/faa2c9e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/faa2c9e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/faa2c9e7
Branch: refs/heads/master
Commit: faa2c9e7c8ca814189d62868af59ab30f602f377
Parents: 12e7abe
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Jul 2 11:42:33 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Jul 2 11:42:33 2014 -0600
----------------------------------------------------------------------
.../usergrid/persistence/cassandra/QueryProcessor.java | 2 +-
.../org/apache/usergrid/persistence/query/ir/AllNode.java | 6 ++++++
.../apache/usergrid/persistence/query/ir/BooleanNode.java | 10 ++++++++++
.../persistence/query/ir/EmailIdentifierNode.java | 6 ++++++
.../usergrid/persistence/query/ir/NameIdentifierNode.java | 6 ++++++
.../org/apache/usergrid/persistence/query/ir/NotNode.java | 6 ++++++
.../apache/usergrid/persistence/query/ir/OrderByNode.java | 6 ++++++
.../apache/usergrid/persistence/query/ir/QueryNode.java | 6 ++++++
.../apache/usergrid/persistence/query/ir/SliceNode.java | 6 ++++++
.../usergrid/persistence/query/ir/UuidIdentifierNode.java | 6 ++++++
.../apache/usergrid/persistence/query/ir/WithinNode.java | 6 ++++++
11 files changed, 65 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/QueryProcessor.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/QueryProcessor.java
index 9ccf240..c2b65b7 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/QueryProcessor.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/QueryProcessor.java
@@ -633,7 +633,7 @@ public class QueryProcessor {
//if it's a root node, and there's only 1 slice to check in the entire tree, then just select what we need
//so we short circuit on range scans faster. otherwise it's more efficient to make less trips with candidates we discard from cassandra
- if ( node == rootNode && sliceCount == 1 ) {
+ if ( node == rootNode && !node.ignoreHintSize()) {
return size;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/AllNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/AllNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/AllNode.java
index d870e49..11c39c9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/AllNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/AllNode.java
@@ -58,6 +58,12 @@ public class AllNode extends QueryNode {
@Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
+ @Override
public String toString() {
return "AllNode";
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/BooleanNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/BooleanNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/BooleanNode.java
index ac3e42d..ee47946 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/BooleanNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/BooleanNode.java
@@ -49,7 +49,17 @@ public abstract class BooleanNode extends QueryNode {
@Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
+ @Override
public String toString() {
return "BooleanNode [left=" + left + ", right=" + right + "]";
}
+
+
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/EmailIdentifierNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/EmailIdentifierNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/EmailIdentifierNode.java
index 92dffee..1dc6d13 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/EmailIdentifierNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/EmailIdentifierNode.java
@@ -47,6 +47,12 @@ public class EmailIdentifierNode extends QueryNode {
}
+ @Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
public Identifier getIdentifier() {
return identifier;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NameIdentifierNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NameIdentifierNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NameIdentifierNode.java
index 2bd1b05..75ba111 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NameIdentifierNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NameIdentifierNode.java
@@ -44,6 +44,12 @@ public class NameIdentifierNode extends QueryNode {
}
+ @Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NotNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NotNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NotNode.java
index 06b8208..306eff3 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NotNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/NotNode.java
@@ -63,6 +63,12 @@ public class NotNode extends QueryNode {
@Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
+ @Override
public String toString() {
return "NotNode [child=" + subtractNode + "]";
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/OrderByNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/OrderByNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/OrderByNode.java
index ae3eb9e..df80aa7 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/OrderByNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/OrderByNode.java
@@ -89,6 +89,12 @@ public class OrderByNode extends QueryNode {
}
+ @Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/QueryNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/QueryNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/QueryNode.java
index 5d3f0aa..954c13f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/QueryNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/QueryNode.java
@@ -32,4 +32,10 @@ public abstract class QueryNode {
* Get the count of the total number of slices in our tree from this node and it's children
*/
public abstract int getCount();
+
+ /**
+ * True if this node should not be used in it's context in the AST, and should ignore it's hint size and always select the max
+ * @return
+ */
+ public abstract boolean ignoreHintSize();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/SliceNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/SliceNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/SliceNode.java
index 046b517..fc6f53b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/SliceNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/SliceNode.java
@@ -65,6 +65,12 @@ public class SliceNode extends QueryNode {
}
+ @Override
+ public boolean ignoreHintSize() {
+ return pairs.size() > 1;
+ }
+
+
/**
* Set the start value. If the range pair doesn't exist, it's created
*
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/UuidIdentifierNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/UuidIdentifierNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/UuidIdentifierNode.java
index 42e2c08..79a6217 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/UuidIdentifierNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/UuidIdentifierNode.java
@@ -48,6 +48,12 @@ public class UuidIdentifierNode extends QueryNode {
}
+ @Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
public UUID getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/faa2c9e7/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/WithinNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/WithinNode.java b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/WithinNode.java
index 6551aee..35afda6 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/WithinNode.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/query/ir/WithinNode.java
@@ -96,6 +96,12 @@ public class WithinNode extends QueryNode {
@Override
+ public boolean ignoreHintSize() {
+ return false;
+ }
+
+
+ @Override
public String toString() {
return "WithinNode [propertyName=" + propertyName + ", distance=" + distance + ", lattitude=" + lattitude
+ ", longitude=" + longitude + "]";
[04/13] git commit: [DPS-1139] Change the visibility of a private
method of ManagementServiceImpl
Posted by to...@apache.org.
[DPS-1139] Change the visibility of a private method of ManagementServiceImpl
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/97fca06d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/97fca06d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/97fca06d
Branch: refs/heads/master
Commit: 97fca06d162ba09a17b74e29b022c164879753f3
Parents: 643031d
Author: Juan Pablo Romero <jr...@apigee.com>
Authored: Wed Jul 9 15:37:01 2014 -0700
Committer: Juan Pablo Romero <jr...@apigee.com>
Committed: Wed Jul 9 15:37:01 2014 -0700
----------------------------------------------------------------------
.../usergrid/management/cassandra/ManagementServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/97fca06d/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 2e6a139..8b45dd0 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -2027,7 +2027,7 @@ public class ManagementServiceImpl implements ManagementService {
}
- private String emailMsg( Map<String, String> values, String propertyName ) {
+ protected String emailMsg(Map<String, String> values, String propertyName) {
return new StrSubstitutor( values ).replace( properties.getProperty( propertyName ) );
}
[06/13] git commit: Switched properties to now use the correct entry
in the properties file.
Posted by to...@apache.org.
Switched properties to now use the correct entry in the properties file.
Signed-off-by: grey <gr...@apigee.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2bfbe416
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2bfbe416
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2bfbe416
Branch: refs/heads/master
Commit: 2bfbe41657061efbae804f74de638778f5a00588
Parents: 1af22d2
Author: grey <gr...@apigee.com>
Authored: Tue Jul 15 15:57:16 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Fri Jul 25 13:39:58 2014 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/management/AccountCreationProps.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2bfbe416/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java b/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
index 9963e8d..90263c4 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/AccountCreationProps.java
@@ -69,9 +69,11 @@ public interface AccountCreationProps {
public static final String PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION = "usergrid.management.notify_admin_of_activation";
public static final String PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS =
- "usergrid.management.admin_users_require_activation";
+ "usergrid.sysadmin.approve.users";
+ //"usergrid.management.admin_users_require_activation";
public static final String PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS =
- "usergrid.management.organizations_require_activation";
+ "usergrid.sysadmin.approve.organizations";
+ //"usergrid.management.organizations_require_activation";
public static final String PROPERTIES_NOTIFY_SYSADMIN_OF_NEW_ORGANIZATIONS =
"usergrid.management.notify_sysadmin_of_new_organizations";
public static final String PROPERTIES_NOTIFY_SYSADMIN_OF_NEW_ADMIN_USERS =
[11/13] git commit: Merge pull request #17 from apigee/DPS-1123
Posted by to...@apache.org.
Merge pull request #17 from apigee/DPS-1123
Dps 1123
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/28e2c354
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/28e2c354
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/28e2c354
Branch: refs/heads/master
Commit: 28e2c3542e05998fba3a9deec110ad1b2a037614
Parents: bac5259 29c8c7b
Author: GERey <gr...@apigee.com>
Authored: Wed Aug 6 09:14:26 2014 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Aug 6 09:14:26 2014 -0700
----------------------------------------------------------------------
.../persistence/cassandra/QueryProcessor.java | 2 +-
.../usergrid/persistence/query/ir/AllNode.java | 6 +
.../persistence/query/ir/BooleanNode.java | 10 ++
.../query/ir/EmailIdentifierNode.java | 6 +
.../query/ir/NameIdentifierNode.java | 6 +
.../usergrid/persistence/query/ir/NotNode.java | 6 +
.../persistence/query/ir/OrderByNode.java | 6 +
.../persistence/query/ir/QueryNode.java | 6 +
.../persistence/query/ir/SliceNode.java | 6 +
.../query/ir/UuidIdentifierNode.java | 6 +
.../persistence/query/ir/WithinNode.java | 6 +
.../query/OrderByDiscardPagesPagingIT.java | 164 +++++++++++++++++++
12 files changed, 229 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[13/13] git commit: added error message to script
Posted by to...@apache.org.
added error message to script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d183fbeb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d183fbeb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d183fbeb
Branch: refs/heads/two-dot-o
Commit: d183fbebf9d42c7ce371106f3c09c75df57597da
Parents: a3ba349
Author: Ubuntu <ub...@ip-10-18-140-7.us-west-2.compute.internal>
Authored: Wed Oct 22 20:43:24 2014 +0000
Committer: Ubuntu <ub...@ip-10-18-140-7.us-west-2.compute.internal>
Committed: Wed Oct 22 20:43:24 2014 +0000
----------------------------------------------------------------------
stack/loadtests/gatling/scripts/gatling-ug.sh | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d183fbeb/stack/loadtests/gatling/scripts/gatling-ug.sh
----------------------------------------------------------------------
diff --git a/stack/loadtests/gatling/scripts/gatling-ug.sh b/stack/loadtests/gatling/scripts/gatling-ug.sh
index e08ad1d..67f1392 100755
--- a/stack/loadtests/gatling/scripts/gatling-ug.sh
+++ b/stack/loadtests/gatling/scripts/gatling-ug.sh
@@ -12,6 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+die () {
+ echo >&2 "$@"
+ exit 1
+}
+
+[ "$#" -eq 5 ] || die "5 arguments required, $# provided. Arguments are URL ORG APP NUM_USERS RAMP_TIME"
OLDDIR=`pwd`
BIN_DIR=`dirname $0`
[10/13] git commit: Merge branch 'master' into DPS-1123
Posted by to...@apache.org.
Merge branch 'master' into DPS-1123
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/29c8c7b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/29c8c7b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/29c8c7b5
Branch: refs/heads/master
Commit: 29c8c7b5e85087b63cd4669cded0c0b54037b1c7
Parents: faa2c9e bac5259
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Aug 6 10:13:00 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Aug 6 10:13:00 2014 -0600
----------------------------------------------------------------------
.gitignore | 7 +
README.md | 20 +-
portal/Gruntfile.js | 25 +-
portal/archive/config.js | 72 +
portal/archive/index.html | 1 +
portal/bower.json | 4 +-
portal/config.js | 2 +-
portal/css/dash.min.css | 2 +-
portal/css/main.css | 10 +
portal/dist/usergrid-portal.2.0.3.zip | Bin 16280571 -> 0 bytes
portal/dist/usergrid-portal/archive/config.js | 72 +
portal/dist/usergrid-portal/archive/index.html | 1 +
.../bower_components/angular/angular-csp.css | 2 +-
.../bower_components/angular/angular.js | 3333 +++++++++++-------
.../bower_components/angular/angular.min.js | 421 +--
.../angular/angular.min.js.gzip | Bin 38793 -> 40453 bytes
.../bower_components/angular/angular.min.js.map | 6 +-
.../bower_components/angular/bower.json | 2 +-
.../jquery-waypoints/CHANGELOG.md | 10 +
.../jquery-waypoints/bower.json | 2 +-
.../jquery-waypoints/package.json | 2 +-
.../infinite-scroll/waypoints-infinite.js | 45 +-
.../infinite-scroll/waypoints-infinite.min.js | 6 +-
.../sticky-elements/waypoints-sticky.js | 24 +-
.../sticky-elements/waypoints-sticky.min.js | 6 +-
.../jquery-waypoints/waypoints.js | 15 +-
.../jquery-waypoints/waypoints.min.js | 8 +-
.../bower_components/jquery/bower.json | 4 +-
.../bower_components/jquery/dist/jquery.js | 88 +-
.../bower_components/jquery/dist/jquery.min.js | 8 +-
.../bower_components/jquery/dist/jquery.min.map | 2 +-
.../bower_components/jquery/src/css.js | 2 +-
.../bower_components/jquery/src/data.js | 12 +-
.../bower_components/jquery/src/effects.js | 8 +-
.../jquery/src/sizzle/dist/sizzle.js | 60 +-
.../jquery/src/sizzle/dist/sizzle.min.js | 4 +-
.../jquery/src/sizzle/dist/sizzle.min.map | 2 +-
portal/dist/usergrid-portal/config.js | 2 +-
portal/dist/usergrid-portal/css/dash.min.css | 2 +-
portal/dist/usergrid-portal/css/main.css | 10 +
portal/dist/usergrid-portal/index-debug.html | 22 +-
portal/dist/usergrid-portal/index-template.html | 22 +-
portal/dist/usergrid-portal/index.html | 22 +-
.../js/libs/usergrid-libs.min.js | 8 +-
.../usergrid-portal/js/libs/usergrid.sdk.js | 38 +-
.../dist/usergrid-portal/js/usergrid-dev.min.js | 263 +-
portal/dist/usergrid-portal/js/usergrid.min.js | 10 +-
portal/index-template.html | 12 +-
portal/js/app.js | 14 +-
portal/js/data/data-controller.js | 18 +-
portal/js/data/data.html | 38 +-
portal/js/data/display-generic.html | 7 +-
portal/js/global/appswitcher-template.html | 8 +-
portal/js/global/help-service.js | 154 +-
portal/js/global/page-controller.js | 11 +
portal/js/global/ug-service.js | 20 +-
portal/js/groups/groups-details.html | 6 +-
portal/js/groups/groups-members.html | 1 +
portal/js/groups/groups-roles.html | 11 +-
portal/js/groups/groups.html | 30 +-
portal/js/libs/usergrid.sdk.js | 38 +-
portal/js/menu.html | 2 +-
portal/js/menus/menu-directives.js | 100 +-
portal/js/profile/organizations.html | 3 +-
portal/js/profile/profile.html | 2 +
portal/js/roles/roles-groups.html | 1 +
portal/js/roles/roles-settings.html | 9 +-
portal/js/roles/roles-tabs.html | 3 +-
portal/js/roles/roles-users.html | 1 +
portal/js/roles/roles.html | 21 +-
portal/js/users/users-activities.html | 4 +-
portal/js/users/users-graph.html | 5 +-
portal/js/users/users-groups.html | 3 +-
portal/js/users/users-profile.html | 13 +-
portal/js/users/users-roles.html | 12 +-
portal/js/users/users.html | 36 +-
portal/package.json | 4 +-
portal/tests/protractorConf.js | 4 +-
sdks/android/pom.xml | 16 -
.../apache/usergrid/android/client/Client.java | 464 ++-
.../client/callbacks/ApiResponseCallback.java | 16 -
.../client/callbacks/ClientAsyncTask.java | 16 -
.../client/callbacks/ClientCallback.java | 16 -
.../callbacks/DeviceRegistrationCallback.java | 16 -
.../callbacks/GroupsRetrievedCallback.java | 16 -
.../client/callbacks/QueryResultsCallback.java | 16 -
.../android/client/utils/DeviceUuidFactory.java | 16 -
.../android/client/utils/ObjectUtils.java | 16 -
sdks/html5-javascript/Gruntfile.js | 49 +-
sdks/html5-javascript/README.md | 76 +-
.../extensions/usergrid.validation.js | 18 +
sdks/html5-javascript/lib/modules/Asset.js | 188 +-
sdks/html5-javascript/lib/modules/Client.js | 26 +-
sdks/html5-javascript/lib/modules/Collection.js | 20 +
sdks/html5-javascript/lib/modules/Counter.js | 20 +
sdks/html5-javascript/lib/modules/Entity.js | 201 +-
sdks/html5-javascript/lib/modules/Error.js | 18 +
sdks/html5-javascript/lib/modules/Folder.js | 19 +
sdks/html5-javascript/lib/modules/Group.js | 22 +-
sdks/html5-javascript/lib/modules/util/Ajax.js | 21 +
.../html5-javascript/lib/modules/util/Logger.js | 21 +
.../lib/modules/util/Promise.js | 21 +
sdks/html5-javascript/tests/mocha/test.js | 34 +-
sdks/html5-javascript/usergrid.js | 344 +-
sdks/html5-javascript/usergrid.min.js | 26 +-
sdks/nodejs/.gitignore | 3 +-
sdks/nodejs/lib/usergrid.js | 168 +-
sdks/nodejs/package.json | 2 +-
sdks/nodejs/readme.md | 2 +-
sdks/perl/.travis.yml | 1 +
sdks/perl/Build.PL | 30 +
sdks/perl/LICENSE | 202 ++
sdks/perl/MANIFEST | 23 +
sdks/perl/Makefile.PL | 25 +
sdks/perl/README.md | 341 ++
sdks/perl/examples/books.pl | 32 +
sdks/perl/lib/Usergrid/Client.pm | 492 +++
sdks/perl/lib/Usergrid/Collection.pm | 212 ++
sdks/perl/lib/Usergrid/Entity.pm | 92 +
sdks/perl/lib/Usergrid/Request.pm | 249 ++
sdks/perl/t/01_init.t | 11 +
sdks/perl/t/02_login.t | 48 +
sdks/perl/t/03_update.t | 86 +
sdks/perl/t/04_collection.t | 88 +
sdks/perl/t/05_query.t | 92 +
sdks/perl/t/06_batch_update.t | 91 +
sdks/perl/t/07_batch_delete.t | 71 +
sdks/perl/t/08_connections.t | 78 +
sdks/perl/t/09_paging.t | 124 +
sdks/perl/t/10_auto_paging.t | 78 +
sdks/php/lib/vendor/Apache/Usergrid/Entity.php | 17 +-
sdks/ruby-on-rails/README.md | 7 +
sdks/ruby/Gemfile | 15 +
sdks/ruby/LICENSE | 27 +-
sdks/ruby/README.md | 33 +-
sdks/ruby/Rakefile | 15 +
sdks/ruby/lib/usergrid/core/application.rb | 15 +
sdks/ruby/lib/usergrid/core/collection.rb | 15 +
sdks/ruby/lib/usergrid/core/entity.rb | 15 +
sdks/ruby/lib/usergrid/core/management.rb | 15 +
sdks/ruby/lib/usergrid/core/organization.rb | 15 +
sdks/ruby/lib/usergrid/core/resource.rb | 15 +
sdks/ruby/lib/usergrid/extensions/hash.rb | 15 +
sdks/ruby/lib/usergrid/extensions/response.rb | 15 +
sdks/ruby/lib/usergrid/version.rb | 15 +
sdks/ruby/lib/usergrid_iron.rb | 15 +
sdks/ruby/spec/spec_helper.rb | 15 +
sdks/ruby/spec/spec_settings.yaml | 15 +
.../ruby/spec/usergrid/core/application_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/collection_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/entity_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/management_spec.rb | 15 +
.../spec/usergrid/core/organization_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/resource_spec.rb | 15 +
sdks/ruby/spec/usergrid/extensions/hash_spec.rb | 15 +
sdks/ruby/usergrid_iron.gemspec | 16 +
.../main/resources/usergrid-default.properties | 7 +-
stack/config/src/test/resources/log4j.xml | 40 -
stack/core/pom.xml | 22 +
.../java/org/apache/usergrid/batch/Job.java | 12 +-
.../org/apache/usergrid/batch/JobFactory.java | 2 +-
.../usergrid/batch/UsergridJobFactory.java | 6 +-
.../batch/service/JobSchedulerService.java | 302 +-
.../usergrid/count/CassandraCounterStore.java | 4 +-
.../org/apache/usergrid/count/common/Count.java | 2 -
.../apache/usergrid/metrics/MetricsFactory.java | 113 +
.../main/java/org/apache/usergrid/mq/Query.java | 21 +-
.../apache/usergrid/mq/QueryFilterLexer.java | 3 +-
.../apache/usergrid/mq/QueryFilterParser.java | 27 -
.../org/apache/usergrid/mq/QueryProcessor.java | 1 -
.../usergrid/mq/cassandra/CassandraMQUtils.java | 14 +-
.../mq/cassandra/MessageIndexUpdate.java | 15 +-
.../mq/cassandra/QueueManagerFactoryImpl.java | 15 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 13 +-
.../mq/cassandra/io/AbstractSearch.java | 8 +-
.../mq/cassandra/io/ConsumerTransaction.java | 2 +-
.../usergrid/mq/cassandra/io/EndSearch.java | 12 +-
.../usergrid/mq/cassandra/io/FilterSearch.java | 1 +
.../usergrid/mq/cassandra/io/StartSearch.java | 7 -
.../usergrid/persistence/AbstractEntity.java | 8 +-
.../usergrid/persistence/CounterQuery.java | 27 +-
.../usergrid/persistence/CredentialsInfo.java | 2 +-
.../usergrid/persistence/EntityManager.java | 54 +-
.../apache/usergrid/persistence/Identifier.java | 8 +-
.../persistence/MultiQueryIterator.java | 6 +-
.../persistence/ObservableIterator.java | 82 +
.../persistence/PagingResultsIterator.java | 7 +-
.../apache/usergrid/persistence/PathQuery.java | 4 +-
.../apache/usergrid/persistence/Results.java | 2 -
.../usergrid/persistence/ResultsIterator.java | 30 +
.../org/apache/usergrid/persistence/Schema.java | 116 +-
.../org/apache/usergrid/persistence/Update.java | 2 +-
.../cassandra/CassandraPersistenceUtils.java | 11 +-
.../cassandra/ConnectionRefImpl.java | 10 +-
.../persistence/cassandra/CounterUtils.java | 16 +-
.../cassandra/EntityManagerFactoryImpl.java | 20 +-
.../cassandra/EntityManagerImpl.java | 29 +-
.../cassandra/RelationManagerImpl.java | 22 +-
.../persistence/cassandra/Serializers.java | 43 +
.../usergrid/persistence/entities/JobStat.java | 7 +-
.../persistence/geo/GeoIndexSearcher.java | 40 +-
.../usergrid/persistence/geo/GeocellUtils.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 5 +-
.../ir/result/ConnectionTypesIterator.java | 9 +-
.../query/ir/result/GeoIterator.java | 19 +-
.../query/ir/result/OrderByIterator.java | 9 +-
.../query/ir/result/UUIDIndexSliceParser.java | 8 +-
.../query/ir/result/UnionIterator.java | 10 +-
.../persistence/query/tree/BooleanOperand.java | 5 -
.../persistence/query/tree/ContainsOperand.java | 18 +-
.../persistence/query/tree/EqualityOperand.java | 4 -
.../persistence/schema/CollectionInfo.java | 3 +-
.../persistence/schema/DictionaryInfo.java | 2 -
.../usergrid/persistence/schema/EntityInfo.java | 17 +-
.../main/resources/usergrid-core-context.xml | 3 +
.../apache/usergrid/batch/BulkTestUtils.java | 10 +-
.../usergrid/batch/UsergridJobFactoryTest.java | 3 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 2 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +
.../usergrid/batch/job/DelayExecution.java | 6 +
.../usergrid/batch/job/DelayHeartbeat.java | 6 +
.../batch/job/FailureJobExceuction.java | 74 -
.../usergrid/batch/job/FailureJobExecution.java | 87 +
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +
.../usergrid/batch/job/SchedulerRuntime1IT.java | 5 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 13 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 34 +-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 4 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 8 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 4 +-
.../batch/job/SchedulerRuntimeIntervalIT.java | 115 +
.../usergrid/batch/job/TestJobListener.java | 67 +-
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
.../count/BatchCountParallelismTest.java | 2 +-
.../usergrid/locking/zookeeper/ZooPut.java | 2 +-
.../usergrid/persistence/EntityManagerIT.java | 6 +-
.../launcher/ClasspathStaticHttpHandler.java | 9 +-
.../launcher/CustomJSPTemplateProcessor.java | 2 +-
.../org/apache/usergrid/launcher/Server.java | 1 +
.../apache/usergrid/mongo/protocol/OpQuery.java | 2 +-
.../usergrid/mongo/query/MongoQueryParser.java | 16 +-
stack/pom.xml | 21 +-
.../org/apache/usergrid/rest/RootResource.java | 13 +-
.../rest/applications/ApplicationResource.java | 2 +-
.../rest/applications/ServiceResource.java | 15 +-
.../rest/applications/users/UsersResource.java | 3 +-
.../organizations/OrganizationsResource.java | 3 +-
.../applications/ApplicationsResource.java | 3 +-
.../organizations/users/UsersResource.java | 17 +-
.../rest/management/users/UsersResource.java | 21 +-
.../organizations/OrganizationsResource.java | 5 +-
.../organizations/OrganizationResource.java | 9 +-
.../apache/usergrid/rest/utils/JSONPUtils.java | 8 +-
.../usergrid/rest/utils/PathingUtils.java | 2 +-
.../collection/activities/AndOrQueryTest.java | 7 +-
.../queues/QueueResourceLong2IT.java | 8 +-
.../users/ConnectionResourceTest.java | 1 -
.../rest/management/ExportResourceIT.java | 130 +-
.../rest/management/RegistrationIT.java | 4 +-
.../organizations/OrganizationsResourceIT.java | 34 +-
stack/services/pom.xml | 5 -
.../management/AccountCreationProps.java | 6 +-
.../cassandra/ManagementServiceImpl.java | 31 +-
.../usergrid/management/export/ExportJob.java | 6 +
.../management/export/ExportServiceImpl.java | 5 +
.../security/providers/FoursquareProvider.java | 2 +-
.../providers/PingIdentityProvider.java | 4 +-
.../security/shiro/CustomPermission.java | 5 +-
.../shiro/PrincipalCredentialsToken.java | 4 +-
.../apache/usergrid/security/shiro/Realm.java | 6 +-
.../security/shiro/utils/SubjectUtils.java | 5 +-
.../tokens/cassandra/TokenServiceImpl.java | 82 +-
.../apache/usergrid/services/ServiceInfo.java | 2 +-
.../usergrid/services/ServiceManager.java | 9 +-
.../usergrid/services/ServiceRequest.java | 6 +-
.../applications/ApplicationsService.java | 9 +-
.../apache/usergrid/management/EmailFlowIT.java | 22 +-
.../usergrid/services/ConnectionsServiceIT.java | 27 +
.../usergrid/services/ServiceInvocationIT.java | 66 +
.../apache/usergrid/NoExitSecurityManager.java | 2 +-
.../usergrid/cassandra/AvailablePortFinder.java | 2 +-
.../usergrid/cassandra/CassandraResource.java | 22 +-
.../org/apache/usergrid/tools/AppAudit.java | 3 -
.../apache/usergrid/tools/EntityCleanup.java | 3 +-
.../usergrid/tools/EntityInsertBenchMark.java | 4 +-
.../usergrid/tools/EntityReadBenchMark.java | 14 +-
.../org/apache/usergrid/tools/EntityUpdate.java | 4 -
.../org/apache/usergrid/tools/IndexRebuild.java | 2 -
.../apache/usergrid/tools/ResetSuperUser.java | 2 -
.../usergrid/tools/UniqueIndexCleanup.java | 3 +-
ugc/Gemfile.lock | 18 +-
ugc/bin/ugc | 4 +-
ugc/lib/ugc/commands/put.rb | 2 +-
ugc/lib/ugc/version.rb | 2 +-
297 files changed, 9057 insertions(+), 3540 deletions(-)
----------------------------------------------------------------------
[09/13] git commit: merge from usergrid-master
Posted by to...@apache.org.
merge from usergrid-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bac5259a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bac5259a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bac5259a
Branch: refs/heads/master
Commit: bac5259ab3a2f25a8c92eb0bb2e054c08aa6009f
Parents: 41a8d4f d61fba9
Author: Shawn Feldman <sh...@gmail.com>
Authored: Fri Aug 1 11:34:38 2014 -0600
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Fri Aug 1 11:34:38 2014 -0600
----------------------------------------------------------------------
README.md | 5 +-
.../main/resources/usergrid-default.properties | 7 +-
stack/core/pom.xml | 22 ++
.../java/org/apache/usergrid/batch/Job.java | 12 +-
.../org/apache/usergrid/batch/JobFactory.java | 2 +-
.../usergrid/batch/UsergridJobFactory.java | 6 +-
.../batch/service/JobSchedulerService.java | 302 +++++++++++++------
.../apache/usergrid/metrics/MetricsFactory.java | 113 +++++++
.../persistence/MultiQueryIterator.java | 6 +-
.../persistence/ObservableIterator.java | 82 +++++
.../persistence/PagingResultsIterator.java | 7 +-
.../usergrid/persistence/ResultsIterator.java | 30 ++
.../main/resources/usergrid-core-context.xml | 3 +
.../apache/usergrid/batch/BulkTestUtils.java | 10 +-
.../usergrid/batch/UsergridJobFactoryTest.java | 3 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +
.../usergrid/batch/job/DelayExecution.java | 6 +
.../usergrid/batch/job/DelayHeartbeat.java | 6 +
.../batch/job/FailureJobExceuction.java | 74 -----
.../usergrid/batch/job/FailureJobExecution.java | 87 ++++++
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +
.../usergrid/batch/job/SchedulerRuntime1IT.java | 5 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 13 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 34 ++-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 4 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 8 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 4 +-
.../batch/job/SchedulerRuntimeIntervalIT.java | 115 +++++++
.../usergrid/batch/job/TestJobListener.java | 67 ++--
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
stack/pom.xml | 3 +-
.../rest/management/ExportResourceIT.java | 130 +++++---
.../cassandra/ManagementServiceImpl.java | 2 +-
.../usergrid/management/export/ExportJob.java | 6 +
.../management/export/ExportServiceImpl.java | 5 +
38 files changed, 919 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bac5259a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
[05/13] git commit: Merge pull request #15 from apigee/DPS-1139
Posted by to...@apache.org.
Merge pull request #15 from apigee/DPS-1139
Dps 1139
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1af22d28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1af22d28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1af22d28
Branch: refs/heads/master
Commit: 1af22d28e2810d1c07c16a7babaf861e75acd370
Parents: c7b8612 97fca06
Author: GERey <gr...@apigee.com>
Authored: Wed Jul 9 18:27:09 2014 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Jul 9 18:27:09 2014 -0700
----------------------------------------------------------------------
.../usergrid/management/cassandra/ManagementServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[08/13] git commit: Merge pull request #16 from
apigee/DPS-1149_1151-fixes
Posted by to...@apache.org.
Merge pull request #16 from apigee/DPS-1149_1151-fixes
Dps 1149 1151 fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/41a8d4f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/41a8d4f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/41a8d4f5
Branch: refs/heads/master
Commit: 41a8d4f5a1844c87a07028bf1968e6b00425fddb
Parents: 1af22d2 c78e0a4
Author: GERey <gr...@apigee.com>
Authored: Wed Jul 30 08:00:29 2014 -0700
Committer: GERey <gr...@apigee.com>
Committed: Wed Jul 30 08:00:29 2014 -0700
----------------------------------------------------------------------
.../management/AccountCreationProps.java | 6 ++++--
.../cassandra/ManagementServiceImpl.java | 13 ++++++------
.../apache/usergrid/management/EmailFlowIT.java | 22 +++++++++++++-------
3 files changed, 25 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[03/13] git commit: [DPS-1139] Change the visibility of a private
method of ManagementServiceImpl
Posted by to...@apache.org.
[DPS-1139] Change the visibility of a private method of ManagementServiceImpl
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/643031d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/643031d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/643031d8
Branch: refs/heads/master
Commit: 643031d806d4704e41a791892889445f028ba59a
Parents: c7b8612
Author: Juan Pablo Romero <jr...@apigee.com>
Authored: Wed Jul 9 14:57:01 2014 -0700
Committer: Juan Pablo Romero <jr...@apigee.com>
Committed: Wed Jul 9 14:57:01 2014 -0700
----------------------------------------------------------------------
.../usergrid/management/cassandra/ManagementServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/643031d8/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 7c2cff9..2e6a139 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -2535,7 +2535,7 @@ public class ManagementServiceImpl implements ManagementService {
}
- private String buildUserAppUrl( UUID applicationId, String url, User user, String token ) throws Exception {
+ protected String buildUserAppUrl(UUID applicationId, String url, User user, String token) throws Exception {
ApplicationInfo ai = getApplicationInfo( applicationId );
OrganizationInfo oi = getOrganizationForApplication( applicationId );
return String.format( url, oi.getName(), StringUtils.stringOrSubstringAfterFirst( ai.getName(), '/' ),