parent: 8076f3e6 | patch | commit
rsanchez
2014-11-14 79435726ed870d8395154e539ba2d9eb7789e0de 
#2021 fix - Fixed some JS code to work with a WAR deployment
1 files deleted
1 files added
8 files modified
changed files
securis/src/main/java/net/curisit/securis/services/BasicServices.java patch | view | blame | history
securis/src/main/resources/META-INF/persistence.xml patch | view | blame | history
securis/src/main/webapp/WEB-INF/web.xml patch | view | blame | history
securis/src/main/webapp/index.jsp patch | view | blame | history
securis/src/main/webapp/js/catalogs.js patch | view | blame | history
securis/src/main/webapp/js/commons.js patch | view | blame | history
securis/src/main/webapp/js/licenses.js patch | view | blame | history
securis/src/main/webapp/js/login.js patch | view | blame | history
securis/src/main/webapp/js/main.js patch | view | blame | history
securis/src/main/webapp/main.html patch | view | blame | history 
 securis/src/main/java/net/curisit/securis/services/BasicServices.java
....@@ -61,7 +61,7 @@
6161     })
6262     public Response init(@PathParam("module") String module, @Context HttpServletRequest request) {
6363         LOG.info("App index main.html");
64
-        String page = "/main.html";
64
+        String page = "/index.jsp";
6565         URI uri = UriBuilder.fromUri(page).build();
6666         return Response.seeOther(uri).build();
6767     }


 securis/src/main/resources/META-INF/persistence.xml
....@@ -14,7 +14,7 @@
1414 			<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
1515 	        <property name="hibernate.connection.datasource" value="java:comp/env/jdbc/SeCurisDS"/>
1616 
17
-			<property name="hibernate.show_sql" value="true" />
17
+			<property name="hibernate.show_sql" value="false" />
1818 		</properties>
1919 		
2020 	</persistence-unit>


 securis/src/main/webapp/WEB-INF/web.xml
....@@ -15,7 +15,6 @@
1515   See the License for the specific language governing permissions and
1616   limitations under the License.
1717 -->
18
-
1918 <web-app xmlns="http://java.sun.com/xml/ns/javaee"
2019   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2120   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
....@@ -67,7 +66,7 @@
6766     </listener>
6867 
6968 	<welcome-file-list>
70
-		<welcome-file>/main.html</welcome-file>
69
+		<welcome-file>/index.jsp</welcome-file>
7170 	</welcome-file-list>
7271 
7372 


 securis/src/main/webapp/index.jsp
....@@ -0,0 +1,63 @@
1
+<!DOCTYPE html>
2
+<html class="no-js" lang="en" ng-app="securis"
3
+	xmlns:ng="http://angularjs.org">
4
+<head>
5
+<base href="<%= pageContext.getServletContext().getContextPath() %>/">
6
+<meta charset="utf-8">
7
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
8
+<title>SeCuris</title>
9
+<meta name="description" content="">
10
+<meta name="viewport" content="width=device-width">
11
+
12
+<link rel="stylesheet" href="css/bootstrap.min.css">
13
+<link rel="stylesheet" href="css/bootstrap-dialog.css">
14
+<link rel="stylesheet" href="css/toaster.css">
15
+<link rel="stylesheet" href="css/chosen.css">
16
+<link rel="stylesheet" href="css/chosen-spinner.css">
17
+<link rel="stylesheet" href="css/bootstrap-theme.min.css">
18
+<link rel="stylesheet" href="css/font-awesome.min.css">
19
+
20
+<link rel="stylesheet" href="css/securis.css">
21
+
22
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
23
+
24
+</head>
25
+<body>
26
+	<div ng-controller="MainCtrl">
27
+		<div ng-view></div>
28
+
29
+		<hr>
30
+		<div>
31
+			<footer>
32
+				<small i18n style="margin: auto; display: block;"
33
+					class="text-center">&copy; CurisTEC 2014</small>
34
+			</footer>
35
+		</div>
36
+		<!-- /container -->
37
+		<script src="js/vendor/modernizr-2.6.2.min.js"></script>
38
+		<script src="js/vendor/jquery.min.js"></script>
39
+		<script type="text/javascript" src="js/vendor/bootstrap.min.js"></script>
40
+		<script type="text/javascript" src="js/vendor/bootstrap-dialog.js"></script>
41
+		<script type="text/javascript" src="js/angular/angular.js"></script>
42
+		<script type="text/javascript" src="js/angular/angular-route.min.js"></script>
43
+		<script type="text/javascript"
44
+			src="js/angular/angular-resource.min.js"></script>
45
+		<script type="text/javascript"
46
+			src="js/angular/angular-resource.min.js"></script>
47
+		<script type="text/javascript" src="js/angular/toaster.js"></script>
48
+		<script type="text/javascript" src="js/angular/toaster.js"></script>
49
+		<script type="text/javascript" src="js/vendor/chosen.jquery.js"></script>
50
+		<script type="text/javascript" src="js/angular/chosen.js"></script>
51
+		<script type="text/javascript" src="js/vendor/store.min.js"></script>
52
+
53
+		<script type="text/javascript" src="js/i18n.js"></script>
54
+		<script type="text/javascript" src="js/main.js"></script>
55
+		<script type="text/javascript" src="js/login.js"></script>
56
+		<script type="text/javascript" src="js/catalogs.js"></script>
57
+		<script type="text/javascript" src="js/licenses.js"></script>
58
+		<script type="text/javascript" src="js/admin.js"></script>
59
+
60
+		<toaster-container toaster-options="{'time-out': 3000}"></toaster-container>
61
+	</div>
62
+</body>
63
+</html>


 securis/src/main/webapp/js/catalogs.js
