Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3549 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/sqlma perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard

Subject: perfsonar development work

List archive

perfsonar: r3549 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/sqlma perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3549 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/sqlma perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard
  • Date: Wed, 26 Mar 2008 07:46:22 -0400
Author: michalis
Date: 2008-03-26 07:46:22 -0400 (Wed, 26 Mar 2008)
New Revision: 3549

Added:
branches/WebAdmin/graphics/
branches/WebAdmin/graphics/Paul_Hasleham.vcf
branches/WebAdmin/graphics/Thumbs.db
branches/WebAdmin/graphics/admin_home_target.gif
branches/WebAdmin/graphics/apply_button.gif
branches/WebAdmin/graphics/apply_button_2.gif
branches/WebAdmin/graphics/arrow_icon.gif
branches/WebAdmin/graphics/arrow_icon2.gif
branches/WebAdmin/graphics/button_1_large.gif
branches/WebAdmin/graphics/button_1_small.gif
branches/WebAdmin/graphics/button_2_large.gif
branches/WebAdmin/graphics/button_2_small.gif
branches/WebAdmin/graphics/cancel_button.gif
branches/WebAdmin/graphics/create_resource_button.gif
branches/WebAdmin/graphics/delete_red_button.gif
branches/WebAdmin/graphics/edit_button.gif
branches/WebAdmin/graphics/edit_green_button.gif
branches/WebAdmin/graphics/login_panel.gif
branches/WebAdmin/graphics/logos.gif
branches/WebAdmin/graphics/logout_button.gif
branches/WebAdmin/graphics/manage_collections_off_tab.gif
branches/WebAdmin/graphics/manage_collections_on_tab.gif
branches/WebAdmin/graphics/manage_users_off_tab.gif
branches/WebAdmin/graphics/manage_users_on_tab.gif
branches/WebAdmin/graphics/step_1_bottom.gif
branches/WebAdmin/graphics/step_1_slice.gif
branches/WebAdmin/graphics/step_1_top.gif
branches/WebAdmin/graphics/step_2_bottom.gif
branches/WebAdmin/graphics/step_2_slice.gif
branches/WebAdmin/graphics/step_2_top.gif

branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/LSWizardHandler.java
branches/WebAdmin/welcome.htm
Removed:
branches/WebAdmin/b.gif
branches/WebAdmin/background.gif
branches/WebAdmin/l.gif
branches/WebAdmin/lb.gif
branches/WebAdmin/lt.gif
branches/WebAdmin/r.gif
branches/WebAdmin/rb.gif
branches/WebAdmin/rt.gif
branches/WebAdmin/stemb.gif
branches/WebAdmin/stemt.gif
branches/WebAdmin/t.gif
branches/WebAdmin/tip_balloon.js
Modified:
branches/WebAdmin/Service_Admin.js
branches/WebAdmin/default.css
branches/WebAdmin/index.html
branches/WebAdmin/main.css
branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
branches/WebAdmin/perfSONARWebAdmin/admin/sqlma/SQLMAdmin.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
branches/WebAdmin/sqlma_admin_script.js
branches/WebAdmin/wizard.properties
Log:
Committing recent code changes,html+css files, new graphics

Modified: branches/WebAdmin/Service_Admin.js
===================================================================
--- branches/WebAdmin/Service_Admin.js 2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/Service_Admin.js 2008-03-26 11:46:22 UTC (rev 3549)
@@ -1,10 +1,46 @@
/**
* @author Michalis Michael,Cynet
- */
-function setTip(el,description){
- if (el) {
- el.style.cursor = 'pointer';
- }
- 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: branches/WebAdmin/b.gif

Deleted: branches/WebAdmin/background.gif

Modified: branches/WebAdmin/default.css
===================================================================
--- branches/WebAdmin/default.css 2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/default.css 2008-03-26 11:46:22 UTC (rev 3549)
@@ -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;
+}
+
+
+

Added: branches/WebAdmin/graphics/Paul_Hasleham.vcf

Added: branches/WebAdmin/graphics/Thumbs.db


Property changes on: branches/WebAdmin/graphics/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/admin_home_target.gif


Property changes on: branches/WebAdmin/graphics/admin_home_target.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/apply_button.gif


Property changes on: branches/WebAdmin/graphics/apply_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/apply_button_2.gif


Property changes on: branches/WebAdmin/graphics/apply_button_2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/arrow_icon.gif


Property changes on: branches/WebAdmin/graphics/arrow_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/arrow_icon2.gif


Property changes on: branches/WebAdmin/graphics/arrow_icon2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/button_1_large.gif


Property changes on: branches/WebAdmin/graphics/button_1_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/button_1_small.gif


Property changes on: branches/WebAdmin/graphics/button_1_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/button_2_large.gif


Property changes on: branches/WebAdmin/graphics/button_2_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/button_2_small.gif


Property changes on: branches/WebAdmin/graphics/button_2_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/cancel_button.gif


Property changes on: branches/WebAdmin/graphics/cancel_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/create_resource_button.gif


Property changes on: branches/WebAdmin/graphics/create_resource_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/delete_red_button.gif


Property changes on: branches/WebAdmin/graphics/delete_red_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/edit_button.gif


Property changes on: branches/WebAdmin/graphics/edit_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/edit_green_button.gif


Property changes on: branches/WebAdmin/graphics/edit_green_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/login_panel.gif


Property changes on: branches/WebAdmin/graphics/login_panel.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/logos.gif


Property changes on: branches/WebAdmin/graphics/logos.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/logout_button.gif


Property changes on: branches/WebAdmin/graphics/logout_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/manage_collections_off_tab.gif


Property changes on: branches/WebAdmin/graphics/manage_collections_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/manage_collections_on_tab.gif


Property changes on: branches/WebAdmin/graphics/manage_collections_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/manage_users_off_tab.gif


Property changes on: branches/WebAdmin/graphics/manage_users_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/manage_users_on_tab.gif


Property changes on: branches/WebAdmin/graphics/manage_users_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/step_1_bottom.gif


Property changes on: branches/WebAdmin/graphics/step_1_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/step_1_slice.gif


Property changes on: branches/WebAdmin/graphics/step_1_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/step_1_top.gif


Property changes on: branches/WebAdmin/graphics/step_1_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/step_2_bottom.gif


Property changes on: branches/WebAdmin/graphics/step_2_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/step_2_slice.gif


Property changes on: branches/WebAdmin/graphics/step_2_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: branches/WebAdmin/graphics/step_2_top.gif


Property changes on: branches/WebAdmin/graphics/step_2_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Modified: branches/WebAdmin/index.html
===================================================================
--- branches/WebAdmin/index.html 2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/index.html 2008-03-26 11:46:22 UTC (rev 3549)
@@ -1,77 +1,111 @@
<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>
-
-</div>
-
-<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>
-</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>
+.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>
+ <a href="SQLMAdmin"
target="main">SQL MA Administration</a>
+ </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="106%" >
+ </object>
+ </div>
+ </div>
+ <div class="footer">
+ PERFormance Service-Oriented Network monitoring ARchitecture
&nbsp;
+ </div>
+ </div>
+ </body>
</html>
-
-

Deleted: branches/WebAdmin/l.gif

Deleted: branches/WebAdmin/lb.gif

Deleted: branches/WebAdmin/lt.gif

Modified: branches/WebAdmin/main.css
===================================================================
--- branches/WebAdmin/main.css 2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/main.css 2008-03-26 11:46:22 UTC (rev 3549)
@@ -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;
-}

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/exist/eXistAdmin.java
2008-03-26 11:46:22 UTC (rev 3549)
@@ -445,7 +445,6 @@
.getName();

out.println("<tr>");
- out.println("<td/>");
out
.println("<td><a
href=\"eXistAdmin?function=collections&ChildCollection="
+ parent + "\" " + "
>Up </a></td>");
@@ -453,6 +452,7 @@
out.println("<td/>");
out.println("<td/>");
out.println("<td/>");
+ out.println("<td/>");
out.println("</tr>");
}
out.println("<tr>");
@@ -1406,50 +1406,46 @@
out.println("<table
class=\"input_table\">");
out.println("<tr><th
class=\"hilighted\" >User:</th>");
if (action.equals("Edit")) {
- out.println("<td
class=\"underlined\">" + usr
- +
"</td>");
+ out.println("<th
class=\"underlined\">" + usr
+ +
"</th><td class=\"underlined\" ></td>");
} else {
out
-
.println("<td><input type=\"text\" name=\"newUser\" value=\"\" size=20
></td>");
+
.println("<td><input type=\"text\" name=\"newUser\" value=\"\" size=20
></td><td/>");
}
// The goups field
out.println("</tr>");

out.println("<tr><th>Group:</th>");
out

.println("<td><input type=\"text\" name=\"group\" value=\""
-
+ groups + "\" size=20 ></td>");
+
+ groups + "\" size=20 ></td><td/>");
out.println("</tr>");
out.println("<tr>");
// The password fields

out.println("<th>Password:</th>");
out
-
.println("<td><input type=\"password\" name=\"password\" value=\"\" size=20
></td>");
+
.println("<td><input type=\"password\" name=\"password\" value=\"\" size=20
></td><td/>");
out.println("</tr>");
out.println("<tr><th>Confirm
Password:</th>");
out
-
.println("<td><input type=\"password\" name=\"confirmPassword\" value=\"\"
size=20 ></td>");
+
.println("<td><input type=\"password\" name=\"confirmPassword\" value=\"\"
size=20 ></td><td/>");
out.println("</tr>");
if (action.equals("Edit")) {

out.println("<tr><th>Don't change password:</th>");
out
-
.println("<td><input type=\"checkbox\" name=\"keep\" value=\"\" size=20
></td>");
+
.println("<td><input type=\"checkbox\" name=\"keep\" value=\"\" size=20
></td><td/>");
out.println("</tr>");

}
// The home collection fields
out.println("<tr><th>Home
Collection</th>");
- out
-
.println("<td><input type=\"text\" name=\"homeCollection\" value=\"\" size=20
></td>");
- out.println("</tr>");

String name =
(action.equals("Edit")) ? "Change"
: "Create";
- out.println("<tr><th></th>");
out
-
.println("<td><input type=\"text\" name=\"homeCollection\" value=\"\" size=20
>");
+
.println("<td><input type=\"text\" name=\"homeCollection\" value=\"\" size=20
></td>");

out
-
.println("<input class=\"execute_button_users\" type=\"submit\"
name=\"Execute\" value=\""
+
.println("<td><input class=\"execute_button_users\" type=\"submit\"
name=\"Execute\" value=\""

+ name + "\" size=20/></td>");
out.println("</tr>");
out.println("</table>");
@@ -1465,7 +1461,7 @@

+ usr + "\" >");
} else {
out
-
.println("<input type=\"hidden\" name=\"action\" value=\"Create\" >");
+
.println("<input type=\"hidden\" name=\"action\" value=\"Create\" >");

}
out.println("</form>");

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/service/Admin.java
2008-03-26 11:46:22 UTC (rev 3549)
@@ -403,12 +403,10 @@

preempt(out);
out.println("<div class=\"info\" >");
- out.println("<h3>perfSONAR Administration page</h3>");
- out.println("<p> ");
- out.println("<h4>");
- out
- .println("The properties file has been
modifyied. Please restart tomcat for any changes to take effect!</h4>");
- out.println("<a href=\"ServiceAdmin?" + Type + "\">Go Back");
+ out.println("<p class=\"welcometextlavender\">Service
Administration<p>");
+ out.println("<p class=\"blueheader\" >");
+ out.println("The properties file has been modified. Please
restart tomcat for any changes to take effect!");
+ out.println("<a href=\"ServiceAdmin?" + Type + "\">Go
Back</a>");
out.println("</p>");
out.println("</div>");
out.println("</body>");
@@ -432,9 +430,9 @@

preempt(out);
out.println("<div class=\"info\" >");
- out.println("<h3>perfSONAR Administration page</h2>");
- out.println("<p><h4>" + error + "</h4></p>");
- out.println("<p> ");
+ out.println("<p>Service Administration<>");
+ out.println("<p class=\"blueheader\">" + error + "</p>");
+ out.println("<p class=\"blueheader\"> ");
out.println("<a href=\"ServiceAdmin?" + Type + "\">Go Back");
out.println("</p>");
out.println("</div>");
@@ -494,7 +492,7 @@
description = description.replace("(", "[");
description = description.replace("#", "");
out.println("<td onmouseover=\"setTip(this,'" +
description
- + "','#009ACD')\" >");
+ + "','#C7C7F2')\" >");
out.println(property.getKey());
out.println("</td>");
out.println("<td>");
@@ -502,7 +500,7 @@
+ " type=\"text\"
class=\"input_style_blue\" size=60 name=\""
+ property.getKey() + "\" value=\"" +
property.getValue()
+ "\" onmouseover=\"setTip(null,'" +
property.getValue()
- + "','#009ACD')\" />");
+ + "','#C7C7F2')\" />");
out.println();
out.println("</td>");
out.println("</tr>");
@@ -517,7 +515,7 @@
out.println("<tr class=\""+cssclass+"\">");
out.println("<td/>");
out.println("<td onmouseover=\"setTip(this,'"
+ description
- + "','#009ACD')\">");
+ + "','#C7C7F2')\">");
out.println(property.getKey());
out.println("</td>");
out.println("<td>");
@@ -527,7 +525,7 @@
+ "\"
value=\""
+
property.getValue()
+ "\"
onmouseover=\"setTip(null,'"
- +
property.getValue() + "','#009ACD')\" />");
+ +
property.getValue() + "','#C7C7F2')\" />");
out.println();
out.println("</td>");
out.println("</tr>");
@@ -638,17 +636,7 @@
out.println("<body>");
out.println("<script src=\"Service_Admin.js\">\n" +
"</script>\n");
out.println("<script src=\"wz_tooltip.js\">\n" +
"</script>\n");
- out.println("<script src=\"tip_balloon.js\">\n" +
"</script>\n");
- out.println("<div style=\"display:none;\" id=\"tooltip\"
>");
- out.println("<table>");
- out.println("<tr style=\"text-align: left ;\">");
- out.println("<th>Group:</th><td id=\"groupName\"></td>");
- out.println("</tr>");
- out.println("<tr>");
- out.println("<th>Description:</th><td
id=\"description\"></td>");
- out.println("<tr>");
- out.println("</table>");
- out.println("</div>");
+
}

/**

Modified: branches/WebAdmin/perfSONARWebAdmin/admin/sqlma/SQLMAdmin.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/admin/sqlma/SQLMAdmin.java
2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/perfSONARWebAdmin/admin/sqlma/SQLMAdmin.java
2008-03-26 11:46:22 UTC (rev 3549)
@@ -133,11 +133,11 @@

deleteActions(request);
output

.infoPage(
-
"SQL MA administration page.",
+
"SQL MA administration",

"Finished deleting ibatis files <a href=\"SQLMAdmin\">Back</a>.",
-
"manage");
+
"manage_sqlma");
} catch (Exception e) {
- output.infoPage("SQL
MA administration page.",
+ output.infoPage("SQL
MA administration",

"Error!\n" + getFault(e), "manage");
}
} else if (function.equals("Edit
File")) {
@@ -145,7 +145,7 @@
try {
output

.mainPage(
-
"SQL MA configuration page!",
+
"SQL MA administration",

manager.getIbatisFiles(),

type,

manager
@@ -160,8 +160,8 @@
editActions(request);
} catch (Exception e) {

- output.infoPage("SQL
MA administration page.",
-
"Error!\n" + getFault(e), "manage");
+ output.infoPage("SQL
MA administration",
+
"Error!\n" + getFault(e), "manage_sqlma");
}
}

@@ -170,8 +170,8 @@

createActions(request);
} catch (Exception e) {

- output.infoPage("SQL
MA administration page.",
-
"Error!\n" + getFault(e), "manage");
+ output.infoPage("SQL
MA administration",
+
"Error!\n" + getFault(e), "manage_sqlma");
}
} else if
(function.equals("Initialize")) {

@@ -200,13 +200,13 @@

initTable, password);
output

.infoPage(
-
"SQL MA administration page.",
+
"SQL MA administration",

"Finished configuring ibatis files <a
href=\"SQLMAdmin\">Back</a>.",
-
"manage");
+
"manage_sqlma");
} catch (Exception e) {

- output.infoPage("SQL
MA administration page.",
-
"Error!\n" + getFault(e), "manage");
+ output.infoPage("SQL
MA administration.",
+
"Error!\n" + getFault(e), "manage_sqlma");
}
} else if (function.equals("No")) {
String ibatisFile =
request.getParameter("ibatisFile");
@@ -216,26 +216,26 @@
if
(deleteOldFiles(ibatisFile))
output

.infoPage(
-
"SQL MA administration page.",
+
"SQL MA administration",

"Finished configuring ibatis files <a
href=\"SQLMAdmin\">Back</a>.",
-
"manage");
+
"manage_sqlma");
else
output

.infoPage(
-
"SQL MA administration page.",
+
"SQL MA administration",

"Problem encountered while finishing configuration
of ibatis files",
-
"manage");
+
"manage_sqlma");
} catch (Exception e)
{
-
output.infoPage("SQL MA administration page.",
-
"Error!\n" + getFault(e), "manage");
+
output.infoPage("SQL MA administration",
+
"Error!\n" + getFault(e), "manage_sqlma");

}
} else if
(action.equals("create")) {
output

.infoPage(
-
"SQL MA administration page.",
+
"SQL MA administration",

"Finished configuring ibatis files <a href=\"SQLMAdmin\">Back</a>.",
-
"manage");
+
"manage_sqlma");
}
} else {
try {
@@ -249,7 +249,7 @@
}
output

.mainPage(
-
"SQL MA configuration page!",
+
"SQL MA administration",

files,

type,

manager
@@ -268,7 +268,7 @@
ibatisFile =
files[0];
}
}
- output.mainPage("SQL MA
configuration page!", files,
+ output.mainPage("SQL MA
administration", files,
type, manager

.getIbatisFileProperties(ibatisFile),
ibatisFile,
"");
@@ -312,7 +312,7 @@
if (files != null) {
ibatisFile = files[0];
}
- output.mainPage("SQL MA
configuration page!", files,
+ output.mainPage("SQL MA
administration", files,
type, manager

.getIbatisFileProperties(ibatisFile),
ibatisFile,
"");
@@ -375,7 +375,7 @@
+ databaseName, username, password,
tableName, metric, mapFile)) {
output
.confirmPage(
- "ibatis file has been
modified succesfull. Would you like to initialize/modify the sql database",
+ "Ibatis file has been
modified succesfuly. Would you like to initialize/modify the sql database?",
"edit", ibatisFile);

}
@@ -405,7 +405,7 @@

output
.confirmPage(
- "ibatis file has been
created succesfull. Would you like to initialize/modify the sql database",
+ "Ibatis file has been
created succesfuly. Would you like to initialize/modify the sql database?",
"create", ibatisFile);
}


Added:
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/LSWizardHandler.java


Property changes on:
branches/WebAdmin/perfSONARWebAdmin/admin/wizard/services/LSWizardHandler.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/sqlma/HTMLOutput.java
2008-03-26 11:46:22 UTC (rev 3549)
@@ -17,7 +17,7 @@
// class fields

// The doctype of the html document. Currently XHtml strict
- private static final String doctype = "<!DOCTYPE html PUBLIC
\"-//W3C//DTD XHTML 1.0 Strict//EN\"
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>";
+ private static final String doctype ="<!DOCTYPE html PUBLIC
\"-//W3C//DTD XHTML 1.0 Strict//EN\"
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\";>";

// The servlet output stream that will be used to output the html code
private static ServletOutputStream out = null;
@@ -60,9 +60,9 @@
throws IOException {
preempt("default.css", true);
out.println("<div align=\"left\" class=\"" + Class + "\">");
- out.println("<br><h3>" + topMessage + "</h3></br>");
+ out.println("<p class=\"welcometextlavender\">" + topMessage
+ "</p>");
if (message != null) {
- out.println("<p>" + message + "</p>");
+ out.println("<p
style=\"float:left;\"class=\"sqlmaheader\">" + message + "</p>");
}
out.println("</div>");
out.println("</body>");
@@ -125,7 +125,7 @@
display = "block";

if (function.equals("Edit")) {
- out.println("<div id=\"EditFile\"
style=\"display:" + display
+ out.println("<p>&nbsp;</p><div
id=\"EditFile\" style=\"display:" + display
+ ";\">");
out.println("<br/>");
out
@@ -167,13 +167,14 @@
+ "\"
size=\"20\" /></td></tr>");

out
- .println("<tr><td><input
class=\"input_Edit_button\" type=\"submit\" name=\"Execute\" value=\"Edit\"
/></td><td/></tr>");
+ .println("<td/><tr><td><input
class=\"input_Edit_button\" type=\"submit\" name=\"Execute\" value=\"Edit\"
/></td></tr>");
out.println("</table></form>");
out.println("</div>");
} else {

- out.println("<div id=\"EditFile\"
style=\"display:" + display
+ out.println("<p>&nbsp;</p><div
id=\"EditFile\" style=\"display:" + display
+ ";\">");
+ out.println("<br/>");
out.println("<table class=\"input_table\"
align=\"center\">");
out
.println("<tr><th
class=\"hilighted\">File Name:</th><td class=\"underlined\">"
@@ -197,9 +198,9 @@

}
display = "none";
- out.println("<div id=\"CreateNewFile\" style=\"display:" +
display
- + ";\">");
- out.println("<br/>");
+ out.println("<p>&nbsp;</p><div id=\"CreateNewFile\"
style=\"display:" + display
+ + ";\" >");
+ out.println("<p>&nbsp;</p>");
out
.println("<form action=\"SQLMAdmin\"
method=\"POST\" onsubmit=\"return confirmForm(this)\"> ");
out.println("<table class=\"input_table\"
align=\"center\">");
@@ -208,7 +209,7 @@
out
.println("<tr><th>Database
URL:</th><td><input type=\"text\" name=\"dataBaseURL\" value=\"\" size=\"20\"
/></td></tr>");
out
- .println("<tr><th>Database
Name:</th><td><input type=\"text\" name=\"databaseName\" value=\"\"
size=\"20\" /></tr>");
+ .println("<tr><th>Database
Name:</th><td><input type=\"text\" name=\"databaseName\" value=\"\"
size=\"20\" /></td></tr>");
out
.println("<tr><th>User Name:</th><td><input
type=\"text\" name=\"userName\" value=\"\" size=\"20\" /></td></tr>");
out
@@ -226,7 +227,7 @@
.println("<tr><th>Table Name:</th><td><input
type=\"text\" name=\"tableName\" value=\"\" size=\"20\" /></td></tr>");

out
- .println("<tr><td><input
class=\"execute_button_sqlma\" type=\"submit\" name=\"Execute\"
value=\"Create\" /></td></tr>");
+ .println("<tr><td><input
class=\"execute_button_sqlma\" type=\"submit\" name=\"Execute\"
value=\"Create\" /></td><td/></tr>");
out.println("</table></form>");
out.println("</div>");

@@ -243,43 +244,46 @@
preempt("default.css", true);
String onClick = " onclick=\"showOptions()\"";
out
- .println("<div align=\"left\" id=\"prompt\"
class=\"manage_sqlma\">");
+ .println("<div class=\"manage_sqlma\">");
+ out.println("<p class=\"sqlmaheader\">" + message + "</p>");
out.println("<form action=\"SQLMAdmin\" method=\"POST\" > ");
+ out.println("<table style=\"float:left\">");
+ out
+ .println("<tr><td><button
class=\"execute_button_sqlma_small\" "
+ + onClick
+ + " type=\"button\"
value=\"Yes\" >Yes</button></td><td><input
class=\"execute_button_sqlma_small\" type=\"submit\" name=\"Execute\"
value=\"No\" /></td> </tr>");
+ out.println("</table>");
+
out.println("<input type=\"hidden\" name=\"ibatisFile\"
value=\""
+ ibatisFile + "\" />");
out.println("<input type=\"hidden\" name=\"action\" value=\""
+ action
+ "\" />");
- out.println("<p>" + message + "</p>");
- out.println("<table align=\"center\">");
- out
- .println("<tr><td><button "
- + onClick
- + " type=\"button\"
value=\"Yes\" >Yes</button></td><td><input type=\"submit\" name=\"Execute\"
value=\"No\" /></td> </tr>");
- out.println("</table></form>");
-
+ out.println("</form>");
+ out.println("</div>");
+
String display = "none";
- out.println("<div id=\"options\" style=\"display:" + display
+ ";\">");
- out.println("<br/>");
+
+ out.println("<div id=\"options\" style=\"display:" + display
+ ";\" >");
+ out.println("<p/>");
out.println("<form action=\"SQLMAdmin\" method=\"POST\" > ");
- out.println("<input type=\"hidden\" name=\"ibatisFile\"
value=\""
- + ibatisFile + "\" />");
- out.println("<input type=\"hidden\" name=\"action\" value=\""
+ action
- + "\" />");
- out.println("<table align=\"center\">");
+ out.println("<table class=\"init_table\">");
out
- .println("<tr><th>Choose what to initialize:
</th><td><input type=\"checkbox\" name=\"createDatabase\" value=\"Yes\"
/>Create Database</td></tr>");
+ .println("<tr><th>Choose what to initialize:
</th><td><input type=\"checkbox\" name=\"createDatabase\" value=\"Yes\"
/>Create Database</td><td/></tr>");
out
- .println("<tr><th/><td><input
type=\"checkbox\" name=\"createUser\" value=\"Yes\" />Create User</td></tr>");
+ .println("<tr><th/><td><input
type=\"checkbox\" name=\"createUser\" value=\"Yes\" />Create
User</td><td/></tr>");
out
- .println("<tr><th/><td><input
type=\"checkbox\" name=\"createTable\" value=\"Yes\"/>Initialize
Table</td></tr>");
+ .println("<tr><th/><td><input
type=\"checkbox\" name=\"createTable\" value=\"Yes\"/>Initialize
Table</td><td/></tr>");
out
- .println("<tr><th>Enter the SQL DB root
password: </th><td><input type=\"password\" size=20 name=\"rtPass\"
value=\"\"/></td></tr>");
- out
- .println("<tr><td><input
class=\"execute_button_sqlma\" type=\"submit\" name=\"Execute\"
value=\"Initialize\" /></td><td/></tr>");
- out.println("</table></form>");
+ .println("<tr><th>Enter the SQL DB root
password: </th><td><input type=\"password\" size=20 name=\"rtPass\"
value=\"\"/></td><td><input class=\"execute_button_sqlma_large\"
type=\"submit\" name=\"Execute\" value=\"Initialize\" /></td></tr>");
+
+ out.println("</table>");
+
+ out.println("<input type=\"hidden\" name=\"ibatisFile\"
value=\""
+ + ibatisFile + "\" />");
+ out.println("<input type=\"hidden\" name=\"action\" value=\""
+ action+ "\" />");
+
+ out.println("</form>");
out.println("</div>");
-
- out.println("</div>");
out.println("</body>");
out.println("</html>");
out.close();
@@ -304,13 +308,12 @@
out.println("<html>");
out.println("<head>" + getCSS(cssFile));
out.println("<title >");
- out.println("perfSONAR SQL database administration page.");
+ out.println("perfSONAR SQL MA administration");
out.println("</title>");
out.println("</head>");
out.println("<body>");
out.println(getScript());
out.println("<div class=\"tablessContent\" >");
- out.println("<br/>");
out.println("</div>");
}


Modified: branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
===================================================================
--- branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/perfSONARWebAdmin/auxiliary/wizard/HTMLOutput.java
2008-03-26 11:46:22 UTC (rev 3549)
@@ -299,12 +299,11 @@
pr = pro.getWizardProperty((String)
it.next());
this.showProperty(pr);
}
+
out.println("</table>");
out.println("</div>");
}
-
- out
- .println("<p><input id=\"Button\"
class=\"submit_button\" type=\"submit\" name=\"Submit\" value=\"Submit
Changes\" /></p>");
+ out.println("<input align=\"right\" input id=\"Button\"
class=\"submit_button\" type=\"submit\" name=\"Submit\" value=\"Submit
Changes\" />");
out.println("</form> ");
out.println("</div>");
out.println("</div>");
@@ -444,7 +443,7 @@
value=" ";
}
out.println("<input class=\"input_style\"
onmouseover=\"setTip(null,'"
- +value + "','#B4EEB4')\" type=\"" +
type
+ +value + "','#D5E9D4')\" type=\"" +
type
+ "\" name=\"" + pr.getKey() + "\"
size=40 value=\""
+ value+ " \"/>");

@@ -463,9 +462,6 @@
+ "</script>\n"
+ "<script src=\"wz_tooltip.js\">"
+ "</script>\n"
- + "<script src=\"tip_balloon.js\">"
- + "</script>\n"
- + "</script>\n"
+ "<script type=\"text/javascript\">\n"
+ "function checkIt(el) {\n"
+ "if (el.value
==document.getElementById(\"Vl_\"+el.name).value) {\n"

Deleted: branches/WebAdmin/r.gif

Deleted: branches/WebAdmin/rb.gif

Deleted: branches/WebAdmin/rt.gif

Modified: branches/WebAdmin/sqlma_admin_script.js
===================================================================
--- branches/WebAdmin/sqlma_admin_script.js 2008-03-26 09:04:33 UTC (rev
3548)
+++ branches/WebAdmin/sqlma_admin_script.js 2008-03-26 11:46:22 UTC (rev
3549)
@@ -134,104 +134,3 @@

}

-
-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 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: branches/WebAdmin/stemb.gif

Deleted: branches/WebAdmin/stemt.gif

Deleted: branches/WebAdmin/t.gif

Deleted: branches/WebAdmin/tip_balloon.js

Added: branches/WebAdmin/welcome.htm

Modified: branches/WebAdmin/wizard.properties
===================================================================
--- branches/WebAdmin/wizard.properties 2008-03-26 09:04:33 UTC (rev 3548)
+++ branches/WebAdmin/wizard.properties 2008-03-26 11:46:22 UTC (rev 3549)
@@ -19,140 +19,96 @@
<!ELEMENT AcceptedValue (#PCDATA) >
]>
<properties>
- <comment>Last Modification Thu Dec 13 16:10:40 EET 2007</comment>
+ <comment>Last Modification Wed Mar 26 11:50:33 EET 2008</comment>
<property>
- <entry key="service.r.service_version">2.3.1</entry>
- <Comment>Enter the version of the service</Comment>
- <ProposedValue>2.3.1</ProposedValue>
- <Group order="3">LS</Group>
- </property>
- <property>
<entry key="component.ma.xmldb.db_username"
required="true">rrdmaservice</entry>
- <Comment>Enter the service username for the exist user</Comment>
+ <Comment>Enter the service username for the eXist user:</Comment>
<ProposedValue>rrdmaservice</ProposedValue>
- <Group order="4">eXist</Group>
+ <Group order="3">eXist</Group>
</property>
<property>
- <entry key="component.ma.xmldb.db_password" required="true"
password="true">perfsonar</entry>
- <Comment>Enter the password for the exist user</Comment>
+ <entry key="old_adminpassword" required="true"
password="true">perfsonar</entry>
+ <Comment>Enter the old eXist administration password:</Comment>
<ProposedValue>perfsonar</ProposedValue>
<Group order="5">eXist</Group>
</property>
<property>
- <entry key="component.ma.xmldb.type" required="true">webapp</entry>
- <Comment>Choose the type of exist installation</Comment>
- <ProposedValue>webapp</ProposedValue>
- <Group order="2">eXist</Group>
- <AcceptedValue>webapp</AcceptedValue>
- <AcceptedValue>stand-alone</AcceptedValue>
+ <entry key="component.ma.xmldb.db_password" required="true"
password="true">perfsonar</entry>
+ <Comment>Enter the password for the eXist user:</Comment>
+ <ProposedValue>perfsonar</ProposedValue>
+ <Group order="4">eXist</Group>
</property>
<property>
- <entry key="component.ma.xmldb.db_status" required="true">on</entry>
- <Comment>Would you like to use eXist db?</Comment>
- <ProposedValue>on</ProposedValue>
- <Group order="1" check="true">eXist</Group>
- <AcceptedValue>on</AcceptedValue>
- <AcceptedValue>off</AcceptedValue>
- </property>
- <property>
- <entry key="servlet.password" required="true"
password="true">perfsonarpass</entry>
- <Comment>Give the password to use for logging in to the admin
pages</Comment>
- <ProposedValue>perfsonarpass</ProposedValue>
+ <entry key="servlet.password" required="true" password="true" />
+ <Comment>Enter the password for logging in to the admin pages:</Comment>
+ <ProposedValue />
<Group order="2">Administration</Group>
</property>
<property>
<entry key="servlet.username" required="true">perfsonaruser</entry>
- <Comment>Give the username to use for logging in to the admin
pages</Comment>
+ <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.ma.rrd.xmldb.db_store.data_dir"
required="true">/home/perfsonar/webapps</entry>
- <Comment>Give the directory where the new rrd files will be
stored</Comment>
- <ProposedValue>/home/perfsonar/webapps</ProposedValue>
- <Group order="2">Store</Group>
- </property>
- <property>
- <entry key="service.ma.conf_file"
required="true">/home/perfsonar/webapps/geant2_java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
- <Comment>Enter the full path of the metadata configuration file</Comment>
-
<ProposedValue>/home/perfsonar/webapps/geant2_java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
+ <entry key="service.ma.conf_file"
required="true">/home/perfsonar/webapps/geant2_java-rrd-ma-x86_32-3.0rc3/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</entry>
+ <Comment>Enter the full path of the metadata configuration
file:</Comment>
+
<ProposedValue>/home/perfsonar/webapps/geant2_java-rrd-ma-x86_32-3.0rc3/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml</ProposedValue>
<Group order="7">eXist</Group>
</property>
<property>
- <entry key="service.r.ls_url" required="true">http://somewhere</entry>
- <Comment>Give the LS url</Comment>
- <ProposedValue>http://somewhere</ProposedValue>
- <Group order="7">LS</Group>
+ <entry key="service.r.ls_url"
required="true">http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</entry>
+ <Comment>Enter the LS URL:</Comment>
+
<ProposedValue>http://loco4.man.poznan.pl:8080/XML-LS/services/LookupService</ProposedValue>
+ <Group order="5">LS</Group>
</property>
<property>
- <entry key="service.ma.xmldb.db_store" required="true">on</entry>
- <Comment>Do you want the service to accept store messages?</Comment>
- <ProposedValue>on</ProposedValue>
- <Group order="1" check="true">Store</Group>
- <AcceptedValue>on</AcceptedValue>
- <AcceptedValue>off</AcceptedValue>
- </property>
- <property>
<entry key="service.r.organization_name">CyNet</entry>
- <Comment>Enter the name of the organization running this
service.</Comment>
+ <Comment>Enter the name of the organization running this
service:</Comment>
<ProposedValue>CyNet</ProposedValue>
- <Group order="6">LS</Group>
+ <Group order="4">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>
- <Group order="5">LS</Group>
- </property>
- <property>
<entry key="component.ma.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc</entry>
- <Comment>Enter the location of the eXist database</Comment>
+ <Comment>Enter the location of the eXist database:</Comment>
<ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc</ProposedValue>
- <Group order="3">eXist</Group>
+ <Group order="2">eXist</Group>
</property>
<property>
+ <entry
key="service.r.contact_email"></entry>
+ <Comment>Enter the service administrator's email address:</Comment>
+
<ProposedValue></ProposedValue>
+ <Group order="3">LS</Group>
+ </property>
+ <property>
<entry key="component.ma.xmldb.db_adminpassword" required="true"
password="true">perfsonar</entry>
- <Comment>Enter the administration password for exist</Comment>
+ <Comment>Enter the new eXist administration password:</Comment>
<ProposedValue>perfsonar</ProposedValue>
<Group order="6">eXist</Group>
</property>
<property>
- <entry key="service.r.service_description">RRD MA</entry>
- <Comment>Give a description of the service</Comment>
- <ProposedValue>RRD MA</ProposedValue>
- <Group order="4">LS</Group>
+ <entry key="service.r.service_description">perfSONAR JavaRRD MA</entry>
+ <Comment>Enter a description for the service:</Comment>
+ <ProposedValue>perfSONAR JavaRRD MA</ProposedValue>
+ <Group order="2">LS</Group>
</property>
<property>
- <entry key="service.r.access_point"
required="true">http://somewhere</entry>
- <Comment>Give the service access point</Comment>
- <ProposedValue>http://somewhere</ProposedValue>
- <Group order="9">LS</Group>
+ <entry key="service.r.access_point"
required="true">http://perfsonartest.usr.cynet.ac.cy:8080/geant2_java-rrd-ma-x86_32/services/MeasurementArchiveService</entry>
+ <Comment>Enter the service access point:</Comment>
+
<ProposedValue>http://perfsonartest.usr.cynet.ac.cy:8080/geant2_java-rrd-ma-x86_32/services/MeasurementArchiveService</ProposedValue>
+ <Group order="7">LS</Group>
</property>
<property>
- <entry
key="component.registrator.scheduler_component">ma_scheduler</entry>
- <Comment>Give the registration componenet</Comment>
- <ProposedValue>ma_scheduler</ProposedValue>
- <Group order="10">LS</Group>
- <AcceptedValue>ma_scheduler</AcceptedValue>
- </property>
- <property>
- <entry key="service.r.service_name" required="true">Cynet RRD MA</entry>
- <Comment>Enter the service name</Comment>
- <ProposedValue>Cynet RRD MA</ProposedValue>
- <Group order="2">LS</Group>
- </property>
- <property>
- <entry key="service.r.service_type" required="true">ma</entry>
- <Comment>Enter the type of the service</Comment>
- <ProposedValue>ma</ProposedValue>
+ <entry key="service.r.service_name" required="true">perfSONAR Java RRD
MA</entry>
+ <Comment>Enter the service name:</Comment>
+ <ProposedValue>perfSONAR Java RRD MA</ProposedValue>
<Group order="1" check="false">LS</Group>
- <AcceptedValue>ma</AcceptedValue>
</property>
<property>
- <entry key="component.registrator.interval">3000</entry>
- <Comment>Give the registration interval</Comment>
- <ProposedValue>3000</ProposedValue>
- <Group order="8">LS</Group>
+ <entry key="component.registrator.interval">30000</entry>
+ <Comment>Set the registration interval (milliseconds):</Comment>
+ <ProposedValue>30000</ProposedValue>
+ <Group order="6">LS</Group>
</property>
</properties>



  • perfsonar: r3549 - in branches/WebAdmin: . graphics perfSONARWebAdmin/admin/exist perfSONARWebAdmin/admin/service perfSONARWebAdmin/admin/sqlma perfSONARWebAdmin/admin/wizard/services perfSONARWebAdmin/auxiliary/sqlma perfSONARWebAdmin/auxiliary/wizard, svnlog, 03/26/2008

Archive powered by MHonArc 2.6.16.

Top of Page