HTRACE-246. HTrace WebApp not properly defined and therefore not packaged into .war (Lewis John McGibbney via iwasakims)

commit: 05ce37fbc7b27183da3592e3e57e9d06ed09db7a [log] [tgz]
author: Masatake Iwasaki <iwasakims@apache.org> Sun Sep 13 18:39:53 2015 +0900
committer: Masatake Iwasaki <iwasakims@apache.org> Sun Sep 13 18:39:53 2015 +0900
tree: 2e5e458c0b05a19a74e284682ce2e9703e3617ec
parent: 2716ffdf957872004750f9a35c3244621c58a5e5 [diff]
diff --git a/htrace-htraced/go/gobuild.sh b/htrace-htraced/go/gobuild.sh
index a614ef4..e627147 100755
--- a/htrace-htraced/go/gobuild.sh
+++ b/htrace-htraced/go/gobuild.sh

@@ -127,7 +127,7 @@
         || die "go install failed."
     # Make a symlink to web src dir so can do development in-situ out
     # of build dir. This is ugly but blame go build.
-    ln -fs "../../htrace-webapp/src/main/web" "${GOBIN}/../"
+    ln -fs "../../htrace-webapp/src/main/webapp" "${GOBIN}/../web"
     # Set the RPATH to make bundling leveldb and snappy easier.
     set_rpath "${GOBIN}/htraced"
     ;;

diff --git a/htrace-webapp/pom.xml b/htrace-webapp/pom.xml
index e169a64..dc1a05c 100644
--- a/htrace-webapp/pom.xml
+++ b/htrace-webapp/pom.xml

@@ -32,7 +32,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-          <webXml>src/main/web/WEB-INF/web.xml</webXml>
+          <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
         </configuration>
       </plugin>
       <plugin>

diff --git a/htrace-webapp/src/main/web/WEB-INF/web.xml b/htrace-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from htrace-webapp/src/main/web/WEB-INF/web.xml
rename to htrace-webapp/src/main/webapp/WEB-INF/web.xml


diff --git a/htrace-webapp/src/main/web/app/about_view.js b/htrace-webapp/src/main/webapp/app/about_view.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/about_view.js
rename to htrace-webapp/src/main/webapp/app/about_view.js


diff --git a/htrace-webapp/src/main/web/app/modal.js b/htrace-webapp/src/main/webapp/app/modal.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/modal.js
rename to htrace-webapp/src/main/webapp/app/modal.js


diff --git a/htrace-webapp/src/main/web/app/partition_widget.js b/htrace-webapp/src/main/webapp/app/partition_widget.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/partition_widget.js
rename to htrace-webapp/src/main/webapp/app/partition_widget.js


diff --git a/htrace-webapp/src/main/web/app/predicate.js b/htrace-webapp/src/main/webapp/app/predicate.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/predicate.js
rename to htrace-webapp/src/main/webapp/app/predicate.js


diff --git a/htrace-webapp/src/main/web/app/predicate_view.js b/htrace-webapp/src/main/webapp/app/predicate_view.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/predicate_view.js
rename to htrace-webapp/src/main/webapp/app/predicate_view.js


diff --git a/htrace-webapp/src/main/web/app/query_results.js b/htrace-webapp/src/main/webapp/app/query_results.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/query_results.js
rename to htrace-webapp/src/main/webapp/app/query_results.js


diff --git a/htrace-webapp/src/main/web/app/router.js b/htrace-webapp/src/main/webapp/app/router.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/router.js
rename to htrace-webapp/src/main/webapp/app/router.js


diff --git a/htrace-webapp/src/main/web/app/search_result.js b/htrace-webapp/src/main/webapp/app/search_result.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/search_result.js
rename to htrace-webapp/src/main/webapp/app/search_result.js


diff --git a/htrace-webapp/src/main/web/app/search_results.js b/htrace-webapp/src/main/webapp/app/search_results.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/search_results.js
rename to htrace-webapp/src/main/webapp/app/search_results.js


diff --git a/htrace-webapp/src/main/web/app/search_results_view.js b/htrace-webapp/src/main/webapp/app/search_results_view.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/search_results_view.js
rename to htrace-webapp/src/main/webapp/app/search_results_view.js


diff --git a/htrace-webapp/src/main/web/app/search_view.js b/htrace-webapp/src/main/webapp/app/search_view.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/search_view.js
rename to htrace-webapp/src/main/webapp/app/search_view.js


diff --git a/htrace-webapp/src/main/web/app/server_info.js b/htrace-webapp/src/main/webapp/app/server_info.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/server_info.js
rename to htrace-webapp/src/main/webapp/app/server_info.js


diff --git a/htrace-webapp/src/main/web/app/span.js b/htrace-webapp/src/main/webapp/app/span.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/span.js
rename to htrace-webapp/src/main/webapp/app/span.js


diff --git a/htrace-webapp/src/main/web/app/span_details_view.js b/htrace-webapp/src/main/webapp/app/span_details_view.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/span_details_view.js
rename to htrace-webapp/src/main/webapp/app/span_details_view.js


diff --git a/htrace-webapp/src/main/web/app/span_group_widget.js b/htrace-webapp/src/main/webapp/app/span_group_widget.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/span_group_widget.js
rename to htrace-webapp/src/main/webapp/app/span_group_widget.js


