You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/22 16:16:17 UTC
[81/95] [abbrv] git commit: merging from remote master
merging from remote 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/d907d576
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d907d576
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d907d576
Branch: refs/heads/import-feature
Commit: d907d576d5c0bf7ee27ba7ca3c38b0527a52a0e5
Parents: 0ad5428 9fc1ab4
Author: Harish Rajagopal <hr...@apigee.com>
Authored: Tue Aug 5 08:41:14 2014 -0700
Committer: Harish Rajagopal <hr...@apigee.com>
Committed: Tue Aug 5 08:41:14 2014 -0700
----------------------------------------------------------------------
.gitignore | 10 +-
bower.json | 39 -
portal/Gruntfile.js | 98 +-
portal/README.md | 2 +-
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 | 7 +-
portal/config.js | 29 +-
portal/css/apigeeGlobalNavigation.css | 291 -
portal/css/dash.min.css | 1 -
portal/css/main.css | 94 +-
portal/css/main.min.css | 1 +
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 +-
.../js/app-overview/app-overview-controller.js | 61 +-
portal/js/app-overview/app-overview.html | 6 -
.../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/global/app-switcher-directive.js | 53 -
portal/js/global/appswitcher-template.html | 34 -
portal/js/global/help-service.js | 22 +-
portal/js/global/page-controller.js | 17 +-
portal/js/global/ug-service.js | 32 +-
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 -
.../angularitics-0.8.5-google-analytics.js | 7 -
.../js/libs/angularitics/angularitics-0.8.5.js | 6 -
portal/package.json | 5 +-
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/tests/karma.conf.js | 4 +-
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 +
.../main/resources/usergrid-default.properties | 7 +-
stack/core/pom.xml | 16 +-
.../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 | 2 +-
.../management/AccountCreationProps.java | 6 +-
.../cassandra/ManagementServiceImpl.java | 44 +-
.../usergrid/management/export/ExportJob.java | 6 +
.../apache/usergrid/management/EmailFlowIT.java | 22 +-
273 files changed, 1185 insertions(+), 94921 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d907d576/portal/bower.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d907d576/portal/config.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d907d576/portal/js/global/ug-service.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d907d576/stack/core/pom.xml
----------------------------------------------------------------------
diff --cc stack/core/pom.xml
index aa861d6,d9bc308..e75bbdf
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@@ -568,8 -579,7 +579,7 @@@
<dependency>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-math</artifactId>
- <version>0.19.6</version>
- <version>${rx.version}</version>
++ <version>${rx.version}</v<version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d907d576/stack/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d907d576/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --cc stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 7e4099e,a94d292..d60f6bf
--- 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
@@@ -16,9 -16,22 +16,21 @@@
*/
package org.apache.usergrid.management.cassandra;
-
+ import java.nio.ByteBuffer;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Map.Entry;
+ import java.util.Properties;
+ import java.util.Set;
+ import java.util.UUID;
+
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import org.springframework.beans.factory.annotation.Autowired;
- import com.google.common.collect.BiMap;
- import com.google.common.collect.HashBiMap;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.shiro.UnavailableSecurityManagerException;
@@@ -49,17 -85,22 +61,33 @@@ import org.apache.usergrid.security.tok
import org.apache.usergrid.security.tokens.TokenInfo;
import org.apache.usergrid.security.tokens.TokenService;
import org.apache.usergrid.security.tokens.exceptions.TokenException;
++<<<<<<< HEAD
+import org.apache.usergrid.services.*;
+import org.apache.usergrid.utils.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
++=======
+ import org.apache.usergrid.services.ServiceAction;
+ import org.apache.usergrid.services.ServiceManager;
+ import org.apache.usergrid.services.ServiceManagerFactory;
+ import org.apache.usergrid.services.ServiceRequest;
+ import org.apache.usergrid.services.ServiceResults;
+ import org.apache.usergrid.utils.ConversionUtils;
+ import org.apache.usergrid.utils.JsonUtils;
+ import org.apache.usergrid.utils.MailUtils;
+ import org.apache.usergrid.utils.StringUtils;
+ import org.apache.usergrid.utils.UUIDUtils;
+
+ import com.google.common.collect.BiMap;
+ import com.google.common.collect.HashBiMap;
++>>>>>>> 9fc1ab40878c4a4756e9734bd444ccdad436d4fd
import static java.lang.Boolean.parseBoolean;
-
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.apache.commons.codec.digest.DigestUtils.sha;
import static org.apache.commons.lang.StringUtils.isBlank;
@@@ -1936,7 -2028,7 +1964,11 @@@ public class ManagementServiceImpl impl
}
++<<<<<<< HEAD
+ protected String emailMsg( Map<String, String> values, String propertyName ) {
++=======
+ public String emailMsg( Map<String, String> values, String propertyName ) {
++>>>>>>> 9fc1ab40878c4a4756e9734bd444ccdad436d4fd
return new StrSubstitutor( values ).replace( properties.getProperty( propertyName ) );
}
@@@ -2444,7 -2536,7 +2476,11 @@@
}
++<<<<<<< HEAD
+ protected String buildUserAppUrl( UUID applicationId, String url, User user, String token ) throws Exception {
++=======
+ public String buildUserAppUrl( UUID applicationId, String url, User user, String token ) throws Exception {
++>>>>>>> 9fc1ab40878c4a4756e9734bd444ccdad436d4fd
ApplicationInfo ai = getApplicationInfo( applicationId );
OrganizationInfo oi = getOrganizationForApplication( applicationId );
return String.format( url, oi.getName(), StringUtils.stringOrSubstringAfterFirst( ai.getName(), '/' ),