perfsonar development work

Author: michael.bischoff
Date: 2008-04-16 07:28:18 -0400 (Wed, 16 Apr 2008)
New Revision: 3686

Added:
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/Service_Admin.js
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/perfsonar.png
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/sqlma_admin_script.js
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/tip_centerwindow.js
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/tip_followscroll.js
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/welcome.htm
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/wz_tooltip.js
Removed:
   
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorData.class
   
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorFilter.class
   
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorPage.class
   
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorTableModel.class
   
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorTextArea.class
   
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$ServiceFilterPanel.class
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet.class
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet.java
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/fingerprint.jsp
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/happyaxis.jsp
   trunk/surfnet_java-flowsa-ma/conf/eventType-rules.xml
Modified:
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/default.css
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.html
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/main.css
   trunk/surfnet_java-flowsa-ma/conf/components.properties
   trunk/surfnet_java-flowsa-ma/conf/eventType-map.xml
   trunk/surfnet_java-flowsa-ma/conf/service.properties
   trunk/surfnet_java-flowsa-ma/conf/servlet.properties
   trunk/surfnet_java-flowsa-ma/conf/wizard.properties
   trunk/surfnet_java-flowsa-ma/pom.xml
Log:
ls webadmin improved/fixed

Deleted: 
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorData.class

Deleted: 
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorFilter.class

Deleted: 
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorPage.class

Deleted: 
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorTableModel.class

Deleted: 
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$SOAPMonitorTextArea.class

Deleted: 
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet$ServiceFilterPanel.class

Deleted: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet.class

Deleted: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/SOAPMonitorApplet.java

Added: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/Service_Admin.js

Modified: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-04-16 
11:28:15 UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-04-16 
11:28:18 UTC (rev 3686)
@@ -3,30 +3,33 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
 Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
 
