perfsonar development work

Author: roman
Date: 2008-03-31 10:10:10 -0400 (Mon, 31 Mar 2008)
New Revision: 3577

Added:
   trunk/geant2_java-sql-ma/conf/axis-1.4/welcome.htm
   trunk/geant2_java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080331.jar
Removed:
   trunk/geant2_java-sql-ma/conf/axis-1.4/b.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/background.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/l.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/lb.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/lt.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/r.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/rb.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/rt.gif
   trunk/geant2_java-sql-ma/conf/axis-1.4/t.gif
   trunk/geant2_java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080303.jar
Modified:
   trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-sql-ma/ant/const.properties.template
   trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
   trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js
   trunk/geant2_java-sql-ma/conf/axis-1.4/default.css
   trunk/geant2_java-sql-ma/conf/axis-1.4/index.html
   trunk/geant2_java-sql-ma/conf/axis-1.4/main.css
   trunk/geant2_java-sql-ma/conf/axis-1.4/sqlma_admin_script.js
   trunk/geant2_java-sql-ma/conf/wizard.properties
Log:
- set of changes required to use new web admin library (0.8b)



Modified: trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml        2008-03-31 
11:31:16 UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml        2008-03-31 
14:10:10 UTC (rev 3577)
@@ -46,7 +46,7 @@
           depends="copy-dep-base-service-jars">
 
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.7b/perfsonar-web-admin-0.7b.jar"
            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.jar"
            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                              
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
@@ -323,7 +323,7 @@
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.7b/perfsonar-web-admin-0.7b.jar"
            todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.jar"
            todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                              todir="${tmpdir}/WEB-INF/lib"/>
 

Modified: trunk/geant2_java-sql-ma/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sql-ma/ant/const.properties.template      2008-03-31 
11:31:16 UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/ant/const.properties.template      2008-03-31 
14:10:10 UTC (rev 3577)
@@ -11,7 +11,7 @@
 service.name=geant2_java-sql-ma
 
 jarfilename=perfsonar-sql-ma
-version=2.0rc3
+version=2.0rc4
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1
@@ -21,7 +21,7 @@
 wsdd.webservice.name=MeasurementArchiveService
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080331.jar
 
 api.location=doc/api
 api.title=perfSONAR

