对war包目录的修改

zkkxyz · May 28, 2013 · 3b96d0f · 3b96d0f
1 parent 7e19d85
commit 3b96d0f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 34 deletions.
diff --git a/docs/.~lock.Hydra架构介绍.docx# b/docs/.~lock.Hydra架构介绍.docx#
diff --git a/modules/hydra-web/src/main/webapp/WEB-INF/views/index.jsp b/modules/hydra-web/src/main/webapp/WEB-INF/views/index.jsp
@@ -3,6 +3,9 @@
 <head>
     <title>Hydra</title>
 </head>
+<script language="JavaScript" type="text/javascript">
+    var ctp = "<%=request.getContextPath() %>";
+</script>
 <body>
 <div style="width:100%;background-color: #7AC5CD;height: 50px;color: #ffffff;font-size:35px;">
     <div style="padding: 10 0 0 10">Hydra</div>
@@ -11,29 +14,29 @@
 
 
 
-<link rel="stylesheet" type="text/css" href="/statics/lib/bootstrap.min.css" />
-<link rel="stylesheet" type="text/css" href="/statics/css/app.css" />
+<link rel="stylesheet" type="text/css" href="<%=request.getContextPath() %>/statics/lib/bootstrap.min.css" />
+<link rel="stylesheet" type="text/css" href="<%=request.getContextPath() %>/statics/css/app.css" />
 
 
-<script type="text/javascript" src="/statics/lib/jquery-1.8.0.min.js"></script>
-<script src="/statics/lib/angular/angular.js"></script>
-<script src="/statics/lib/angular/angular-resource.js?"></script>
-<script type="text/javascript" src="/statics/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath() %>/statics/lib/jquery-1.8.0.min.js"></script>
+<script src="<%=request.getContextPath() %>/statics/lib/angular/angular.js"></script>
+<script src="<%=request.getContextPath() %>/statics/lib/angular/angular-resource.js?"></script>
+<script type="text/javascript" src="<%=request.getContextPath() %>/statics/lib/bootstrap.min.js"></script>
 
-<script src="/statics/js/app.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/app.js"></script>
 <!-- repo -->
-<script src="/statics/js/repository/trace-repo.js"></script>
-<script src="/statics/js/repository/service-repo.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/repository/trace-repo.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/repository/service-repo.js"></script>
 
 <!-- service -->
-<script src="/statics/js/service/sequence-service.js"></script>
-<script src="/statics/js/service/tree-service.js"></script>
-<script src="/statics/js/service/query-service.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/service/sequence-service.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/service/tree-service.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/service/query-service.js"></script>
 <!-- controller -->
-<script src="/statics/js/controller/query-controller.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/controller/query-controller.js"></script>
 
 <!-- filter -->
-<script src="/statics/js/filters.js"></script>
+<script src="<%=request.getContextPath() %>/statics/js/filters.js"></script>
 <%--<script src="/statics/js/directives.js"></script>--%>
 </body>
 </html>
diff --git a/modules/hydra-web/src/main/webapp/WEB-INF/views/query.jsp b/modules/hydra-web/src/main/webapp/WEB-INF/views/query.jsp
@@ -1,21 +1,20 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html lang="en">
 <head>
