perfsonar development work

Author: psnc.procyk
Date: 2010-10-20 15:41:18 +0100 (Wed, 20 Oct 2010)
New Revision: 5781

Added:
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/LogoutServlet.java
Modified:
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/FormServlet.java
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/org/perfsonar/webadmin/xslt/templates/xslt-menu.xml
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/wa/styles/main.css
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/info.jsp
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/login.jsp
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/main.jsp
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/parts/savedFailed.jsp
   
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-exampleservice/src/main/webapp/WEB-INF/web.xml
Log:
Added logout feature


Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/FormServlet.java
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/FormServlet.java
    2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/FormServlet.java
    2010-10-20 14:41:18 UTC (rev 5781)
@@ -84,7 +84,7 @@
                        }
                }
 
-               req.getSession().setAttribute("info", "Registration saved");
+               req.getSession().setAttribute("info", "Configuration saved");
                req.getSession().setAttribute("page", "/views/info.jsp");
                redirect(req, resp, "/main");
        }

Added: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/LogoutServlet.java
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/LogoutServlet.java
                          (rev 0)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/java/net/geant/perfsonar/webadmin/servlets/LogoutServlet.java
  2010-10-20 14:41:18 UTC (rev 5781)
@@ -0,0 +1,22 @@
+package net.geant.perfsonar.webadmin.servlets;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+public class LogoutServlet extends CoreServlet {
+
+       @Override
+       protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+                       throws ServletException, IOException {
+
+               req.getSession().removeAttribute("logged");
+               req.getSession().setAttribute("info", "User logged out");
+               req.getSession().setAttribute("page", "/views/info.jsp");
+               redirect(req, resp, "/main");
+       }
+
+}

Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/org/perfsonar/webadmin/xslt/templates/xslt-menu.xml
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/org/perfsonar/webadmin/xslt/templates/xslt-menu.xml
  2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/org/perfsonar/webadmin/xslt/templates/xslt-menu.xml
  2010-10-20 14:41:18 UTC (rev 5781)
@@ -35,6 +35,13 @@
                                        </xsl:for-each>
                                </td>
                        </tr>
+                       <tr>
+                               <td>
+                                       <a href="logout" class="button" 
target="_self">
+                                               Log out
+                                       </a>
+                               </td>
+                       </tr>
                </table>
                <img src="wa/graphics/logos.gif" 
                         alt="perfSONAR project partners"

Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/wa/styles/main.css
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/wa/styles/main.css
   2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/resources/wa/styles/main.css
   2010-10-20 14:41:18 UTC (rev 5781)
@@ -300,6 +300,7 @@
        background-position: 100% 50%;
        background-image: url(../graphics/admin_home_target.gif);
        background-repeat: no-repeat;
+       padding-right: 30px;
 }
 
 .sidebar a {

Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/info.jsp
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/info.jsp
  2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/info.jsp
  2010-10-20 14:41:18 UTC (rev 5781)
@@ -11,24 +11,26 @@
 
        <div class="adminPanel">
        <div class="banner">
-               
<%@include
 file="parts/banner.jsp"%>
-        </div>
+                       
<%@include
 file="parts/banner.jsp"%>
+               </div>
         <div class="mainWindow">
                <div class="sidebar">
                 <%
                                        
out.println(request.getAttribute("menu"));
                                %>
-            </div>
+                       </div>
             <div class="centerWindow">
-               <span style="color:#468C46">
-                       <%
+                               <span style="color:#468C46">
+                                       <%
                                                
out.println(request.getAttribute("content"));
                                        %>
                                </span>
-            </div>
+                       </div>
+               </div>
+       <div class="footer">
+               
<%@include
 file="parts/footer.jsp"%>
         </div>
-      </div>
+       </div>
 
-
 </body>
 </html>

Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/login.jsp
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/login.jsp
 2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/login.jsp
 2010-10-20 14:41:18 UTC (rev 5781)
@@ -49,6 +49,9 @@
                
             </div>
         </div>
+       <div class="footer">
+               
<%@include
 file="parts/footer.jsp"%>
+        </div>
     </div>
 
 

Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/main.jsp
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/main.jsp
  2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/main.jsp
  2010-10-20 14:41:18 UTC (rev 5781)
@@ -34,7 +34,10 @@
                                %>
             </div>
         </div>
-      </div>
+       <div class="footer">
+               
<%@include
 file="parts/footer.jsp"%>
+        </div>
+       </div>
 
 </body>
 </html>

Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/parts/savedFailed.jsp
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/parts/savedFailed.jsp
     2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-component/src/main/webapp/views/parts/savedFailed.jsp
     2010-10-20 14:41:18 UTC (rev 5781)
@@ -3,5 +3,5 @@
 
 
 <p class="heading1">
-       The configuration files have been saved.
+       The configuration files have NOT been saved.
 </p>
\ No newline at end of file

Modified: 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-exampleservice/src/main/webapp/WEB-INF/web.xml
===================================================================
--- 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-exampleservice/src/main/webapp/WEB-INF/web.xml
    2010-10-20 13:57:32 UTC (rev 5780)
+++ 
trunk/perfsonar-java-web-admin-xslt/perfsonar-java-web-admin-xslt-exampleservice/src/main/webapp/WEB-INF/web.xml
    2010-10-20 14:41:18 UTC (rev 5781)
@@ -18,11 +18,11 @@
   <!-- SERVLET -->
   
   <servlet>
-       <servlet-name>basicServlet</servlet-name>
+       <servlet-name>BasicServlet</servlet-name>
        
<servlet-class>net.geant.perfsonar.webadmin.servlets.BasicServlet</servlet-class>
   </servlet>
   <servlet-mapping>
-       <servlet-name>basicServlet</servlet-name>
+       <servlet-name>BasicServlet</servlet-name>
        <url-pattern>/main</url-pattern>
   </servlet-mapping>
     
@@ -44,6 +44,15 @@
        <url-pattern>/selfTest</url-pattern>
    </servlet-mapping>
 
+  <servlet>
+       <servlet-name>LogoutServlet</servlet-name>
+       
<servlet-class>net.geant.perfsonar.webadmin.servlets.LogoutServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+       <servlet-name>LogoutServlet</servlet-name>
+       <url-pattern>/logout</url-pattern>
+  </servlet-mapping>
+    
 <!-- resources -->
        <servlet>
                <servlet-name>ResourceServlet</servlet-name>