perfsonar development work

Author: roman
Date: 2008-09-03 06:13:30 -0400 (Wed, 03 Sep 2008)
New Revision: 4444

Added:
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/Paul_Hasleham.vcf
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/Thumbs.db
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/admin_home_target.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/apply_button.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/apply_button_2.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/arrow_icon.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/arrow_icon2.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_1_large.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_1_small.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_2_large.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_2_small.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/cancel_button.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/create_resource_button.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/delete_red_button.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/edit_button.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/edit_green_button.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/login_panel.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/logos.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/logout_button.gif
   
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif
   
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_bottom.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_slice.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_top.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_bottom.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_slice.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_top.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_fail.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_main.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_return.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_startbn.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_succ.gif
   trunk/geant2-java-rrd-ma/conf/axis-1.4/testdepl.jsp
   trunk/geant2-java-rrd-ma/conf/axis-1.4/welcome_sqlma.htm
Modified:
   trunk/geant2-java-rrd-ma/conf/axis-1.4/Service_Admin.js
   trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml
   trunk/geant2-java-rrd-ma/conf/axis-1.4/default.css
   trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp
   trunk/geant2-java-rrd-ma/conf/axis-1.4/main.css
Log:
web admin library upgraded (0.9.1b)



Modified: trunk/geant2-java-rrd-ma/conf/axis-1.4/Service_Admin.js
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/Service_Admin.js     2008-09-03 
10:08:18 UTC (rev 4443)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/Service_Admin.js     2008-09-03 
10:13:30 UTC (rev 4444)
@@ -31,7 +31,7 @@
                 reset_button.style.left = 83 + '%';
             }
             else {
-                               //alert("Not 768 "+x);
+                //alert("Not 768 "+x);
                 reset_button.style.top = 95 + '%';
                 reset_button.style.left = 67 + '%';
             }
@@ -42,7 +42,7 @@
                 button.style.left = 91.5 + '%';
             }
             else {
-              button.style.top = 95 + '%';
+                button.style.top = 95 + '%';
                 button.style.left = 74 + '%';
             }
         }
@@ -54,4 +54,75 @@
 onscroll = FloatPosition;
 onresize = FloatPosition;
 
+function checkStarFields(){
 
+    var divs = document.getElementsByTagName("div");
+    var filled = true;
+    
+    for (var i = 0; i < divs.length; i++) {
+    
+        var div = divs[i];
+        if (div.style.display == "block") {
+            var input_array = div.getElementsByTagName("input");
+            
+            var text = document.createElement("td");
+            var ex = document.getElementById("extra");
+            if (ex != null) {
+                var p = ex.parentNode;
+                p.removeChild(ex);
+            }
+            text.id = "extra";
+            text.innerHTML = '<p style=\"color:red;\">Please fill in the 
field!</p>';
+            
+            for (var j = 0; j < input_array.length; j++) {
+            
+                var input = input_array[j];
+                
+                if (input.id == "required") {
+                
+                    var parent = input.parentNode.parentNode;
+                    if (input.value == null || input.value == "" || 
input.value == " ") {
+                        if 
(parent.parentNode.parentNode.parentNode.style.display == "block") {
+                            filled = false;
+                            parent.appendChild(text);
+                            return filled;
+                        }
+                        
+                    }
+                    
+                }
+                
+            }
+        }
+        
+    }
+    
+    return filled;
+    
+}
+
+function getDate(){
+
+    var date = document.getElementById("date");
+    
+    var stampdays = new Array("Sunday", "Monday", "Tuesday", "Wednesday", 
"Thursday", "Friday", "Saturday");
+    
+    var stampmonths = new Array("January", "February", "March", "April", 
"May", "June", "July", "August", "September", "October", "November", 
"December");
+    
+    var thedate = new Date();
+    
+    date.innerHTML = stampdays[thedate.getDay()] + ", " + 
stampmonths[thedate.getMonth()] + " " + thedate.getDate() + ", " + 
thedate.getFullYear();
+    
+}
+
+function highlight(el){
+    alert("Highlighted");
+    var links = document.getElementsByTagName("a");
+    for (var i = 0; i < links.length; i++) {
+    
+        var link = links[i];
+        
+        link.className
+    }
+}
+