Modified: trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/libs-download-targets.xml      2008-03-31 
11:31:16 UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/ant/libs-download-targets.xml      2008-03-31 
14:10:10 UTC (rev 3577)
@@ -55,7 +55,7 @@
     <artifact:dependencies>
 
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080310"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.7b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8b"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-rrd-ma"     
version="3.0rc2"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
 

Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js     2008-03-31 
11:31:16 UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/Service_Admin.js     2008-03-31 
14:10:10 UTC (rev 3577)
@@ -1,10 +1,46 @@
 /**
  * @author Michalis Michael,Cynet
- */
-function setTip(group,description){
-       
-       //document.getElementById('description').text=description;
-       //document.getElementById('groupName').text=group;
-       var text='<span style=\"font-size: 12px; 
width:20px;\">'+description+'</span>';
-       Tip(text,BALLOON, true,WIDTH, 260, PADDING, 8, TEXTALIGN, 'justify', 
ABOVE, true);
+ */
+function setTip(el, description, color){
+    var text = '<span style=\"font-size: 12px; width:20px;\">' + description 
+ '</span>';
+    var width;
+    if (el) {
+        el.style.cursor = 'pointer';
+        width = 250;
+    }
+    else {
+        width = 0;
+    }
+    
+    Tip(text, BGCOLOR, color, WIDTH, width, TEXTALIGN, 'justify', ABOVE, 
true);
 }
+
+function FloatPosition(){
+    var ns = (navigator.appName.indexOf("Netscape") != -1);
+    var button = document.getElementById("Button");
+    var reset_button = document.getElementById("ResetButton");
+    if (reset_button) {
+        var width = reset_button.parentNode.offsetWidth;
+        var offset = reset_button.parentNode.offsetLeft;
+        var leftoffset = parent
+        if (reset_button != null) {
+            reset_button.style.top = 96 + '%';
+            reset_button.style.left = 85+ '%';
+                   //reset_button.style.top = (innerHeight - 28) + 'px';
+           //reset_button.style.left = (offset + width - 53 - 68) + 'px';
+        }
+        if (button != null) {
+          button.style.top = 96 + '%';
+                 button.style.left = 91.5+ '%';
+                  // button.style.top = (innerHeight - 28) + 'px';
+           // button.style.left = (offset + width - 55) + 'px';
+        }
+    }
+    
+}
+
+onload = FloatPosition;
+onscroll = FloatPosition;
+onresize = FloatPosition;
+
+

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/b.gif

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/background.gif

Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/default.css
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/default.css  2008-03-31 11:31:16 
UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/default.css  2008-03-31 14:10:10 
UTC (rev 3577)
@@ -1,181 +1,567 @@
-/* standard elements */
-html {
-    min-height: 100%;
-}
-
-* {
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: #ffffff;
-    font-family: arial;
-}
-/* title */
-.top {
-    display: block;
-    font-family: arial;
-    font-weight: bold;
-    margin: 2% 1% 0 1%;
-    border-top: 1px solid green;
-    border-right: 1px solid green;
-    border-left: 1px solid green;
-    padding: 7px;
-    background: #afdfc0;
-}
-
-.properties {
-    font-family: arial;
-    font-size: 15px;
-    border: 1px solid green;
-    padding: 10px;
-    margin: 0% 1% 0 1%;
-}
-
-.properties p {
-    font-size: 120%;
-}
-
-.properties div{
- 
-}
-.properties table {
-    margin-bottom: 20px;
-    border-bottom: 1px solid green;
-}
-
-.properties td {
-    padding: 15px;
-    width: 27%;
-}
-
-.properties em {
-    display: block;
-    color: red;
-    font-size: 95%;
-}
-
-.main{
-   padding: 10px;
-}
-.info {
-    font-family: arial;
-    font-size: 120%;
-    padding: 10px;
-    border: 1px solid green;
-}
-
-.info p {
-    position: relative;
-    #left: -30px;
-}
-
-.tablessContent {
-    margin: 2% 1% 0 1%;
-    background: #ffffff;
-    border-top: 1px solid green;
-    border-left: 1px solid green;
-    border-right: 1px solid green;
-}
-
-.content {
-    font-family: arial;
-    font-size: 120%;
-    margin: 2% 1% 0 1%;
-    background: #ffffff;
-}
-
-.content ul {
-    margin-top: 5px;
-    display: block;
-    list-style: none outside;
-    padding: 5px;
-    border-top: 1px solid green;
-    border-left: 1px solid green;
-    border-right: 1px solid green;
-}
-
-.content li {
-    margin: 0 0 0 0;
-    padding: 0px;
-    display: block;
-    float: left;
-    position: relative;
-    top: -1.32em;
-}
-
-.content a {
-    padding: 5px;
-    text-decoration: none;
-    color: green;
-    background: #ffffff;
-}
-
-.content a:hover {
-    background: #3CB371;
-    color: green;
-}
-
-.content #selected {
-}
-
-.content #selected a {
-    font-weight: bold;
-    color: green;
-    background: #3CB3A1;
-}
-
-.manage {
-    background: #ffffff;
-    border-bottom: 1px solid green;
-    border-left: 1px solid green;
-    border-right: 1px solid green;
-    margin: 0 1% 0 1%;
-    padding: 1em;
-}
-
-.manage table {
-    padding: 5px;
-}
-
-.manage td {
-    padding: 5px;
-}
-
-.manage th {
-    padding: 5px;
-    text-align: left;
-}
-
-.showResource {
-    font-weight: bold;
-    text-indent: 0%;
-    text-align: inherit;
-    background: #ffffff;
-}
-
-.showResource td {
-    padding: 7px;
-}
-
-.input {
-    padding: 1em;
-    font-size: 110%;
-    font-family: arial;
-}
-
-.input table {
-    padding: 5px;
-}
-
-.input td {
-    padding: 5px;
-}
-
-.input th {
-    padding: 5px;
-    text-align: left;
-}
-
-
+/* standard elements */
+html {
+    min-height: 100%;
+}
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    background-color: #ffffff;
+    font-family: arial;
+}
+
+a img {
+    border: none;
+}
+/* Wizard CSS */
+.top {
+    display: block;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    color: #468C46;
+    margin: 0% 1% 0 1%;
+    border-bottom: 1px dotted #468C46;
+    padding: 7px;
+    background: #ffffff;
+}
+
+.greenasterisk {
+    font-size: 130%;
+    color: #468C46;
+}
+
+.properties {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    padding: 10px;
+    margin: 0% 1% 0 1%;
+}
+
+.properties p {
+    font-size: 120%;
+}
+
+.properties table {
+    border-bottom: 1px dotted #468C46;
+    margin-bottom: 20px;
+}
+
+.properties td {
+    padding: 15px;
+}
+
+.properties em {
+    display: block;
+    color: red;
+    font-size: 95%;
+}
+
+.info_wizard {
+    font-family: erdana, Arial, Helvetica, sans-serif;
+    font-size: 100%;
+    color: #468C46;
+}
+
+.info_wizard p {
+}
+/* General Purpose CSS*/
+.welcometextlavender {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 110%;
+    font-weight: bold;
+    color: #4169E1;
+    font-weight: bold;
+    border-bottom-width: 1px;
+    border-bottom-style: dotted;
+    border-bottom-color: #4169E1;
+    clip: rect( auto, auto, auto, auto );
+    margin-left: 1%;
+}
+
+.blueheader {
+    text-align: left;
+    color: #4169E1;
+}
+
+.info {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 100%;
+    color: #4169E1;
+    margin: 0% 0% 0% 1%;
+}
+
+.info p {
+}
+
+.lightgrey {
+    background-color: #f1f3f1;
+}
+
+.lightgrey td {
+    padding: 8px
+}
+
+.darkgrey {
+    background-color: #e1e5e1;
+}
+
+.darkgrey td {
+    padding: 8px;
+}
+
+.hilighted {
+    color: #4169E1;
+    border-bottom: 1px solid #4169E1;
+}
+
+.underlined {
+    border-bottom: 1px solid #4169E1;
+}
+
+.tablessContent {
+    margin: 2% 1% 0 1%;
+    background: #ffffff;
+}
+
+.headerlavender {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    background-color: #A0A0D8;
+    margin-right: 0px;
+    margin-left: 0px;
+    padding: 5px;
+}
+/*eXist Admin CSS*/
+.content {
+    font-family: arial;
+    font-size: 120%;
+    margin: 2% 1% 0 1%;
+    background: #ffffff;
+}
+
+.content ul {
+    margin-top: 5px;
+    display: block;
+    list-style: none outside;
+    padding: 5px;
+}
+
+.content li {
+    margin: 0 0 0 0;
+    padding: 0px;
+    display: block;
+    float: left;
+    position: relative;
+    top: -1.32em;
+}
+
+.manage_exist {
+    background: #ffffff;
+    margin: 0% 1% 0% 0%;
+    padding: 0px;
+}
+
+.showResource {
+    font-weight: bold;
+    text-indent: 0%;
+    margin-top: 5px;
+    margin-left: 1%;
+    padding: 0px;
+    text-align: inherit;
+}
+
+.showResource table {
+    left: -100px;
+    position: static;
+    margin-top: 0px;
+}
+
+.showResource th {
+    padding: 10px;
+    background-color: #C7C7F2;
+}
+
+.showResource td {
+    padding: 10px;
+}
+
+.showResource p {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 100%;
+    border: none;
+    padding: 5px;
+    margin: 0% 4% 0% 0%;
+}
+
+#exist_text {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    text-align: left;
+    font-size: 100%;
+    border: none;
+    margin: 0% 3% 0% 0%;
+}
+
+.exist_welcome_text {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 100%;
+    font-weight: bold;
+    padding: 5px;
+    color: #4169E1;
+    font-weight: bold;
+    border-bottom-width: 1px;
+    border-bottom-style: dotted;
+    border-bottom-color: #4169E1;
+    clip: rect( auto, auto, auto, auto );
+    margin-left: 1%;
+}
+
+.input {
+    padding: 1em;
+    font-size: 110%;
+    font-family: arial;
+}
+
+.input_style {
+    border-color: #468C46;
+    border-style: solid;
+    border-width: 1px;
+}
+
+.login_table {
+       background-color: #E6E6FA;
+
+}
+
+.login_table td{
+    font-weight:bold;
+}
+
+
+.logout {
+    margin-top: 10px;
+    margin-left: 48%;
+}
+
+.logout a {
+    padding: 5px;
+    text-decoration: none;
+    color: green;
+    background: transparent url(graphics/logout_button.gif) no-repeat center 
top;
+    width: 64px;
+    height: 28px;
+    display: block;
+}
+
+.logout a:hover {
+    background: transparent url(graphics/logout_button.gif) no-repeat center 
top;
+    color: #049;
+}
+
+.input_table {
+    border: 1px solid #4169E1;
+    border-spacing: 0px 1px;
+}
+
+.input_table td {
+    padding: 5px;
+}
+
+.input_table th {
+    padding: 5px;
+    text-align: left;
+}
+/*Exist Buttons CSS*/
+.collections_option_on a {
+    padding: 7px 80px 7px 80px;
+    width: 210px;
+    height: 28px;
+    text-decoration: none;
+    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;
+    width: 210px;
+    height: 28px;
+    text-decoration: none;
+    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 {
+    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;
+}
+
+users_option_on a:visited, a:active {
+    background: transparent url(graphics/manage_users_on_tab.gif) no-repeat 
center top;
+}
+
+.users_option_off 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;
+}
+
+users_option_off a:visited, a:active {
+    background: transparent url(graphics/manage_users_off_tab.gif) no-repeat 
center top;
+}
+
+.login_button {
+    width: 54px;
+    height: 28px;
+    margin: 0;
+    padding: 0;
+       border:0px;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 80%;
+    font-weight: bold;
+       text-align:center;
+       clip: rect(auto,auto,auto,auto);
+    background: transparent url(graphics/button_1_small.gif) no-repeat 
center top;
+    float: left;
+}
+
+.edit_button_res {
+    display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 28px;
+    float: left;
+       outline: none;
+    border: none;
+       text-align: center;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight: bold;
+    text-decoration: none;
+    background:url(graphics/button_1_large.gif) no-repeat center;
+}
+
+.create_button_res {
+    display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 28px;
+    float: left;
+    border: none;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight:600;
+    text-decoration: none;
+    background: transparent url(graphics/button_1_large.gif) no-repeat 
center;
+}
+
+.delete_button_res {
+    display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 28px;
+    float: left;
+    border: none;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight: 600;
+    text-decoration: none;
+    background: transparent url(graphics/button_1_large.gif) no-repeat 
center top;
+}
+
+.input_Edit_button {
+    width: 54px;
+    height: 28px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight: 600;
+    background: transparent url(graphics/button_1_small.gif) no-repeat 
center top;
+    float: left;
+}
+
+.input_Create_button {
+    width: 54px;
+    height: 28px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight: 600;
+    background: transparent url(graphics/button_1_small.gif) no-repeat 
center top;
+    float: left;
+}
+.execute_button_users{
+       width: 54px;
+    height: 28px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight: 600;
+    background: transparent url(graphics/button_1_small.gif) no-repeat 
center top;
+    float: right;
+}
+/*Properties CSS */
+.groupheading {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    color: #468C46;
+}
+
+.manage {
+    background: #ffffff;
+    margin: 0 1% 0 1%;
+    padding: 0px;
+}
+
+.manage table {
+    padding: 10px;
+    border-spacing: 1px 0px;
+}
+
+.manage th {
+    padding: 10px;
+    text-align: left;
+}
+
+.manage td {
+    padding: 10px;
+}
+/*Properties Buttons CSS*/
+.floatResetButton {
+    position: fixed;
+    width: 64px;
+    height: 28px;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    text-indent: -1000em;
+    background: transparent url(graphics/cancel_button.gif) no-repeat center 
top;
+    float: right;
+}
+
+.floatSubmitButton {
+    position: fixed;;
+    width: 53px;
+    height: 28px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+    text-indent: -1000em;
+    background: transparent url(graphics/apply_button_2.gif) no-repeat 
center top;
+    float: right;
+}
+
+.submit_button {
+    width: 53px;
+    height: 28px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+    text-indent: -1000em;
+    background: transparent url(graphics/apply_button.gif) no-repeat center 
top;
+    float: left;
+}
+/* SQLMA Admin CSS*/
+.manage_slqma {
+    margin: 0% 1% 0% 1%;
+}
+
+.Options {
+    margin: 0% 1% 0% 1%;
+}
+
+#options {
+    margin: 0% 1% 0% 1%;
+}
+
+
+#EditFile {
+    margin: 0% 1% 0% 1%;
+       float:none;
+}
+
+#CreateNewFile {
+    margin: 0% 1% 0% 1%;
+       float:none;
+}
+.execute_button_sqlma{
+       
+        display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 28px;
+    float: left;
+    border: none;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight:600;
+    text-decoration: none;
+    background: transparent url(graphics/button_1_large.gif) no-repeat 
center;
+}
+
+.execute_button_sqlma_small{
+       
+       display: block;
+    margin-top: 5px;
+    width: 54px;
+    height: 28px;
+    float: left;
+    border: none;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight:600;
+    text-decoration: none;
+    background: transparent url(graphics/button_1_small.gif) no-repeat 
center;
+}
+.execute_button_sqlma_large{
+       
+       display: block;
+    margin-top: 5px;
+    width: 120px;
+    height: 28px;
+    float: left;
+    border: none;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 70%;
+    font-weight:600;
+    text-decoration: none;
+    background: transparent url(graphics/button_1_large.gif) no-repeat 
center;
+}
+.sqlmaheader {
+       margin-left:1%;
+    color: #4169E1;
+}
+init_table{
+       margin-left:1%;
+       float:left;
+}
+
+.init_table td{
+       padding:8px;
+       text-align:left;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+}
+.init_table th{
+       padding:8px;
+       text-align:left;
+       color:#4169E1;
+       font-family: Helvetica, Calibri, Arial, sans-serif;
+}
+
+
+

Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/index.html
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/index.html   2008-03-31 11:31:16 
UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/index.html   2008-03-31 14:10:10 
UTC (rev 3577)
@@ -1,81 +1,125 @@
 <html>