-<web-app>
-       <display-name>Apache-Axis</display-name>
-       
-       <filter>
-               <filter-name>ipfilter</filter-name>
-               <filter-class>nl.surfnet.web.IpAccessFilter</filter-class>
-               <init-param>
-                       <param-name>ips</param-name>
-                       <param-value>127.0.0.1 
2001:610:508:109:20b:dbff:fee9:61f3 62.131.17.150 78.27.8.39 192.87.102.* 
192.87.109.* 192.87.117.* </param-value>
-                       <description>
-                               A space separated list of ips that are 
allowed to access
-                               resources.
-                       </description>
-               </init-param>
-       </filter>
-       <filter-mapping>
-               <filter-name>ipfilter</filter-name>
-               <url-pattern>/servlet/*</url-pattern>
-       </filter-mapping>
-       <filter-mapping>
-               <filter-name>ipfilter</filter-name>
-               <url-pattern>/services/*</url-pattern>
-       </filter-mapping>
+<web-app>
+       <display-name>perfSONAR - Flow Selection &amp; Aggregation 
MA</display-name>
 
+       <filter>
+               <filter-name>ipfilter</filter-name>
+               <filter-class>nl.surfnet.web.IpAccessFilter</filter-class>
+               <init-param>
+                       <param-name>ips</param-name>
+                       <param-value>
+                               127.0.0.1 62.131.17.150 78.27.8.39 
192.87.102.*
+                               192.87.109.* 192.87.117.*
+                       </param-value>
+                       <description>
+                               A space separated list of ips that are 
allowed to access
+                               resources.
+                       </description>
+               </init-param>
+       </filter>
+       <filter-mapping>
+               <filter-name>ipfilter</filter-name>
+               <url-pattern>/servlet/*</url-pattern>
+       </filter-mapping>
+       <filter-mapping>
+               <filter-name>ipfilter</filter-name>
+               <url-pattern>/services/*</url-pattern>
+       </filter-mapping>
+
        <listener>
                <listener-class>
                        org.apache.axis.transport.http.AxisHTTPSessionListener
@@ -36,46 +39,27 @@
                <listener-class>
                        
org.perfsonar.service.base.container.listeners.StartupInitializer
                </listener-class>
-       </listener>
-       
+       </listener>
+
        <servlet>
                <servlet-name>AxisServlet</servlet-name>
                <display-name>Apache-Axis Servlet</display-name>
                <servlet-class>
                        org.apache.axis.transport.http.AxisServlet
                </servlet-class>
-       </servlet>
-       <servlet>
-               <servlet-name>ConfFile</servlet-name>
-               <display-name>Config File for LS</display-name>
-               <servlet-class>
-                       
org.perfsonar.service.measurementArchive.flowsa.ConfFileServlet
-               </servlet-class>
-       </servlet>
-       <servlet>
-               <servlet-name>ServiceAdmin</servlet-name>
-       <servlet-class>
-               perfSONARWebAdmin.admin.service.Admin
-       </servlet-class>
-    </servlet>
-    <servlet>
-       <servlet-name>Wizard</servlet-name>
-       <servlet-class>
-               perfSONARWebAdmin.admin.wizard.Wizard
-       </servlet-class>
-    </servlet>  
+       </servlet>
        <servlet>
-               <servlet-name>SOAPMonitorService</servlet-name>
-               <display-name>SOAPMonitorService</display-name>
+               <servlet-name>ServiceAdmin</servlet-name>
                <servlet-class>
-                       org.apache.axis.monitor.SOAPMonitorService
+                       perfSONARWebAdmin.admin.service.Admin
                </servlet-class>
-               <init-param>
-                       <param-name>SOAPMonitorPort</param-name>
-                       <param-value>5001</param-value>
-               </init-param>
-               <load-on-startup>100</load-on-startup>
        </servlet>
+       <servlet>
+               <servlet-name>Wizard</servlet-name>
+               <servlet-class>
+                       perfSONARWebAdmin.admin.wizard.Wizard
+               </servlet-class>
+       </servlet>
 
        <servlet-mapping>
                <servlet-name>AxisServlet</servlet-name>
@@ -88,23 +72,15 @@
        <servlet-mapping>
                <servlet-name>AxisServlet</servlet-name>
                <url-pattern>/services/*</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>ConfFile</servlet-name>
-               <url-pattern>/config.xml</url-pattern>
        </servlet-mapping>
        <servlet-mapping>
-               <servlet-name>SOAPMonitorService</servlet-name>
-               <url-pattern>/SOAPMonitor</url-pattern>
+               <servlet-name>ServiceAdmin</servlet-name>
+               <url-pattern>/ServiceAdmin</url-pattern>
        </servlet-mapping>
-       <servlet-mapping>
-       <servlet-name>ServiceAdmin</servlet-name>
-       <url-pattern>/ServiceAdmin</url-pattern>
-    </servlet-mapping> 
-       <servlet-mapping>
-       <servlet-name>Wizard</servlet-name>
-               <url-pattern>/Wizard</url-pattern>
-    </servlet-mapping> 
+       <servlet-mapping>
+               <servlet-name>Wizard</servlet-name>
+               <url-pattern>/Wizard</url-pattern>
+       </servlet-mapping>
        <session-config>
                <!-- Default to 5 minute session timeouts -->
                <session-timeout>5</session-timeout>
@@ -128,5 +104,5 @@
                <welcome-file>index.jsp</welcome-file>
                <welcome-file>index.jws</welcome-file>
        </welcome-file-list>
-       
+
 </web-app>

Modified: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/default.css
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/default.css      2008-04-16 
11:28:15 UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/default.css      2008-04-16 
11:28:18 UTC (rev 3686)
@@ -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;
+}
+
+
+

Deleted: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/fingerprint.jsp

Deleted: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/happyaxis.jsp

Modified: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.html
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.html       2008-04-16 
11:28:15 UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/index.html       2008-04-16 
11:28:18 UTC (rev 3686)
@@ -1,75 +1,108 @@
 <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>
-</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>
+                                    </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>
-
-

Modified: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/main.css
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/main.css 2008-04-16 11:28:15 
UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/main.css 2008-04-16 11:28:18 
UTC (rev 3686)
@@ -7,56 +7,250 @@
 * {
        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: 50%;
        float:left;
        margin-left: 5%;
        margin-right: 5%;
        background-color:       #ffffff;
-       margin-bottom: 0%;
+       margin-bottom: 2%;
 }
 .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: 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 {
+.sidebar{
        width: 15%;
-       height: 300px;
-       padding-bottom: 200px;
+       height: 66%;
+       padding-bottom: 12.1%;
        padding-right: 0px;
        float: left;
        border-right-width: 1px;
@@ -71,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;
@@ -84,38 +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;
-       word-spacing: 10em;
+       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{
-       clear: both;
-       height: 30px;
+
+.footer{
+       height: 20px;
        text-align: right;
        color: #61AF61;
        background-color: #ffffff;
@@ -124,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;
@@ -144,30 +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;
-}

Added: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/perfsonar.png


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

Added: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/sqlma_admin_script.js

Added: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/tip_centerwindow.js

Added: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/tip_followscroll.js

Added: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/welcome.htm

Added: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/wz_tooltip.js

Modified: trunk/surfnet_java-flowsa-ma/conf/components.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/components.properties     2008-04-16 
11:28:15 UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/components.properties     2008-04-16 
11:28:18 UTC (rev 3686)
@@ -10,10 +10,15 @@
 # Simple scheduler
 
ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
-# Registration in LS
-registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent
+# Context implementation
+context=org.perfsonar.base.auxiliary.components.context.inMemory.InMemoryContext
 
-eventType_config=org.perfsonar.service.measurementArchive.eventTypeConfig.EventTypeConfigurationComponent
+# workaround helper
+ls_Helper=org.perfsonar.service.measurementArchive.flowsa.LSHelper
 
+# - DO NOT USE - Registration in LS
+# - DO NOT USE - the service will load this component depending on 
service.r.ls_url has a valid value in service.properties 
+# - DO NOT USE - 
registrator=org.perfsonar.service.base.registration.LSRegistrationComponent
+
 
authn=org.perfsonar.commons.auxiliary.components.authn.wssec.WSSecAuthNComponent
 

Modified: trunk/surfnet_java-flowsa-ma/conf/eventType-map.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/eventType-map.xml 2008-04-16 11:28:15 
UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/eventType-map.xml 2008-04-16 11:28:18 
UTC (rev 3686)
@@ -8,8 +8,6 @@
 <eventType-config>
     <eventType>
         <name>http://ggf.org/ns/nmwg/tools/flow/raw/2.0/</name>
-        
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.FlowQueryGenerator</metadataQueryGenerator>
-        
<baseChainingMerger>org.perfsonar.service.measurementArchive.flowsa.NMWGInterfaceBaseChaining</baseChainingMerger>
         <authentication>no</authentication>
     </eventType>
 </eventType-config>

Deleted: trunk/surfnet_java-flowsa-ma/conf/eventType-rules.xml

Modified: trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-04-16 
11:28:15 UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-04-16 
11:28:18 UTC (rev 3686)
@@ -3,13 +3,23 @@
 # ----------------------------------------------
 
 # === Service Type ===
+#Group=ServiceType
 service.r.type=ma
+#Group=ServiceType
+service.r.service_type=ma
+#Group=ServiceType
 service.r.service_name=Java flowSA MA
-service.r.ls_url=http://sonar1.amsterdam.surfnet.nl:8080/LS/services/LookupService
+#Group=ServiceType
+service.r.ls_url=http://localhost:8080/XML-LS-1.1.2/services/LookupService
+#Group=ServiceType
+service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.9.1/services/FlowsaMeasurementArchiveService
 
 # === Measurement Archive general properties ===
+#Group=MaGeneral
 
service.ma.class_name=org.perfsonar.service.measurementArchive.flowsa.FlowsaMAServiceEngine
+#Group=MaGeneral
 service.ma.message_types=SetupDataRequest
+#Group=MaGeneral
 service.ma.conf_file=config.xml
 
 # === Flowsa specific properties ===
@@ -81,7 +91,7 @@
 # nfdump.source - location of nfcapd files
 # nfdump.location - the location of the nfdump executable (including nfdump 
filename)
 # nfdump.outputreader - fully qualified name of the class used for output 
reading (expects a class implementing NfdumpOutputReader)
-service.ma.flowsa.nfdump.source=/var/nfdump/flows
+service.ma.flowsa.nfdump.source=/usr/local/var/nfdump/flows/
 service.ma.flowsa.nfdump.location=/usr/bin/nfdump
 
service.ma.flowsa.nfdump.ouputreader=org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory
 
@@ -96,7 +106,6 @@
 service.ma.flowsa.nfcapd.user=tomcat
 service.ma.flowsa.nfcapd.group=tomcat
 
-
 # === Logger properties === 
 service.log.log4j.config=/perfsonar/conf/log4j.properties
 
@@ -104,10 +113,11 @@
 service.sax_parser.config=/perfsonar/conf/objects.config
 
 #=== LS registrator ===
-#component.registrator.scheduler_component=ma_scheduler
-#component.registrator.interval=30000
+component.registrator.scheduler_component=ma_scheduler
+component.registrator.interval=30000
+service.ls.service_content_type=context
 
 #=== Authentication ===
 service.as.authn_active=off
 service.as.authn_for_msg_types=SetupDataRequest
-service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
+service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
\ No newline at end of file

Modified: trunk/surfnet_java-flowsa-ma/conf/servlet.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/servlet.properties        2008-04-16 
11:28:15 UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/servlet.properties        2008-04-16 
11:28:18 UTC (rev 3686)
@@ -1,5 +1,5 @@
 #The type of the service
-servlet.service_type=rrdma 
+servlet.service_type=flowsama 
 #The ConfigurationHandler interface implementation used by the Wizard Servlet
 
servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler
  
 #The username used for authentication reasons when accessing properties 
configuration and Wizard servlets

Modified: trunk/surfnet_java-flowsa-ma/conf/wizard.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/wizard.properties 2008-04-16 11:28:15 
UTC (rev 3685)
+++ trunk/surfnet_java-flowsa-ma/conf/wizard.properties 2008-04-16 11:28:18 
UTC (rev 3686)
@@ -43,37 +43,37 @@
   <property>
     <entry key="service.r.service_name" required="true">Cynet RRD MA</entry>
     <Comment>Enter the service name</Comment>
-    <ProposedValue>Cynet RRD MA</ProposedValue>
+    <ProposedValue>Company X Flowsa MA</ProposedValue>
     <Group order="2">LS</Group>
   </property>
   <property>
-    <entry key="service.r.service_version">2.3.1</entry>
+    <entry key="service.r.service_version">0.9.1</entry>
     <Comment>Enter the version of the service</Comment>
-    <ProposedValue>2.3.1</ProposedValue>
+    <ProposedValue>0.9.1</ProposedValue>
     <Group order="3">LS</Group>
   </property>
   <property>
     <entry key="service.r.service_description">RRD MA</entry>
     <Comment>Give a description of the  service</Comment>
-    <ProposedValue>RRD MA</ProposedValue>
+    <ProposedValue>Flowsa MA</ProposedValue>
     <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>
+    
<ProposedValue>admin@localhost</ProposedValue>
     <Group order="5">LS</Group>
   </property>
   <property>
-    <entry key="service.r.organization_name">CyNet</entry>
+    <entry key="service.r.organization_name">Company X</entry>
     <Comment>Enter the name of the organization running this 
service.</Comment>
-    <ProposedValue>CyNet</ProposedValue>
+    <ProposedValue>Company X</ProposedValue>
     <Group order="6">LS</Group>
   </property>
   <property>
-    <entry key="service.r.ls_url" required="true">http://somewhere</entry>
+    <entry key="service.r.ls_url" required="true"></entry>
     <Comment>Give the LS url</Comment>
-    <ProposedValue>http://somewhere</ProposedValue>
+    <ProposedValue></ProposedValue>
     <Group order="7">LS</Group>
   </property>
   <property>
@@ -83,14 +83,14 @@
     <Group order="8">LS</Group>
   </property>
   <property>
-    <entry key="service.r.access_point" 
required="true">http://somewhere</entry>
+    <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/flowsa-ma-0.9.1</entry>
     <Comment>Give the service access point</Comment>
     <ProposedValue>http://somewhere</ProposedValue>
     <Group order="9">LS</Group>
   </property>
   <property>
     <entry 
key="component.registrator.scheduler_component">ma_scheduler</entry>
-    <Comment>Give the registration componenet</Comment>
+    <Comment>Give the registration component</Comment>
     <ProposedValue>ma_scheduler</ProposedValue>
     <Group order="10">LS</Group>
     <AcceptedValue>ma_scheduler</AcceptedValue>
@@ -163,7 +163,7 @@
   </property>
   
   <property>
-    <entry key="service.ma.wizzard.flowsa.exporter2" 
required="true">yes</entry>
+    <entry key="service.ma.wizzard.flowsa.exporter2" 
required="true">no</entry>
     <Comment>Use exporter 2</Comment>
     <ProposedValue>no</ProposedValue>
     <Group order="1" check="true">Exporter2</Group>

Modified: trunk/surfnet_java-flowsa-ma/pom.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/pom.xml        2008-04-16 11:28:15 UTC (rev 
3685)
+++ trunk/surfnet_java-flowsa-ma/pom.xml        2008-04-16 11:28:18 UTC (rev 
3686)
@@ -45,6 +45,7 @@
     <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
     <outputDirectory>${basedir}/bin</outputDirectory>
     <directory>${basedir}/build</directory>
+    <finalName>flowsama</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -54,24 +55,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <configuration>
-          <container>
-            <containerId>tomcat5x</containerId>
-            <type>remote</type>
-          </container>
-          <configuration>
-            <type>runtime</type>
-            <properties>
-              
<cargo.tomcat.manager.url>http://${tomcatHostname}/manager/html</cargo.tomcat.manager.url>
-              <cargo.hostname>${tomcatHostname}</cargo.hostname>
-              
<cargo.remote.username>${tomcatUsername}</cargo.remote.username>
-              
<cargo.remote.password>${tomcatPassword}</cargo.remote.password>
-            </properties>
-          </configuration>
-        </configuration>
-      </plugin>
+        <groupId>org.mortbay.jetty</groupId> 
+        <artifactId>maven-jetty-plugin</artifactId> 
+      </plugin> 
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -153,7 +139,7 @@
     <dependency>
       <groupId>perfsonar</groupId>
       <artifactId>perfsonar-web-admin</artifactId>
-      <version>0.6b</version>
+      <version>0.8b</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>