Modified: trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml      2008-09-03 
10:08:18 UTC (rev 4443)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/WEB-INF/web.xml      2008-09-03 
10:13:30 UTC (rev 4444)
@@ -158,8 +158,8 @@
 
 
   <welcome-file-list id="WelcomeFileList">
+    <welcome-file>index.jsp</welcome-file>
     <welcome-file>index.html</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
     <welcome-file>index.jws</welcome-file>
   </welcome-file-list>
 

Modified: trunk/geant2-java-rrd-ma/conf/axis-1.4/default.css
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/default.css  2008-09-03 10:08:18 
UTC (rev 4443)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/default.css  2008-09-03 10:13:30 
UTC (rev 4444)
@@ -1,3 +1,4 @@
+
 /* standard elements */
 html {
     min-height: 100%;
@@ -13,7 +14,7 @@
     font-family: arial;
 }
 
-a img {
+a img{
     border: none;
 }
 /* Wizard CSS */
@@ -50,6 +51,16 @@
     margin-bottom: 20px;
 }
 
+.inner_properties {
+       padding:0px;
+       margin:0px;
+}
+.inner_properties table{
+       border: none;
+       margin:0px;
+       padding:0px;
+}
+
 .properties td {
     padding: 15px;
     font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -317,9 +328,6 @@
     background: transparent url(graphics/manage_collections_on_tab.gif) 
no-repeat center top;
 }
 
-.collections_option_on a:visited, a:active {
-    background: transparent url(graphics/manage_collections_on_tab.gif) 
no-repeat center top;
-}
 
 .collections_option_off a {
     padding: 7px 80px 7px 80px;
@@ -329,33 +337,23 @@
     background: transparent url(graphics/manage_collections_off_tab.gif) 
no-repeat center top;
 }
 
-.collections_option_off a:visited, a:active {
-    background: transparent url(graphics/manage_collections_off_tab.gif) 
no-repeat center top;
-}
 
-.users_option_on a {
+.users_option_off a{
     padding: 7px 65px 7px 65px;
     width: 210px;
     height: 28px;
     text-decoration: none;
-    background: transparent url(graphics/manage_users_on_tab.gif) no-repeat 
center top;
+    background: transparent url(graphics/manage_users_off_tab.gif) no-repeat 
center top;
 }
 
-users_option_on a:visited, a:active {
-    background: transparent url(graphics/manage_users_on_tab.gif) no-repeat 
center top;
-}
-
-.users_option_off a {
+.users_option_on a {
     padding: 7px 65px 7px 65px;
     width: 210px;
     height: 28px;
     text-decoration: none;
-    background: transparent url(graphics/manage_users_off_tab.gif) no-repeat 
center top;
+    background: transparent url(graphics/manage_users_on_tab.gif) no-repeat 
center top;
 }
 
-users_option_off a:visited, a:active {
-    background: transparent url(graphics/manage_users_off_tab.gif) no-repeat 
center top;
-}
 
 .login_button {
     width: 54px;
@@ -637,5 +635,167 @@
     font-size: 13px;
 }
 
+.test_table {
+    background-color: #99ff99;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+}
 
+.test_table td {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+}
 
+/* Stitching Servlet*/
+
+#main_iface_panel{
+       margin-top: 2%;
+       margin-left:2%;
+       background-color: #ffffff;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       height:100%
+       
+}
+#main_iface_panel a{
+       
+}
+
+#main_iface_panel a:visited a:active{
+       
+}
+#iface_panel_body table{
+       
+}
+#iface_panel_body td{
+       vertical-align:top;
+       height:100%;
+       padding:0px;
+}
+#file_management{
+       border: 1px solid blue;
+       padding:10px;
+       font-weight:bold;
+}
+
+#file_management table{
+       width:100%;
+}
+#file_info{
+       background-color:#BBBBE6;
+       padding:0px;
+}
+
+#file_info table{
+       width:100%;
+}
+#file_info th{
+       
+       background-color:#8282C9;
+       color:#000000;
+       padding: 5px;
+       text-align:left;
+}
+#file_info_header{
+       color:white;
+       background-color:#8282C9;
+       font-weight:bold;
+}
+#file_info td{
+       
+       padding: 5px;
+       text-align:left;
+}
+
+#iface_panel_header{
+       
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+       padding: 5px;
+       background-color: #E6E6FA;
+       margin:1px;
+       
+}
+#panel_body_sidebar{
+       
+       background-color: #CBCBED;
+}
+#panel_body_sidebar_devices{
+       height:100%;
+       background-color: #CBCBED;
+       float:left;
+       padding: 5px;
+       margin:1px;
+       
+}
+
+#panel_body_sidebar table{
+       width:100%;
+       height:100%;
+}
+#panel_body_sidebar tr{
+       height:100%;
+}
+#panel_body_sidebar td{
+       padding: 8px;
+}
+
+#panel_body_sidebar a a:visited a:link{
+       padding: 0px;
+       margin:0px
+}
+
+#panel_body_ifaces{
+       background-color: #DEDEF9;
+       float:left;
+       padding-left: 10px;
+       padding-right: 10px;
+       padding-bottom:20px;
+       padding-top:8px;
+       margin:0px;
+}
+#host_name{
+       font-size:15px;
+       font-weight:bold;
+}
+
+#ifaces_table{
+       margin-top: 15px;
+       background-color:#ECECFC;
+       width:100%;
+      border-spacing: 1px 0px;
+
+}
+
+#ifaces_table td{
+       padding: 5px;
+       border-top:none;
+}
+
+
+.ifaces_header1{
+       text-align:left;
+       font-weight:bold;
+       background-color:#8282C9;
+}
+.ifaces_header2{
+       background-color:#8282C9;
+       font-weight:bold;
+       text-align:center;
+}
+
+.execute_button_stitching {
+    display: block;
+    margin: 0px;
+    width: 120px;
+    height: 28px;
+    float: left;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 90%;
+    font-weight: 600;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/button_1_large.gif) no-repeat 
center;
+}
+

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/Paul_Hasleham.vcf

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/Thumbs.db


