Author: sboehme
Date: Fri Mar 27 13:34:13 2015
New Revision: 1669584
URL: http://svn.apache.org/r1669584
Log:
SLING-4462 Integrated the frontend-maven-plugin to use NodeJS, npm and Grunt.
Also for SLING-4205.
Added:
sling/trunk/contrib/explorers/resourceeditor/frontend/ (with props)
sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js
sling/trunk/contrib/explorers/resourceeditor/frontend/grunt (with props)
sling/trunk/contrib/explorers/resourceeditor/frontend/grunt.cmd
sling/trunk/contrib/explorers/resourceeditor/frontend/karma (with props)
sling/trunk/contrib/explorers/resourceeditor/frontend/karma.cmd
sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.js
sling/trunk/contrib/explorers/resourceeditor/frontend/licenselist (with
props)
sling/trunk/contrib/explorers/resourceeditor/frontend/npm (with props)
sling/trunk/contrib/explorers/resourceeditor/frontend/npm.cmd
sling/trunk/contrib/explorers/resourceeditor/frontend/package.json
sling/trunk/contrib/explorers/resourceeditor/src/main/less/alerts.less
- copied unchanged from r1660214,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/alerts.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/buttons.less
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/buttons.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/elements.less
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/elements.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/forms.less
- copied unchanged from r1654912,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/forms.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/modals.less
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/modals.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/navs.less
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/navs.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor.less
- copied, changed from r1654912,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/reseditor.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/scaffolding.less
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/scaffolding.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/variables.less
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/variables.less
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/3rd_party/
(with props)
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/3rd_party/
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/3rd_party/Michroma.eot
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/Michroma.eot
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/3rd_party/Michroma.woff
- copied unchanged from r1654910,
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/Michroma.woff
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/3rd_party/
(with props)
sling/trunk/contrib/explorers/resourceeditor/src/test/
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/e2e/
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/e2e/spec/
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/e2e/spec/e2e_spec.js
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/spec/
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/spec/resource_editor_spec.js
Removed:
sling/trunk/contrib/explorers/resourceeditor/src/main/less/badges.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/bootstrap.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/breadcrumbs.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/button-groups.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/carousel.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/close.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/code.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/component-animations.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/dropdowns.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/glyphicons.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/grid.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/input-groups.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/jumbotron.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/labels.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/list-group.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/media.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/mixins.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/navbar.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/normalize.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/pager.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/pagination.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/panels.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/popovers.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/print.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/progress-bars.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/
sling/trunk/contrib/explorers/resourceeditor/src/main/less/responsive-utilities.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/tables.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/theme.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/thumbnails.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/tooltip.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/type.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/utilities.less
sling/trunk/contrib/explorers/resourceeditor/src/main/less/wells.less
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/animate.min.css
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/select2.css
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/select2.png
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/shake.css
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/Michroma.eot
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/font/Michroma.woff
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/bootbox.min.js
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/bootstrap.min.js
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/jquery.min.js
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/jquery.scrollTo-min.js
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/jstree.js
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/select2.min.js
Modified:
sling/trunk/contrib/explorers/resourceeditor/ (props changed)
sling/trunk/contrib/explorers/resourceeditor/README
sling/trunk/contrib/explorers/resourceeditor/pom.xml
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/
(props changed)
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
Propchange: sling/trunk/contrib/explorers/resourceeditor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 27 13:34:13 2015
@@ -8,3 +8,4 @@ bin
.classpath
.externalToolBuilders
maven-eclipse.xml
+node_modules
Modified: sling/trunk/contrib/explorers/resourceeditor/README
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/README?rev=1669584&r1=1669583&r2=1669584&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/README (original)
+++ sling/trunk/contrib/explorers/resourceeditor/README Fri Mar 27 13:34:13 2015
@@ -2,23 +2,17 @@ Apache Sling Resource Editor
The Apache Sling Resource Editor allows to edit Apache Sling content based on
the Sling API.
-++ Deploy Binaries ++
-o Navigate to the OSGi Repository page of the management console within your
running Sling instance (/system/console/obr)
-o If the OSGi Repository page is not there, install
`http://search.maven.org/#artifactdetails|org.apache.felix|org.apache.felix.webconsole.plugins.obr|1.0.2|bundle`
at `system/console/bundles` to make it available.
-o Add the OSGi repository URL
(http://www.jcrbrowser.org/sling/obr/repository.xml).
-o Search for the "Apache Sling Resource Editor" resource and navigate to the
latest version.
-o Click "Deploy and Start".
-o At /system/console/bundles you will see that the Resource Editor bundle is
active.
-o Open "/reseditor/.html" at your server to see the web application.
-
-++ Build the Sling Resource Editor ++
-o Deploy the binaries as described above.
-o Download and install Git from http://www.git-scm.com/download
-o Call `git clone git://github.com/sandroboehme/resourceeditor.git` in a
shell. It will create the resourceeditor subfolder containing the source.
-o Change to the resourceeditor subdirectory and call `mvn clean package` there
to install the sources into the running Sling instance.
+++ Installation ++
+o First install the JSNodeTypes library here: 'contrib/commons/js/nodetypes'.
You find the short installation instruction in its README file.
+o Then use 'mvn install -P autoInstallBundle' to install this bundle to your
local Sling instance at port 8080.
+o After that you find the web application at "/reseditor/.html" on your server.
-++ Develop with the Sling Resource Editor ++
+++ Development with the Sling Resource Editor ++
o Use `mvn install sling:install` to deploy changes of Java classes
-o To have frontend changes automatically deployed call `mvn install`
-o To have the less sources automatically compiled call `mvn lesscss:compile
-Dlesscss.watch=true`
+o To have frontend changes automatically deployed call `mvn install -P
autoInstallBundle -Dsling.mountByFS=true`
+o To have the less sources automatically compiled on change call `./grunt
watch:less` in the frontend directory. Press Ctrl-Z to stop watching.
+o To run the build on your local maschine call './grunt local_build' within
the frontend directory. It includes end to end tests with firefox and chrome.
+
+
+Enjoy!
\ No newline at end of file
Propchange: sling/trunk/contrib/explorers/resourceeditor/frontend/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 27 13:34:13 2015
@@ -0,0 +1,2 @@
+node_modules
+node
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/Gruntfile.js Fri Mar
27 13:34:13 2015
@@ -0,0 +1,139 @@
+module.exports = function(grunt) {
+ grunt.initConfig({
+ less: {
+ compileCore: {
+ options: {
+ strictMath: true,
+ sourceMap: true,
+ outputSourceFiles: true,
+ sourceMapURL: 'bootstrap.css.map',
+ sourceMapFilename:
'../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/bootstrap.css.map'
+ },
+ src: '../src/main/less/reseditor.less',
+ dest:
'../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/bootstrap.css'
+ }
+ },
+ watch: {
+ less : {
+ files : '../src/main/less/**/*.less',
+ tasks : [ 'less' ],
+ }
+ },
+ _comment:'The google web fonts could be downloaded and copied via
grunt-goog-webfont-dl. But goog-webfont-dl directly points to the global
#!/usr/bin/env node and not to the local one.',
+ copy: {
+ js_dependencies: {
+ files: [
+ {
+ expand: true, // Enable dynamic expansion.
+ cwd: 'node_modules/', // Src matches are
relative to this path.
+ src: [
+ 'bootstrap/dist/js/bootstrap.min.js',
+ 'select2/select2.min.js',
+ 'jquery/dist/jquery.min.js',
+ 'bootbox/bootbox.min.js',
+ 'jstree/dist/jstree.min.js'
+ ], // Actual pattern(s) to match.
+ dest:
'../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/3rd_party',
// Destination path prefix.
+ flatten: true
+ },
+ ],
+ },
+ css_dependencies: {
+ files: [
+ {
+ expand: true, // Enable dynamic expansion.
+ cwd: 'node_modules/', // Src matches are relative to
this path.
+ src: [
+ 'select2/select2.css',
+ 'select2/select2.png',
+ 'animate.css/animate.min.css',
+ ], // Actual pattern(s) to match.
+ dest:
'../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/3rd_party',
// Destination path prefix.
+ flatten: true
+ },
+ ],
+ }
+ },
+ jasmine: {
+ main: {
+ src:
['../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/jquery.min.js',
+
'../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/**/*.js'],
+ options: {
+ specs: '../src/test/javascript/spec/*spec.js',
+ helpers: '../src/test/javascript/spec/*Helper.js',
+ version: '2.2.1',
+ summary: true
+ }
+ }
+ },
+ karma: {
+ options: {
+ runnerPort: 9999,
+ singleRun: true,
+ browsers: ['PhantomJS'],
+ plugins : ['karma-jasmine', 'karma-phantomjs-launcher'],
+ frameworks: ['jasmine']
+ },
+ build: {
+ singleRun: true,
+ files: [
+ { src:
['../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/3rd_party/jquery.min.js']},
+ { src: ['../src/test/javascript/spec/*spec.js']},
+ { src:
['../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/**/*.js']}
+ ]
+ },
+ local_build: {
+ singleRun: true,
+ browsers: ['Chrome', 'Firefox', 'PhantomJS'],
+ plugins : ['karma-jasmine', 'karma-phantomjs-launcher',
'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-ie-launcher'],
+ files: [
+ { src: ['../src/test/javascript/spec/*spec.js']},
+ { src:
['../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/3rd_party/jquery.min.js']},
+ { src:
['../src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/**/*.js']}
+ ]
+ },
+ watch: {
+ reporters: 'dots',
+ autoWatch: true,
+ background: true,
+ singleRun: false
+ }
+ },
+ webdriver: {
+ options: {
+// desiredCapabilities: {
+// browserName: 'chrome'
+// }
+ },
+ chrome: {
+ tests: ['../src/test/javascript/e2e/spec/**/*spec.js'],
+ options: {
+ // overwrite default settings
+ desiredCapabilities: {
+ browserName: 'chrome'
+ }
+ }
+ },
+ firefox: {
+ tests: ['../src/test/javascript/e2e/spec/**/*spec.js'],
+ options: {
+ // overwrite default settings
+ desiredCapabilities: {
+ browserName: 'firefox'
+ }
+ }
+ }
+ }
+ })
+
+ // These plugins provide necessary tasks.
+ require('load-grunt-tasks')(grunt, { scope: 'devDependencies' });
+
+// grunt.registerTask('build', ['less', 'copy', 'jasmine', 'karma:build']);
+ grunt.registerTask('build', ['less', 'copy', 'karma:build']);
+
+ grunt.registerTask('default', ['build']);
+
+
+ grunt.registerTask('local_build', ['less', 'copy', 'karma:local_build',
'webdriver:chrome', 'webdriver:firefox', 'build']);
+};
\ No newline at end of file
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/grunt
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/grunt?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/grunt (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/grunt Fri Mar 27
13:34:13 2015
@@ -0,0 +1,3 @@
+#!/bin/sh
+"node/node" "node_modules/grunt-cli/bin/grunt" "$@"
+
Propchange: sling/trunk/contrib/explorers/resourceeditor/frontend/grunt
------------------------------------------------------------------------------
svn:executable = *
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/grunt.cmd
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/grunt.cmd?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/grunt.cmd (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/grunt.cmd Fri Mar 27
13:34:13 2015
@@ -0,0 +1,3 @@
+@echo off
+%~dp0node/node node_modules/grunt-cli/bin/grunt %*
+@echo on
\ No newline at end of file
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/karma
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/karma?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/karma (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/karma Fri Mar 27
13:34:13 2015
@@ -0,0 +1,2 @@
+#!/bin/sh
+"node/node" "node_modules/karma/bin/karma" "$@"
Propchange: sling/trunk/contrib/explorers/resourceeditor/frontend/karma
------------------------------------------------------------------------------
svn:executable = *
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/karma.cmd
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/karma.cmd?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/karma.cmd (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/karma.cmd Fri Mar 27
13:34:13 2015
@@ -0,0 +1,3 @@
+@echo off
+%~dp0node/node node_modules/karma/bin/karma %*
+@echo on
\ No newline at end of file
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.js
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.js?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.js (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/karma.conf.js Fri Mar
27 13:34:13 2015
@@ -0,0 +1,44 @@
+module.exports = function(config) {
+ config.set({
+
+ // base path, that will be used to resolve files and exclude
+ basePath: '../src/',
+
+ // frameworks to use
+ frameworks: ['jasmine'],
+
+ // list of files / patterns to load in the browser
+ files: [
+ '**/*.js'
+ ],
+
+ // list of files to exclude
+ exclude: [
+ ],
+
+ // test results reporter to use
+ reporters: ['progress'],
+
+ // web server port
+ port: 9876,
+
+ // enable / disable colors in the output (reporters and logs)
+ colors: true,
+
+ // level of logging
+ logLevel: config.LOG_INFO,
+
+ // enable / disable watching file and executing tests whenever any
file changes
+ autoWatch: true,
+
+ // Start these browsers
+ browsers: ['PhantomJS'],
+
+ // If browser does not capture in given timeout [ms], kill it
+ captureTimeout: 60000,
+
+ // Continuous Integration mode
+ // if true, it capture browsers, run tests and exit
+ singleRun: false
+ });
+};
\ No newline at end of file
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/licenselist
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/licenselist?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/licenselist (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/licenselist Fri Mar
27 13:34:13 2015
@@ -0,0 +1,2 @@
+#!/bin/sh
+node_modules/nlf/bin/nlf -d -r 0
\ No newline at end of file
Propchange: sling/trunk/contrib/explorers/resourceeditor/frontend/licenselist
------------------------------------------------------------------------------
svn:executable = *
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/npm
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/npm?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/npm (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/npm Fri Mar 27
13:34:13 2015
@@ -0,0 +1,2 @@
+#!/bin/sh
+"node/node" "node/npm/bin/npm-cli.js" "$@"
Propchange: sling/trunk/contrib/explorers/resourceeditor/frontend/npm
------------------------------------------------------------------------------
svn:executable = *
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/npm.cmd
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/npm.cmd?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/npm.cmd (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/npm.cmd Fri Mar 27
13:34:13 2015
@@ -0,0 +1,3 @@
+@echo off
+%~dp0node/node node/npm/bin/npm-cli.js %*
+@echo on
\ No newline at end of file
Added: sling/trunk/contrib/explorers/resourceeditor/frontend/package.json
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/frontend/package.json?rev=1669584&view=auto
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/frontend/package.json (added)
+++ sling/trunk/contrib/explorers/resourceeditor/frontend/package.json Fri Mar
27 13:34:13 2015
@@ -0,0 +1,38 @@
+{
+ "name": "resource-editor",
+ "version": "0.1.0",
+ "readme": "A resource editor frontend for Apache Sling.",
+ "dependencies": {
+ "jquery": "1.11.2",
+ "bootbox": "4.4.0",
+ "jstree": "3.1.0",
+ "animate.css": "3.2.1",
+ "bootstrap": "3.3.2",
+ "select2": "3.5.2-browserify",
+ "jstree": "3.0.9",
+ "animate.css": "3.1.1",
+ "jquery-scrollto": "1.4.4"
+ },
+ "devDependencies": {
+ "grunt": "0.4.5",
+ "load-grunt-tasks": "2.0.0",
+ "grunt-cli": "0.1.13",
+ "grunt-contrib-less": "1.0.0",
+ "grunt-contrib-copy": "0.8.0",
+ "grunt-contrib-watch": "0.6.1",
+ "jasmine":"2.2.1",
+ "grunt-contrib-jasmine":"0.8.2",
+ "grunt-karma": "0.10.1",
+ "karma-phantomjs-launcher": "0.1.2",
+ "karma-jasmine": "0.3.5",
+ "karma-chrome-launcher": "0.1.7",
+ "karma-firefox-launcher": "0.1.4",
+ "karma-ie-launcher": "0.1.5",
+ "webdriver-manager": "3.0.0",
+ "grunt-webdriver": "0.4.8",
+ "nlf": "1.1.0"
+ },
+ "scripts": {
+ "postinstall": "node_modules/.bin/webdriver-manager update --standalone"
+ }
+}
Modified: sling/trunk/contrib/explorers/resourceeditor/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/pom.xml?rev=1669584&r1=1669583&r2=1669584&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/resourceeditor/pom.xml (original)
+++ sling/trunk/contrib/explorers/resourceeditor/pom.xml Fri Mar 27 13:34:13
2015
@@ -38,24 +38,6 @@
</resources>
<plugins>
<plugin>
- <groupId>org.lesscss</groupId>
- <artifactId>lesscss-maven-plugin</artifactId>
- <version>1.7.0.1.1</version>
- <configuration>
-
<outputDirectory>${project.basedir}/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css</outputDirectory>
- <includes>
-
<include>bootstrap.less</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<executions>
@@ -99,6 +81,31 @@
<remoteOBR>www.jcrbrowser.org</remoteOBR>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>0.0.22</version>
+ <configuration>
+ <workingDirectory>frontend</workingDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
<goal>install-node-and-npm</goal> </goals>
+ <configuration>
+
<nodeVersion>v0.12.1</nodeVersion>
+ <npmVersion>1.4.9</npmVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <goals> <goal>npm</goal>
</goals>
+ </execution>
+ <execution>
+ <id>grunt build</id>
+ <goals> <goal>grunt</goal>
</goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<extensions>
<extension>
Copied:
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor.less (from
r1654912,
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/reseditor.less)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor.less?p2=sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor.less&p1=sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/reseditor.less&r1=1654912&r2=1669584&rev=1669584&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor/reseditor.less
(original)
+++ sling/trunk/contrib/explorers/resourceeditor/src/main/less/reseditor.less
Fri Mar 27 13:34:13 2015
@@ -17,6 +17,8 @@
* under the License.
*/
+ @import "../../../frontend/node_modules/bootstrap/less/bootstrap.less";
+
/* ################################################################# */
/* --- Overwriting Bootstrap styles --- */
/* ################################################################# */
Propchange:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 27 13:34:13 2015
@@ -1 +1,2 @@
bootstrap.css
+bootstrap.css.map
Propchange:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/3rd_party/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 27 13:34:13 2015
@@ -0,0 +1,3 @@
+animate.min.css
+select2.css
+select2.png
Modified:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css?rev=1669584&r1=1669583&r2=1669584&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font.css
Fri Mar 27 13:34:13 2015
@@ -2,5 +2,5 @@
font-family: 'Michroma';
font-style: normal;
font-weight: 400;
- src: local('Michroma'), url(../font/Michroma.woff) format('woff');
+ src: local('Michroma'), url(../font/3rd_party/Michroma.woff) format('woff');
}
\ No newline at end of file
Modified:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css?rev=1669584&r1=1669583&r2=1669584&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/css/font_ie.css
Fri Mar 27 13:34:13 2015
@@ -2,6 +2,6 @@
font-family: 'Michroma';
font-style: normal;
font-weight: 400;
- src: url(../font/Michroma.eot);
- src: local('Michroma'), url(../font/Michroma.eot)
format('embedded-opentype'), url(../font/Michroma.woff) format('woff');
+ src: url(../font/3rd_party/Michroma.eot);
+ src: local('Michroma'), url(../font/3rd_party/Michroma.eot)
format('embedded-opentype'), url(../font/3rd_party/Michroma.woff)
format('woff');
}
\ No newline at end of file
Propchange:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor-static-content/js/3rd_party/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 27 13:34:13 2015
@@ -0,0 +1,5 @@
+bootbox.min.js
+bootstrap.min.js
+jquery.min.js
+jstree.min.js
+select2.min.js
Modified:
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp?rev=1669584&r1=1669583&r2=1669584&view=diff
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
(original)
+++
sling/trunk/contrib/explorers/resourceeditor/src/main/resources/SLING-INF/libs/sling/resource-editor/html.jsp
Fri Mar 27 13:34:13 2015
@@ -26,11 +26,11 @@ original
<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/jsnodetypes/js/jsnodetypes.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/jquery.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/bootbox.min.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/jstree.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/select2.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/3rd_party/jquery.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/3rd_party/bootstrap.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/3rd_party/bootbox.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/3rd_party/jstree.min.js"></script>
+<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/3rd_party/select2.min.js"></script>
<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/reseditor/tree/JSTreeAdapter.js"></script>
<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/reseditor/tree/TreeController.js"></script>
@@ -40,14 +40,14 @@ original
<!--
<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/jquery.scrollTo-min.js"></script>
- -->
<script type="text/javascript" src="<%= request.getContextPath()
%>/libs/sling/resource-editor-static-content/js/urlEncode.js"></script>
+ -->
<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/style.css">
<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/bootstrap.css">
<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/bootbox.reseditor.css">
-<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/shake.css">
-<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/select2.css">
+<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/3rd_party/animate.min.css">
+<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/3rd_party/select2.css">
<link rel="stylesheet" type="text/css" media="all" href="<%=
request.getContextPath()
%>/libs/sling/resource-editor-static-content/css/select2.reseditor.css">
<!--[if IE]>
@@ -97,7 +97,7 @@ new org.apache.sling.reseditor.JSTreeAda
<div id="login" class="row">
<div class="col-sm-12">
<div class="logo">
- Sling Resource Editor <span
class="edition">node-edit version</span>
+ The Sling Resource Editor <span
class="edition">node-edit version</span>
</div>
<div class="tabbable tabs-below">
<div id="login_tab_content"
class="tab-content plate-background plate-box-shadow" style="display:none;">
Added:
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/e2e/spec/e2e_spec.js
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/e2e/spec/e2e_spec.js?rev=1669584&view=auto
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/e2e/spec/e2e_spec.js
(added)
+++
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/e2e/spec/e2e_spec.js
Fri Mar 27 13:34:13 2015
@@ -0,0 +1,14 @@
+'use strict';
+
+var assert = require('assert');
+
+describe('The Apache Sling Resource Editor', function() {
+ it('should have a title', function(done) {
+ browser
+ .url('http://juliemr.github.io/protractor-demo/')
+ .getTitle(function(err,title) {
+ assert(title.indexOf('Super Calculator') !== -1);
+ })
+ .call(done);
+ });
+});
\ No newline at end of file
Added:
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/spec/resource_editor_spec.js
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/spec/resource_editor_spec.js?rev=1669584&view=auto
==============================================================================
---
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/spec/resource_editor_spec.js
(added)
+++
sling/trunk/contrib/explorers/resourceeditor/src/test/javascript/spec/resource_editor_spec.js
Fri Mar 27 13:34:13 2015
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+describe('The Resource Editor', function() {
+
+ it('\'s MainController', function() {
+// it('can encode a URL', function() {
+// var ntManager = new de.sandroboehme.NodeTypeManager();
+ var mainControllerSettings = {
+ contextPath: "/",
+// nodeTypes: ntManager.getNodeTypeNames()
+ };
+ var mainController = new
org.apache.sling.reseditor.MainController(mainControllerSettings, null);
+ var urlToEncode = "/reseditor/testnode/$&?äöÃ<>
test.html";
+
expect(mainController.encodeURL(urlToEncode)).toEqual("/reseditor/testnode/%24%26%3F%C3%A4%C3%B6%C3%9F%3C%3E%20test.html");
+// });
+ });
+});
\ No newline at end of file
