include配下のJSPをWEB-INFの下に移動 (#5)

* include対象のjspをWEB-INF配下に移動 * WEB-INF/include配下もlibdirとするよう変更。libdirが存在しなかった場合は無視する * バージョン変更 * gitignoreにnpm installで追加されるファイルを追加 NAB-114
nablarch · Apr 20, 2017 · 42ef767 · 42ef767
1 parent 40d0f00
commit 42ef767
Show file tree

Hide file tree

Showing 40 changed files with 392 additions and 377 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,12 @@
-**/.idea/
-**/*.iml
+**/.idea/
+**/*.iml
+
+jquery
+sugar
+requirejs
+font-awesome
+less
+shelljs
+es6-promise
+
+**/tools/lib/*.jar
diff --git a/node_modules/nablarch-dev-tool-uibuild/package.json b/node_modules/nablarch-dev-tool-uibuild/package.json
diff --git a/node_modules/nablarch-dev-tool-uibuild/ui_local/tools/build/lib/autoconf.js b/node_modules/nablarch-dev-tool-uibuild/ui_local/tools/build/lib/autoconf.js
diff --git a/node_modules/nablarch-dev-ui_demo-core-lib/package.json b/node_modules/nablarch-dev-ui_demo-core-lib/package.json
diff --git a/node_modules/nablarch-dev-ui_demo-core-lib/ui_test/jsp/el.jsp b/node_modules/nablarch-dev-ui_demo-core-lib/ui_test/jsp/el.jsp
diff --git a/node_modules/nablarch-dev-ui_test-support/package.json b/node_modules/nablarch-dev-ui_test-support/package.json
diff --git a/...ui_test-support/ui_test/include/aside.jsp → ...support/ui_test/WEB-INF/include/aside.jsp b/...ui_test-support/ui_test/include/aside.jsp → ...support/ui_test/WEB-INF/include/aside.jsp
diff --git a/node_modules/nablarch-dev-ui_test-support/ui_test/WEB-INF/tags/template/ui_test_template.tag b/node_modules/nablarch-dev-ui_test-support/ui_test/WEB-INF/tags/template/ui_test_template.tag
diff --git a/node_modules/nablarch-dev-ui_test-support/ui_test/jsp/index.jsp b/node_modules/nablarch-dev-ui_test-support/ui_test/jsp/index.jsp
diff --git a/node_modules/nablarch-template-app_aside/package.json b/node_modules/nablarch-template-app_aside/package.json
diff --git a/...app_aside/ui_public/include/app_aside.jsp → ...e/ui_public/WEB-INF/include/app_aside.jsp b/...app_aside/ui_public/include/app_aside.jsp → ...e/ui_public/WEB-INF/include/app_aside.jsp
diff --git a/node_modules/nablarch-template-app_footer/package.json b/node_modules/nablarch-template-app_footer/package.json
diff --git a/...p_footer/ui_public/include/app_footer.jsp → .../ui_public/WEB-INF/include/app_footer.jsp b/...p_footer/ui_public/include/app_footer.jsp → .../ui_public/WEB-INF/include/app_footer.jsp
diff --git a/...i_public/include/subwindow_app_footer.jsp → .../WEB-INF/include/subwindow_app_footer.jsp b/...i_public/include/subwindow_app_footer.jsp → .../WEB-INF/include/subwindow_app_footer.jsp
diff --git a/node_modules/nablarch-template-app_header/package.json b/node_modules/nablarch-template-app_header/package.json
diff --git a/...p_header/ui_public/include/app_header.jsp → .../ui_public/WEB-INF/include/app_header.jsp b/...p_header/ui_public/include/app_header.jsp → .../ui_public/WEB-INF/include/app_header.jsp
diff --git a/...i_public/include/subwindow_app_header.jsp → .../WEB-INF/include/subwindow_app_header.jsp b/...i_public/include/subwindow_app_header.jsp → .../WEB-INF/include/subwindow_app_header.jsp
diff --git a/node_modules/nablarch-template-app_nav/package.json b/node_modules/nablarch-template-app_nav/package.json
diff --git a/...app_nav/ui_public/include/app_top_nav.jsp → ...ui_public/WEB-INF/include/app_top_nav.jsp b/...app_nav/ui_public/include/app_top_nav.jsp → ...ui_public/WEB-INF/include/app_top_nav.jsp
diff --git a/..._public/include/subwindow_app_top_nav.jsp → ...WEB-INF/include/subwindow_app_top_nav.jsp b/..._public/include/subwindow_app_top_nav.jsp → ...WEB-INF/include/subwindow_app_top_nav.jsp
diff --git a/node_modules/nablarch-template-base/package.json b/node_modules/nablarch-template-base/package.json
diff --git a/node_modules/nablarch-template-base/ui_public/WEB-INF/tags/template/base_layout.tag b/node_modules/nablarch-template-base/ui_public/WEB-INF/tags/template/base_layout.tag
diff --git a/node_modules/nablarch-template-head/package.json b/node_modules/nablarch-template-head/package.json
diff --git a/...late-head/ui_public/include/html_head.jsp → ...d/ui_public/WEB-INF/include/html_head.jsp b/...late-head/ui_public/include/html_head.jsp → ...d/ui_public/WEB-INF/include/html_head.jsp
diff --git a/node_modules/nablarch-template-js_include/package.json b/node_modules/nablarch-template-js_include/package.json
diff --git a/..._include/ui_public/include/js_include.jsp → .../ui_public/WEB-INF/include/js_include.jsp b/..._include/ui_public/include/js_include.jsp → .../ui_public/WEB-INF/include/js_include.jsp
diff --git a/node_modules/nablarch-template-multicol-head/package.json b/node_modules/nablarch-template-multicol-head/package.json
diff --git a/...icol-head/ui_public/include/html_head.jsp → ...d/ui_public/WEB-INF/include/html_head.jsp b/...icol-head/ui_public/include/html_head.jsp → ...d/ui_public/WEB-INF/include/html_head.jsp
diff --git a/node_modules/nablarch-template-page/package.json b/node_modules/nablarch-template-page/package.json
diff --git a/...late-page/ui_public/include/app_error.jsp → ...e/ui_public/WEB-INF/include/app_error.jsp b/...late-page/ui_public/include/app_error.jsp → ...e/ui_public/WEB-INF/include/app_error.jsp
diff --git a/node_modules/nablarch-template-page/ui_public/WEB-INF/tags/template/page_template.tag b/node_modules/nablarch-template-page/ui_public/WEB-INF/tags/template/page_template.tag
diff --git a/...odules/nablarch-template-page/ui_public/WEB-INF/tags/template/subwindow_page_template.tag b/...odules/nablarch-template-page/ui_public/WEB-INF/tags/template/subwindow_page_template.tag
diff --git a/node_modules/nablarch-widget-event-listen/package.json b/node_modules/nablarch-widget-event-listen/package.json