Property changes on: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/admin_home_target.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/admin_home_target.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/apply_button.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/apply_button.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/apply_button_2.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/apply_button_2.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/arrow_icon.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/arrow_icon.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/arrow_icon2.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/arrow_icon2.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_1_large.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_1_large.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_1_small.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_1_small.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_2_large.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_2_large.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_2_small.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/button_2_small.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/cancel_button.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/cancel_button.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/create_resource_button.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/create_resource_button.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/delete_red_button.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/delete_red_button.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/edit_button.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/edit_button.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/edit_green_button.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/edit_green_button.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/login_panel.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/login_panel.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/logos.gif


Property changes on: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/logos.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/logout_button.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/logout_button.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_collections_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_collections_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_users_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/manage_users_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_bottom.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_bottom.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_slice.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_slice.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_top.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_1_top.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_bottom.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_bottom.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_slice.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_slice.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_top.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/step_2_top.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_fail.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_fail.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_main.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_main.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_return.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_return.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_startbn.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_startbn.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_succ.gif


Property changes on: 
trunk/geant2-java-rrd-ma/conf/axis-1.4/graphics/testdepl_succ.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp    2008-09-03 10:08:18 
UTC (rev 4443)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/index.jsp    2008-09-03 10:13:30 
UTC (rev 4444)
@@ -1,112 +1,152 @@
+<%@ page 
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
 %>
+
 <html>
-<%@ page contentType="text/html; charset=utf-8" %>
-<%
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-%>
+    <head>
+        <title>perfSONAR Service Web Administration page</title>
+        <link rel="stylesheet" type="text/css" href="main.css"/>
+        <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1">
+                <script src="Service_Admin.js"></script>
 
-<%@ include file="i18nLib.jsp" %>
+        <style type="text/css">
+         <!--
+        
+        a {
+        }
+        
+        .style3 {
+            color: #8585c1;
+            font-size: 13px;
+        }
+        
+        .style3 a:link {
+            color: #8585C1;
+            cursor: pointer;
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-size: 12px;
+        }
+        
+        .style3 a:active {
+            color: #117721;
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-size: 12px;
+        }
+        
+        .style3 a:visited {
+            color: #8585C1;
+            cursor: auto;
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-size: 12px;
+            /*font-weight: bold;*/
+        }
+        
+        
+        .style3 a:hover {
+            color: #8585C1;
+            cursor: pointer;
+            text-decoration: underline;
+            font-family: Verdana, Arial, Helvetica, sans-serif;
+            font-size: 12px;
+        }
+        -->
+        </style>
+    </head>
+    <body>
+     <%
+       java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE 
MMM dd HH:mm:ss zzz yyyy");
+       java.util.Date now=  new java.util.Date();
+       java.util.Date date= dateFormat.parse(now.toString());
+       String confPath = "WEB-INF/classes/perfsonar/conf/";
+       String ServicePropertiesPath = confPath+ "service.properties";
+       ServletContext sc = getServletContext();
+       String ServicePath = sc.getRealPath("/");
+       PerfsonarProperty property = new PerfsonarProperty();
+       PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
+       serviceProperties.loadProperties(new FileInputStream(ServicePath
+                                       + ServicePropertiesPath));
 
