Skip to content

Commit 3e28c3c

Browse files
corneadougcorneadoug
committed
Change Zeppelin-web code and compiled code folders
1 parent 0ee04a2 commit 3e28c3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+28
-14
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ zeppelin-web/dist
2121
zeppelin-web/.tmp
2222
zeppelin-web/.sass-cache
2323
zeppelin-web/bower_components
24-
zeppelin-web/src
2524
**nbproject/
2625
**node/
2726

‎bin/common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ if [[ -z "$ZEPPELIN_PID_DIR" ]]; then
4545
fi
4646

4747
if [[ -z "${ZEPPELIN_WAR}" ]]; then
48-
if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/src/main/webapp" ]]; then
49-
export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/src/main/webapp"
48+
if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
49+
export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/dist"
5050
else
5151
export ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web*.war")
5252
fi

‎zeppelin-web/Gruntfile.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ module.exports = function (grunt) {
3434

3535
// Configurable paths for the application
3636
var appConfig = {
37-
app: require('./bower.json').appPath || 'app',
38-
dist: 'src/main/webapp'
37+
app: require('./bower.json').appPath || 'src',
38+
dist: 'dist'
3939
};
4040

4141
// Define the configuration for all the tasks
@@ -157,7 +157,8 @@ module.exports = function (grunt) {
157157
all: {
158158
src: [
159159
'Gruntfile.js',
160-
'<%= yeoman.app %>/{app, components}/**/*.js'
160+
'<%= yeoman.app %>/app/**/*.js',
161+
'<%= yeoman.app %>/components/**/*.js'
161162
]
162163
},
163164
test: {
@@ -285,7 +286,11 @@ module.exports = function (grunt) {
285286
files: [{
286287
expand: true,
287288
cwd: '<%= yeoman.dist %>',
288-
src: ['*.html', '{app, components}/**/*.html'],
289+
src: [
290+
'*.html',
291+
'app/**/*.html',
292+
'components/**/*.html'
293+
],
289294
dest: '<%= yeoman.dist %>'
290295
}]
291296
}

‎zeppelin-web/bower.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
"angular-mocks": "1.3.8",
3030
"angular-scenario": "1.3.8"
3131
},
32-
"appPath": "app",
32+
"appPath": "src",
33+
"resolutions": {
34+
"perfect-scrollbar": "~0.5.4"
35+
},
3336
"overrides": {
3437
"ace-builds": {
3538
"main": ["src-noconflict/ace.js",

‎zeppelin-web/pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@
3333

3434
<build>
3535
<plugins>
36+
<plugin>
37+
<groupId>org.apache.maven.plugins</groupId>
38+
<artifactId>maven-war-plugin</artifactId>
39+
<configuration>
40+
<webXml>dist\WEB-INF\web.xml</webXml>
41+
</configuration>
42+
</plugin>
3643
<plugin>
3744
<groupId>org.apache.rat</groupId>
3845
<artifactId>apache-rat-plugin</artifactId>
@@ -55,7 +62,7 @@
5562
<exclude>node_modules/**</exclude>
5663
<exclude>bower_components/**</exclude>
5764
<exclude>test/**</exclude>
58-
<exclude>src/main/webapp/**</exclude>
65+
<exclude>dist/**</exclude>
5966
<exclude>app/.buildignore</exclude>
6067
<exclude>app/fonts/fontawesome*</exclude>
6168
<exclude>app/fonts/font-awesome*</exclude>

zeppelin-web/app/.buildignore renamed to zeppelin-web/src/.buildignore

File renamed without changes.

zeppelin-web/app/404.html renamed to zeppelin-web/src/404.html

File renamed without changes.

zeppelin-web/app/WEB-INF/web.xml renamed to zeppelin-web/src/WEB-INF/web.xml

File renamed without changes.

zeppelin-web/app/app/app.js renamed to zeppelin-web/src/app/app.js

File renamed without changes.

zeppelin-web/app/app/custom-font.css renamed to zeppelin-web/src/app/custom-font.css

File renamed without changes.

0 commit comments

Comments
 (0)