....@@ -18,18 +18,18 @@
1818 							function($rootScope, $http, $resource, $q) {
1919 								var resources = {
2020 									application : $resource(
21
-											'/application/:appId', {
21
+											'application/:appId', {
2222 												appId : '@id'
2323 											}),
2424 									user : $resource('/user/:userId', {
2525 										userId : '@username'
2626 									}),
2727 									organization : $resource(
28
-											'/organization/:orgId', {
28
+											'organization/:orgId', {
2929 												orgId : '@id'
3030 											}),
3131 									licensetype : $resource(
32
-											'/licensetype/:licenseTypeId', {
32
+											'licensetype/:licenseTypeId', {
3333 												licenseTypeId : '@id'
3434 											})
3535 								}
....@@ -38,7 +38,7 @@
3838 								var _current = null;
3939 
4040 								var _list = function() {
41
-									return $http.get('/js/catalogs.json')
41
+									return $http.get('js/catalogs.json')
4242 											.success(function(data) {
4343 												_metadata = data;
4444 											})


 securis/src/main/webapp/js/commons.js
....@@ -25,7 +25,7 @@
2525 	app.factory('Catalogs', function($http, $resource) {
2626 		var CatalogsService = {
2727 			resources : {
28
-				application : $resource('/application/:appId', {
28
+				application : $resource('application/:appId', {
2929 					appId : '@id'
3030 				}, {
3131 					update : {
....@@ -39,14 +39,14 @@
3939 						}
4040 					}
4141 				}),
42
-				user : $resource('/user/:userId', {
42
+				user : $resource('user/:userId', {
4343 					userId : '@id'
4444 				}, {
4545 					update : {
4646 						method : "PUT"
4747 					}
4848 				}),
49
-				licensetype : $resource('/licenseType/:licenseTypeId', {
49
+				licensetype : $resource('licenseType/:licenseTypeId', {
5050 					licenseTypeId : '@id'
5151 				}, {
5252 					update : {
....@@ -56,7 +56,7 @@
5656 
5757 			},
5858 			list : function(initFn) {
59
-				$http.get('/js/catalogs.json').success(function(data) {
59
+				$http.get('js/catalogs.json').success(function(data) {
6060 					console.log(data);
6161 					CatalogsService.data = data;
6262 					initFn();


 securis/src/main/webapp/js/licenses.js
....@@ -38,7 +38,7 @@
3838 	            'delete': [PACK_STATUS.CREATED, PACK_STATUS.CANCELLED]
3939 	    }
4040 		
41
-		var packResource = $resource('/pack/:packId/:action', 
41
+		var packResource = $resource('pack/:packId/:action', 
4242 				{
4343 					packId : '@id',
4444 					action : '@action'
....@@ -166,7 +166,7 @@
166166 	            'delete': [LIC_STATUS.CREATED, LIC_STATUS.CANCELLED]
167167 	    }
168168 		
169
-        var licenseResource = $resource('/license/:licenseId/:action', {
169
+        var licenseResource = $resource('license/:licenseId/:action', {
170170             licenseId : '@id',
171171 			action : '@action'
172172 		},


 securis/src/main/webapp/js/login.js
....@@ -12,7 +12,7 @@
1212 		$scope.submit = function() {
1313 			console.log('Sending user: ' + $scope.username + ' pass: ' + $scope.password);
1414 			$http({	method: 'POST', 
15
-					url: '/user/login',
15
+					url: 'user/login',
1616 					headers: {
1717 						"Content-Type": "application/x-www-form-urlencoded"
1818 					}, 


 securis/src/main/webapp/js/main.js
....@@ -90,7 +90,7 @@
9090 		$location.path('/login');
9191 		if ($store.get('token') != null) {
9292 
93
-			$http.get('/check', {
93
+			$http.get('check', {
9494 				headers: {
9595 					'X-SECURIS-TOKEN': $store.get('token')
9696 				}


 securis/src/main/webapp/main.html
deleted file mode 100644
....@@ -1,72 +0,0 @@
1
-<!DOCTYPE html>
2
-<html class="no-js" lang="en" ng-app="securis"
3
-	xmlns:ng="http://angularjs.org">
4
-<head>
5
-<base href="/">
6
-<meta charset="utf-8">
7
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
8
-<title>SeCuris</title>
9
-<meta name="description" content="">
10
-<meta name="viewport" content="width=device-width">
11
-
12
-<link rel="stylesheet" href="/css/bootstrap.min.css">
13
-<link rel="stylesheet" href="/css/bootstrap-dialog.css">
14
-<link rel="stylesheet" href="/css/toaster.css">
15
-<link rel="stylesheet" href="/css/chosen.css">
16
-<link rel="stylesheet" href="/css/chosen-spinner.css">
17
-<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
18
-<link rel="stylesheet" href="/css/font-awesome.min.css">
19
-
20
-<link rel="stylesheet" href="/css/securis.css">
21
-
22
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
23
-
24
-</head>
25
-<body >
26
-<div ng-controller="MainCtrl">
27
-	<div ng-view ></div>
28
-
29
-	<hr>
30
-	<div>
31
-		<footer>
32
-			<small i18n style="margin: auto; display: block;" class="text-center">&copy; CurisTEC 2014</small>
33
-		</footer>
34
-	</div>
35
-	<!-- /container -->
36
-    <script src="/js/vendor/modernizr-2.6.2.min.js"></script>
37
-	<script
38
-		src="/js/vendor/jquery.min.js"></script>
39
-	<script type="text/javascript"
40
-		src="/js/vendor/bootstrap.min.js"></script>
41
-	<script type="text/javascript"
42
-		src="/js/vendor/bootstrap-dialog.js"></script>
43
-	<script type="text/javascript"
44
-		src="/js/angular/angular.js"></script>
45
-	<script type="text/javascript"
46
-		src="/js/angular/angular-route.min.js"></script>
47
-	<script type="text/javascript"
48
-		src="/js/angular/angular-resource.min.js"></script>
49
-	<script type="text/javascript"
50
-		src="/js/angular/angular-resource.min.js"></script>
51
-	<script type="text/javascript"
52
-		src="/js/angular/toaster.js"></script>
53
-	<script type="text/javascript"
54
-		src="/js/angular/toaster.js"></script>
55
-	<script type="text/javascript"
56
-		src="/js/vendor/chosen.jquery.js"></script>
57
-	<script type="text/javascript"
58
-		src="/js/angular/chosen.js"></script>
59
-	<script type="text/javascript"
60
-		src="/js/vendor/store.min.js"></script>
61
-		
62
- 	<script type="text/javascript" src="js/i18n.js"></script>
63
- 	<script type="text/javascript" src="js/main.js"></script>
64
- 	<script type="text/javascript" src="js/login.js"></script>
65
- 	<script type="text/javascript" src="js/catalogs.js"></script>
66
- 	<script type="text/javascript" src="js/licenses.js"></script>
67
- 	<script type="text/javascript" src="js/admin.js"></script>
68
-
69
-    <toaster-container toaster-options="{'time-out': 3000}"></toaster-container>
70
-</div>
71
-</body>
72
-</html>