-<%
-    // initialize a private HttpServletRequest
-    setRequest(request);
+      String serviceName= 
serviceProperties.getProperty("service.r.service_name").getValue().trim();
+      String serviceVersion= 
serviceProperties.getProperty("service.r.service_version").getValue().trim();
+ 
 
-    // set a resouce base
-    setResouceBase("i18n");
-%>
+        %> 
+        <div class="adminPanel">
+            <div class="banner">
+                <table border="0" align="left" cellpadding="0" 
cellspacing="0">
+                    <tr>
+                        <td>
+                            <a href="welcome.htm" target="main"><img 
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0" 
align="right"></a>
+                        </td>          
+                        <td> 
+                               <table>
+                                <tr><td 
id="date"><%=date.toString()%></td></tr>
+                                 <tr><td id="serviceName"><%=serviceName %> 
&nbsp;<%=serviceVersion%></td></tr>                
+                                </table>
+                       </td> 
+                    </tr>
+                </table>
+                </td>
+                </tr>
+                </table>
+            </div>
+            <div class="mainWindow">
+                <div class="sidebar">
+                    <table border="0" cellpadding="0" cellspacing="0">
+                        <tr>
+                            <th>
+                                <a href="welcome.htm" class="button" 
target="main">Admin home  &nbsp;  &nbsp;  &nbsp;</a>
+                            </th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <p>
+                                    <span class="navtexheading">Basic
+                                        <br>
+                                        Configuration
+                                    </span>
+                                </p>
+                                <p>
+                                    <span class="navtex"><a  href="Wizard" 
target="main">Service</a></span>
+                                 <br>
+                                        <a  href="testdepl.jsp" 
target="main">Test</a>
+                                </p>
+                            </td>
+                        </tr>
 
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Apache-Axis</title>
-</head>
+                        <tr>
+                            <td>
+                                <p>
+                                    <span class="navtexheading 
style3">Advanced
+                                        <br>
+                                        Configuration
+                                    </span>
+                                </p>
+                                <p>
+                                    <span class="navtex style3"><a  
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+                                        <br>
+                                        <a  
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+                                        <br>
+                                        <a  href="eXistAdmin" 
target="main">eXist Database</a>
+                                        <br>
+                                        <a  href="MetadataAdmin" 
target="main">Config File Management</a>
+                                        <br>
 
-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<%= getLocaleChoice() %>
-
-<%
-  out.print(getMessage("welcomeMessage")+"<p/>");
-  out.print(getMessage("operationType"));
-%>
-
-<ul>
-
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("validationURL") +"\">");
-      out.print(getMessage("validation") +"</a> - ");
-      out.print(getMessage("validationFootnote00") +"<br>");
-      out.print("<i>"+ getMessage("validationFootnote01") +"</i>");
-    %>
-  </li>
-
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("serviceListURL") +"\">");
-      out.print(getMessage("serviceList") +"</a> - ");
-      out.print(getMessage("serviceListFootnote"));
-    %>
-  </li>
-
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("callAnEndpointURL") +"\">");
-      out.print(getMessage("callAnEndpoint") +"</a> - ");
-      out.print(getMessage("callAnEndpointFootnote00") +" ");
-      out.print(getMessage("callAnEndpointFootnote01"));
-    %>
-  </li>
-
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("visitURL") +"\">");
-      out.print(getMessage("visit") +"</a> - ");
-      out.print(getMessage("visitFootnote"));
-    %>
-  </li>
-
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("adminURL") +"\">");
-      out.print(getMessage("admin") +"</a> - ");
-      out.print(getMessage("adminFootnote"));
-    %>
-  </li>
-
-  <li>
-    <%
-      out.print("<a href=\""+ getMessage("soapMonitorURL") +"\">");
-      out.print(getMessage("soapMonitor") +"</a> - ");
-      out.print(getMessage("soapMonitorFootnote"));
-    %>
-  </li>
-
-</ul>
-
-<%
-  out.print(getMessage("sideNote") +"<p/>");
-%>
-
-<%
-  out.print("<h3>"+ getMessage("validatingAxis") +"</h3>");
-
-  out.print(getMessage("validationNote00") +"<p/>");
-  out.print(getMessage("validationNote01"));
-%>
-</body>
+                                    </span>
+                                </p>
+                            </td>
+                        </tr>
+                        <tr>
+                        </tr>
+                    </table>
+                    <img src="graphics/logos.gif" alt="perfSONAR project 
partners" width="117" height="263" border="0" align="top"/>
+                </div>
+                <div class="centerWindow">
+                    <object data="welcome.htm" type="text/html" name="main" 
width="99%" height="100%">
+                    </object>
+                </div>
+            </div>
+            <div class="footer">
+                PERFormance Service-Oriented Network monitoring ARchitecture 
&nbsp;
+            </div>
+        </div>
+    </body>
 </html>

