From 79435726ed870d8395154e539ba2d9eb7789e0de Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 14 Nov 2014 13:46:37 +0000
Subject: [PATCH] #2021 fix - Fixed some JS code to work with a WAR deployment
---
securis/src/main/resources/META-INF/persistence.xml | 2
securis/src/main/webapp/js/catalogs.js | 8 +-
/dev/null | 72 ------------------------
securis/src/main/webapp/js/main.js | 2
securis/src/main/webapp/js/commons.js | 8 +-
securis/src/main/webapp/WEB-INF/web.xml | 3
securis/src/main/webapp/js/licenses.js | 4
securis/src/main/java/net/curisit/securis/services/BasicServices.java | 2
securis/src/main/webapp/index.jsp | 63 +++++++++++++++++++++
securis/src/main/webapp/js/login.js | 2
10 files changed, 78 insertions(+), 88 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/BasicServices.java b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
index 2a783de..40ad38d 100644
--- a/securis/src/main/java/net/curisit/securis/services/BasicServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
@@ -61,7 +61,7 @@
})
public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
LOG.info("App index main.html");
- String page = "/main.html";
+ String page = "/index.jsp";
URI uri = UriBuilder.fromUri(page).build();
return Response.seeOther(uri).build();
}
diff --git a/securis/src/main/resources/META-INF/persistence.xml b/securis/src/main/resources/META-INF/persistence.xml
index 6cde5f7..ceac0f5 100644
--- a/securis/src/main/resources/META-INF/persistence.xml
+++ b/securis/src/main/resources/META-INF/persistence.xml
@@ -14,7 +14,7 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
<property name="hibernate.connection.datasource" value="java:comp/env/jdbc/SeCurisDS"/>
- <property name="hibernate.show_sql" value="true" />
+ <property name="hibernate.show_sql" value="false" />
</properties>
</persistence-unit>
diff --git a/securis/src/main/webapp/WEB-INF/web.xml b/securis/src/main/webapp/WEB-INF/web.xml
index d07668d..106da5d 100644
--- a/securis/src/main/webapp/WEB-INF/web.xml
+++ b/securis/src/main/webapp/WEB-INF/web.xml
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
@@ -67,7 +66,7 @@
</listener>
<welcome-file-list>
- <welcome-file>/main.html</welcome-file>
+ <welcome-file>/index.jsp</welcome-file>
</welcome-file-list>
diff --git a/securis/src/main/webapp/index.jsp b/securis/src/main/webapp/index.jsp
new file mode 100644
index 0000000..18f222a
--- /dev/null
+++ b/securis/src/main/webapp/index.jsp
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html class="no-js" lang="en" ng-app="securis"
+ xmlns:ng="http://angularjs.org">
+<head>
+<base href="<%= pageContext.getServletContext().getContextPath() %>/">
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<title>SeCuris</title>
+<meta name="description" content="">
+<meta name="viewport" content="width=device-width">
+
+<link rel="stylesheet" href="css/bootstrap.min.css">
+<link rel="stylesheet" href="css/bootstrap-dialog.css">
+<link rel="stylesheet" href="css/toaster.css">
+<link rel="stylesheet" href="css/chosen.css">
+<link rel="stylesheet" href="css/chosen-spinner.css">
+<link rel="stylesheet" href="css/bootstrap-theme.min.css">
+<link rel="stylesheet" href="css/font-awesome.min.css">
+
+<link rel="stylesheet" href="css/securis.css">
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+</head>
+<body>
+ <div ng-controller="MainCtrl">
+ <div ng-view></div>
+
+ <hr>
+ <div>
+ <footer>
+ <small i18n style="margin: auto; display: block;"
+ class="text-center">© CurisTEC 2014</small>
+ </footer>
+ </div>
+ <!-- /container -->
+ <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+ <script src="js/vendor/jquery.min.js"></script>
+ <script type="text/javascript" src="js/vendor/bootstrap.min.js"></script>
+ <script type="text/javascript" src="js/vendor/bootstrap-dialog.js"></script>
+ <script type="text/javascript" src="js/angular/angular.js"></script>
+ <script type="text/javascript" src="js/angular/angular-route.min.js"></script>
+ <script type="text/javascript"
+ src="js/angular/angular-resource.min.js"></script>
+ <script type="text/javascript"
+ src="js/angular/angular-resource.min.js"></script>
+ <script type="text/javascript" src="js/angular/toaster.js"></script>
+ <script type="text/javascript" src="js/angular/toaster.js"></script>
+ <script type="text/javascript" src="js/vendor/chosen.jquery.js"></script>
+ <script type="text/javascript" src="js/angular/chosen.js"></script>
+ <script type="text/javascript" src="js/vendor/store.min.js"></script>
+
+ <script type="text/javascript" src="js/i18n.js"></script>
+ <script type="text/javascript" src="js/main.js"></script>
+ <script type="text/javascript" src="js/login.js"></script>
+ <script type="text/javascript" src="js/catalogs.js"></script>
+ <script type="text/javascript" src="js/licenses.js"></script>
+ <script type="text/javascript" src="js/admin.js"></script>
+
+ <toaster-container toaster-options="{'time-out': 3000}"></toaster-container>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/securis/src/main/webapp/js/catalogs.js b/securis/src/main/webapp/js/catalogs.js
index 298af83..e437ddd 100644
--- a/securis/src/main/webapp/js/catalogs.js
+++ b/securis/src/main/webapp/js/catalogs.js
@@ -18,18 +18,18 @@
function($rootScope, $http, $resource, $q) {
var resources = {
application : $resource(
- '/application/:appId', {
+ 'application/:appId', {
appId : '@id'
}),
user : $resource('/user/:userId', {
userId : '@username'
}),
organization : $resource(
- '/organization/:orgId', {
+ 'organization/:orgId', {
orgId : '@id'
}),
licensetype : $resource(
- '/licensetype/:licenseTypeId', {
+ 'licensetype/:licenseTypeId', {
licenseTypeId : '@id'
})
}
@@ -38,7 +38,7 @@
var _current = null;
var _list = function() {
- return $http.get('/js/catalogs.json')
+ return $http.get('js/catalogs.json')
.success(function(data) {
_metadata = data;
})
diff --git a/securis/src/main/webapp/js/commons.js b/securis/src/main/webapp/js/commons.js
index 692793b..d99c93d 100644
--- a/securis/src/main/webapp/js/commons.js
+++ b/securis/src/main/webapp/js/commons.js
@@ -25,7 +25,7 @@
app.factory('Catalogs', function($http, $resource) {
var CatalogsService = {
resources : {
- application : $resource('/application/:appId', {
+ application : $resource('application/:appId', {
appId : '@id'
}, {
update : {
@@ -39,14 +39,14 @@
}
}
}),
- user : $resource('/user/:userId', {
+ user : $resource('user/:userId', {
userId : '@id'
}, {
update : {
method : "PUT"
}
}),
- licensetype : $resource('/licenseType/:licenseTypeId', {
+ licensetype : $resource('licenseType/:licenseTypeId', {
licenseTypeId : '@id'
}, {
update : {
@@ -56,7 +56,7 @@
},
list : function(initFn) {
- $http.get('/js/catalogs.json').success(function(data) {
+ $http.get('js/catalogs.json').success(function(data) {
console.log(data);
CatalogsService.data = data;
initFn();
diff --git a/securis/src/main/webapp/js/licenses.js b/securis/src/main/webapp/js/licenses.js
index 71b5014..0921b5d 100644
--- a/securis/src/main/webapp/js/licenses.js
+++ b/securis/src/main/webapp/js/licenses.js
@@ -38,7 +38,7 @@
'delete': [PACK_STATUS.CREATED, PACK_STATUS.CANCELLED]
}
- var packResource = $resource('/pack/:packId/:action',
+ var packResource = $resource('pack/:packId/:action',
{
packId : '@id',
action : '@action'
@@ -166,7 +166,7 @@
'delete': [LIC_STATUS.CREATED, LIC_STATUS.CANCELLED]
}
- var licenseResource = $resource('/license/:licenseId/:action', {
+ var licenseResource = $resource('license/:licenseId/:action', {
licenseId : '@id',
action : '@action'
},
diff --git a/securis/src/main/webapp/js/login.js b/securis/src/main/webapp/js/login.js
index 8051120..2d10421 100644
--- a/securis/src/main/webapp/js/login.js
+++ b/securis/src/main/webapp/js/login.js
@@ -12,7 +12,7 @@
$scope.submit = function() {
console.log('Sending user: ' + $scope.username + ' pass: ' + $scope.password);
$http({ method: 'POST',
- url: '/user/login',
+ url: 'user/login',
headers: {
"Content-Type": "application/x-www-form-urlencoded"
},
diff --git a/securis/src/main/webapp/js/main.js b/securis/src/main/webapp/js/main.js
index ff529be..aa73fd3 100644
--- a/securis/src/main/webapp/js/main.js
+++ b/securis/src/main/webapp/js/main.js
@@ -90,7 +90,7 @@
$location.path('/login');
if ($store.get('token') != null) {
- $http.get('/check', {
+ $http.get('check', {
headers: {
'X-SECURIS-TOKEN': $store.get('token')
}
diff --git a/securis/src/main/webapp/main.html b/securis/src/main/webapp/main.html
deleted file mode 100644
index 45e27e9..0000000
--- a/securis/src/main/webapp/main.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html class="no-js" lang="en" ng-app="securis"
- xmlns:ng="http://angularjs.org">
-<head>
-<base href="/">
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<title>SeCuris</title>
-<meta name="description" content="">
-<meta name="viewport" content="width=device-width">
-
-<link rel="stylesheet" href="/css/bootstrap.min.css">
-<link rel="stylesheet" href="/css/bootstrap-dialog.css">
-<link rel="stylesheet" href="/css/toaster.css">
-<link rel="stylesheet" href="/css/chosen.css">
-<link rel="stylesheet" href="/css/chosen-spinner.css">
-<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
-<link rel="stylesheet" href="/css/font-awesome.min.css">
-
-<link rel="stylesheet" href="/css/securis.css">
-
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-</head>
-<body >
-<div ng-controller="MainCtrl">
- <div ng-view ></div>
-
- <hr>
- <div>
- <footer>
- <small i18n style="margin: auto; display: block;" class="text-center">© CurisTEC 2014</small>
- </footer>
- </div>
- <!-- /container -->
- <script src="/js/vendor/modernizr-2.6.2.min.js"></script>
- <script
- src="/js/vendor/jquery.min.js"></script>
- <script type="text/javascript"
- src="/js/vendor/bootstrap.min.js"></script>
- <script type="text/javascript"
- src="/js/vendor/bootstrap-dialog.js"></script>
- <script type="text/javascript"
- src="/js/angular/angular.js"></script>
- <script type="text/javascript"
- src="/js/angular/angular-route.min.js"></script>
- <script type="text/javascript"
- src="/js/angular/angular-resource.min.js"></script>
- <script type="text/javascript"
- src="/js/angular/angular-resource.min.js"></script>
- <script type="text/javascript"
- src="/js/angular/toaster.js"></script>
- <script type="text/javascript"
- src="/js/angular/toaster.js"></script>
- <script type="text/javascript"
- src="/js/vendor/chosen.jquery.js"></script>
- <script type="text/javascript"
- src="/js/angular/chosen.js"></script>
- <script type="text/javascript"
- src="/js/vendor/store.min.js"></script>
-
- <script type="text/javascript" src="js/i18n.js"></script>
- <script type="text/javascript" src="js/main.js"></script>
- <script type="text/javascript" src="js/login.js"></script>
- <script type="text/javascript" src="js/catalogs.js"></script>
- <script type="text/javascript" src="js/licenses.js"></script>
- <script type="text/javascript" src="js/admin.js"></script>
-
- <toaster-container toaster-options="{'time-out': 3000}"></toaster-container>
-</div>
-</body>
-</html>
\ No newline at end of file
--
Gitblit v1.3.2