-
-  <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"><style type="text/css">
-<!--
-body,td,th {
-       font-family: arial;
+    <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">
+        <style type="text/css">
+         <!--
+        
+        a {
+        }
+        
+        .style3 {
+            color: #8585c1
+        }
+               .style3 a:link {
+       color: #8585C1;
+       cursor: pointer;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
 }
-a:hover {
-       color: #000000;
+.style3 a:active {
+       color: #117721;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       font-weight: bold;
 }
--->
-</style></head>
-  <body>
-<div class="adminPanel" >
-       
-<div class="banner">
-<table border="0" align="left" cellpadding="0" cellspacing="0">
-<tr>
-  <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" 
border="0" align="right"></td>
-</tr>
-</table>
+.style3 a:visited {
+       color: #8585C1;
+       cursor: auto;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+.style3 a:hover {
+       color: #8585C1;
+       cursor: pointer;
+       text-decoration: underline;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+        -->
+        </style>
+    </head>
+    <body>
+        <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>
+                    </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>
+                                </p>
+                                </p>
+                            </td>
+                        </tr>
+                        <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>
+                                    </span>
+                                </p>
+                            </td>
+                        </tr>
 
-</div>
+                        <tr>
+                            <td class="configheadinglavender">
+                                <p>
+                                    <a href="SQLMAdmin" target="main">SQL MA 
Administration </a> 
+                                </p>
+                                <p>
+                                    &nbsp;
+                                </p>
+                                <p>
+                                    &nbsp;
+                                </p>
+                            </td>
+                        </tr>
 
-<div class="mainWindow" >
-
-<div class="sidebar" >
-<table border="0" cellpadding="0" cellspacing="0">
-<tr >
-<th>Administration</th>
-</tr>
-<tr>
-       <td>
-    <p><a href="Wizard" target="main" class="navtex" >Service Configuration 
Wizard</a></p></td>
-</tr>
-<tr>
-       <td>
-    <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex" 
>Service configuration</a></p></td>
-</tr>
-<tr>
-  <td>
-    <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex" 
>Logging configuration</a></p></td>
-</tr>
-<td>
-  <p><a href="eXistAdmin" target="main" class="navtex" >eXist Database 
Administration</a></p></td>
-</tr>
-<tr>
-<td>
-  <p><a href="SQLMAdmin" target="main" class="navtex" >ibatis File 
Configuration</a></p></td>
-</tr>
-</table>
-
-
-<a href="http://www.perfsonar.net/partners.html";></a> <br>
-<img src="partners.gif" alt="perfSONAR project partners" border="0"/> 
</a></div>
-
-<div class="centerWindow" >
-  <object data="http://www.perfsonar.net"; type="text/html" name="main" 
width="101%" height="106%" class="main" >
-    <p>Sorry for the inconvenience we are having connectiong to the main 
page...</p>
-  </object>
-</div>
-
-
-</div>
-
-<div class="footer" >PERFormance Service-Oriented Network monitoring 
ARchitecture &nbsp;</div>
-
-
-
-
-       
-</div>
-       
-
-  </body>
+                        <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="106%" >
+                    </object>
+                </div>
+            </div>
+            <div class="footer">
+                PERFormance Service-Oriented Network monitoring ARchitecture 
&nbsp;
+            </div>
+        </div>
+    </body>
 </html>
-
-

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/l.gif

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/lb.gif

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/lt.gif

Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/main.css
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/main.css     2008-03-31 11:31:16 
UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/main.css     2008-03-31 14:10:10 
UTC (rev 3577)
@@ -7,20 +7,49 @@
 * {
        margin: 0;
        padding: 0;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       text-decoration: none;
+       border-top-style: none;
+       border-right-style: none;
+       border-bottom-style: none;
+       border-left-style: none;
 }
 
 
 body{
-       
-         background-color: #C0C0C0;
-      width: 100%;
-         height: 100%;
-         font-family: arial;
+       background-color: #C0C0C0;
+       width: 100%;
+       height: 100%;
+       }
+a:link {
+       color: #468C46;
+       cursor: pointer;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
 }
+a:active {
+       color: #117721;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       font-weight: bold;
+}
+a:visited {
+       color: #468C46;
+       cursor: auto;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+a:hover {
+       color: #468C46;
+       cursor: pointer;
+       text-decoration: underline;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
 
 .adminPanel{
        width: 90%;
-       height: 60%;
+       height: 50%;
        float:left;
        margin-left: 5%;
        margin-right: 5%;
@@ -30,35 +59,198 @@
 .navtex {
        font-family: Verdana, Arial, Helvetica, sans-serif;
        font-size: 13px;
-       color: #666666;
+       color: #468C46;
        text-align: right;
        font-style: normal;
        font-weight: normal;
+       line-height: 28px;
+       background-image: none;
 }
 
+.navtexheading {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       color: #468C46;
+       text-align: right;
+       font-style: normal;
+       font-weight: bold;
+       line-height: normal;
+       
+}
+.welcometext {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       color: #468C46;
+       border-bottom-width: 1px;
+       border-bottom-style: dotted;
+       border-bottom-color: #468C46;
+       padding-top: 10px;
+       padding-bottom: 8px;
+       padding-right: 0px;
+       clip: rect(auto,auto,auto,auto);
+       margin-right: 0px;
+       margin-left: 2%;
+}
+.heading1 {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 14px;
+       color: #468C46;
+       padding-top: 23px;
+       padding-bottom: 23px;
+       font-weight: bold;
+       margin-left: 2%;
+}
+       
+.bodytext1 {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 11px;
+       color: #333333;
+       width: 100%;
+       margin-left: 18%;
+       font-weight: normal;
+       line-height: 22px;
+}
 
+.bodytextgreenline {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 11px;
+       color: #333333;
+       margin-left: 18%;
+       font-weight: normal;
+       line-height: 18px;
+       border-bottom-width: 1px;
+       border-bottom-style: dotted;
+       border-bottom-color: #468C46;
+       padding-bottom: 11pt;
+}      
+       
+.contenttable {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       color: #468C46;
+       padding-top: 0px;
+       margin-left: 20px;
+       font-weight: bold;
+       background-color: #FFFFFF;
+}
+.configheadinglavender {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       color: #8585C1;
+       font-weight: bold;
+       background-image: url(graphics/arrow_icon2.gif);
+       background-repeat: no-repeat;
+       background-position: 17px top;
+       padding-left: 38px;
+}
+
+.configheadinglavender a:link {
+       color: #8585C1;
+       cursor: pointer;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+.configheadinglavender a:active {
+       color: #117721;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       font-weight: bold;
+}
+.configheadinglavender a:visited {
+       color: #8585C1;
+       cursor: auto;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+.configheadinglavender a:hover {
+       color: #8585C1;
+       cursor: pointer;
+       text-decoration: underline;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+
+
+.configheading {
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       color: #27752C;
+       font-weight: bold;
+       background-image: url(graphics/arrow_icon.gif);
+       background-repeat: no-repeat;
+       background-position: 17px top;
+       padding-left: 38px;
+}
+
+.configheading a:link {
+       color: #27752C;
+       cursor: pointer;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+.configheading a:active {
+       color: #117721;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+       font-weight: bold;
+}
+.configheading a:visited {
+       color: #27752C;
+       cursor: auto;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+.configheading a:hover {
+       color: #27752C;
+       cursor: pointer;
+       text-decoration: underline;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 13px;
+}
+
 .banner{
        margin: 5px;
        width: 99%;
        height: 94px;
        background-image: url(top_slice.gif);
        background-color: #FFFFFF;
+       padding-left: 0px;
+       clip: rect(auto,auto,auto,auto);
+       float:left;
 }
-
-
 .mainWindow{
        border: none;
        width: 100%;
-       height: 554px;
+       height: 750px;
        background-color: #ffffff;
 }
+.centerWindow{
+       background-color: #FFFFFF;
+       width: 82%;
+       height:80%;
+       margin-right: 5px;
+       margin-bottom: 5px;
+       margin-left: 5px;
+       float: left;
+}
+.centerWindow object{
+       width: 100%;
+       height: 105%;
+       background-color: #FFFFFF;
+}
+
+.welcomepage{
+       background-color: #FFFFFF;
+       width: 100%;
+       height: 100%;
+}
+
 /* Sidebar*/
 
-
 .sidebar{
        width: 15%;
-       height: 300px;
-       padding-bottom: 250px;
+       height: 66%;
+       padding-bottom: 12.1%;
        padding-right: 0px;
        float: left;
        border-right-width: 1px;
@@ -73,12 +265,19 @@
        color: #ffffff;
        text-align: right;
        background-color: #61AF61;
-       padding: 10px;
-       right: 0px;
        width: 15%;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       font-weight: normal;
+       text-decoration:none;
+       background-repeat: no-repeat;
+       
+       padding-top: 10px;
+       padding-right: 8%;
+       padding-bottom: 10px;
+       padding-left: 10px;
 }
 .sidebar td{
-       color: #000000;
        text-align: right;
        background-color: #ffffff;
        padding: 10px;
@@ -86,40 +285,42 @@
        border-bottom-style: dotted;
        border-bottom-color: #92C992;
 }
+.sidebar a.button {
+       color: #ffffff;
+       text-align:left;
+       background-color: #61AF61;
+       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-size: 12px;
+       font-weight: normal;
+       text-decoration:none;
+       background-position: 100% 50%;
+       background-image: url(graphics/admin_home_target.gif);
+       background-repeat: no-repeat;
+       
+}
 
+
+
 .sidebar a{
-       text-decoration: none;
        font-weight: normal;
-       padding: 0px;
+       padding-top: 0px;
+       padding-right: 0px;
+       padding-bottom: 0px;
+       padding-left: 0px;
+       margin-bottom: 0px;
 }
 
 .sidebar img{
-       float: none;
+       float: right;
        border: none;
-       width: 120px;
-       height: 60px;
-       padding-top: 40px;
+       padding-top: 0px;
        padding-right: 0px;
        padding-bottom: 0px;
-       padding-left: 15px;
 }
-.centerWindow{
-       width: 83%;
-       height: 500px;
-       background-color: #ffffff;
-       float: left;
-       
 
-}
-.centerWindow object{
-     
-     width: 100%;
-     height: 100%;
 
-}
-
 .footer{
-       height: 30px;
+       height: 20px;
        text-align: right;
        color: #61AF61;
        background-color: #ffffff;
@@ -128,11 +329,13 @@
        border-top-width: 1px;
        border-top-style: dotted;
        border-top-color: #61AF61;
-       padding-top: 5px;
+       padding-top: 12px;
        width: 100%;
        border-right-style: none;
        border-right-color: #FFFFFF;
        border-left-color: #FFFFFF;
+       float: none;
+}
 .footermain {
        height: 20px;
        text-align: right;
@@ -148,29 +351,6 @@
        border-right-style: none;
        border-right-color: #FFFFFF;
        border-left-color: #FFFFFF;
-}
-.footermain {
-       height: 20px;
-       text-align: right;
-       color: #61AF61;
-       background-color: #ffffff;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 10px;
-       width: 100%;
+       }
+       
 
-.footermain {
-       height: 20px;
-       text-align: right;
-       color: #61AF61;
-       background-color: #ffffff;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 10px;
-       border-top-width: 1px;
-       border-top-style: dotted;
-       border-top-color: #61AF61;
-       padding-top: 5px;
-       width: 100%;
-       border-right-style: none;
-       border-right-color: #FFFFFF;
-       border-left-color: #FFFFFF;     padding: 5px;
-}

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/r.gif

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/rb.gif

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/rt.gif

Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/sqlma_admin_script.js
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/sqlma_admin_script.js        
2008-03-31 11:31:16 UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/sqlma_admin_script.js        
2008-03-31 14:10:10 UTC (rev 3577)
@@ -118,103 +118,19 @@
     document.getElementById('options').style.display = "block";
 }
 
-function checkForPrompt(form){
-
-    if (form.createDatabase != null || form.createUser != null) {
-    
-        var rootPass = prompt("Please enter root password for SQL database", 
'');
-        if (rootPass != null) {
-            var el = document.createElement("input");
-            el.type = "hidden";
-            el.name = "rtPass";
-            el.value = rootPass;
-            form.appendChild(el);
-           // document.form.submit();
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    
+function sendRequest(file){
+       document.body.style.cursor='wait';
+       var input=document.createElement("input");
+       input.type = "hidden";
+    input.name = "ibatisFile";
+    input.value = file;
+       var form=document.createElement("form");
+       form.name="ShowForm"
+       form.method='post';
+       form.action='SQLMAdmin';
+       form.appendChild(input);
+       document.getElementById('EditFile').appendChild(form);
+       document.ShowForm.submit();
+       
 }
 
-function insRow(i){
-    var x = document.getElementById('fieldTable').insertRow(0);
-    var field = x.insertCell(0);
-    var type = x.insertCell(1);
-    var size = x.insertCell(2);
-    var nul = x.insertCell(3);
-    var def = x.insertCell(4);
-    var extra = x.insertCell(5);
-    
-    field.innerHTML = "<input type=\"text\" size=\"15\" name=\"field" + i + 
"\" value=\" \" />";
-    type.innerHTML = "<input type=\"text\" size=\"15\" name=\"type" + i + 
"\" value=\" \" />";
-    size.innerHTML = "<input type=\"text\" size=\"5\" name=\"size" + i + "\" 
value=\" \" />";
-    nul.innerHTML = "<select name=\"null" + i + "\">" +
-    "<option value =\"NULL\" >NULL</option>" +
-    "<option value =\"\NOT NULL\" >NOT NULL</option>" +
-    "</select>";
-    def.innerHTML = "<input type=\"text\" size=\"15\" name=\"default" + i + 
"\" value=\" \" />";
-    extra.innerHTML = "<input type=\"text\" size=\"40\" name=\"extra" + i + 
"\" value=\" \" />";
-    
-}
-
-function addTableDescription(){
-
-    var x = document.getElementById('fieldTable').insertRow(0);
-    var field = x.insertCell(0);
-    var type = x.insertCell(1);
-    var size = x.insertCell(2);
-    var nul = x.insertCell(3);
-    var def = x.insertCell(4);
-    var extra = x.insertCell(5);
-    
-    field.innerHTML = "<h4>Field</h4>";
-    type.innerHTML = "<h4>Type</h4>";
-    size.innerHTML = "<h4>Size</h4>";
-    nul.innerHTML = "<h4>Null</h4>";
-    def.innerHTML = "<h4>Default</h4>";
-    extra.innerHTML = "<h4>Extra</h4>";
-    
-    x = document.getElementById('fieldTable').insertRow(0);
-    
-    var label = x.insertCell(0);
-    var input = x.insertCell(1);
-    x.insertCell(2);
-    x.insertCell(3);
-    x.insertCell(4);
-    
-    label.innerHTML = "<h4>Table Name</h4>";
-    input.innerHTML = "<input type=\"text\" size=\"15\" name=\"tableName\" 
value=\" \" />";
-    
-}
-
-function addSubmitButton(){
-
-    var x = document.getElementById('fieldTable').insertRow(0);
-    
-    var submit = x.insertCell(0);
-    x.insertCell(1);
-    x.insertCell(2);
-    x.insertCell(3);
-    x.insertCell(4);
-    
-    submit.innerHTML = "<input type=\"submit\" name=\"Execute\" 
value=\"Create Table\" />";
-    
-}
-
-function importData(){
-    //alert("HI");
-    var index = document.tableForm.table.selectedIndex;
-    var table = document.tableForm.table.options[index].value;
-    var hidden = document.createElement("input");
-    hidden.setAttribute("type", "hidden");
-    hidden.setAttribute("value", table);
-    hidden.setAttribute("name", "table");
-    document.dataForm.appendChild(hidden);
-    
-    //alert(table);
-
-}
-

Deleted: trunk/geant2_java-sql-ma/conf/axis-1.4/t.gif

Added: trunk/geant2_java-sql-ma/conf/axis-1.4/welcome.htm

Modified: trunk/geant2_java-sql-ma/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sql-ma/conf/wizard.properties     2008-03-31 11:31:16 
UTC (rev 3576)
+++ trunk/geant2_java-sql-ma/conf/wizard.properties     2008-03-31 14:10:10 
UTC (rev 3577)
@@ -56,10 +56,17 @@
   </property>
 
   <property>
+    <entry key="old_adminpassword" required="true" 
password="true">perfsonar</entry>
+    <Comment>Enter the old eXist administration password:</Comment>
+    <ProposedValue>perfsonar</ProposedValue>
+    <Group order="6">eXist</Group>
+  </property>
+
+  <property>
     <entry key="service.ma.conf_file" 
required="true">__BASEPATH__/classes/perfsonar/conf/sql-database_TEST.xml</entry>
     <Comment>Enter the full path of the metadata configuration 
file:</Comment>
     
<ProposedValue>__BASEPATH__/classes/perfsonar/conf/sql-database_TEST.xml</ProposedValue>
-    <Group order="5">eXist</Group>
+    <Group order="7">eXist</Group>
   </property>
 
 

Deleted: trunk/geant2_java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080303.jar

Added: trunk/geant2_java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080331.jar


Property changes on: 
trunk/geant2_java-sql-ma/lib/misc/perfsonar-base-ant-1.0.20080331.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream