perfsonar development work

Author: dante.delvaux
Date: 2013-04-19 15:56:09 +0100 (Fri, 19 Apr 2013)
New Revision: 6252

Modified:
   trunk/BUILDING.txt
   trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClient.java
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/wa/styles/main.css
Log:
Web Admin: better self test error detection and reporting.


Modified: trunk/BUILDING.txt
===================================================================
--- trunk/BUILDING.txt  2013-04-18 20:12:12 UTC (rev 6251)
+++ trunk/BUILDING.txt  2013-04-19 14:56:09 UTC (rev 6252)
@@ -38,7 +38,7 @@
 maven to use the GÉANT Artifactory. This can be done the following way
  
        mvn -s mvn-settings.xml clean package
-       mvn -s mvn-settings.xml pacakge -am -pl perfsonar-java-sql-ma
+       mvn -s mvn-settings.xml package -am -pl perfsonar-java-sql-ma
 
 
 Maven project structure

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml 
  2013-04-18 20:12:12 UTC (rev 6251)
+++ trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml 
  2013-04-19 14:56:09 UTC (rev 6252)
@@ -130,6 +130,11 @@
                        <artifactId>httpcore</artifactId>
                        <version>4.0.1</version>
                </dependency>
+               <dependency>
+                   <groupId>org.apache.commons</groupId>
+                   <artifactId>commons-lang3</artifactId>
+                   <version>3.1</version>
+               </dependency>
                
        </dependencies>
 

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
 2013-04-18 20:12:12 UTC (rev 6251)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
 2013-04-19 14:56:09 UTC (rev 6252)
@@ -9,6 +9,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+
 import org.perfsonar.webadmin.config.ObjectMap;
 import org.perfsonar.webadmin.servlet.util.ConfigurationServletHelper;
 import org.perfsonar.webadmin.test.SOAPClient;
@@ -39,9 +41,9 @@
                        try {
                                String result = 
soapClient.sendMessage(messageContent);
                                if (result != null) {
-                                       if (result.contains("error")) {
+                                       if (result.contains("error") || 
result.contains("failure")) {
                                                logger.info("Self test 
failed!");
-                                               
getServletContext().setAttribute("errors", result);
+                                               
getServletContext().setAttribute("errors", 
StringEscapeUtils.escapeHtml4(result));
                                        } else if 
(result.contains("success")) {
                                                logger.info("Self test 
succeeded!");
                                                redirectURL = redirectURL + 
"&ok";                                              

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClient.java
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClient.java
 2013-04-18 20:12:12 UTC (rev 6251)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/test/SOAPClient.java
 2013-04-19 14:56:09 UTC (rev 6252)
@@ -31,9 +31,8 @@
        }
 
        /**
+        * Sends a request to the web service and returns the content of the 
response
         * 
-        * sends request to webService and returns content of the response
-        * 
         * @param content
         *            - content of the message (soap message)
         * @return

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
        2013-04-18 20:12:12 UTC (rev 6251)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
        2013-04-19 14:56:09 UTC (rev 6252)
@@ -17,6 +17,7 @@
                                %>
                                        <div class="failed">Test Failed!
                        <br/><hr/>
+                       <code>
                                <%
                                                String error = (String) 
application.getAttribute("errors");
                                                if (error != null) {
@@ -26,5 +27,6 @@
                                                }
                                        }
                                %>
+                                      </code>
        </div>
 </div>
\ No newline at end of file

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/wa/styles/main.css
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/wa/styles/main.css
        2013-04-18 20:12:12 UTC (rev 6251)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/wa/styles/main.css
        2013-04-19 14:56:09 UTC (rev 6252)
@@ -339,4 +339,10 @@
        border-right-color: #FFFFFF;
        border-left-color: #FFFFFF;
        float: none;
+}
+
+code {
+       font-family: monospace;
+       font-size: 12px;
+       font-weight: normal;
 }
\ No newline at end of file