Modified: trunk/geant2-java-rrd-ma/conf/axis-1.4/main.css
===================================================================
--- trunk/geant2-java-rrd-ma/conf/axis-1.4/main.css     2008-09-03 10:08:18 
UTC (rev 4443)
+++ trunk/geant2-java-rrd-ma/conf/axis-1.4/main.css     2008-09-03 10:13:30 
UTC (rev 4444)
@@ -218,6 +218,25 @@
        clip: rect(auto,auto,auto,auto);
        float:left;
 }
+#date{
+       padding-top:5px;
+       float:right;
+       text-align:right;
+       margin-left: 79.5%;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+
+#serviceName{
+       padding-top:5px;
+       float:right;
+       text-align:right;
+       margin-left: 79.5%;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       font-weight:bold;
+}
+
 .mainWindow{
        border: none;
        padding: 0px;
@@ -354,4 +373,115 @@
        border-left-color: #FFFFFF;
        }
        
+.execute_button_testdepl {
+    display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 30px;
+    float: right;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/button_2_medium.gif) no-repeat 
center;
+}
 
+.testdeplmain {
+       text-align: left;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+/*     font-weight:bold;;*/
+/*     margin-left: -20%;*/
+       margin-left: 2%;
+       border-width: 1px;
+       border-color: #61AF61;
+       padding: 5px;
+       width: 556px;
+       height:108px;
+       background: transparent url(graphics/testdepl_main.gif) no-repeat 
center;
+}
+
+.testdeplsucc {
+       text-align: left;
+       float: left;
+       /*font-weight:bold;;*/
+    text-decoration: none;
+/*     margin-left: -20%;*/
+       margin-left: 2%;
+       padding: 5px;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       border:solid;
+       border-width: 1px;
+       border-color: #61AF61;
+       width: 544px;
+       height: 220px;
+    background: transparent url(graphics/testdepl_succ.gif) no-repeat center;
+}
+
+.testdeplfail {
+       text-align: left;
+       float: left;
+/*     font-weight:bold;;*/
+    text-decoration: none;
+       padding: 5px;
+       margin-left: 2%;
+       /*margin-left: -20%;*/
+    height: 105px;
+    width:555px;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       border:solid;
+       border-width: 1px;
+       border-color: #61AF61;
+       background: transparent url(graphics/testdepl_fail.gif) no-repeat 
center;
+}
+
+.testdeplstartbn {
+    display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 30px;
+    float: right;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/testdepl_startbn.gif) no-repeat 
center;
+}
+
+.testdeplretbn {
+    display: block;
+    margin-top: 5px;
+    width: 150px;
+    height: 30px;
+    float: none;;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/testdepl_return.gif) no-repeat 
center;
+}
+
+.testdeplretbn2 {
+    display: block;
+    margin-top: 5px;
+    width: 150px;
+    height: 30px;
+    float: right;
+    border: none;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 60%;
+    font-weight: 400;
+    text-decoration: none;
+    cursor: pointer;
+    background: transparent url(graphics/testdepl_return.gif) no-repeat 
center;
+}
+       
+

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/testdepl.jsp

Added: trunk/geant2-java-rrd-ma/conf/axis-1.4/welcome_sqlma.htm