perfsonar development work

Author: rodriguez
Date: 2008-04-10 03:51:48 -0400 (Thu, 10 Apr 2008)
New Revision: 3642

Added:
   trunk/geant2_java-as/ant/webapp-package-targets.xml
   trunk/geant2_java-as/conf/axis-1.4/WEB-INF/server-config.wsdd
   trunk/geant2_java-as/conf/axis-1.4/perfsonar.png
   trunk/geant2_java-as/conf/wizardproperties.dtd
Modified:
   trunk/geant2_java-as/ant/axis-deploy-targets.xml
   trunk/geant2_java-as/ant/build.xml
   trunk/geant2_java-as/ant/const.properties.template
   trunk/geant2_java-as/ant/libs-download-targets.xml
   trunk/geant2_java-as/conf/axis-1.4/Service_Admin.js
   trunk/geant2_java-as/conf/axis-1.4/default.css
   trunk/geant2_java-as/conf/axis-1.4/graphics/Thumbs.db
   trunk/geant2_java-as/conf/axis-1.4/graphics/step_1_bottom.gif
   trunk/geant2_java-as/conf/axis-1.4/graphics/step_1_slice.gif
   trunk/geant2_java-as/conf/axis-1.4/graphics/step_1_top.gif
   trunk/geant2_java-as/conf/axis-1.4/graphics/step_2_bottom.gif
   trunk/geant2_java-as/conf/axis-1.4/graphics/step_2_slice.gif
   trunk/geant2_java-as/conf/axis-1.4/graphics/step_2_top.gif
   trunk/geant2_java-as/conf/axis-1.4/index.html
   trunk/geant2_java-as/conf/axis-1.4/main.css
   trunk/geant2_java-as/conf/axis-1.4/welcome.htm
   trunk/geant2_java-as/conf/components.properties.template
   trunk/geant2_java-as/conf/service.properties.template-2
   trunk/geant2_java-as/conf/wizard.properties.template
   trunk/geant2_java-as/doc/ChangeLog.txt
Log:
- Updates the ant scripts: prepared for creating the webapps folder and the 
WAR file
- Updates stuff about the webadmin
- Fixes some problems with components.properties and services.properties

Modified: trunk/geant2_java-as/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-04-10 07:44:30 
UTC (rev 3641)
+++ trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-04-10 07:51:48 
UTC (rev 3642)
@@ -52,7 +52,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080124/nmwg-1.0.20080124.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <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.8b/perfsonar-web-admin-0.8b.jar"
       todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.1b/perfsonar-web-admin-0.8.1b.jar"
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"
                                      
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
                                 
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
   todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

Modified: trunk/geant2_java-as/ant/build.xml
===================================================================
--- trunk/geant2_java-as/ant/build.xml  2008-04-10 07:44:30 UTC (rev 3641)
+++ trunk/geant2_java-as/ant/build.xml  2008-04-10 07:51:48 UTC (rev 3642)
@@ -21,5 +21,6 @@
   <import file="axis-deploy-targets.xml"/>
   <import file="test-targets.xml"/>
   <import file="release-targets.xml"/>
+  <import file="webapp-package-targets.xml"/>
 
 </project>
\ No newline at end of file

Modified: trunk/geant2_java-as/ant/const.properties.template
===================================================================
--- trunk/geant2_java-as/ant/const.properties.template  2008-04-10 07:44:30 
UTC (rev 3641)
+++ trunk/geant2_java-as/ant/const.properties.template  2008-04-10 07:51:48 
UTC (rev 3642)
@@ -11,7 +11,7 @@
 service.name=geant2_java-as
 
 jarfilename=perfsonar-as
-version=1.0rc4
+version=1.0rc6
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd

Modified: trunk/geant2_java-as/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/libs-download-targets.xml  2008-04-10 07:44:30 
UTC (rev 3641)
+++ trunk/geant2_java-as/ant/libs-download-targets.xml  2008-04-10 07:51:48 
UTC (rev 3642)
@@ -55,14 +55,14 @@
     <artifact:dependencies>
 
       <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20080310"/>
-      <dependency groupId="perfsonar" artifactId="perfsonar-web-admin" 
version="0.8b"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-web-admin" 
version="0.8.1b"/>
       <dependency groupId="nmwg"      artifactId="nmwg"           
version="1.0.20080124"/>
 
       <!-- dependencies for perfsonar-web-admin -->
       <dependency groupId="commons-io"                                 
artifactId="commons-io"                         version="1.3.2"/>
       <dependency groupId="commons-codec"                      
artifactId="commons-codec"          version="1.3"/>
       <dependency groupId="commons-fileupload"      
artifactId="commons-fileupload"     version="1.2"/>
-      <dependency groupId="perfsonar"                          
artifactId="perfsonar-web-admin"    version="0.8b"/>
+      <dependency groupId="perfsonar"                          
artifactId="perfsonar-web-admin"    version="0.8.1b"/>
 
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>

Added: trunk/geant2_java-as/ant/webapp-package-targets.xml

Modified: trunk/geant2_java-as/conf/axis-1.4/Service_Admin.js
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/Service_Admin.js 2008-04-10 07:44:30 
UTC (rev 3641)
+++ trunk/geant2_java-as/conf/axis-1.4/Service_Admin.js 2008-04-10 07:51:48 
UTC (rev 3642)
@@ -17,6 +17,8 @@
 
 function FloatPosition(){
     var ns = (navigator.appName.indexOf("Netscape") != -1);
+    var x = screen.width;
+    var y = screen.height;
     var button = document.getElementById("Button");
     var reset_button = document.getElementById("ResetButton");
     if (reset_button) {
@@ -24,16 +26,25 @@
         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 (y == 768) {
+                reset_button.style.top = 95 + '%';
+                reset_button.style.left = 83 + '%';
+            }
+            else {
+                               //alert("Not 768 "+x);
+                reset_button.style.top = 95 + '%';
+                reset_button.style.left = 67 + '%';
+            }
         }
         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';
+            if (y == 768) {
+                button.style.top = 95 + '%';
+                button.style.left = 91.5 + '%';
+            }
+            else {
+              button.style.top = 95 + '%';
+                button.style.left = 74 + '%';
+            }
         }
     }
     

Added: trunk/geant2_java-as/conf/axis-1.4/WEB-INF/server-config.wsdd

Modified: trunk/geant2_java-as/conf/axis-1.4/default.css
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/default.css      2008-04-10 07:44:30 
UTC (rev 3641)
+++ trunk/geant2_java-as/conf/axis-1.4/default.css      2008-04-10 07:51:48 
UTC (rev 3642)
@@ -20,6 +20,7 @@
 .top {
     display: block;
     font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     color: #468C46;
     margin: 0% 1% 0 1%;
     border-bottom: 1px dotted #468C46;
@@ -34,12 +35,14 @@
 
 .properties {
     font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     padding: 10px;
     margin: 0% 1% 0 1%;
 }
 
 .properties p {
-    font-size: 120%;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .properties table {
@@ -49,6 +52,8 @@
 
 .properties td {
     padding: 15px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .properties em {
@@ -58,8 +63,8 @@
 }
 
 .info_wizard {
-    font-family: erdana, Arial, Helvetica, sans-serif;
-    font-size: 100%;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     color: #468C46;
 }
 
@@ -68,64 +73,93 @@
 /* General Purpose CSS*/
 .welcometextlavender {
     font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 110%;
+    font-size: 13px;
     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%;
+    margin-left: 0%;
 }
 
+.formated_text {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+}
+
 .blueheader {
     text-align: left;
     color: #4169E1;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .info {
     font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 100%;
+    font-size: 13px;
     color: #4169E1;
+    float: none;
     margin: 0% 0% 0% 1%;
 }
 
 .info p {
+    float: none;
+    text-align: justify;
 }
 
 .lightgrey {
     background-color: #f1f3f1;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
 }
 
 .lightgrey td {
-    padding: 8px
+    padding: 5px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
 }
 
 .darkgrey {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
     background-color: #e1e5e1;
 }
 
 .darkgrey td {
-    padding: 8px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
+    padding: 5px;
 }
 
 .hilighted {
     color: #4169E1;
     border-bottom: 1px solid #4169E1;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .underlined {
     border-bottom: 1px solid #4169E1;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .tablessContent {
-    margin: 2% 1% 0 1%;
+    margin: 2% 0 0 0.3%;
     background: #ffffff;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
+.input_style_blue {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
+}
+
 .headerlavender {
     font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     background-color: #A0A0D8;
     margin-right: 0px;
     margin-left: 0px;
@@ -133,9 +167,9 @@
 }
 /*eXist Admin CSS*/
 .content {
-    font-family: arial;
-    font-size: 120%;
-    margin: 2% 1% 0 1%;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+    margin: 2% 0% 0 0%;
     background: #ffffff;
 }
 
@@ -157,15 +191,17 @@
 
 .manage_exist {
     background: #ffffff;
-    margin: 0% 1% 0% 0%;
+    margin: 0% 0% 0% 0%;
     padding: 0px;
 }
 
 .showResource {
-    font-weight: bold;
+    float: none;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     text-indent: 0%;
     margin-top: 5px;
-    margin-left: 1%;
+    margin-left: 0.3%;
     padding: 0px;
     text-align: inherit;
 }
@@ -174,10 +210,13 @@
     left: -100px;
     position: static;
     margin-top: 0px;
+    border-spacing: 1px 0px;
 }
 
 .showResource th {
     padding: 10px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 12px;
     background-color: #C7C7F2;
 }
 
@@ -187,23 +226,15 @@
 
 .showResource p {
     font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 100%;
+    font-size: 13px;
     border: none;
     padding: 5px;
-    margin: 0% 4% 0% 0%;
+    margin: 0% 0% 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-size: 13px;
     font-weight: bold;
     padding: 5px;
     color: #4169E1;
@@ -212,13 +243,13 @@
     border-bottom-style: dotted;
     border-bottom-color: #4169E1;
     clip: rect( auto, auto, auto, auto );
-    margin-left: 1%;
+    margin-left: 0%;
 }
 
 .input {
     padding: 1em;
-    font-size: 110%;
-    font-family: arial;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .input_style {
@@ -228,15 +259,16 @@
 }
 
 .login_table {
-       background-color: #E6E6FA;
-
+    background-color: #E6E6FA;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
-.login_table td{
-    font-weight:bold;
+.login_table td {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
-
 .logout {
     margin-top: 10px;
     margin-left: 48%;
@@ -260,15 +292,21 @@
 .input_table {
     border: 1px solid #4169E1;
     border-spacing: 0px 1px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .input_table td {
     padding: 5px;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 
 .input_table th {
     padding: 5px;
     text-align: left;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
 }
 /*Exist Buttons CSS*/
 .collections_option_on a {
@@ -324,12 +362,13 @@
     height: 28px;
     margin: 0;
     padding: 0;
-       border:0px;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 80%;
+    border: 0px;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 90%;
     font-weight: bold;
-       text-align:center;
-       clip: rect(auto,auto,auto,auto);
+    text-align: center;
+    clip: rect( auto, auto, auto, auto );
+    cursor: pointer;
     background: transparent url(graphics/button_1_small.gif) no-repeat 
center top;
     float: left;
 }
@@ -337,17 +376,19 @@
 .edit_button_res {
     display: block;
     margin-top: 5px;
+    margin-left: 0px;
     width: 120px;
     height: 28px;
     float: left;
-       outline: none;
+    outline: none;
     border: none;
-       text-align: center;
+    text-align: center;
     font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 70%;
+    font-size: 90%;
     font-weight: bold;
     text-decoration: none;
-    background:url(graphics/button_1_large.gif) no-repeat center;
+    background: url(graphics/button_1_large.gif) no-repeat center;
+    cursor: pointer;
 }
 
 .create_button_res {
@@ -357,10 +398,11 @@
     height: 28px;
     float: left;
     border: none;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 70%;
-    font-weight:600;
+    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;
 }
 
@@ -369,12 +411,13 @@
     margin-top: 5px;
     width: 120px;
     height: 28px;
-    float: left;
+    float: none;
     border: none;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 70%;
+    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 top;
 }
 
@@ -384,9 +427,10 @@
     margin: 0;
     border: 0;
     padding: 0;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 70%;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 90%;
     font-weight: 600;
+    cursor: pointer;
     background: transparent url(graphics/button_1_small.gif) no-repeat 
center top;
     float: left;
 }
@@ -397,49 +441,56 @@
     margin: 0;
     border: 0;
     padding: 0;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 70%;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 90%;
     font-weight: 600;
+    cursor: pointer;
     background: transparent url(graphics/button_1_small.gif) no-repeat 
center top;
     float: left;
 }
-.execute_button_users{
-       width: 54px;
+
+.execute_button_users {
+    width: 54px;
     height: 28px;
     margin: 0;
     border: 0;
     padding: 0;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
-    font-size: 70%;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 90%;
     font-weight: 600;
+    cursor: pointer;
     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;
+    font-size: 10px;
     color: #468C46;
 }
 
 .manage {
     background: #ffffff;
-    margin: 0 1% 0 1%;
+    margin: 0 0.3% 0 0.3%;
     padding: 0px;
 }
 
 .manage table {
-    padding: 10px;
+    padding: 3px;
     border-spacing: 1px 0px;
 }
 
 .manage th {
-    padding: 10px;
+    padding-top: 8px;
+    padding-bottom: 8px;
+    padding-left: 5px;
     text-align: left;
 }
 
 .manage td {
-    padding: 10px;
+    padding-top: 8px;
+    padding-bottom: 8px;
+    padding-left: 5px;
 }
 /*Properties Buttons CSS*/
 .floatResetButton {
@@ -450,6 +501,7 @@
     padding: 0;
     border: 0;
     text-indent: -1000em;
+    cursor: pointer;
     background: transparent url(graphics/cancel_button.gif) no-repeat center 
top;
     float: right;
 }
@@ -462,6 +514,7 @@
     border: 0;
     padding: 0;
     text-indent: -1000em;
+    cursor: pointer;
     background: transparent url(graphics/apply_button_2.gif) no-repeat 
center top;
     float: right;
 }
@@ -473,94 +526,115 @@
     border: 0;
     padding: 0;
     text-indent: -1000em;
+    cursor: pointer;
     background: transparent url(graphics/apply_button.gif) no-repeat center 
top;
-    float: left;
+    float: none;
 }
 /* SQLMA Admin CSS*/
 .manage_slqma {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     margin: 0% 1% 0% 1%;
 }
 
 .Options {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     margin: 0% 1% 0% 1%;
 }
 
 #options {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     margin: 0% 1% 0% 1%;
 }
 
-
 #EditFile {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
     margin: 0% 1% 0% 1%;
-       float:none;
+    float: none;
 }
 
 #CreateNewFile {
     margin: 0% 1% 0% 1%;
-       float:none;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 13px;
+    float: none;
 }
-.execute_button_sqlma{
-       
-        display: block;
+
+.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;
+    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;
 }
 
-.execute_button_sqlma_small{
-       
-       display: block;
+.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;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 90%;
+    font-weight: 600;
     text-decoration: none;
+    cursor: pointer;
     background: transparent url(graphics/button_1_small.gif) no-repeat 
center;
 }
-.execute_button_sqlma_large{
-       
-       display: block;
+
+.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;
+    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;
 }
+
 .sqlmaheader {
-       margin-left:1%;
+    margin-left: 1%;
     color: #4169E1;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 13px;
 }
-init_table{
-       margin-left:1%;
-       float:left;
+
+init_table {
+    margin-left: 1%;
+    float: left;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 13px;
 }
 
-.init_table td{
-       padding:8px;
-       text-align:left;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
+.init_table td {
+    padding: 8px;
+    text-align: left;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 13px;
 }
-.init_table th{
-       padding:8px;
-       text-align:left;
-       color:#4169E1;
-       font-family: Helvetica, Calibri, Arial, sans-serif;
+
+.init_table th {
+    padding: 8px;
+    text-align: left;
+    color: #4169E1;
+    font-family: Helvetica, Calibri, Arial, sans-serif;
+    font-size: 13px;
 }
 
 

Modified: trunk/geant2_java-as/conf/axis-1.4/graphics/Thumbs.db
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/axis-1.4/graphics/step_1_bottom.gif
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/axis-1.4/graphics/step_1_slice.gif
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/axis-1.4/graphics/step_1_top.gif
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/axis-1.4/graphics/step_2_bottom.gif
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/axis-1.4/graphics/step_2_slice.gif
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/axis-1.4/graphics/step_2_top.gif
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/axis-1.4/index.html
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/index.html       2008-04-10 07:44:30 
UTC (rev 3641)
+++ trunk/geant2_java-as/conf/axis-1.4/index.html       2008-04-10 07:51:48 
UTC (rev 3642)
@@ -10,33 +10,39 @@
         }
         
         .style3 {
-            color: #8585c1
+            color: #8585c1;
+            font-size: 13px;
         }
-               .style3 a:link {
-       color: #8585C1;
-       cursor: pointer;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 13px;
-}
-.style3 a:active {
-       color: #117721;
-       font-family: Verdana, Arial, Helvetica, sans-serif;
-       font-size: 13px;
-       font-weight: bold;
-}
-.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;
-}
+        
+        .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>
@@ -56,7 +62,7 @@
                     <table border="0" cellpadding="0" cellspacing="0">
                         <tr>
                             <th>
-                                <a  href="welcome.htm" class="button" 
target="main" >Admin home  &nbsp;  &nbsp;  &nbsp;</a> 
+                                <a href="welcome.htm" class="button" 
target="main">Admin home  &nbsp;  &nbsp;  &nbsp;</a>
                             </th>
                         </tr>
                         <tr>
@@ -68,7 +74,7 @@
                                     </span>
                                 </p>
                                 <p>
-                                    <span class="navtex"><a  href="Wizard" 
target="main">Service</a></span>
+                                    <span class="navtex"><a href="Wizard" 
target="main">Service</a></span>
                                 </p>
                                 </p>
                             </td>
@@ -95,8 +101,8 @@
                     </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%" >
+                <div class="centerWindow">
+                    <object data="welcome.htm" type="text/html" name="main" 
width="99%" height="100%">
                     </object>
                 </div>
             </div>

Modified: trunk/geant2_java-as/conf/axis-1.4/main.css
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/main.css 2008-04-10 07:44:30 UTC (rev 
3641)
+++ trunk/geant2_java-as/conf/axis-1.4/main.css 2008-04-10 07:51:48 UTC (rev 
3642)
@@ -48,10 +48,10 @@
 }
 
 .adminPanel{
-       width: 90%;
+       width: 94%;
        height: 50%;
        float:left;
-       margin-left: 5%;
+       margin-left: 3%;
        margin-right: 5%;
        background-color:       #ffffff;
        margin-bottom: 2%;
@@ -214,12 +214,13 @@
        height: 94px;
        background-image: url(top_slice.gif);
        background-color: #FFFFFF;
-       padding-left: 0px;
+       padding: 0px;
        clip: rect(auto,auto,auto,auto);
        float:left;
 }
 .mainWindow{
        border: none;
+       padding: 0px;
        width: 100%;
        height: 750px;
        background-color: #ffffff;
@@ -230,11 +231,11 @@
        height:80%;
        margin-right: 5px;
        margin-bottom: 5px;
-       margin-left: 5px;
+       margin-left: 0;
        float: left;
 }
 .centerWindow object{
-       width: 100%;
+       width: 101%;
        height: 105%;
        background-color: #FFFFFF;
 }
@@ -249,7 +250,7 @@
 
 .sidebar{
        width: 15%;
-       height: 66%;
+       height: 71.1%;
        padding-bottom: 12.1%;
        padding-right: 0px;
        float: left;

Added: trunk/geant2_java-as/conf/axis-1.4/perfsonar.png


Property changes on: trunk/geant2_java-as/conf/axis-1.4/perfsonar.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/geant2_java-as/conf/axis-1.4/welcome.htm
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/welcome.htm      2008-04-10 07:44:30 
UTC (rev 3641)
+++ trunk/geant2_java-as/conf/axis-1.4/welcome.htm      2008-04-10 07:51:48 
UTC (rev 3642)
@@ -17,7 +17,7 @@
                         <table width="0" border="0" cellpadding="0" 
cellspacing="0" background="graphics/step_1_slice.gif" class="contenttable">
                             <tr>
                                 <td>
-                                    <img src="graphics/step_1_top.gif" 
width="401" height="122">
+                                    <img src="graphics/step_1_top.gif" 
width="350" height="122">
                                 </td>
                             </tr>
                             <tr>
@@ -62,7 +62,7 @@
                                                        <tr><td> </td></tr>
                             <tr>
                                 <td>
-                                    <img src="graphics/step_1_bottom.gif" 
width="401" height="18">
+                                    <img src="graphics/step_1_bottom.gif" 
width="350" height="18">
                                 </td>
                             </tr>
                         </table>
@@ -71,7 +71,7 @@
                         <table width="0" border="0" cellpadding="0" 
cellspacing="0" background="graphics/step_2_slice.gif" class="contenttable">
                             <tr>
                                 <td>
-                                    <img src="graphics/step_2_top.gif" 
width="401" height="118">
+                                    <img src="graphics/step_2_top.gif" 
width="350" height="118">
                                 </td>
                             </tr>
                             <tr>
@@ -115,7 +115,7 @@
                             </tr>
                             <tr>
                                 <td>
-                                    <img src="graphics/step_2_bottom.gif" 
width="401" height="18">
+                                    <img src="graphics/step_2_bottom.gif" 
width="350" height="18">
                                 </td>
                             </tr>
                         </table>

Modified: trunk/geant2_java-as/conf/components.properties.template
===================================================================
--- trunk/geant2_java-as/conf/components.properties.template    2008-04-10 
07:44:30 UTC (rev 3641)
+++ trunk/geant2_java-as/conf/components.properties.template    2008-04-10 
07:51:48 UTC (rev 3642)
@@ -8,8 +8,8 @@
 
 #Group=Scheduler
 #Description=Simple scheduler
-#scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
+#as_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
 #Group=LS
 #Description=Registration in LS
-#registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent
+#registrator=org.perfsonar.service.base.registration.LSRegistrationComponent

Modified: trunk/geant2_java-as/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-as/conf/service.properties.template-2     2008-04-10 
07:44:30 UTC (rev 3641)
+++ trunk/geant2_java-as/conf/service.properties.template-2     2008-04-10 
07:51:48 UTC (rev 3642)
@@ -14,13 +14,17 @@
 service.as.message_types=AuthNEERequest,EchoRequest,LookupInfoRequest
 
 # Group=Internal
-# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/home/perfsonar/webapps/geant2_java-as-1.0rc4/WEB-INF/classes/perfsonar/conf/objects.config
+# Description=Description of the service.
+service.r.service_description=perfSONAR authentication service
 
 # Group=Internal
-# Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/home/perfsonar/webapps/geant2_java-as-1.0rc4/WEB-INF/classes/perfsonar/conf/log4j.properties
+# Description=The location of the SAX parser configuration.
+service.sax_parser.config=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/objects.config
 
+# Group=Internal
+# Description=The location of the the log4j logger configuration file.
+service.log.log4j.config=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
+
 # 
-----------------------------------------------------------------------------------------------
 # Configuration of LS functionality
 
@@ -37,7 +41,7 @@
 service.r.access_point=http://somewhere
 
 # Group=LS
-# Description=The name of the organisation who who is deploying the service.
+# Description=The name of the organisation who is deploying the service.
 service.r.organization_name=X
 
 # Group=LS
@@ -53,36 +57,36 @@
 
service.r.contact_email=user@domain
 
 # Group=LS
-# Description=The description of the service.
-service.r.service_description=perfSONAR authentication service
-
-# Group=LS
-# Description=The time (miliseconds) between register requests to the LS 
service (default value is 900000 ms; 15 minutes).
+# Description=The time (miliseconds) between register requests to the LS 
service.
 component.registrator.interval=43200000
 
 # Group=LS
 # Description=The name of the scheduler component (the implementation of 
this component must also be declared in the components.properties file).
-#component.registrator.scheduler_component=as_scheduler
+component.registrator.scheduler_component=as_scheduler
 
+# Group=LS
+# Description=The name of the metadata configuration file which is to be 
sent to the LS.
+service.ls.registration_file=
+
 # 
-----------------------------------------------------------------------------------------------
 # Configuration of AS functionality
 
-# Group=AS
+# Group=Authentication
 # Description=The maximum lifetime (miliseconds) token allowed in the 
service (default value is 900000 ms; 15 minutes).
 service.as.maxttl=900000
 
-# Group=AS
+# Group=Authentication
 # Description=The full path to the TrustStore file containing the CA certs.
-service.as.truststore_file=/home/perfsonar/webapps/geant2_java-as-1.0rc4/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
+service.as.truststore_file=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
 
-# Group=AS
+# Group=Authentication
 # Description=The password for the TrustStore file.
 service.as.truststore_password=12345678
 
-# Group=AS
+# Group=Authentication
 # Description=The full path to a file containing valid Component IDs in 
eduGAIN.
-service.as.valid_components=/home/perfsonar/webapps/geant2_java-as-1.0rc4/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
+service.as.valid_components=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
 
-# Group=AS
+# Group=Authentication
 # Description=The crypt provider library for the service.
 service.as.crypt_provider=SunRsaSign
\ No newline at end of file

Modified: trunk/geant2_java-as/conf/wizard.properties.template
===================================================================
--- trunk/geant2_java-as/conf/wizard.properties.template        2008-04-10 
07:44:30 UTC (rev 3641)
+++ trunk/geant2_java-as/conf/wizard.properties.template        2008-04-10 
07:51:48 UTC (rev 3642)
@@ -19,53 +19,96 @@
 <!ELEMENT AcceptedValue (#PCDATA) >
 ]>
 <properties>
-  <comment>Last Modification Tue Jan 22 14:53:01 EET 2008</comment>
+  <comment>$Id$</comment>
   <property>
-    <entry key="service.r.organization_name">Organization</entry>
-    <Comment>Enter the name of the organization running this 
service.</Comment>
-    <ProposedValue>RedIRIS</ProposedValue>
-    <Group order="6">LS</Group>
+    <entry key="service.r.service_name" required="true">perfSONAR AS</entry>
+    <Comment>Enter the service name:</Comment>
+    <ProposedValue>perfSONAR AS</ProposedValue>
+    <Group order="1">LS</Group>
   </property>
+
   <property>
-    <entry 
key="service.r.contact_email"></entry>
-    <Comment>Enter the email address of the person administrating the 
service</Comment>
-    
<ProposedValue></ProposedValue>
+    <entry key="service.r.service_description">perfSONAR AS</entry>
+    <Comment>Enter a description for the service:</Comment>
+    <ProposedValue>perfSONAR AS</ProposedValue>
+    <Group order="2">LS</Group>
+  </property>
+
+  <property>
+    <entry 
key="service.r.contact_email">user@domain</entry>
+    <Comment>Enter the service administrator's email address:</Comment>
+    
<ProposedValue>user@domain</ProposedValue>
+    <Group order="3">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.organization_name">Institution</entry>
+    <Comment>Enter the name of the organization running this 
service:</Comment>
+    <ProposedValue>Institution</ProposedValue>
+    <Group order="4">LS</Group>
+  </property>
+
+  <property>
+    <entry key="service.r.ls_url" required="true">http://somewhere</entry>
+    <Comment>Enter the LS URL:</Comment>
+    <ProposedValue>http://somewhere</ProposedValue>
     <Group order="5">LS</Group>
   </property>
+
   <property>
-    <entry key="servlet.password" required="true" 
password="true">perfsonarpass</entry>
-    <Comment>Enter the password for logging in to the admin pages:</Comment>
-    <ProposedValue>perfsonarpass</ProposedValue>
-    <Group order="2">Administration</Group>
+    <entry key="component.registrator.interval">3000</entry>
+    <Comment>Set the registration interval (milliseconds):</Comment>
+    <ProposedValue>30000</ProposedValue>
+    <Group order="6">LS</Group>
   </property>
+
   <property>
+    <entry key="service.r.access_point" 
required="true">http://somewhere</entry>
+    <Comment>Enter the service access point:</Comment>
+    <ProposedValue>http://somewhere</ProposedValue>
+    <Group order="7">LS</Group>
+  </property>
+
+  <property>
     <entry key="servlet.username" required="true">perfsonaruser</entry>
     <Comment>Enter the username for logging in to the admin pages:</Comment>
     <ProposedValue>perfsonaruser</ProposedValue>
     <Group order="1" check="false">Administration</Group>
   </property>
+
   <property>
-    <entry key="service.r.ls_url" required="true">http://somewhere</entry>
-    <Comment>Give the LS url</Comment>
-    
<ProposedValue>http://selena.acad.bg:8070/axis/services/LookupService</ProposedValue>
-    <Group order="7">LS</Group>
+    <entry key="servlet.password" required="true" 
password="true">perfsonarpass</entry>
+    <Comment>Enter the password for logging in to the admin pages:</Comment>
+    <ProposedValue>perfsonarpass</ProposedValue>
+    <Group order="2">Administration</Group>
   </property>
+
   <property>
     <entry key="service.as.truststore_file" 
required="true">/home/perfsonar/webapps/perfSONAR-AS/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
     <Comment>Enter the full path to the TrustStore file containing the CA 
certs:</Comment>
     
<ProposedValue>/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
-    <Group order="8">AS</Group>
+    <Group order="1">Authentication</Group>
   </property>
+  
   <property>
     <entry key="service.as.truststore_password" 
required="true">12345678</entry>
     <Comment>Enter the password for the TrustStore file:</Comment>
     <ProposedValue>12345678</ProposedValue>
-    <Group order="9">AS</Group>
+    <Group order="2">Authentication</Group>
   </property>
+  
   <property>
     <entry key="service.as.valid_components" 
required="true">/home/perfsonar/webapps/perfSONAR-AS/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
     <Comment>Enter the full path to a file containing valid Component IDs in 
eduGAIN:</Comment>
     
<ProposedValue>/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
-    <Group order="10">AS</Group>
+    <Group order="3">Authentication</Group>
   </property>
+  
+  <property>
+    <entry key="service.as.maxttl" required="true">900000</entry>
+    <Comment>Enter the maximum lifetime (miliseconds) token allowed in the 
service:</Comment>
+    <ProposedValue>900000</ProposedValue>
+    <Group order="4">Authentication</Group>
+  </property>
+  
 </properties>
\ No newline at end of file

Added: trunk/geant2_java-as/conf/wizardproperties.dtd

Modified: trunk/geant2_java-as/doc/ChangeLog.txt
===================================================================
--- trunk/geant2_java-as/doc/ChangeLog.txt      2008-04-10 07:44:30 UTC (rev 
3641)
+++ trunk/geant2_java-as/doc/ChangeLog.txt      2008-04-10 07:51:48 UTC (rev 
3642)
@@ -1,5 +1,14 @@
 AS ChangeLog
 
+2008-04-10 Version 1.0rc6
+- Uses the webadmin 0.8.1b
+- Updates the ASHandler for the webadmin
+- Improves the creation of PerfSONARException objects
+- Fixes problems with components.properties and services.properties
+
+2008-04-02 Version 1.0rc5
+- Fixes a problem with the service.properties file
+
 2008-04-01 Version 1.0rc4
 - Uses the psBase-ant 20080331
 - Uses the webadmin 0.8b