-    <style type="text/css">
-
-
-    </style>
-    <link href="/statics/lib/bootstrap/datetimepicker/css/datetimepicker.css" rel="stylesheet" media="screen">
-    <link href="/statics/lib/DataTables-1.9.4/media/css/jquery.dataTables.css" rel="stylesheet" type="text/css"/>
-    <link href="/statics/lib/jquery.qtip.min.css" rel="stylesheet" type="text/css"/>
-    <script type="text/javascript" src="/statics/lib/d3.v3.min.js"></script>
-    <script src="/statics/lib/jquery.qtip.min.js" type="text/javascript"></script>
-    <script type="text/javascript" src="/statics/lib/DataTables-1.9.4/media/js/jquery.dataTables.min.js"></script>
-    <script type="text/javascript" src="/statics/lib/DataTables-1.9.4/media/js/plugin.js"></script>
+    <script language="javascript" type="text/javascript">
+        var ctp = "<%=request.getContextPath() %>";
+    </script>
+    <link href="<%=request.getContextPath() %>/statics/lib/bootstrap/datetimepicker/css/datetimepicker.css" rel="stylesheet" media="screen">
+    <link href="<%=request.getContextPath() %>/statics/lib/DataTables-1.9.4/media/css/jquery.dataTables.css" rel="stylesheet" type="text/css"/>
+    <link href="<%=request.getContextPath() %>/statics/lib/jquery.qtip.min.css" rel="stylesheet" type="text/css"/>
+    <script type="text/javascript" src="<%=request.getContextPath() %>/statics/lib/d3.v3.min.js"></script>
+    <script src="<%=request.getContextPath() %>/statics/lib/jquery.qtip.min.js" type="text/javascript"></script>
+    <script type="text/javascript" src="<%=request.getContextPath() %>/statics/lib/DataTables-1.9.4/media/js/jquery.dataTables.min.js"></script>
+    <script type="text/javascript" src="<%=request.getContextPath() %>/statics/lib/DataTables-1.9.4/media/js/plugin.js"></script>
     <script type="text/javascript"
-            src="/statics/lib/bootstrap/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+            src="<%=request.getContextPath() %>/statics/lib/bootstrap/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
     <script type="text/javascript"
-            src="/statics/lib/bootstrap/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"></script>
+            src="<%=request.getContextPath() %>/statics/lib/bootstrap/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"></script>
 </head>
 <body>
 <div ng-show="showType == 'query'">

diff --git a/modules/hydra-web/src/main/webapp/statics/js/app.js b/modules/hydra-web/src/main/webapp/statics/js/app.js
@@ -9,6 +9,6 @@ angular.module('myApp',
             'hydra.filters'
         ]).
     config(['$routeProvider', function ($routeProvider) {
-        $routeProvider.when('/query', {templateUrl: '/index/query.html', controller: QueryCtrl});
+        $routeProvider.when('/query', {templateUrl:  ctp + '/index/query.html', controller: QueryCtrl});
     $routeProvider.otherwise({redirectTo: '/query'});
     }]);
diff --git a/modules/hydra-web/src/main/webapp/statics/js/repository/service-repo.js b/modules/hydra-web/src/main/webapp/statics/js/repository/service-repo.js
@@ -16,12 +16,12 @@
 'use strict';
 angular.module('hydra.repository.service', ['ngResource'])
     .factory('ServiceList', function ($resource) {
-        return $resource('/rest/service/:appId', {}, {
+        return $resource(ctp + '/rest/service/:appId', {}, {
             getAll: {method: 'GET', isArray: true}
         });
     })
     .factory('AppList', function ($resource) {
-        return $resource('/rest/service/appList', {}, {
+        return $resource(ctp + '/rest/service/appList', {}, {
             getAll: {method: 'GET', isArray: true}
         });
     });
diff --git a/modules/hydra-web/src/main/webapp/statics/js/repository/trace-repo.js b/modules/hydra-web/src/main/webapp/statics/js/repository/trace-repo.js
@@ -16,18 +16,18 @@
 'use strict';
 angular.module('hydra.repository.trace', ['ngResource'])
     .factory('Trace', function ($resource) {
-        return $resource('/rest/trace/one/:traceId');
+        return $resource(ctp + '/rest/trace/one/:traceId');
     })
     .factory('TraceList', function ($resource) {
-        return $resource('/rest/trace/list/:serviceId/:startTime/:durationMin/:durationMax/:sum', {}, {
+        return $resource(ctp + '/rest/trace/list/:serviceId/:startTime/:durationMin/:durationMax/:sum', {}, {
             getTraceList:{
                 method:'GET',
                 isArray:true
             }
         });
     })
     .factory('TraceListEx', function ($resource) {
-        return $resource('/rest/trace/list/ex/:serviceId/:startTime/:sum', {}, {
+        return $resource(ctp + '/rest/trace/list/ex/:serviceId/:startTime/:sum', {}, {
             getTraceList:{
                 method:'GET',
                 isArray:true