Changed security constraints on info pages

oskopek · Apr 15, 2014 · 44bb415 · 44bb415
1 parent 29b7aff
commit 44bb415
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 23 deletions.
diff --git a/carcv-webapp/src/main/webapp/WEB-INF/web.xml b/carcv-webapp/src/main/webapp/WEB-INF/web.xml
@@ -8,6 +8,7 @@
         <web-resource-collection>
             <web-resource-name>allowed_pages</web-resource-name>
             <url-pattern>/resources/*</url-pattern>
+            <url-pattern>/info/*</url-pattern>
             <url-pattern>/welcome.jsp</url-pattern>
         </web-resource-collection>
         <user-data-constraint>

diff --git a/carcv-webapp/src/main/webapp/app/index.jsp b/carcv-webapp/src/main/webapp/app/index.jsp
@@ -21,8 +21,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/carcv-webapp/src/main/webapp/app/refresh_in_progress.jsp b/carcv-webapp/src/main/webapp/app/refresh_in_progress.jsp
@@ -21,8 +21,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/carcv-webapp/src/main/webapp/app/upload.jsp b/carcv-webapp/src/main/webapp/app/upload.jsp
@@ -23,8 +23,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/carcv-webapp/src/main/webapp/app/working.jsp b/carcv-webapp/src/main/webapp/app/working.jsp
@@ -15,8 +15,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                target="_top" style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                target="_top" style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/...webapp/src/main/webapp/app/contact_us.jsp → ...ebapp/src/main/webapp/info/contact_us.jsp b/...webapp/src/main/webapp/app/contact_us.jsp → ...ebapp/src/main/webapp/info/contact_us.jsp
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <link rel="SHORTCUT ICON" href="http://upload.wikimedia.org/wikipedia/commons/f/f0/Car_with_Driver-Silhouette.svg">
 <link rel="icon" href="http://upload.wikimedia.org/wikipedia/commons/f/f0/Car_with_Driver-Silhouette.svg" type="image/ico">
-<title>CarCV - Login</title>
+<title>CarCV - Contact Us</title>
 <link rel="stylesheet" type="text/css" href="/resources/mystyle.css">
 </head>
 
@@ -15,8 +15,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                target="_top" style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                target="_top" style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/...webapp/src/main/webapp/app/contribute.jsp → ...ebapp/src/main/webapp/info/contribute.jsp b/...webapp/src/main/webapp/app/contribute.jsp → ...ebapp/src/main/webapp/info/contribute.jsp
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <link rel="SHORTCUT ICON" href="http://upload.wikimedia.org/wikipedia/commons/f/f0/Car_with_Driver-Silhouette.svg">
 <link rel="icon" href="http://upload.wikimedia.org/wikipedia/commons/f/f0/Car_with_Driver-Silhouette.svg" type="image/ico">
-<title>CarCV - Login</title>
+<title>CarCV - Contribute</title>
 <link rel="stylesheet" type="text/css" href="/resources/mystyle.css">
 </head>
 
@@ -15,8 +15,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                target="_top" style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                target="_top" style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/...v-webapp/src/main/webapp/app/features.jsp → ...-webapp/src/main/webapp/info/features.jsp b/...v-webapp/src/main/webapp/app/features.jsp → ...-webapp/src/main/webapp/info/features.jsp
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <link rel="SHORTCUT ICON" href="http://upload.wikimedia.org/wikipedia/commons/f/f0/Car_with_Driver-Silhouette.svg">
 <link rel="icon" href="http://upload.wikimedia.org/wikipedia/commons/f/f0/Car_with_Driver-Silhouette.svg" type="image/ico">
-<title>CarCV - Login</title>
+<title>CarCV - Features</title>
 <link rel="stylesheet" type="text/css" href="/resources/mystyle.css">
 </head>
 
@@ -15,8 +15,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                target="_top" style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                target="_top" style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/carcv-webapp/src/main/webapp/login/badLogin.jsp b/carcv-webapp/src/main/webapp/login/badLogin.jsp
@@ -15,8 +15,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                target="_top" style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                target="_top" style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/carcv-webapp/src/main/webapp/login/login.jsp b/carcv-webapp/src/main/webapp/login/login.jsp
@@ -15,8 +15,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                target="_top" style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                target="_top" style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>

diff --git a/carcv-webapp/src/main/webapp/welcome.jsp b/carcv-webapp/src/main/webapp/welcome.jsp
@@ -15,8 +15,8 @@
             alt="OpenCV" /></a>
         <p style="position: absolute; right: 8%; top: 2%; font-size: 11pt; word-spacing: .5em;">
             <strong> <a href="/app/index.jsp" target="_top" style="text-decoration: none">Home</a> <a
-                href="/app/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/app/contribute.jsp"
-                target="_top" style="text-decoration: none">Contribute</a> <a href="/app/contact_us.jsp" target="_top"
+                href="/info/features.jsp" target="_top" style="text-decoration: none">Features</a> <a href="/info/contribute.jsp"
+                target="_top" style="text-decoration: none">Contribute</a> <a href="/info/contact_us.jsp" target="_top"
                 style="text-decoration: none; word-spacing: 0em;">Contact us</a>
             </strong>
         </p>