You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/12 01:35:43 UTC
[1/7] incubator-usergrid git commit: USERGRID-248 Create a package
for portal distributions that can be uploaded via nexus.
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 3032dfaa1 -> c06f26b58
USERGRID-248 Create a package for portal distributions that can be uploaded via nexus.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3c06eb15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3c06eb15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3c06eb15
Branch: refs/heads/master
Commit: 3c06eb15f8c9bf5190a8be12f0daa5aba035501f
Parents: 7131c5a
Author: John D. Ament <jo...@apache.org>
Authored: Wed Nov 12 21:56:54 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Wed Nov 12 21:56:54 2014 -0500
----------------------------------------------------------------------
.gitignore | 5 +-
portal/Gruntfile.js | 204 +++++++++++++++++++++++++++++++----------------
portal/README.md | 5 ++
portal/build.sh | 1 +
portal/package.json | 2 +-
portal/pom.xml | 81 +++++++++++++++++++
6 files changed, 225 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3c06eb15/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 47ed041..123fac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ Icon
/stack/corepersistence/priamcluster/aws.properties
#Webstorm artifacts
.idea/
+*.iml
stack/corepersistence/collection/nbactions.xml
stack/corepersistence/graph/nbactions.xml
stack/corepersistence/model/nbactions.xml
@@ -40,7 +41,7 @@ stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/q
/portal/js/templates.js
/portal/index.html
/portal/index-debug.html
-
+/portal/dist/*
/portal/dist/usergrid-portal/
/portal/dist/appsvc-ui/
/portal/nbproject/project.properties
@@ -60,4 +61,4 @@ portal/js/templates.js
/portal/seleniumLog.txt
/stack/core/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
-/stack/core/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
\ No newline at end of file
+/stack/core/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3c06eb15/portal/Gruntfile.js
----------------------------------------------------------------------
diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js
index f768b61..5ebba14 100644
--- a/portal/Gruntfile.js
+++ b/portal/Gruntfile.js
@@ -18,8 +18,8 @@
*/
var bower = require('./bower.json');
-var distPath = 'dist/'+bower.name,
- coveragePath = 'dist-cov/'+bower.name,
+var distPath = 'dist/' + bower.name,
+ coveragePath = 'dist-cov/' + bower.name,
libsFile = 'js/generated/usergrid-libs.min.js',
devFile = 'js/generated/usergrid-dev.js',
mainFile = 'js/generated/usergrid.min.js',
@@ -28,7 +28,8 @@ var distPath = 'dist/'+bower.name,
coverageFile = 'test/coverage/instrument/js/usergrid-coverage.min.js',
distName = bower.name,
- licenseHeader =' /**\n \
+ licenseHeader =
+ ' /**\n \
Licensed to the Apache Software Foundation (ASF) under one\n \
or more contributor license agreements. See the NOTICE file\n \
distributed with this work for additional information \n \
@@ -46,8 +47,10 @@ var distPath = 'dist/'+bower.name,
specific language governing permissions and limitations\n \
under the License.\n \
*/\n';
-console.warn('to run e2e tests you need to have a running instance of webdriver, 1) npm install protractor -g -> 2) webdriver-manager start --standalone');
-module.exports = function (grunt) {
+console.warn(
+ 'to run e2e tests you need to have a running instance of webdriver, 1) npm install protractor -g -> 2) webdriver-manager start --standalone'
+);
+module.exports = function(grunt) {
// Project configuration.
@@ -56,16 +59,19 @@ module.exports = function (grunt) {
uglify: {
options: {
- banner: licenseHeader + '\n /*! <%= pkg.name %>@<%= pkg.version %> */\n'
+ banner: licenseHeader +
+ '\n /*! <%= pkg.name %>@<%= pkg.version %> */\n'
},
- 'usergrid-libs':{
+ 'usergrid-libs': {
options: {
mangle: false,
- compress: {warnings:false},
+ compress: {
+ warnings: false
+ },
beautify: false
},
- files:{
- 'js/generated/usergrid-libs.min.js':[
+ files: {
+ 'js/generated/usergrid-libs.min.js': [
'js/libs/jquery/jquery-1.9.1.min.js',
'js/libs/jquery/jquery-migrate-1.1.1.min.js',
'js/libs/jquery/jquery.sparkline.min.js',
@@ -110,20 +116,22 @@ module.exports = function (grunt) {
},
files: {
'test/coverage/instrument/js/usergrid-coverage.min.js': [
- coverageDir+'js/app.js',
- coverageDir+'js/**/*.js',
+ coverageDir + 'js/app.js',
+ coverageDir + 'js/**/*.js',
'js/generated-templates/templates.js',
- '!'+coverageDir+'js/config.js',
- '!'+coverageDir+'js/libs/**/*.js',
- '!'+coverageDir+'js/generated/*.js',
- '!'+coverageDir+'js/usergrid-coverage.min.js'
+ '!' + coverageDir + 'js/config.js',
+ '!' + coverageDir + 'js/libs/**/*.js',
+ '!' + coverageDir + 'js/generated/*.js',
+ '!' + coverageDir + 'js/usergrid-coverage.min.js'
]
}
},
'usergrid-coverage-min': {
options: {
mangle: false,
- compress: {warnings:false},
+ compress: {
+ warnings: false
+ },
beautify: false
},
files: {
@@ -135,7 +143,9 @@ module.exports = function (grunt) {
'usergrid': {
options: {
mangle: false,
- compress: {warnings:false},
+ compress: {
+ warnings: false
+ },
beautify: false
},
files: {
@@ -151,10 +161,12 @@ module.exports = function (grunt) {
options: {
base: 'js/'
},
- src: ['js/**/*.html','!**/index*'],
+ src: ['js/**/*.html', '!**/index*'],
dest: templateFile,
- options: {
- url: function(url) { return url.replace('js/', ''); }
+ options: {
+ url: function(url) {
+ return url.replace('js/', '');
+ }
}
}
},
@@ -188,8 +200,8 @@ module.exports = function (grunt) {
options: {
target: 'http://localhost:3000/index-debug.html', // target url to open
open: 'http://localhost:3000/index-debug.html',
- hostname:'*',
- livereload:true,
+ hostname: '*',
+ livereload: true,
port: 3000,
base: ''
}
@@ -239,13 +251,13 @@ module.exports = function (grunt) {
keepAlive: true, // If false, the grunt process stops when the test fails.
noColor: false, // If true, protractor will not use colors in its output.
args: {
- baseUrl:'http://localhost:3005/'
+ baseUrl: 'http://localhost:3005/'
}
},
phantom: {
options: {
args: {
- baseUrl:'http://localhost:3005/',
+ baseUrl: 'http://localhost:3005/',
// Arguments passed to the command
'browser': 'phantomjs'
}
@@ -254,7 +266,7 @@ module.exports = function (grunt) {
chrome: {
options: {
args: {
- baseUrl:'http://localhost:3006/?noHelp=true',
+ baseUrl: 'http://localhost:3006/?noHelp=true',
// Arguments passed to the command
'browser': 'chrome'
}
@@ -263,76 +275,116 @@ module.exports = function (grunt) {
firefox: {
options: {
args: {
- baseUrl:'http://localhost:3007/',
+ baseUrl: 'http://localhost:3007/',
// Arguments passed to the command
'browser': 'firefox'
}
}
}
},
- copy:{
- coverage:{
- files:[
- {
- src:['js/*.min.js','js/libs/**','sdk/**','js/charts/*.json','css/**','img/**','js/libs/**','config.js','bower_components/**'],
- dest:coveragePath,
- expand:true
- },
- {
- src:['js/*.min.js'],
- dest:coveragePath,
- cwd: coverageDir,
- expand:true
- }
- ]
+ copy: {
+ coverage: {
+ files: [{
+ src: ['js/*.min.js', 'js/libs/**', 'sdk/**',
+ 'js/charts/*.json', 'css/**', 'img/**', 'js/libs/**',
+ 'config.js', 'bower_components/**'
+ ],
+ dest: coveragePath,
+ expand: true
+ }, {
+ src: ['js/*.min.js'],
+ dest: coveragePath,
+ cwd: coverageDir,
+ expand: true
+ }]
},
- main:{
- files:[
+ main: {
+ files: [
// includes files within path
- {expand: true, src: ['*.html','config.js', '*.ico', 'helpJson.json'], dest: distPath, filter: 'isFile'},
- {expand: true, src: ['sdk/**','css/**','img/**','js/charts/*.json'], dest: distPath},
- {expand: true, src: ['js/generated/**','js/libs/**','css/**','img/**','bower_components/**'], dest: distPath}
+ {
+ expand: true,
+ src: ['*.html', 'config.js', '*.ico', 'helpJson.json'],
+ dest: distPath,
+ filter: 'isFile'
+ }, {
+ expand: true,
+ src: ['sdk/**', 'css/**', 'img/**', 'js/charts/*.json'],
+ dest: distPath
+ }, {
+ expand: true,
+ src: ['js/generated/**', 'js/libs/**', 'css/**', 'img/**',
+ 'bower_components/**'
+ ],
+ dest: distPath
+ }
]
}
},
clean: {
- build: ['dist/','dist-cov/','test/','js/generated/','js/*.min.js',templateFile,'index.html','index-debug.html'],
- coverage: ['reports/']
+ build: ['dist/', 'dist-cov/', 'test/', 'js/generated/',
+ 'js/*.min.js', templateFile, 'index.html', 'index-debug.html'
+ ],
+ coverage: ['reports/']
},
dom_munger: {
main: {
options: {
- update: {selector:'#main-script',attribute:'src',value:mainFile}
+ update: {
+ selector: '#main-script',
+ attribute: 'src',
+ value: mainFile
+ }
},
- src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
- dest: 'index.html' //update the dist/index.html (the src index.html is copied there)
+ src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
+ dest: 'index.html' //update the dist/index.html (the src index.html is copied there)
},
dev: {
options: {
- update: {selector:'#main-script',attribute:'src',value:devFile}
+ update: {
+ selector: '#main-script',
+ attribute: 'src',
+ value: devFile
+ }
},
- src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
- dest: 'index-debug.html' //update the dist/index.html (the src index.html is copied there)
+ src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
+ dest: 'index-debug.html' //update the dist/index.html (the src index.html is copied there)
},
coverage: {
options: {
- update: {selector:'#main-script',attribute:'src',value:'js/usergrid-coverage.min.js'}
+ update: {
+ selector: '#main-script',
+ attribute: 'src',
+ value: 'js/usergrid-coverage.min.js'
+ }
},
- src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
- dest: coveragePath+'/index.html' //update the dist/index.html (the src index.html is copied there)
+ src: 'index-template.html', //update the dist/index.html (the src index.html is copied there)
+ dest: coveragePath + '/index.html' //update the dist/index.html (the src index.html is copied there)
}
},
bower: {
install: {
- options:{
- cleanup:false,
- copy:false
+ options: {
+ cleanup: false,
+ copy: false
}
}
},
+ compress: {
+ main: {
+ options: {
+ mode: 'tar',
+ archive: 'dist/' + distName + '.tar'
+ },
+ expand: true,
+ cwd: distPath + '/',
+ src: ['**/*'],
+ dest: distName + '.' + bower.version
+ }
+ },
+
instrument: {
files: 'js/**/*.js',
options: {
@@ -355,6 +407,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-connect');
+ grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-angular-templates');
grunt.loadNpmTasks('grunt-bower-task');
@@ -371,17 +424,28 @@ module.exports = function (grunt) {
grunt.registerTask('validate', ['jshint', 'complexity']);
grunt.registerTask('report', ['build', 'coverage']);
- grunt.registerTask('build', ['clean:build','bower:install','ngtemplates', 'uglify','cssmin','dom_munger','karma:unit','copy']);
- grunt.registerTask('build-dev', [ 'build']);
- grunt.registerTask('build-coverage', [ 'ngtemplates','instrument','uglify:usergrid-coverage','uglify:usergrid-coverage-min', 'cssmin','dom_munger', 'copy:coverage']);
+ grunt.registerTask('build', ['clean:build', 'bower:install', 'ngtemplates',
+ 'uglify', 'cssmin', 'dom_munger', 'karma:unit', 'copy'
+ ]);
+ grunt.registerTask('build-dev', ['build']);
+ grunt.registerTask('build-coverage', ['ngtemplates', 'instrument',
+ 'uglify:usergrid-coverage', 'uglify:usergrid-coverage-min', 'cssmin',
+ 'dom_munger', 'copy:coverage'
+ ]);
grunt.registerTask('default', ['build']);
- grunt.registerTask('e2e', ['connect:e2e-phantom','protractor:phantom']);
- grunt.registerTask('e2e-chrome', ['connect:e2e-chrome','protractor:chrome']);
- grunt.registerTask('e2e-coverage', ['clean:coverage', 'connect:e2e-coverage','protractor:coverage']);
- grunt.registerTask('e2e-coverage-chrome', ['clean:coverage', 'connect:e2e-coverage-chrome','protractor:chrome', 'makeReport']);
- grunt.registerTask('e2e-firefox', ['connect:e2e-firefox','protractor:firefox']);
- grunt.registerTask('no-monitoring', ['build','clean:perf','karma:unit']);
+ grunt.registerTask('e2e', ['connect:e2e-phantom', 'protractor:phantom']);
+ grunt.registerTask('e2e-chrome', ['connect:e2e-chrome', 'protractor:chrome']);
+ grunt.registerTask('e2e-coverage', ['clean:coverage',
+ 'connect:e2e-coverage', 'protractor:coverage'
+ ]);
+ grunt.registerTask('e2e-coverage-chrome', ['clean:coverage',
+ 'connect:e2e-coverage-chrome', 'protractor:chrome', 'makeReport'
+ ]);
+ grunt.registerTask('e2e-firefox', ['connect:e2e-firefox',
+ 'protractor:firefox'
+ ]);
+ grunt.registerTask('no-monitoring', ['build', 'clean:perf', 'karma:unit']);
};
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3c06eb15/portal/README.md
----------------------------------------------------------------------
diff --git a/portal/README.md b/portal/README.md
index b6e7ced..5318229 100644
--- a/portal/README.md
+++ b/portal/README.md
@@ -51,6 +51,11 @@ If you want to run the e2e tests:
To version open a terminal and run 'npm version x.x.x' this will add a tag and increment the package.json.
+If you are building via maven:
+
+1. The maven profile supports the default install options currently, just run `mvn clean install` to create the bundle.
+2. To override to another option, run maven via `mvn clean install -Dbuild.mode=e2e` or `mvn clean install -Dbuild.mode=dev`.
+
##Using a different api location
1. You can use api from usergrid at any location by navigating to the portal and adding a querystring http://myurl/?api_url=http://someurl
2. Another option is to change the Usergrid.overrideUrl in config.js
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3c06eb15/portal/build.sh
----------------------------------------------------------------------
diff --git a/portal/build.sh b/portal/build.sh
index fdfb28b..88e524f 100755
--- a/portal/build.sh
+++ b/portal/build.sh
@@ -20,6 +20,7 @@ buildMain(){
echo grunt $1
echo #####
./node_modules/grunt-cli/bin/grunt $1
+ ./node_modules/grunt-cli/bin/grunt compress
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3c06eb15/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index 78aba40..3829983 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -32,7 +32,7 @@
"protractor": "~0.22.0",
"grunt-protractor-runner": "~0.2.0",
"grunt-contrib-copy": "~0.4.1",
- "grunt-contrib-compress": "~0.5.3",
+ "grunt-contrib-compress": "~0.12.0",
"grunt-contrib-clean": "~0.4.0",
"grunt-dom-munger": "~3.1.0",
"bower": "~1.2.8",
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3c06eb15/portal/pom.xml
----------------------------------------------------------------------
diff --git a/portal/pom.xml b/portal/pom.xml
new file mode 100644
index 0000000..f21158e
--- /dev/null
+++ b/portal/pom.xml
@@ -0,0 +1,81 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>15</version>
+ <relativePath></relativePath>
+ </parent>
+
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>usergrid-portal</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <name>Usergrid Portal</name>
+ <description>Apache Usergrid Portal Project</description>
+ <packaging>pom</packaging>
+ <properties>
+ <build.mode>standard</build.mode>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>dist</directory>
+ </fileset>
+ <fileset>
+ <directory>dist-cov</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ <executions>
+ <execution>
+ <id>create-package</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>build.sh</executable>
+ <arguments>
+ <argument>${build.mode}</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>dist/usergrid-portal.tar</file>
+ <type>tar</type>
+ <classifier>dist</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
[2/7] incubator-usergrid git commit: USERGRID-248 Missed header.
Posted by ro...@apache.org.
USERGRID-248 Missed header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1d7755a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1d7755a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1d7755a8
Branch: refs/heads/master
Commit: 1d7755a8b664bb2f76ba49872d4ccf56833794d0
Parents: 3c06eb1
Author: John D. Ament <jo...@apache.org>
Authored: Wed Nov 12 22:00:14 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Wed Nov 12 22:00:14 2014 -0500
----------------------------------------------------------------------
portal/pom.xml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d7755a8/portal/pom.xml
----------------------------------------------------------------------
diff --git a/portal/pom.xml b/portal/pom.xml
index f21158e..8d9527b 100644
--- a/portal/pom.xml
+++ b/portal/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
[3/7] incubator-usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Posted by ro...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Conflicts:
.gitignore
portal/README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/91ba3560
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/91ba3560
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/91ba3560
Branch: refs/heads/master
Commit: 91ba35606b5c0bd74f92cd025038dcc35d032017
Parents: 3c06eb1 dd636ed
Author: John D. Ament <jo...@apache.org>
Authored: Thu Nov 27 20:21:04 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Thu Nov 27 20:21:04 2014 -0500
----------------------------------------------------------------------
.gitattributes | 17 +
.gitignore | 3 +-
.usergridversion | 1 +
CHANGELOG | 3 +
README.txt | 37 +
docs/.gitignore | 2 +
docs/Makefile | 177 +
docs/README | 31 +
docs/_theme/sphinx_rtd_theme/__init__.py | 17 +
docs/_theme/sphinx_rtd_theme/breadcrumbs.html | 19 +
docs/_theme/sphinx_rtd_theme/footer.html | 33 +
docs/_theme/sphinx_rtd_theme/layout.html | 162 +
docs/_theme/sphinx_rtd_theme/layout_old.html | 205 +
docs/_theme/sphinx_rtd_theme/search.html | 50 +
docs/_theme/sphinx_rtd_theme/searchbox.html | 7 +
.../sphinx_rtd_theme/static/css/badge_only.css | 2 +
.../sphinx_rtd_theme/static/css/theme.css | 5 +
.../static/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes
.../static/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes
.../static/fonts/fontawesome-webfont.svg | 414 ++
.../static/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes
.../static/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes
docs/_theme/sphinx_rtd_theme/static/js/theme.js | 47 +
docs/_theme/sphinx_rtd_theme/theme.conf | 8 +
docs/_theme/sphinx_rtd_theme/versions.html | 37 +
docs/concepts/activity.md | 1121 +++++
docs/concepts/applications.md | 78 +
docs/concepts/assets.md | 20 +
docs/concepts/collections.md | 21 +
docs/concepts/events-and-counters.md | 268 +
docs/concepts/groups.md | 38 +
docs/concepts/query-language.md | 427 ++
docs/concepts/relationships.md | 100 +
docs/concepts/roles-and-permissions.md | 18 +
docs/concepts/users-devices.md | 108 +
docs/conf.py | 273 +
docs/contribute-code.md | 24 +
docs/deploy-local.md | 175 +
docs/getting-up-and-running-locally.md | 72 +
docs/index.md | 12 +
docs/lib/sphinxcontrib_markdown.py | 58 +
docs/make.bat | 242 +
docs/organizations-admins.md | 55 +
docs/presentations-and-videos.md | 7 +
docs/presentations-and-videos/presentations.md | 21 +
docs/presentations-and-videos/videos.md | 11 +
docs/upgrading.md | 3 +
docs/usage.md | 15 +
portal/README.md | 30 +-
portal/config.js | 4 +-
release/changelog.rb | 150 +
release/pom.xml | 65 -
release/release-candidate.sh | 292 ++
release/release.sh | 244 +
release/sign-release.sh | 30 -
release/src/main/assembly/source.xml | 57 -
sdks/android/.gitignore | 20 +
sdks/android/README.md | 33 +
sdks/android/README.txt | 2 -
sdks/android/build_release_zip.sh | 166 +
sdks/android/dependency-reduced-pom.xml | 109 +
sdks/android/dist/jackson-core-asl-1.9.1.jar | Bin 0 -> 228286 bytes
sdks/android/dist/jackson-mapper-asl-1.9.1.jar | Bin 0 -> 764465 bytes
.../dist/spring-android-core-1.0.0.M4.jar | Bin 0 -> 83065 bytes
.../spring-android-rest-template-1.0.0.M4.jar | Bin 0 -> 137368 bytes
.../0.0.6/usergrid-java-client-0.0.6.jar | Bin 0 -> 46389 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 | 47 +-
.../apache/usergrid/android/client/Client.java | 1036 ----
.../client/callbacks/ApiResponseCallback.java | 26 -
.../client/callbacks/ClientAsyncTask.java | 54 -
.../client/callbacks/ClientCallback.java | 25 -
.../callbacks/DeviceRegistrationCallback.java | 25 -
.../callbacks/GroupsRetrievedCallback.java | 29 -
.../client/callbacks/QueryResultsCallback.java | 25 -
.../android/client/utils/DeviceUuidFactory.java | 170 -
.../android/client/utils/ObjectUtils.java | 36 -
.../usergrid/android/sdk/CounterIncrement.java | 53 +
.../sdk/DefaultURLConnectionFactory.java | 17 +
.../apache/usergrid/android/sdk/UGClient.java | 3160 ++++++++++++
.../android/sdk/URLConnectionFactory.java | 12 +
.../sdk/callbacks/ApiResponseCallback.java | 12 +
.../android/sdk/callbacks/ClientAsyncTask.java | 47 +
.../android/sdk/callbacks/ClientCallback.java | 12 +
.../sdk/callbacks/GroupsRetrievedCallback.java | 16 +
.../sdk/callbacks/QueryResultsCallback.java | 14 +
.../usergrid/android/sdk/entities/Activity.java | 1019 ++++
.../android/sdk/entities/Collection.java | 319 ++
.../usergrid/android/sdk/entities/Device.java | 103 +
.../usergrid/android/sdk/entities/Entity.java | 533 ++
.../usergrid/android/sdk/entities/Group.java | 132 +
.../usergrid/android/sdk/entities/Message.java | 140 +
.../usergrid/android/sdk/entities/User.java | 296 ++
.../android/sdk/exception/ClientException.java | 40 +
.../android/sdk/response/AggregateCounter.java | 39 +
.../sdk/response/AggregateCounterSet.java | 98 +
.../android/sdk/response/ApiResponse.java | 755 +++
.../sdk/response/ClientCredentialsInfo.java | 45 +
.../android/sdk/response/QueueInfo.java | 28 +
.../android/sdk/utils/DeviceUuidFactory.java | 154 +
.../usergrid/android/sdk/utils/JsonUtils.java | 166 +
.../usergrid/android/sdk/utils/MapUtils.java | 23 +
.../usergrid/android/sdk/utils/ObjectUtils.java | 20 +
.../usergrid/android/sdk/utils/UrlUtils.java | 108 +
sdks/php5/apache-usergrid/.gitignore | 12 +
.../Examples/collections/books.php | 130 +
.../Examples/collections/data.php | 38 +
.../Examples/collections/users.php | 101 +
sdks/php5/apache-usergrid/Examples/examples.md | 17 +
sdks/php5/apache-usergrid/Examples/examples.php | 246 +
.../Examples/management/management.php | 91 +
.../apache-usergrid/Examples/messages/data.php | 17 +
.../Examples/messages/messages.php | 62 +
.../Examples/notifications/data.php | 17 +
.../Examples/notifications/notifications.php | 86 +
.../Examples/notifications/notifiers.php | 78 +
sdks/php5/apache-usergrid/LICENSE | 202 +
sdks/php5/apache-usergrid/README.md | 195 +
sdks/php5/apache-usergrid/TODO.md | 2 +
sdks/php5/apache-usergrid/composer.json | 40 +
sdks/php5/apache-usergrid/composer.lock | 1116 +++++
sdks/php5/apache-usergrid/phpunit.xml | 29 +
.../src/Api/Exception/BadRequestException.php | 33 +
.../src/Api/Exception/InvalidIdException.php | 33 +
.../src/Api/Exception/NotFoundException.php | 32 +
.../src/Api/Exception/ServerErrorException.php | 32 +
.../src/Api/Exception/UnauthorizedException.php | 33 +
.../src/Api/Exception/UsergridException.php | 155 +
.../apache-usergrid/src/Api/Filters/Boolean.php | 44 +
.../apache-usergrid/src/Api/Filters/Date.php | 44 +
.../apache-usergrid/src/Api/Filters/Number.php | 48 +
.../apache-usergrid/src/Api/GuzzleClient.php | 64 +
.../src/Api/Models/Application.php | 35 +
.../src/Api/Models/BaseCollection.php | 100 +
.../src/Api/Models/Collection.php | 37 +
.../apache-usergrid/src/Api/Models/Device.php | 39 +
.../apache-usergrid/src/Api/Models/Entity.php | 36 +
.../apache-usergrid/src/Api/Models/Event.php | 35 +
.../src/Api/Models/GuzzleCommandTrait.php | 50 +
.../src/Api/Models/Organization.php | 60 +
.../apache-usergrid/src/Api/Models/User.php | 37 +
.../apache-usergrid/src/Api/QueryAggregator.php | 61 +
.../src/Api/ResourceIterator.php | 69 +
sdks/php5/apache-usergrid/src/Api/Usergrid.php | 445 ++
.../Oauth2/GrantType/AuthorizationCode.php | 77 +
.../Oauth2/GrantType/ClientCredentials.php | 74 +
.../Oauth2/GrantType/GrantTypeInterface.php | 41 +
.../GrantType/HWIOAuthBundleRefreshToken.php | 62 +
.../Oauth2/GrantType/PasswordCredentials.php | 74 +
.../Plugin/Oauth2/GrantType/RefreshToken.php | 75 +
.../src/Guzzle/Plugin/Oauth2/Oauth2Plugin.php | 204 +
.../Laravel/ApacheUsergridServiceProvider.php | 157 +
.../src/Laravel/Facades/Usergrid.php | 42 +
.../src/Manifests/1.0.0/Application.php | 979 ++++
.../src/Manifests/1.0.0/Errors.php | 60 +
.../src/Manifests/1.0.0/Management.php | 1076 ++++
.../src/Manifests/1.0.0/Manifest.php | 25 +
.../src/Manifests/1.0.0/Notification.php | 154 +
.../src/Manifests/1.0.1/Activities.php | 24 +
.../src/Manifests/1.0.1/Application.php | 1111 +++++
.../src/Manifests/1.0.1/Assets.php | 24 +
.../src/Manifests/1.0.1/Custom.php | 380 ++
.../src/Manifests/1.0.1/Devices.php | 381 ++
.../src/Manifests/1.0.1/Errors.php | 50 +
.../src/Manifests/1.0.1/Events.php | 24 +
.../src/Manifests/1.0.1/Groups.php | 485 ++
.../src/Manifests/1.0.1/Management.php | 1076 ++++
.../src/Manifests/1.0.1/Manifest.php | 24 +
.../src/Manifests/1.0.1/Messages.php | 19 +
.../src/Manifests/1.0.1/Notifications.php | 241 +
.../src/Manifests/1.0.1/Notifiers.php | 131 +
.../src/Manifests/1.0.1/Receipts.php | 24 +
.../src/Manifests/1.0.1/Roles.php | 380 ++
.../src/Manifests/1.0.1/Users.php | 380 ++
.../src/Manifests/Application.php | 985 ++++
.../src/Manifests/Management.php | 1381 ++++++
.../apache-usergrid/src/Manifests/Manifest.php | 23 +
.../apache-usergrid/src/Manifests/Usergrid.php | 4689 ++++++++++++++++++
.../src/Manifests/applications.json | 1262 +++++
.../src/Manifests/management.json | 1905 +++++++
.../src/Manifests/resources.json | 15 +
.../src/Native/ConfigRepository.php | 102 +
.../src/Native/Facades/Usergrid.php | 119 +
.../src/Native/UsergridBootstrapper.php | 151 +
sdks/php5/apache-usergrid/src/config/config.php | 65 +
.../tests/Api/ApplicationTest.php | 72 +
.../Api/Exception/BadRequestExceptionTest.php | 59 +
.../Api/Exception/InvalidIdExceptionTest.php | 58 +
.../Api/Exception/NotFoundExceptionTest.php | 57 +
.../Api/Exception/ServerErrorExceptionTest.php | 58 +
.../Api/Exception/UnauthorizedExceptionTest.php | 58 +
.../tests/Api/Filters/BooleanTest.php | 45 +
.../tests/Api/Filters/DateTest.php | 41 +
.../tests/Api/ManagementTest.php | 59 +
.../tests/Api/QueryAggregatorTest.php | 42 +
.../apache-usergrid/tests/Api/UsergridTest.php | 153 +
.../tests/Laravel/Facades/UsergridTest.php | 53 +
sdks/php5/apache-usergrid/tests/bootstrap.php | 73 +
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
.../apache/usergrid/batch/job/package-info.java | 17 -
.../usergrid/batch/repository/package-info.java | 17 -
.../usergrid/batch/service/package-info.java | 17 -
.../org/apache/usergrid/count/package-info.java | 18 -
.../org/apache/usergrid/utils/package-info.java | 17 -
.../apache/usergrid/batch/job/package-info.java | 17 -
.../org/apache/usergrid/utils/package-info.java | 17 -
stack/java-sdk-old/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
.../apache/usergrid/launcher/package-info.java | 17 -
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 2 +-
stack/rest/pom.xml | 2 +-
.../rest/management/users/UsersResource.java | 38 +-
stack/services/pom.xml | 2 +-
.../usergrid/management/ManagementService.java | 2 +
.../cassandra/ManagementServiceImpl.java | 20 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 2 +-
.../apache/usergrid/tools/ResetSuperUser.java | 18 +-
stack/websocket/pom.xml | 2 +-
225 files changed, 36405 insertions(+), 1803 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/91ba3560/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/91ba3560/portal/README.md
----------------------------------------------------------------------
diff --cc portal/README.md
index 5318229,e42451c..d131551
--- a/portal/README.md
+++ b/portal/README.md
@@@ -51,17 -47,20 +47,25 @@@ If you want to run the e2e tests
To version open a terminal and run 'npm version x.x.x' this will add a tag and increment the package.json.
+If you are building via maven:
+
+1. The maven profile supports the default install options currently, just run `mvn clean install` to create the bundle.
+2. To override to another option, run maven via `mvn clean install -Dbuild.mode=e2e` or `mvn clean install -Dbuild.mode=dev`.
+
- ##Using a different api location
- 1. You can use api from usergrid at any location by navigating to the portal and adding a querystring http://myurl/?api_url=http://someurl
- 2. Another option is to change the Usergrid.overrideUrl in config.js
+ ##Using a Different API location
+ You can change the API URL that the portal uses in several ways. For example, if your Usergrid is not running locally or if you have changed how it runs by default.
+
+ 1. Edit the config.js located in the root. Locate and change the following line to point to your Usergrid install:
+
+ Usergrid.overrideUrl = 'https://localhost:8080';
+
+ 2. Append the api_url query parameter to the end of the portal's URL path. In the example below, you are running the portal using the method above and it is running on http://localhost:3000
+
+ http://localhost:3000?api_url=http://path.to.another.usergrid.install
+
- ##Displaying API calls as cURL commands
- You can display the equivalent cURL syntax for each API call that is made through the Admin portal. The calls are displayed in the console area of any of the following browsers: Chrome, Internet Explorer (in the debugger), Firefox (in Firebug), and Safari.
+ ##Viewing API Calls as cURL Commands
+ You can view the equivalent cURL syntax for each API call that is made through the Admin portal. The calls are displayed in the console area of any of the following browsers: Chrome, Internet Explorer (in the debugger), Firefox (in Firebug), and Safari.
More information on cURL can be found here:
[6/7] incubator-usergrid git commit: USERGRID-258 Introduce config
options for organizations to fetch on login.
Posted by ro...@apache.org.
USERGRID-258 Introduce config options for organizations to fetch on login.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bbdeafa4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bbdeafa4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bbdeafa4
Branch: refs/heads/master
Commit: bbdeafa4858dd386303beddf581092a3d4983692
Parents: 541e8ec
Author: John D. Ament <jo...@apache.org>
Authored: Fri Nov 28 16:04:34 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Fri Nov 28 16:04:34 2014 -0500
----------------------------------------------------------------------
.../apache/usergrid/management/AccountCreationProps.java | 11 +++++++++++
.../management/cassandra/AccountCreationPropsImpl.java | 8 ++++++++
.../management/cassandra/ManagementServiceImpl.java | 3 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bbdeafa4/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 90263c4..6c000e2 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
@@ -61,6 +61,7 @@ public interface AccountCreationProps {
public static final String PROPERTIES_ADMIN_CONFIRMATION_URL = "usergrid.admin.confirmation.url";
public static final String PROPERTIES_ORGANIZATION_ACTIVATION_URL = "usergrid.organization.activation.url";
public static final String PROPERTIES_ADMIN_RESETPW_URL = "usergrid.admin.resetpw.url";
+ public static final String PROPERTIES_USERGRID_SYSADMIN_LOGIN_FETCH_ORGS = "usergrid.sysadmin.login.fetch_orgs";
public static final String PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION =
"usergrid.management.admin_users_require_confirmation";
@@ -110,12 +111,22 @@ public interface AccountCreationProps {
public boolean notifyAdminOfActivation();
+ /**
+ * Retrieves the maximum number of organizations to show when the admin logs in.
+ * Default is 10
+ *
+ * @return
+ */
+ public int getMaxOrganizationsForSuperUserLogin();
+
public String getProperty( String name );
public String getProperty( String name, String defaultValue );
public boolean isProperty( String name );
+ public int intProperty( String name, String defaultValue );
+
public void setProperty( String name, String value );
public Properties getMailProperties();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bbdeafa4/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
index 0f9f8d7..0aedf39 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/AccountCreationPropsImpl.java
@@ -26,6 +26,7 @@ import org.apache.usergrid.management.AccountCreationProps;
import static java.lang.Boolean.parseBoolean;
+import static java.lang.Integer.parseInt;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.usergrid.utils.ListUtils.anyNull;
@@ -77,6 +78,10 @@ public class AccountCreationPropsImpl implements AccountCreationProps {
return isProperty( PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION );
}
+ public int getMaxOrganizationsForSuperUserLogin() {
+ return intProperty( PROPERTIES_USERGRID_SYSADMIN_LOGIN_FETCH_ORGS, "10" );
+ }
+
public String getProperty( String name ) {
String propertyValue = properties.getProperty( name );
@@ -97,6 +102,9 @@ public class AccountCreationPropsImpl implements AccountCreationProps {
return parseBoolean( getProperty( name ) );
}
+ public int intProperty( String name, String defaultValue ) {
+ return parseInt( getProperty( name, defaultValue ) );
+ }
public void setProperty( String name, String value ) {
properties.setProperty( name, value );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bbdeafa4/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 8c7f420..a2e1271 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
@@ -1491,7 +1491,8 @@ public class ManagementServiceImpl implements ManagementService {
AccountCreationProps.SuperUser superUser = properties.getSuperUser();
if ( superUser.isEnabled() && superUser.getUsername().equals( user.getUsername() ) ) {
- organizations = buildOrgBiMap( getOrganizations( null, 10000 ) );
+ int maxOrganizations = this.getAccountCreationProps().getMaxOrganizationsForSuperUserLogin();
+ organizations = buildOrgBiMap( getOrganizations( null, maxOrganizations ) );
}
else {
organizations = getOrganizationsForAdminUser( user.getUuid() );
[4/7] incubator-usergrid git commit: Merge branch 'master' into
USERGRID-248
Posted by ro...@apache.org.
Merge branch 'master' into USERGRID-248
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/16205d8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/16205d8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/16205d8b
Branch: refs/heads/master
Commit: 16205d8b3332918a6ce20cb93064df7e983b3321
Parents: 1d7755a 91ba356
Author: John D. Ament <jo...@apache.org>
Authored: Thu Nov 27 20:21:15 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Thu Nov 27 20:21:15 2014 -0500
----------------------------------------------------------------------
.gitattributes | 17 +
.gitignore | 3 +-
.usergridversion | 1 +
CHANGELOG | 3 +
README.txt | 37 +
docs/.gitignore | 2 +
docs/Makefile | 177 +
docs/README | 31 +
docs/_theme/sphinx_rtd_theme/__init__.py | 17 +
docs/_theme/sphinx_rtd_theme/breadcrumbs.html | 19 +
docs/_theme/sphinx_rtd_theme/footer.html | 33 +
docs/_theme/sphinx_rtd_theme/layout.html | 162 +
docs/_theme/sphinx_rtd_theme/layout_old.html | 205 +
docs/_theme/sphinx_rtd_theme/search.html | 50 +
docs/_theme/sphinx_rtd_theme/searchbox.html | 7 +
.../sphinx_rtd_theme/static/css/badge_only.css | 2 +
.../sphinx_rtd_theme/static/css/theme.css | 5 +
.../static/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes
.../static/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes
.../static/fonts/fontawesome-webfont.svg | 414 ++
.../static/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes
.../static/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes
docs/_theme/sphinx_rtd_theme/static/js/theme.js | 47 +
docs/_theme/sphinx_rtd_theme/theme.conf | 8 +
docs/_theme/sphinx_rtd_theme/versions.html | 37 +
docs/concepts/activity.md | 1121 +++++
docs/concepts/applications.md | 78 +
docs/concepts/assets.md | 20 +
docs/concepts/collections.md | 21 +
docs/concepts/events-and-counters.md | 268 +
docs/concepts/groups.md | 38 +
docs/concepts/query-language.md | 427 ++
docs/concepts/relationships.md | 100 +
docs/concepts/roles-and-permissions.md | 18 +
docs/concepts/users-devices.md | 108 +
docs/conf.py | 273 +
docs/contribute-code.md | 24 +
docs/deploy-local.md | 175 +
docs/getting-up-and-running-locally.md | 72 +
docs/index.md | 12 +
docs/lib/sphinxcontrib_markdown.py | 58 +
docs/make.bat | 242 +
docs/organizations-admins.md | 55 +
docs/presentations-and-videos.md | 7 +
docs/presentations-and-videos/presentations.md | 21 +
docs/presentations-and-videos/videos.md | 11 +
docs/upgrading.md | 3 +
docs/usage.md | 15 +
portal/README.md | 30 +-
portal/config.js | 4 +-
release/changelog.rb | 150 +
release/pom.xml | 65 -
release/release-candidate.sh | 292 ++
release/release.sh | 244 +
release/sign-release.sh | 30 -
release/src/main/assembly/source.xml | 57 -
sdks/android/.gitignore | 20 +
sdks/android/README.md | 33 +
sdks/android/README.txt | 2 -
sdks/android/build_release_zip.sh | 166 +
sdks/android/dependency-reduced-pom.xml | 109 +
sdks/android/dist/jackson-core-asl-1.9.1.jar | Bin 0 -> 228286 bytes
sdks/android/dist/jackson-mapper-asl-1.9.1.jar | Bin 0 -> 764465 bytes
.../dist/spring-android-core-1.0.0.M4.jar | Bin 0 -> 83065 bytes
.../spring-android-rest-template-1.0.0.M4.jar | Bin 0 -> 137368 bytes
.../0.0.6/usergrid-java-client-0.0.6.jar | Bin 0 -> 46389 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 | 47 +-
.../apache/usergrid/android/client/Client.java | 1036 ----
.../client/callbacks/ApiResponseCallback.java | 26 -
.../client/callbacks/ClientAsyncTask.java | 54 -
.../client/callbacks/ClientCallback.java | 25 -
.../callbacks/DeviceRegistrationCallback.java | 25 -
.../callbacks/GroupsRetrievedCallback.java | 29 -
.../client/callbacks/QueryResultsCallback.java | 25 -
.../android/client/utils/DeviceUuidFactory.java | 170 -
.../android/client/utils/ObjectUtils.java | 36 -
.../usergrid/android/sdk/CounterIncrement.java | 53 +
.../sdk/DefaultURLConnectionFactory.java | 17 +
.../apache/usergrid/android/sdk/UGClient.java | 3160 ++++++++++++
.../android/sdk/URLConnectionFactory.java | 12 +
.../sdk/callbacks/ApiResponseCallback.java | 12 +
.../android/sdk/callbacks/ClientAsyncTask.java | 47 +
.../android/sdk/callbacks/ClientCallback.java | 12 +
.../sdk/callbacks/GroupsRetrievedCallback.java | 16 +
.../sdk/callbacks/QueryResultsCallback.java | 14 +
.../usergrid/android/sdk/entities/Activity.java | 1019 ++++
.../android/sdk/entities/Collection.java | 319 ++
.../usergrid/android/sdk/entities/Device.java | 103 +
.../usergrid/android/sdk/entities/Entity.java | 533 ++
.../usergrid/android/sdk/entities/Group.java | 132 +
.../usergrid/android/sdk/entities/Message.java | 140 +
.../usergrid/android/sdk/entities/User.java | 296 ++
.../android/sdk/exception/ClientException.java | 40 +
.../android/sdk/response/AggregateCounter.java | 39 +
.../sdk/response/AggregateCounterSet.java | 98 +
.../android/sdk/response/ApiResponse.java | 755 +++
.../sdk/response/ClientCredentialsInfo.java | 45 +
.../android/sdk/response/QueueInfo.java | 28 +
.../android/sdk/utils/DeviceUuidFactory.java | 154 +
.../usergrid/android/sdk/utils/JsonUtils.java | 166 +
.../usergrid/android/sdk/utils/MapUtils.java | 23 +
.../usergrid/android/sdk/utils/ObjectUtils.java | 20 +
.../usergrid/android/sdk/utils/UrlUtils.java | 108 +
sdks/php5/apache-usergrid/.gitignore | 12 +
.../Examples/collections/books.php | 130 +
.../Examples/collections/data.php | 38 +
.../Examples/collections/users.php | 101 +
sdks/php5/apache-usergrid/Examples/examples.md | 17 +
sdks/php5/apache-usergrid/Examples/examples.php | 246 +
.../Examples/management/management.php | 91 +
.../apache-usergrid/Examples/messages/data.php | 17 +
.../Examples/messages/messages.php | 62 +
.../Examples/notifications/data.php | 17 +
.../Examples/notifications/notifications.php | 86 +
.../Examples/notifications/notifiers.php | 78 +
sdks/php5/apache-usergrid/LICENSE | 202 +
sdks/php5/apache-usergrid/README.md | 195 +
sdks/php5/apache-usergrid/TODO.md | 2 +
sdks/php5/apache-usergrid/composer.json | 40 +
sdks/php5/apache-usergrid/composer.lock | 1116 +++++
sdks/php5/apache-usergrid/phpunit.xml | 29 +
.../src/Api/Exception/BadRequestException.php | 33 +
.../src/Api/Exception/InvalidIdException.php | 33 +
.../src/Api/Exception/NotFoundException.php | 32 +
.../src/Api/Exception/ServerErrorException.php | 32 +
.../src/Api/Exception/UnauthorizedException.php | 33 +
.../src/Api/Exception/UsergridException.php | 155 +
.../apache-usergrid/src/Api/Filters/Boolean.php | 44 +
.../apache-usergrid/src/Api/Filters/Date.php | 44 +
.../apache-usergrid/src/Api/Filters/Number.php | 48 +
.../apache-usergrid/src/Api/GuzzleClient.php | 64 +
.../src/Api/Models/Application.php | 35 +
.../src/Api/Models/BaseCollection.php | 100 +
.../src/Api/Models/Collection.php | 37 +
.../apache-usergrid/src/Api/Models/Device.php | 39 +
.../apache-usergrid/src/Api/Models/Entity.php | 36 +
.../apache-usergrid/src/Api/Models/Event.php | 35 +
.../src/Api/Models/GuzzleCommandTrait.php | 50 +
.../src/Api/Models/Organization.php | 60 +
.../apache-usergrid/src/Api/Models/User.php | 37 +
.../apache-usergrid/src/Api/QueryAggregator.php | 61 +
.../src/Api/ResourceIterator.php | 69 +
sdks/php5/apache-usergrid/src/Api/Usergrid.php | 445 ++
.../Oauth2/GrantType/AuthorizationCode.php | 77 +
.../Oauth2/GrantType/ClientCredentials.php | 74 +
.../Oauth2/GrantType/GrantTypeInterface.php | 41 +
.../GrantType/HWIOAuthBundleRefreshToken.php | 62 +
.../Oauth2/GrantType/PasswordCredentials.php | 74 +
.../Plugin/Oauth2/GrantType/RefreshToken.php | 75 +
.../src/Guzzle/Plugin/Oauth2/Oauth2Plugin.php | 204 +
.../Laravel/ApacheUsergridServiceProvider.php | 157 +
.../src/Laravel/Facades/Usergrid.php | 42 +
.../src/Manifests/1.0.0/Application.php | 979 ++++
.../src/Manifests/1.0.0/Errors.php | 60 +
.../src/Manifests/1.0.0/Management.php | 1076 ++++
.../src/Manifests/1.0.0/Manifest.php | 25 +
.../src/Manifests/1.0.0/Notification.php | 154 +
.../src/Manifests/1.0.1/Activities.php | 24 +
.../src/Manifests/1.0.1/Application.php | 1111 +++++
.../src/Manifests/1.0.1/Assets.php | 24 +
.../src/Manifests/1.0.1/Custom.php | 380 ++
.../src/Manifests/1.0.1/Devices.php | 381 ++
.../src/Manifests/1.0.1/Errors.php | 50 +
.../src/Manifests/1.0.1/Events.php | 24 +
.../src/Manifests/1.0.1/Groups.php | 485 ++
.../src/Manifests/1.0.1/Management.php | 1076 ++++
.../src/Manifests/1.0.1/Manifest.php | 24 +
.../src/Manifests/1.0.1/Messages.php | 19 +
.../src/Manifests/1.0.1/Notifications.php | 241 +
.../src/Manifests/1.0.1/Notifiers.php | 131 +
.../src/Manifests/1.0.1/Receipts.php | 24 +
.../src/Manifests/1.0.1/Roles.php | 380 ++
.../src/Manifests/1.0.1/Users.php | 380 ++
.../src/Manifests/Application.php | 985 ++++
.../src/Manifests/Management.php | 1381 ++++++
.../apache-usergrid/src/Manifests/Manifest.php | 23 +
.../apache-usergrid/src/Manifests/Usergrid.php | 4689 ++++++++++++++++++
.../src/Manifests/applications.json | 1262 +++++
.../src/Manifests/management.json | 1905 +++++++
.../src/Manifests/resources.json | 15 +
.../src/Native/ConfigRepository.php | 102 +
.../src/Native/Facades/Usergrid.php | 119 +
.../src/Native/UsergridBootstrapper.php | 151 +
sdks/php5/apache-usergrid/src/config/config.php | 65 +
.../tests/Api/ApplicationTest.php | 72 +
.../Api/Exception/BadRequestExceptionTest.php | 59 +
.../Api/Exception/InvalidIdExceptionTest.php | 58 +
.../Api/Exception/NotFoundExceptionTest.php | 57 +
.../Api/Exception/ServerErrorExceptionTest.php | 58 +
.../Api/Exception/UnauthorizedExceptionTest.php | 58 +
.../tests/Api/Filters/BooleanTest.php | 45 +
.../tests/Api/Filters/DateTest.php | 41 +
.../tests/Api/ManagementTest.php | 59 +
.../tests/Api/QueryAggregatorTest.php | 42 +
.../apache-usergrid/tests/Api/UsergridTest.php | 153 +
.../tests/Laravel/Facades/UsergridTest.php | 53 +
sdks/php5/apache-usergrid/tests/bootstrap.php | 73 +
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
.../apache/usergrid/batch/job/package-info.java | 17 -
.../usergrid/batch/repository/package-info.java | 17 -
.../usergrid/batch/service/package-info.java | 17 -
.../org/apache/usergrid/count/package-info.java | 18 -
.../org/apache/usergrid/utils/package-info.java | 17 -
.../apache/usergrid/batch/job/package-info.java | 17 -
.../org/apache/usergrid/utils/package-info.java | 17 -
stack/java-sdk-old/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
.../apache/usergrid/launcher/package-info.java | 17 -
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 2 +-
stack/rest/pom.xml | 2 +-
.../rest/management/users/UsersResource.java | 38 +-
stack/services/pom.xml | 2 +-
.../usergrid/management/ManagementService.java | 2 +
.../cassandra/ManagementServiceImpl.java | 20 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 2 +-
.../apache/usergrid/tools/ResetSuperUser.java | 18 +-
stack/websocket/pom.xml | 2 +-
225 files changed, 36405 insertions(+), 1803 deletions(-)
----------------------------------------------------------------------
[7/7] incubator-usergrid git commit: Merge remote-tracking branch
'johnament/USERGRID-248' into apache_usergrid/master
Posted by ro...@apache.org.
Merge remote-tracking branch 'johnament/USERGRID-248' into apache_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/c06f26b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c06f26b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c06f26b5
Branch: refs/heads/master
Commit: c06f26b5863a72a54da6e6977af4cf2c8f9a247f
Parents: 3032dfa bbdeafa
Author: Rod Simpson <ro...@apigee.com>
Authored: Thu Dec 11 17:35:34 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Thu Dec 11 17:35:34 2014 -0700
----------------------------------------------------------------------
.gitignore | 2 +-
portal/Gruntfile.js | 204 ++++++++++++-------
portal/README.md | 5 +
portal/build.sh | 1 +
portal/package.json | 2 +-
portal/pom.xml | 98 +++++++++
stack/pom.xml | 2 +-
.../management/AccountCreationProps.java | 11 +
.../cassandra/AccountCreationPropsImpl.java | 8 +
.../cassandra/ManagementServiceImpl.java | 3 +-
10 files changed, 262 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
[5/7] incubator-usergrid git commit: USERGRID-258 Set default query
for organizations to be 10k. Upgraded apache parent.
Posted by ro...@apache.org.
USERGRID-258 Set default query for organizations to be 10k. Upgraded apache parent.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/541e8ec2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/541e8ec2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/541e8ec2
Branch: refs/heads/master
Commit: 541e8ec213bf8d35b54bf826885bef7d77b2d1b3
Parents: 16205d8
Author: John D. Ament <jo...@apache.org>
Authored: Fri Nov 28 08:47:31 2014 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Fri Nov 28 08:47:31 2014 -0500
----------------------------------------------------------------------
stack/pom.xml | 2 +-
.../usergrid/management/cassandra/ManagementServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/541e8ec2/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 1c3c60b..c598caf 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>10</version>
+ <version>16</version>
<relativePath></relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/541e8ec2/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 eb6c375..8c7f420 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
@@ -1491,7 +1491,7 @@ public class ManagementServiceImpl implements ManagementService {
AccountCreationProps.SuperUser superUser = properties.getSuperUser();
if ( superUser.isEnabled() && superUser.getUsername().equals( user.getUsername() ) ) {
- organizations = buildOrgBiMap( getOrganizations( null, 10 ) );
+ organizations = buildOrgBiMap( getOrganizations( null, 10000 ) );
}
else {
organizations = getOrganizationsForAdminUser( user.getUuid() );