diff --git a/htrace-webapp/src/main/web/app/span_widget.js b/htrace-webapp/src/main/webapp/app/span_widget.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/span_widget.js
rename to htrace-webapp/src/main/webapp/app/span_widget.js


diff --git a/htrace-webapp/src/main/web/app/string.js b/htrace-webapp/src/main/webapp/app/string.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/string.js
rename to htrace-webapp/src/main/webapp/app/string.js


diff --git a/htrace-webapp/src/main/web/app/time_cursor.js b/htrace-webapp/src/main/webapp/app/time_cursor.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/time_cursor.js
rename to htrace-webapp/src/main/webapp/app/time_cursor.js


diff --git a/htrace-webapp/src/main/web/app/tree.js b/htrace-webapp/src/main/webapp/app/tree.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/tree.js
rename to htrace-webapp/src/main/webapp/app/tree.js


diff --git a/htrace-webapp/src/main/web/app/triangle_button.js b/htrace-webapp/src/main/webapp/app/triangle_button.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/triangle_button.js
rename to htrace-webapp/src/main/webapp/app/triangle_button.js


diff --git a/htrace-webapp/src/main/web/app/widget_manager.js b/htrace-webapp/src/main/webapp/app/widget_manager.js
similarity index 100%
rename from htrace-webapp/src/main/web/app/widget_manager.js
rename to htrace-webapp/src/main/webapp/app/widget_manager.js


diff --git a/htrace-webapp/src/main/web/custom.css b/htrace-webapp/src/main/webapp/custom.css
similarity index 100%
rename from htrace-webapp/src/main/web/custom.css
rename to htrace-webapp/src/main/webapp/custom.css


diff --git a/htrace-webapp/src/main/web/image/owl.png b/htrace-webapp/src/main/webapp/image/owl.png
similarity index 100%
rename from htrace-webapp/src/main/web/image/owl.png
rename to htrace-webapp/src/main/webapp/image/owl.png
Binary files differ

diff --git a/htrace-webapp/src/main/web/index.html b/htrace-webapp/src/main/webapp/index.html
similarity index 100%
rename from htrace-webapp/src/main/web/index.html
rename to htrace-webapp/src/main/webapp/index.html


diff --git a/htrace-webapp/src/main/web/lib/backbone-1.1.2.js b/htrace-webapp/src/main/webapp/lib/backbone-1.1.2.js
similarity index 100%
rename from htrace-webapp/src/main/web/lib/backbone-1.1.2.js
rename to htrace-webapp/src/main/webapp/lib/backbone-1.1.2.js


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap-theme.css b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap-theme.css
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap-theme.css
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap-theme.css


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap-theme.css.map b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap-theme.css.map
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap-theme.css.map
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap-theme.css.map


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap-theme.min.css b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap-theme.min.css
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap-theme.min.css
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap-theme.min.css


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap.css b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap.css
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap.css
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap.css


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap.css.map b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap.css.map
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap.css.map
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap.css.map


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap.min.css b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap.min.css
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/css/bootstrap.min.css
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/css/bootstrap.min.css


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/js/bootstrap.js b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/js/bootstrap.js
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/js/bootstrap.js
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/js/bootstrap.js


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/js/bootstrap.min.js b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/js/bootstrap.min.js
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/js/bootstrap.min.js
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/js/bootstrap.min.js


diff --git a/htrace-webapp/src/main/web/lib/bootstrap-3.3.1/js/npm.js b/htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/js/npm.js
similarity index 100%
rename from htrace-webapp/src/main/web/lib/bootstrap-3.3.1/js/npm.js
rename to htrace-webapp/src/main/webapp/lib/bootstrap-3.3.1/js/npm.js


diff --git a/htrace-webapp/src/main/web/lib/jquery-2.1.4.js b/htrace-webapp/src/main/webapp/lib/jquery-2.1.4.js
similarity index 100%
rename from htrace-webapp/src/main/web/lib/jquery-2.1.4.js
rename to htrace-webapp/src/main/webapp/lib/jquery-2.1.4.js


diff --git a/htrace-webapp/src/main/web/lib/moment-2.10.3.js b/htrace-webapp/src/main/webapp/lib/moment-2.10.3.js
similarity index 100%
rename from htrace-webapp/src/main/web/lib/moment-2.10.3.js
rename to htrace-webapp/src/main/webapp/lib/moment-2.10.3.js


diff --git a/htrace-webapp/src/main/web/lib/underscore-1.7.0.js b/htrace-webapp/src/main/webapp/lib/underscore-1.7.0.js
similarity index 100%
rename from htrace-webapp/src/main/web/lib/underscore-1.7.0.js
rename to htrace-webapp/src/main/webapp/lib/underscore-1.7.0.js
commit	05ce37fbc7b27183da3592e3e57e9d06ed09db7a	[log] [tgz]
author	Masatake Iwasaki <iwasakims@apache.org>	Sun Sep 13 18:39:53 2015 +0900
committer	Masatake Iwasaki <iwasakims@apache.org>	Sun Sep 13 18:39:53 2015 +0900
tree	2e5e458c0b05a19a74e284682ce2e9703e3617ec
parent	2716ffdf957872004750f9a35c3244621c58a5e5 [diff]