You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2016/09/24 04:54:22 UTC
[1/6] ode-console git commit: upgraded gulp plugins to make it work
on nodejs 4.5
Repository: ode-console
Updated Branches:
refs/heads/master 40059acfe -> 36e187ad8
upgraded gulp plugins to make it work on nodejs 4.5
Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/6eb13983
Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/6eb13983
Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/6eb13983
Branch: refs/heads/master
Commit: 6eb1398379624a02cb21df22bbea1ca21339257b
Parents: 40059ac
Author: sathwik <sa...@apache.org>
Authored: Wed Aug 24 13:20:12 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Aug 24 13:20:12 2016 +0530
----------------------------------------------------------------------
gulp/build.js | 22 +++++------
package.json | 69 +++++++++++++++++----------------
src/app/process/process.service.js | 5 ++-
src/index.html | 6 +--
4 files changed, 50 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/gulp/build.js
----------------------------------------------------------------------
diff --git a/gulp/build.js b/gulp/build.js
index bef1ccf..46d438c 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -69,7 +69,7 @@ gulp.task('injector:js', ['jshint', 'injector:css'], function () {
gulp.task('partials', function () {
return gulp.src('src/{app,components}/**/*.html')
- .pipe($.minifyHtml({
+ .pipe($.htmlmin({
empty: true,
spare: true,
quotes: true
@@ -81,10 +81,9 @@ gulp.task('partials', function () {
});
gulp.task('html', ['wiredep', 'injector:css', 'injector:js', 'partials'], function () {
- var htmlFilter = $.filter('*.html');
- var jsFilter = $.filter('**/*.js');
- var cssFilter = $.filter('**/*.css');
- var assets;
+ var htmlFilter = $.filter('*.html',{restore: true});
+ var jsFilter = $.filter('**/*.js',{restore: true});
+ var cssFilter = $.filter('**/*.css',{restore: true});
return gulp.src('src/*.html')
.pipe($.inject(gulp.src('.tmp/inject/templateCacheHtml.js', {read: false}), {
@@ -92,26 +91,25 @@ gulp.task('html', ['wiredep', 'injector:css', 'injector:js', 'partials'], functi
ignorePath: '.tmp',
addRootSlash: false
}))
- .pipe(assets = $.useref.assets())
+ .pipe($.useref())
.pipe($.rev())
.pipe(jsFilter)
.pipe($.ngAnnotate())
.pipe($.uglify({preserveComments: $.uglifySaveLicense}))
- .pipe(jsFilter.restore())
+ .pipe(jsFilter.restore)
.pipe(cssFilter)
.pipe($.replace('bower_components/bootstrap-sass-official/assets/fonts/bootstrap','fonts'))
.pipe($.csso())
- .pipe(cssFilter.restore())
- .pipe(assets.restore())
+ .pipe(cssFilter.restore)
.pipe($.useref())
.pipe($.revReplace())
.pipe(htmlFilter)
- .pipe($.minifyHtml({
+ .pipe($.htmlmin({
empty: true,
spare: true,
quotes: true
}))
- .pipe(htmlFilter.restore())
+ .pipe(htmlFilter.restore)
.pipe(gulp.dest('dist/'))
.pipe($.size({ title: 'dist/', showFiles: true }));
});
@@ -139,7 +137,7 @@ gulp.task('misc', function () {
});
gulp.task('clean', function (done) {
- $.del(['dist/', '.tmp/'], done);
+ $.del.sync(['dist/', '.tmp/'], done);
});
gulp.task('build', ['html', 'images', 'fonts', 'misc']);
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index a80c0bc..e86bcdd 100644
--- a/package.json
+++ b/package.json
@@ -3,40 +3,41 @@
"version": "0.1.0",
"dependencies": {},
"devDependencies": {
- "gulp": "~3.8.10",
- "gulp-autoprefixer": "~2.0.0",
- "gulp-cache": "~0.2.4",
- "gulp-angular-templatecache": "~1.4.2",
- "del": "~0.1.3",
- "gulp-csso": "~0.2.9",
- "gulp-filter": "~1.0.2",
- "gulp-flatten": "~0.0.4",
- "gulp-imagemin": "~2.0.0",
- "gulp-jshint": "~1.9.0",
- "gulp-load-plugins": "~0.7.1",
- "gulp-size": "~1.1.0",
- "gulp-uglify": "~1.0.1",
- "gulp-useref": "~1.0.2",
- "gulp-ng-annotate": "~0.5.0",
- "gulp-replace": "~0.5.0",
- "gulp-rev": "~2.0.1",
- "gulp-rev-replace": "~0.3.1",
- "gulp-minify-html": "~0.1.7",
- "gulp-inject": "~1.0.2",
- "gulp-protractor": "~0.0.12",
- "gulp-karma": "~0.0.4",
- "gulp-sass": "~1.1.0",
- "main-bower-files": "~2.4.0",
- "jshint-stylish": "~1.0.0",
- "wiredep": "~2.2.0",
- "karma-jasmine": "~0.3.1",
- "karma-phantomjs-launcher": "~0.1.4",
- "require-dir": "~0.1.0",
- "browser-sync": "~1.7.1",
- "http-proxy": "~1.7.0",
- "chalk": "~0.5.1",
- "protractor": "~1.8.0",
- "uglify-save-license": "~0.4.1"
+ "gulp": "~3.9.1",
+ "gulp-autoprefixer": "~3.1.1",
+ "gulp-cache": "~0.4.5",
+ "gulp-angular-templatecache": "~2.0.0",
+ "del": "~2.2.2",
+ "gulp-csso": "~2.0.0",
+ "gulp-filter": "~4.0.0",
+ "gulp-flatten": "~0.3.1",
+ "gulp-imagemin": "~3.0.3",
+ "gulp-jshint": "~2.0.1",
+ "gulp-load-plugins": "~1.2.4",
+ "gulp-size": "~2.1.0",
+ "gulp-uglify": "~2.0.0",
+ "gulp-useref": "~3.1.0",
+ "gulp-ng-annotate": "~2.0.0",
+ "gulp-replace": "~0.5.4",
+ "gulp-rev": "~7.1.2",
+ "gulp-rev-replace": "~0.4.3",
+ "gulp-htmlmin": "~2.0.0",
+ "gulp-inject": "~4.1.0",
+ "gulp-protractor": "~3.0.0",
+ "karma": "~1.2.0",
+ "gulp-sass": "~2.3.2",
+ "main-bower-files": "~2.13.1",
+ "jshint-stylish": "~2.2.1",
+ "wiredep": "~4.0.0",
+ "karma-jasmine": "~1.0.2",
+ "karma-phantomjs-launcher": "~1.0.1",
+ "require-dir": "~0.3.0",
+ "browser-sync": "~2.14.0",
+ "http-proxy": "~1.14.0",
+ "chalk": "~1.1.3",
+ "protractor": "~4.0.3",
+ "uglify-save-license": "~0.4.1",
+ "jshint": "~2.9.3"
},
"engines": {
"node": ">=0.10.0"
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/src/app/process/process.service.js
----------------------------------------------------------------------
diff --git a/src/app/process/process.service.js b/src/app/process/process.service.js
index 938e2c1..5c633f6 100644
--- a/src/app/process/process.service.js
+++ b/src/app/process/process.service.js
@@ -100,6 +100,9 @@ angular.module('odeConsole')
return result;
};
+ /** public functions **/
+ var ps = {};
+
var updateStats = function(packages) {
ps.summary = {};
ps.summary.packages = 0;
@@ -135,8 +138,6 @@ angular.module('odeConsole')
});
};
- /** public functions **/
- var ps = {};
ps.getPackages = function() {
var deferred = $q.defer();
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6eb13983/src/index.html
----------------------------------------------------------------------
diff --git a/src/index.html b/src/index.html
index 33dd76d..08c36bc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -24,9 +24,6 @@
<!-- endinject -->
<!-- endbuild -->
- <!-- build:js scripts/modernizr.js -->
- <script src="../bower_components/modernizr/modernizr.js"></script>
- <!-- endbuild -->
</head>
<body>
<!--[if lt IE 10]>
@@ -39,13 +36,14 @@
<!-- build:js scripts/vendor.js -->
<!-- bower:js -->
+ <script src="../bower_components/modernizr/modernizr.js"></script>
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/angular/angular.js"></script>
<script src="../bower_components/angular-animate/angular-animate.js"></script>
<script src="../bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="../bower_components/angular-route/angular-route.js"></script>
<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
- <script src="../bower_components/angular-smart-table/dist/smart-table.min.js"></script>
+ <script src="../bower_components/angular-smart-table/dist/smart-table.js"></script>
<script src="../bower_components/angular-xml/angular-xml.js"></script>
<script src="../bower_components/angular-poller/angular-poller.min.js"></script>
<script src="../bower_components/moment/moment.js"></script>
[2/6] ode-console git commit: Used Karma as gulp-karma is deprecated.
Removed revisioning, revisit later.
Posted by sa...@apache.org.
Used Karma as gulp-karma is deprecated. Removed revisioning, revisit later.
Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/dd1fcbae
Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/dd1fcbae
Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/dd1fcbae
Branch: refs/heads/master
Commit: dd1fcbae3d56f6a67a81e02a93a2ac31fb8a012c
Parents: 6eb1398
Author: sathwik <sa...@apache.org>
Authored: Tue Aug 30 14:15:11 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Tue Aug 30 14:15:11 2016 +0530
----------------------------------------------------------------------
gulp/build.js | 2 +-
gulp/unit-tests.js | 28 ++++++++++++++++++----------
karma.conf.js | 2 +-
src/index.html | 3 ++-
4 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-console/blob/dd1fcbae/gulp/build.js
----------------------------------------------------------------------
diff --git a/gulp/build.js b/gulp/build.js
index 46d438c..e257770 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -92,7 +92,7 @@ gulp.task('html', ['wiredep', 'injector:css', 'injector:js', 'partials'], functi
addRootSlash: false
}))
.pipe($.useref())
- .pipe($.rev())
+ //.pipe($.rev())
.pipe(jsFilter)
.pipe($.ngAnnotate())
.pipe($.uglify({preserveComments: $.uglifySaveLicense}))
http://git-wip-us.apache.org/repos/asf/ode-console/blob/dd1fcbae/gulp/unit-tests.js
----------------------------------------------------------------------
diff --git a/gulp/unit-tests.js b/gulp/unit-tests.js
index 05ff6a0..719aad4 100644
--- a/gulp/unit-tests.js
+++ b/gulp/unit-tests.js
@@ -5,6 +5,22 @@ var gulp = require('gulp');
var $ = require('gulp-load-plugins')();
var wiredep = require('wiredep');
+var karma = require('karma');
+
+function runTests(configuration) {
+ var Server = karma.Server;
+
+ var server = new Server(configuration, function(exitCode) {
+ console.log('Karma has exited with ' + exitCode)
+ process.exit(exitCode)
+ });
+
+ server.on('browser_register', function (browser) {
+ console.log('A new browser was registered')
+ });
+
+ return server.start();
+}
gulp.task('test', function() {
var bowerDeps = wiredep({
@@ -15,16 +31,8 @@ gulp.task('test', function() {
});
var testFiles = bowerDeps.js.concat([
- 'src/{app,components}/**/*.js'
+ 'src/app/**/*.js','src/components/**/*.js'
]);
- return gulp.src(testFiles)
- .pipe($.karma({
- configFile: 'karma.conf.js',
- action: 'run'
- }))
- .on('error', function(err) {
- // Make sure failed tests cause gulp to exit non-zero
- throw err;
- });
+ return runTests({configFile: __dirname + '/../karma.conf.js', files: testFiles})
});
http://git-wip-us.apache.org/repos/asf/ode-console/blob/dd1fcbae/karma.conf.js
----------------------------------------------------------------------
diff --git a/karma.conf.js b/karma.conf.js
index 12e3ff3..a5beaa4 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -4,7 +4,7 @@ module.exports = function(config) {
config.set({
autoWatch : false,
-
+ singleRun : true,
frameworks: ['jasmine'],
browsers : ['PhantomJS'],
http://git-wip-us.apache.org/repos/asf/ode-console/blob/dd1fcbae/src/index.html
----------------------------------------------------------------------
diff --git a/src/index.html b/src/index.html
index 08c36bc..1ca17e9 100644
--- a/src/index.html
+++ b/src/index.html
@@ -34,6 +34,7 @@
<div ng-view></div>
+
<!-- build:js scripts/vendor.js -->
<!-- bower:js -->
<script src="../bower_components/modernizr/modernizr.js"></script>
@@ -66,8 +67,8 @@
<script src="app/st-select.directive.js"></script>
<script src="vendor/jquery.xpath.js"></script>
<script src="vendor/vkbeautify.js"></script>
- <script src="components/navbar/navbar.controller.js"></script>
<script src="app/dashboard/dashboard.controller.js"></script>
+ <script src="components/navbar/navbar.controller.js"></script>
<script src="app/instance/instance.controller.js"></script>
<script src="app/instance/instance.service.js"></script>
<script src="app/instance/instanceactions.controller.js"></script>
[4/6] ode-console git commit: added license text to source files
Posted by sa...@apache.org.
added license text to source files
Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/6279e8dc
Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/6279e8dc
Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/6279e8dc
Branch: refs/heads/master
Commit: 6279e8dce5b7a5515bf8e4d669933502ff02c515
Parents: 1c3875a
Author: sathwik <sa...@apache.org>
Authored: Wed Aug 31 15:00:53 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Aug 31 15:00:53 2016 +0530
----------------------------------------------------------------------
gulp/build.js | 18 ++++++++++++++++++
gulp/e2e-tests.js | 18 ++++++++++++++++++
gulp/maven.js | 19 +++++++++++++++++++
gulp/proxy.js | 19 +++++++++++++++++++
gulp/server.js | 18 ++++++++++++++++++
gulp/unit-tests.js | 18 ++++++++++++++++++
gulp/watch.js | 18 ++++++++++++++++++
gulp/wiredep.js | 18 ++++++++++++++++++
gulpfile.js | 18 ++++++++++++++++++
karma.conf.js | 18 ++++++++++++++++++
protractor.conf.js | 18 ++++++++++++++++++
src/index.html | 4 ++--
12 files changed, 202 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/build.js
----------------------------------------------------------------------
diff --git a/gulp/build.js b/gulp/build.js
index e257770..def575c 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
var gulp = require('gulp');
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/e2e-tests.js
----------------------------------------------------------------------
diff --git a/gulp/e2e-tests.js b/gulp/e2e-tests.js
index c248188..e4e5d03 100644
--- a/gulp/e2e-tests.js
+++ b/gulp/e2e-tests.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
var gulp = require('gulp');
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/maven.js
----------------------------------------------------------------------
diff --git a/gulp/maven.js b/gulp/maven.js
index b185a1b..1083f3e 100644
--- a/gulp/maven.js
+++ b/gulp/maven.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
'use strict';
var gulp = require('gulp'),
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/proxy.js
----------------------------------------------------------------------
diff --git a/gulp/proxy.js b/gulp/proxy.js
index 2fcd734..b76c38e 100644
--- a/gulp/proxy.js
+++ b/gulp/proxy.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/*jshint unused:false */
/***************
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/server.js
----------------------------------------------------------------------
diff --git a/gulp/server.js b/gulp/server.js
index 76ed368..4f68afd 100644
--- a/gulp/server.js
+++ b/gulp/server.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
var gulp = require('gulp');
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/unit-tests.js
----------------------------------------------------------------------
diff --git a/gulp/unit-tests.js b/gulp/unit-tests.js
index 719aad4..5bf5bc2 100644
--- a/gulp/unit-tests.js
+++ b/gulp/unit-tests.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
var gulp = require('gulp');
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/watch.js
----------------------------------------------------------------------
diff --git a/gulp/watch.js b/gulp/watch.js
index c7459e8..6bdafea 100644
--- a/gulp/watch.js
+++ b/gulp/watch.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
var gulp = require('gulp');
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulp/wiredep.js
----------------------------------------------------------------------
diff --git a/gulp/wiredep.js b/gulp/wiredep.js
index 7695787..bab2830 100644
--- a/gulp/wiredep.js
+++ b/gulp/wiredep.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
var gulp = require('gulp');
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 9670cf3..397c8a7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
var gulp = require('gulp');
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/karma.conf.js
----------------------------------------------------------------------
diff --git a/karma.conf.js b/karma.conf.js
index a5beaa4..0588381 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
'use strict';
module.exports = function(config) {
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/protractor.conf.js
----------------------------------------------------------------------
diff --git a/protractor.conf.js b/protractor.conf.js
index b283f72..5e3b84c 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
// An example configuration file.
exports.config = {
// The address of a running selenium server.
http://git-wip-us.apache.org/repos/asf/ode-console/blob/6279e8dc/src/index.html
----------------------------------------------------------------------
diff --git a/src/index.html b/src/index.html
index cb94fe2..5e17e9b 100644
--- a/src/index.html
+++ b/src/index.html
@@ -61,12 +61,12 @@
<!-- build:js({.tmp,src}) scripts/app.js -->
<!-- inject:js -->
- <script src="vendor/jquery.xpath.js"></script>
- <script src="vendor/vkbeautify.js"></script>
<script src="app/index.js"></script>
<script src="app/really.directive.js"></script>
<script src="app/soap.service.js"></script>
<script src="app/st-select.directive.js"></script>
+ <script src="vendor/jquery.xpath.js"></script>
+ <script src="vendor/vkbeautify.js"></script>
<script src="components/navbar/navbar.controller.js"></script>
<script src="app/dashboard/dashboard.controller.js"></script>
<script src="app/instance/instance.controller.js"></script>
[6/6] ode-console git commit: added ci-build and serial execution of
tasks
Posted by sa...@apache.org.
added ci-build and serial execution of tasks
Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/36e187ad
Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/36e187ad
Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/36e187ad
Branch: refs/heads/master
Commit: 36e187ad804d44d0d025b9230d858b5577841a9e
Parents: 42a97c4
Author: sathwik <sa...@apache.org>
Authored: Thu Sep 8 23:14:57 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Thu Sep 8 23:14:57 2016 +0530
----------------------------------------------------------------------
ci-build.sh | 38 ++++++++++++++++++++++++++++++++++++++
e2e/main.po.js | 19 +++++++++++++++++++
e2e/main.spec.js | 19 +++++++++++++++++++
gulp/build.js | 12 ++++++++----
gulp/maven.js | 9 +++++----
gulpfile.js | 7 ++++---
maven-config.json | 4 ++--
package.json | 3 ++-
8 files changed, 97 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/ci-build.sh
----------------------------------------------------------------------
diff --git a/ci-build.sh b/ci-build.sh
new file mode 100755
index 0000000..af35db9
--- /dev/null
+++ b/ci-build.sh
@@ -0,0 +1,38 @@
+# 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.
+
+#!/bin/sh
+
+docker pull sathwik/docker-maven-gulp:latest
+
+export JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
+GULP_ARGS="$@"
+CONTAINER_USERNAME="dummy"
+CONTAINER_GROUPNAME="dummy"
+HOMEDIR="/home/$CONTAINER_USERNAME"
+GROUP_ID=$(id -g)
+USER_ID=$( id -u)
+
+CREATE_USER_COMMAND="groupadd -f -g $GROUP_ID $CONTAINER_GROUPNAME && useradd -u $USER_ID -g $CONTAINER_GROUPNAME $CONTAINER_USERNAME && mkdir --parent $HOMEDIR && chown -R $CONTAINER_USERNAME:$CONTAINER_GROUPNAME $HOMEDIR"
+
+SU_USER="su $CONTAINER_USERNAME -c "
+
+NPM_COMMAND="$SU_USER 'npm install'"
+
+GULP_COMMAND="$SU_USER 'gulp $GULP_ARGS'"
+
+FINAL_COMMAND="$CREATE_USER_COMMAND && $NPM_COMMAND && $GULP_COMMAND"
+
+docker run --rm -e JAVA_OPTS -v `pwd`:/workspace -v $HOME/.m2:/home/dummy/.m2 -v /tmp:/tmp --entrypoint bash sathwik/maven_gulp:3.9_4.5 -c "$FINAL_COMMAND"
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/e2e/main.po.js
----------------------------------------------------------------------
diff --git a/e2e/main.po.js b/e2e/main.po.js
index 2ae8e2c..11afcbc 100644
--- a/e2e/main.po.js
+++ b/e2e/main.po.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
/**
* This file uses the Page Object pattern to define the main page for tests
* https://docs.google.com/presentation/d/1B6manhG0zEXkC-H-tPo2vwU06JhL8w9-XCF9oehXzAQ
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/e2e/main.spec.js
----------------------------------------------------------------------
diff --git a/e2e/main.spec.js b/e2e/main.spec.js
index da89d22..71648a6 100644
--- a/e2e/main.spec.js
+++ b/e2e/main.spec.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
'use strict';
describe('The main view', function () {
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/gulp/build.js
----------------------------------------------------------------------
diff --git a/gulp/build.js b/gulp/build.js
index def575c..5c5c957 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -18,7 +18,8 @@
*/
'use strict';
-var gulp = require('gulp');
+var gulp = require('gulp'),
+ runSequence = require('run-sequence');
var $ = require('gulp-load-plugins')({
pattern: ['gulp-*', 'main-bower-files', 'uglify-save-license', 'del']
@@ -154,8 +155,11 @@ gulp.task('misc', function () {
.pipe(gulp.dest('dist/'));
});
-gulp.task('clean', function (done) {
- $.del.sync(['dist/', '.tmp/'], done);
+gulp.task('clean', function () {
+ return $.del.sync(['dist/', '.tmp/']);
+});
+
+gulp.task('build', function(done){
+ runSequence('clean', 'html', 'images', 'fonts', 'misc',done);
});
-gulp.task('build', ['html', 'images', 'fonts', 'misc']);
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/gulp/maven.js
----------------------------------------------------------------------
diff --git a/gulp/maven.js b/gulp/maven.js
index 1083f3e..3c32b86 100644
--- a/gulp/maven.js
+++ b/gulp/maven.js
@@ -21,22 +21,23 @@
var gulp = require('gulp'),
maven = require('maven-deploy'),
- config = require('../maven-config.json');
+ config = require('../maven-config.json'),
+ runSequence = require('run-sequence');
//install on local maven repo
-gulp.task('install', function() {
+gulp.task('install', ['build'], function() {
maven.config(config);
return maven.install();
});
//Snapshot release to Apache, used by CI server
-gulp.task('snapshot', function() {
+gulp.task('snapshot', ['build'], function() {
maven.config(config);
return maven.deploy('apache-snapshot-repo',true);
});
//Actual release to Apache repo
-gulp.task('release', function() {
+gulp.task('release', ['build'], function() {
maven.config(config);
return maven.deploy('apache-release-repo');
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 397c8a7..4c825d3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,10 +18,11 @@
*/
'use strict';
-var gulp = require('gulp');
+var gulp = require('gulp'),
+ runSequence = require('run-sequence');
require('require-dir')('./gulp');
-gulp.task('default', ['clean'], function () {
- gulp.start('build');
+gulp.task('default', function (callback) {
+ runSequence('clean', callback);
});
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/maven-config.json
----------------------------------------------------------------------
diff --git a/maven-config.json b/maven-config.json
index 97fd649..79b1565 100644
--- a/maven-config.json
+++ b/maven-config.json
@@ -8,11 +8,11 @@
"repositories" : [
{
"id": "apache-snapshot-repo",
- "url": "https://repository.apache.org/content/repositories/snapshots"
+ "url": "http://192.168.0.101:8080/repository/snapshots/"
},
{
"id": "apache-release-repo",
- "url": "https://repository.apache.org/service/local/staging/deploy/maven2"
+ "url": "http://192.168.0.101:8080/repository/internal/"
}
]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode-console/blob/36e187ad/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index c75755e..a765068 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,8 @@
"uglify-save-license": "~0.4.1",
"jshint": "~2.9.3",
"gulp-zip": "~3.2.0",
- "maven-deploy": "~1.5.0"
+ "maven-deploy": "~1.5.0",
+ "run-sequence": "~1.2.2"
},
"engines": {
"node": ">=0.10.0"
[3/6] ode-console git commit: Added maven tasks
Posted by sa...@apache.org.
Added maven tasks
Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/1c3875a2
Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/1c3875a2
Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/1c3875a2
Branch: refs/heads/master
Commit: 1c3875a21fe51a148ca94cf5d59c25818464705f
Parents: dd1fcba
Author: sathwik <sa...@apache.org>
Authored: Wed Aug 31 14:49:31 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Wed Aug 31 14:49:31 2016 +0530
----------------------------------------------------------------------
gulp/maven.js | 23 +++++++++++++++++++++++
maven-config.json | 18 ++++++++++++++++++
package.json | 6 ++++--
src/index.html | 6 +++---
4 files changed, 48 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-console/blob/1c3875a2/gulp/maven.js
----------------------------------------------------------------------
diff --git a/gulp/maven.js b/gulp/maven.js
new file mode 100644
index 0000000..b185a1b
--- /dev/null
+++ b/gulp/maven.js
@@ -0,0 +1,23 @@
+'use strict';
+
+var gulp = require('gulp'),
+ maven = require('maven-deploy'),
+ config = require('../maven-config.json');
+
+//install on local maven repo
+gulp.task('install', function() {
+ maven.config(config);
+ return maven.install();
+});
+
+//Snapshot release to Apache, used by CI server
+gulp.task('snapshot', function() {
+ maven.config(config);
+ return maven.deploy('apache-snapshot-repo',true);
+});
+
+//Actual release to Apache repo
+gulp.task('release', function() {
+ maven.config(config);
+ return maven.deploy('apache-release-repo');
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode-console/blob/1c3875a2/maven-config.json
----------------------------------------------------------------------
diff --git a/maven-config.json b/maven-config.json
new file mode 100644
index 0000000..97fd649
--- /dev/null
+++ b/maven-config.json
@@ -0,0 +1,18 @@
+{
+ "groupId" : "org.apache.ode",
+ "artifactId" : "{name}",
+ "buildDir" : "dist",
+ "finalName" : "{name}-{version}",
+ "type" : "zip",
+ "fileEncoding" : "utf-8",
+ "repositories" : [
+ {
+ "id": "apache-snapshot-repo",
+ "url": "https://repository.apache.org/content/repositories/snapshots"
+ },
+ {
+ "id": "apache-release-repo",
+ "url": "https://repository.apache.org/service/local/staging/deploy/maven2"
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ode-console/blob/1c3875a2/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index e86bcdd..e9be3f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ode-console",
- "version": "0.1.0",
+ "version": "0.1.0-SNAPSHOT",
"dependencies": {},
"devDependencies": {
"gulp": "~3.9.1",
@@ -37,7 +37,9 @@
"chalk": "~1.1.3",
"protractor": "~4.0.3",
"uglify-save-license": "~0.4.1",
- "jshint": "~2.9.3"
+ "jshint": "~2.9.3",
+ "gulp-zip": "~3.2.0",
+ "maven-deploy": "~1.5.0"
},
"engines": {
"node": ">=0.10.0"
http://git-wip-us.apache.org/repos/asf/ode-console/blob/1c3875a2/src/index.html
----------------------------------------------------------------------
diff --git a/src/index.html b/src/index.html
index 1ca17e9..cb94fe2 100644
--- a/src/index.html
+++ b/src/index.html
@@ -61,14 +61,14 @@
<!-- build:js({.tmp,src}) scripts/app.js -->
<!-- inject:js -->
+ <script src="vendor/jquery.xpath.js"></script>
+ <script src="vendor/vkbeautify.js"></script>
<script src="app/index.js"></script>
<script src="app/really.directive.js"></script>
<script src="app/soap.service.js"></script>
<script src="app/st-select.directive.js"></script>
- <script src="vendor/jquery.xpath.js"></script>
- <script src="vendor/vkbeautify.js"></script>
- <script src="app/dashboard/dashboard.controller.js"></script>
<script src="components/navbar/navbar.controller.js"></script>
+ <script src="app/dashboard/dashboard.controller.js"></script>
<script src="app/instance/instance.controller.js"></script>
<script src="app/instance/instance.service.js"></script>
<script src="app/instance/instanceactions.controller.js"></script>
[5/6] ode-console git commit: Updated package.json to run bower
install post npm install
Posted by sa...@apache.org.
Updated package.json to run bower install post npm install
Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/42a97c46
Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/42a97c46
Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/42a97c46
Branch: refs/heads/master
Commit: 42a97c467039e0fdab3495ae77032a46da8fb26f
Parents: 6279e8d
Author: sathwik <sa...@apache.org>
Authored: Thu Sep 1 12:12:20 2016 +0530
Committer: sathwik <sa...@apache.org>
Committed: Thu Sep 1 12:12:20 2016 +0530
----------------------------------------------------------------------
package.json | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode-console/blob/42a97c46/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index e9be3f4..c75755e 100644
--- a/package.json
+++ b/package.json
@@ -43,5 +43,8 @@
},
"engines": {
"node": ">=0.10.0"
+ },
+ "scripts": {
+ "postinstall": "bower install"
}
}