perfsonar development work

Author: melis
Date: 2007-10-11 08:56:25 -0400 (Thu, 11 Oct 2007)
New Revision: 2943

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyResponseListener.java
Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
Log:
added ongoing work for the merging of the Looking Glass into psUI

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2007-10-11 12:18:30 UTC (rev 2942)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2007-10-11 12:56:25 UTC (rev 2943)
@@ -37,4 +37,4 @@
 
;PIONIER-LS,http://ls.perfsonar.pionier.net.pl:8080/XML-LS-1.1.1/services/LookupService,ls,"",ls,ls
 
;SWITCH-LS,http://ls.sonar.net.switch.ch:8180/XML-LS-1.1.1/services/LookupService,ls,"",ls,ls
 
 
;REDIRIS-Test-AS,http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService,as,"",as,as
 
-;TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2/services/TelnetSSH,lg,"",lg,lg
\ No newline at end of file
+TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2/services/TelnetSSH,lg,"",lg,lg
\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-10-11 12:18:30 UTC (rev 2942)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-10-11 12:56:25 UTC (rev 2943)
@@ -24,8 +24,13 @@
 
 package org.perfsonar.perfsonarui.lookingglass;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.StringWriter;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.Namespace;
+import org.jdom.output.DOMOutputter;
 
 import org.perfsonar.perfsonarui.AbstractMARequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -33,9 +38,8 @@
 import org.perfsonar.perfsonarui.plugins.IUserData;
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
+
 /**
  *  @author Stijn Melis
  *  @author Nina Jeliazkova (skeleton framework)
@@ -46,97 +50,147 @@
      * uData.getEndpoint is the service address to be queried, use 
messagetype if necessary to distinguish between different types of messages 
(metadatarequest, setupdatarequest)
      */
     @Override
-    public Document createRequest(IUserData uData, String messageType)
+    public org.w3c.dom.Document createRequest(IUserData uData, String 
messageType)
     throws Exception {
-       Document doc = null;
+       org.w3c.dom.Document doc = null;
        
+       org.jdom.Document jdoc = null;
+       
        if (IPerfsonarRequest.MA_MetadataKeyRequest.equals(messageType)) {
-           DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
-           factory.setNamespaceAware(true);
-           DocumentBuilder builder = factory.newDocumentBuilder();
-           doc = builder.newDocument();
            
-           Element msg = doc.createElementNS(NMWG2,"nmwg:message");
+           System.out.println("MetadataKeyRequest is being made...");
+           
+           jdoc = new Document();
+           //DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
+           //factory.setNamespaceAware(true);
+           //DocumentBuilder builder = factory.newDocumentBuilder();
+    
+           Element msg = new 
Element("message",Namespace.getNamespace("nmwg",NMWG2));
            msg.setAttribute("id", "msg1");
            msg.setAttribute("type", messageType);
-           
-           doc.appendChild(msg);
-           
-           Element metadata = doc.createElementNS(NMWG2,"nmwg:metadata");
+         
+           Element metadata = new 
Element("metadata",Namespace.getNamespace("nmwg",NMWG2));
            metadata.setAttribute("id", "meta1");
-           msg.appendChild(metadata);
+           msg.addContent(metadata);
            
-           Element subject = doc.createElementNS(NMWG2,"nmwg:subject");
+           Element subject = new 
Element("subject",Namespace.getNamespace("nmwg",NMWG2));
            subject.setAttribute("id", "server");
-           metadata.appendChild(subject);
+           metadata.addContent(subject);
            
-           Element params = doc.createElementNS(NMWG2,"nmwg:parameters");
+           Element params = new 
Element("parameters",Namespace.getNamespace("nmwg",NMWG2));
            params.setAttribute("id", "params1");
-           subject.appendChild(params);
+           subject.addContent(params);
            
-           Element param = doc.createElementNS(NMWG2,"nmwg:parameter");
+           Element param = new 
Element("parameter",Namespace.getNamespace("nmwg",NMWG2));
            param.setAttribute("id", "param1");
-           params.appendChild(param);
+           param.setText("SES");
+           params.addContent(param);
            
-           //here comes the data entered in by the user
-           param.appendChild(doc.createTextNode(uData.getQuery("param1")));
+           Element data = new Element("data", Namespace.getNamespace("nmwg", 
NMWG2));
+           data.setAttribute("id", "data1");
+           data.setAttribute("metadataIdRef", "meta1");
            
+           msg.addContent(data);
            
+           jdoc.setRootElement(msg);
+           
+           DOMOutputter domout = new DOMOutputter ();
+           
+           doc = domout.output(jdoc);
+           
+           StringWriter sw = new StringWriter();
+           XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(doc));
+           ser.serialize(doc.getDocumentElement());
+ 
+           String XMLStr = sw.toString();
+           
+           System.out.println("MetadataKeyRequest (DOM): " + XMLStr);
+           
        } else if (IPerfsonarRequest.MA_SetupDataRequest.equals(messageType)) 
{
-           DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
-           factory.setNamespaceAware(true);
-           DocumentBuilder builder = factory.newDocumentBuilder();
-           doc = builder.newDocument();
            
-           Element msg = doc.createElementNS(NMWG2,"nmwg:message");
+           System.out.println("SetupDataRequest is being made...");
+           
+           //DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
+           //factory.setNamespaceAware(true);
+           //DocumentBuilder builder = factory.newDocumentBuilder();
+           //doc = builder.newDocument();
+           
+           jdoc = new Document();
+           
+           Element msg = new 
Element("message",Namespace.getNamespace("nmwg",NMWG2));
            msg.setAttribute("id", "msg1");
            msg.setAttribute("type", messageType);
            
-           doc.appendChild(msg);
            
-           Element metadata = doc.createElementNS(NMWG2,"nmwg:metadata");
+           
+           Element metadata = new 
Element("metadata",Namespace.getNamespace("nmwg",NMWG2));
            metadata.setAttribute("id", "meta1");
-           msg.appendChild(metadata);
+           msg.addContent(metadata);
            
-           Element subject = doc.createElementNS(NMWG2,"nmwg:subject");
+           Element subject = new 
Element("subject",Namespace.getNamespace("nmwg",NMWG2));
            subject.setAttribute("id", "server");
-           metadata.appendChild(subject);
+           metadata.addContent(subject);
            
-           Element params = doc.createElementNS(NMWG2,"nmwg:parameters");
+           Element params = new 
Element("parameters",Namespace.getNamespace("nmwg",NMWG2));
            params.setAttribute("id", "params1");
-           subject.appendChild(params);
+           subject.addContent(params);
            
-           Element param = doc.createElementNS(NMWG2,"nmwg:parameter");
+           Element param = new 
Element("parameter",Namespace.getNamespace("nmwg",NMWG2));
            param.setAttribute("id", "param1");
-           params.appendChild(param);
+           params.addContent(param);
            
            //here comes the data entered in by the user
-           param.appendChild(doc.createTextNode(uData.getQuery("param1")));
+           //param.addContent(doc.createTextNode(uData.getQuery("param1")));
            
            //create the relevant Document, get parameters from udata
-                       /*
-                       <?xml version='1.0' encoding='UTF-8'?>
-                       <nmwg:message id="msg1" type="SetupDataRequest" 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
-                           <nmwg:metadata id="meta1">
-                               <nmwg:subject id="subject1">
-                                   <nmwgtopo:endPoint type="hostname" 
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>cisco</nmwgtopo:endPoint>
-                               </nmwg:subject>
-                               <nmwg:parameters id="params1"/>
-                               
<nmwg:eventType>STATUS_SHOW_ENVIRONMENT</nmwg:eventType>
-                           </nmwg:metadata>
-                           <nmwg:data id="data1" metadataIdRef="meta1"/>
-                       </nmwg:message>
-                        
-                        */
+           
+           /*
+           <?xml version='1.0' encoding='UTF-8'?>
+           <nmwg:message id="msg1" type="SetupDataRequest" 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+               <nmwg:metadata id="meta1">
+                   <nmwg:subject id="subject1">
+                       <nmwgtopo:endPoint type="hostname" 
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>cisco</nmwgtopo:endPoint>
+                   </nmwg:subject>
+                   <nmwg:parameters id="params1"/>
+                   <nmwg:eventType>STATUS_SHOW_ENVIRONMENT</nmwg:eventType>
+               </nmwg:metadata>
+               <nmwg:data id="data1" metadataIdRef="meta1"/>
+           </nmwg:message>
+           
+           */
+           /*
+           
+           Element data = new Element("data", Namespace.getNamespace("nmwg", 
NMWG2));
+           data.setAttribute("id", "data1");
+           data.setAttribute("metadataIdRef", "meta1");
+           
+           msg.addContent(data);
+            */
+           
+           
+           
+           jdoc.setRootElement(msg);
+           
+           DOMOutputter domout = new DOMOutputter ();
+           
+           doc = domout.output(jdoc);
+           
+           StringWriter sw = new StringWriter();
+           XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(doc));
+           ser.serialize(doc.getDocumentElement());
+ 
+           String XMLStr = sw.toString();
+           
+           System.out.println("MetadataKeyRequest (DOM): " + XMLStr);
        }
        return doc;
     }
     
     @Override
-    public Document createRequest(MAEndpoint endpoint, MetaDataList query,
+    public org.w3c.dom.Document createRequest(MAEndpoint endpoint, 
MetaDataList query,
            String messageType) throws Exception {
        // endpoint is the service address to be queried, query is a list of 
IUserData entries
-       //This is if you need to send several simultaneous request for each 
entries in query  - not sure if relevant for LG
+       // This is if you need to send several simultaneous request for each 
entries in query  - not sure if relevant for LG
        System.out.println(query);
        return null;
     }
@@ -159,13 +213,19 @@
     /**
      * This is normally invoked after response is received
      */
-    public void process(IUserData uData, Document response,
+    public void process(IUserData uData, org.w3c.dom.Document response,
            IPerfsonarResponse listener) throws Exception {
        // TODO Auto-generated method stub
        
+       StringWriter sw = new StringWriter();
+       XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(response));
+       ser.serialize(response.getDocumentElement());
+ 
+       String XMLStr = sw.toString();
+           
+       System.out.println("MetadataKeyRequest (DOM): " + XMLStr);
+       
     }
-    
-    
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-10-11 12:18:30 UTC (rev 2942)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-10-11 12:56:25 UTC (rev 2943)
@@ -32,7 +32,6 @@
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
@@ -45,12 +44,10 @@
 import javax.swing.event.EventListenerList;
 import javax.swing.text.DefaultCaret;
 import org.perfsonar.perfsonarui.lookingglass.model.Command;
-import org.w3c.dom.Document;
 import org.perfsonar.perfsonarui.lookingglass.model.DeviceComboboxModel;
 import org.perfsonar.perfsonarui.lookingglass.model.DeviceListModel;
 import org.perfsonar.perfsonarui.lookingglass.model.FunctionComboboxModel;
 import org.perfsonar.perfsonarui.lookingglass.model.LatestResultListModel;
-import 
org.perfsonar.perfsonarui.lookingglass.model.LinkedWebserviceComboboxModel;
 import org.perfsonar.perfsonarui.lookingglass.model.LookingGlassClientModel;
 import org.perfsonar.perfsonarui.lookingglass.model.ParameterListModel;
 import 
org.perfsonar.perfsonarui.lookingglass.model.QueriedDeviceComboboxModel;
@@ -92,10 +89,8 @@
     private JComboBox deviceCombobox;
     private JLabel jLabel3;
     private JComboBox functionCombobox;
-    private JButton clearButton;
-    private JButton sendButton;
-    private JLabel jLabel27;
-    private JProgressBar progressBar;
+    //private JLabel jLabel27;
+    //private JProgressBar progressBar;
     private JList deviceList;
     private JScrollPane jScrollPane8;
     private JButton addDeviceButton;
@@ -112,11 +107,10 @@
     private JTextField parameterStringTextField;
     
     private LookingGlassClientModel model;
-    private WebserviceComboboxModel webserviceComboboxModel = null;
+    private WebserviceComboboxModel webserviceComboboxModel;
     private boolean busy = false;
     private InfiniteProgressPanel infiniteProgressPanel;
     private ChangeEvent changeEvent;
-    private LinkedWebserviceComboboxModel linkedWebserviceComboboxModel;
     private DeviceComboboxModel deviceComboboxModel;
     private FunctionComboboxModel functionComboboxModel;
     private ParameterListModel parameterListModel;
@@ -132,6 +126,8 @@
     public LookingGlassMainPanel(Component parentFrame, IPerfsonarTab 
iperftab) {
        super(parentFrame, iperftab);
        this.iperftab = iperftab;
+       
+       System.out.println("iperftab (in constructor): " + iperftab);
     }
     
     @Override
@@ -145,8 +141,6 @@
        changeEvent = new ChangeEvent("webservicesAlteration");
        
        webserviceComboboxModel = new WebserviceComboboxModel(model);
-       linkedWebserviceComboboxModel =
-               new LinkedWebserviceComboboxModel(model);
        deviceComboboxModel = new DeviceComboboxModel(model);
        functionComboboxModel = new FunctionComboboxModel(model);
        
@@ -159,9 +153,8 @@
        queriedDeviceComboboxModel2 = new QueriedDeviceComboboxModel();
        
        addChangeListener(webserviceComboboxModel);
-       addChangeListener(linkedWebserviceComboboxModel);
        
-       JSplitPane split = new 
JSplitPane(JSplitPane.VERTICAL_SPLIT,addTopPane(), addBottomPane());
+       JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, 
addTopPane(), addBottomPane());
        
        add(split);
     }
@@ -174,10 +167,8 @@
        deviceCombobox = new javax.swing.JComboBox();
        jLabel3 = new javax.swing.JLabel();
        functionCombobox = new javax.swing.JComboBox();
-       clearButton = new javax.swing.JButton();
-       sendButton = new javax.swing.JButton();
-       jLabel27 = new javax.swing.JLabel();
-       progressBar = new javax.swing.JProgressBar();
+       //jLabel27 = new javax.swing.JLabel();
+       //progressBar = new javax.swing.JProgressBar();
        jScrollPane8 = new javax.swing.JScrollPane();
        deviceList = new javax.swing.JList();
        addDeviceButton = new javax.swing.JButton();
@@ -193,18 +184,21 @@
        parameterLabel = new javax.swing.JLabel();
        parameterStringTextField = new javax.swing.JTextField();
        
-       
+    
        
jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Request"));
        jLabel1.setText("Telnet / SSH Measurement Point:");
        
        
        webserviceCombobox.setModel(webserviceComboboxModel);
        webserviceCombobox.setToolTipText("Select the desired configured 
webserver");
-       webserviceCombobox.addActionListener(new 
java.awt.event.ActionListener() {
-           public void actionPerformed(java.awt.event.ActionEvent evt) {
-               webserviceComboboxActionperformedHandler(evt);
-           }
-       });
+       //webserviceCombobox.addActionListener(new 
java.awt.event.ActionListener() {
+       //    public void actionPerformed(java.awt.event.ActionEvent evt) {
+       //      webserviceComboboxActionperformedHandler(evt);
+       //    }
+       //});
+       System.out.println("model (in addTopPane): "+super.model);
+       System.out.println("Action :" + super.model.getActions().get("0"));
+       webserviceCombobox.setAction(super.model.getActions().get("0")); // 
this should be the LGMetadataKeyRequestAction
        
        jLabel2.setText("Device:");
        
@@ -227,28 +221,12 @@
            }
        });
        
-       clearButton.setText("Clear All");
-       clearButton.setToolTipText("Clear all fields");
-       clearButton.addActionListener(new java.awt.event.ActionListener() {
-           public void actionPerformed(java.awt.event.ActionEvent evt) {
-               clearButtonActionPerformed(evt);
-           }
-       });
+       //jLabel27.setText("Working");
        
-       sendButton.setText("Query");
-       sendButton.setToolTipText("Contact the webserver with the stated 
request");
-       sendButton.addActionListener(new java.awt.event.ActionListener() {
-           public void actionPerformed(java.awt.event.ActionEvent evt) {
-               sendButtonActionPerformed(evt);
-           }
-       });
+       //progressBar.setForeground(new java.awt.Color(0, 153, 153));
+       //progressBar.setEnabled(false);
+       //progressBar.setString("");
        
-       jLabel27.setText("Working");
-       
-       progressBar.setForeground(new java.awt.Color(0, 153, 153));
-       progressBar.setEnabled(false);
-       progressBar.setString("");
-       
        deviceList.setModel(deviceListModel);
        
deviceList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
        deviceList.setToolTipText("This list represents a set of devices to 
which the same command will be sent. It can also be used to select the 
appropriate result to be displayed in the large box below.");
@@ -297,41 +275,41 @@
        org.jdesktop.layout.GroupLayout jPanel3Layout = new 
org.jdesktop.layout.GroupLayout(jPanel3);
        jPanel3.setLayout(jPanel3Layout);
        jPanel3Layout.setHorizontalGroup(
-               
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-               .add(jPanel3Layout.createSequentialGroup()
-               .addContainerGap()
-               
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-               .add(jPanel3Layout.createSequentialGroup()
-               .add(jLabel31)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(commandTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 88, Short.MAX_VALUE))
-               .add(jPanel3Layout.createSequentialGroup()
-               .add(jLabel29)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(descriptionTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE))
-               .add(jPanel3Layout.createSequentialGroup()
-               .add(jLabel30)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(syntaxTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 153, Short.MAX_VALUE)))
-               .addContainerGap())
-               );
-       jPanel3Layout.setVerticalGroup(
-               
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-               .add(jPanel3Layout.createSequentialGroup()
-               .addContainerGap()
-               
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(jLabel29)
-               .add(descriptionTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(jLabel30)
-               .add(syntaxTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(jLabel31)
-               .add(commandTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-               .add(0, 0, Short.MAX_VALUE))
-               );
+            
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(jPanel3Layout.createSequentialGroup()
+                .addContainerGap()
+                
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(jPanel3Layout.createSequentialGroup()
+                        .add(jLabel31)
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(commandTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 88, Short.MAX_VALUE))
+                    .add(jPanel3Layout.createSequentialGroup()
+                        .add(jLabel29)
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(descriptionTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE))
+                    .add(jPanel3Layout.createSequentialGroup()
+                        .add(jLabel30)
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(syntaxTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 153, Short.MAX_VALUE)))
+                .addContainerGap())
+        );
+        jPanel3Layout.setVerticalGroup(
+            
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(jPanel3Layout.createSequentialGroup()
+                .addContainerGap()
+                
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(jLabel29)
+                    .add(descriptionTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(jLabel30)
+                    .add(syntaxTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(jLabel31)
+                    .add(commandTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .add(0, 0, Short.MAX_VALUE))
+        );
        
        parameterLabel.setText("Parameterstring:");
        
@@ -340,88 +318,77 @@
        org.jdesktop.layout.GroupLayout jPanel1Layout = new 
org.jdesktop.layout.GroupLayout(jPanel1);
        jPanel1.setLayout(jPanel1Layout);
        jPanel1Layout.setHorizontalGroup(
-               
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-               .add(jPanel1Layout.createSequentialGroup()
-               .addContainerGap()
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-               .add(jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-               .add(jPanel1Layout.createSequentialGroup()
-               .add(jLabel3)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(functionCombobox, 0, 176, Short.MAX_VALUE))
-               .add(jPanel1Layout.createSequentialGroup()
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-               .add(org.jdesktop.layout.GroupLayout.LEADING, 
jPanel1Layout.createSequentialGroup()
-               .add(jLabel1)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(webserviceCombobox, 0, 69, Short.MAX_VALUE))
-               .add(org.jdesktop.layout.GroupLayout.LEADING, 
jPanel1Layout.createSequentialGroup()
-               .add(jLabel2)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(deviceCombobox, 0, 191, Short.MAX_VALUE)))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
-               .add(jPanel1Layout.createSequentialGroup()
-               .add(parameterLabel)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(parameterStringTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-               .add(org.jdesktop.layout.GroupLayout.LEADING, 
jPanel1Layout.createSequentialGroup()
-               .add(jLabel27)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(progressBar, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 201, Short.MAX_VALUE))
-               .add(jPanel1Layout.createSequentialGroup()
-               .add(addDeviceButton, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(removeDeviceButton))
-               .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane8, 
0, 0, Short.MAX_VALUE)
-               .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel28)
-               .add(jPanel1Layout.createSequentialGroup()
-               .add(sendButton, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 136, Short.MAX_VALUE)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(clearButton, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 102, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-               .add(253, 253, 253))
-               );
-       jPanel1Layout.setVerticalGroup(
-               
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-               .add(jPanel1Layout.createSequentialGroup()
-               .addContainerGap()
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-               .add(jPanel1Layout.createSequentialGroup()
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(jLabel1)
-               .add(webserviceCombobox, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-               .add(jLabel27))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(jLabel2)
-               .add(deviceCombobox, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(jLabel3)
-               .add(functionCombobox, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(parameterLabel)
-               .add(parameterStringTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
108, Short.MAX_VALUE))
-               .add(jPanel1Layout.createSequentialGroup()
-               .add(progressBar, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 22, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(jLabel28)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(removeDeviceButton)
-               .add(addDeviceButton))
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               .add(jScrollPane8, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 111, Short.MAX_VALUE)
-               .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-               
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-               .add(clearButton)
-               .add(sendButton))))
-               .addContainerGap())
-               );
+            
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(jPanel1Layout.createSequentialGroup()
+                .addContainerGap()
+                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(jPanel3, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(jPanel1Layout.createSequentialGroup()
+                        .add(jLabel3)
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(functionCombobox, 0, 176, Short.MAX_VALUE))
+                    .add(jPanel1Layout.createSequentialGroup()
+                        
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(org.jdesktop.layout.GroupLayout.LEADING, 
jPanel1Layout.createSequentialGroup()
+                                .add(jLabel1)
+                                
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                                .add(webserviceCombobox, 0, 69, 
Short.MAX_VALUE))
+                            .add(org.jdesktop.layout.GroupLayout.LEADING, 
jPanel1Layout.createSequentialGroup()
+                                .add(jLabel2)
+                                
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                                .add(deviceCombobox, 0, 191, 
Short.MAX_VALUE)))
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
+                    .add(jPanel1Layout.createSequentialGroup()
+                        .add(parameterLabel)
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(parameterStringTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(jPanel1Layout.createSequentialGroup()
+                        .add(jLabel28)
+                        .addContainerGap())
+                    .add(org.jdesktop.layout.GroupLayout.TRAILING, 
jPanel1Layout.createSequentialGroup()
+                        
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                            .add(org.jdesktop.layout.GroupLayout.LEADING, 
jScrollPane8, 0, 0, Short.MAX_VALUE)
+                            .add(jPanel1Layout.createSequentialGroup()
+                                .add(addDeviceButton, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                                .add(removeDeviceButton)
+                                
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)))
+                        .add(253, 253, 253))))
+        );
+        jPanel1Layout.setVerticalGroup(
+            
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(jPanel1Layout.createSequentialGroup()
+                .addContainerGap()
+                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(jPanel1Layout.createSequentialGroup()
+                        
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                            .add(jLabel1)
+                            .add(webserviceCombobox, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                            .add(jLabel28))
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                            .add(jLabel2)
+                            .add(deviceCombobox, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                            .add(addDeviceButton)
+                            .add(removeDeviceButton))
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                            .add(jLabel3)
+                            .add(functionCombobox, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                            .add(parameterLabel)
+                            .add(parameterStringTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(jPanel3, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 108, Short.MAX_VALUE))
+                    .add(org.jdesktop.layout.GroupLayout.TRAILING, 
jPanel1Layout.createSequentialGroup()
+                        .add(jScrollPane8, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE))))
+                .addContainerGap())
+        );
        
        return jPanel1;
     }
@@ -602,9 +569,9 @@
                try {
                    
                    //infiniteProgressPanel.start();
-                   progressBar.setString("Contacting MP ...");
-                   progressBar.setStringPainted(true);
-                   progressBar.setIndeterminate(true);
+                   //progressBar.setString("Contacting MP ...");
+                   //progressBar.setStringPainted(true);
+                   //progressBar.setIndeterminate(true);
                    Thread performer = new Thread(new Runnable(){
                        
                        public void run() {
@@ -623,9 +590,9 @@
                            }
                            
                            //infiniteProgressPanel.stop();
-                           progressBar.setString("");
-                           progressBar.setStringPainted(false);
-                           progressBar.setIndeterminate(false);
+                           //progressBar.setString("");
+                           //progressBar.setStringPainted(false);
+                           //progressBar.setIndeterminate(false);
                            
                            
                        }
@@ -673,8 +640,7 @@
        
        if (this.functionCombobox.getSelectedIndex() > -1) {
            
model.setSelectedCommand((String)functionCombobox.getSelectedItem());
-           this.sendButton.setEnabled(true);
-           
+                   
            this.parameterStringTextField.setEnabled(true);
            
            descriptionTextField.setText(model.getDescription(
@@ -689,8 +655,7 @@
            
            
        } else {
-           this.sendButton.setEnabled(false);
-           
+                   
            this.parameterStringTextField.setEnabled(false);
            
            
@@ -702,160 +667,7 @@
        }
        deviceList.repaint();
     }
-    
-    /**
-     * Code for the clearance of all the input and output fields in the 
application
-     **/
-    private void clearButtonActionPerformed(java.awt.event.ActionEvent evt) {
-       
-       parameterListModel.removeAllElements();
-       deviceListModel.removeAllElements();
-       
-       
-       functionCombobox.setEnabled(false);
-       functionComboboxModel.removeAllElements();
-       
-       deviceCombobox.setEnabled(false);
-       deviceComboboxModel.removeAllElements();
-       
-       webserviceComboboxModel.setSelectedItem(null);
-       
-       resultTextArea.setText(null);
-       
-       statusTextField.setText(null);
-       
-       addDeviceButton.setEnabled(false);
-       removeDeviceButton.setEnabled(false);
-       
-       parameterStringTextField.setEnabled(false);
-       parameterStringTextField.setText("");
-       
-       searchTextField.setEnabled(false);
-       highlightButton.setEnabled(false);
-       
-    }
-    
-    
-    /**
-     * Code for the executing of a query to the webservice. It used the input
-     * from the different comboboxes and parameterList
-     **/
-    private void sendButtonActionPerformed(java.awt.event.ActionEvent evt) {
-       
-       if (!(deviceListModel.
-               contains((String)deviceCombobox.getSelectedItem()))) {
-           
-           deviceListModel.
-                   addElement((String)deviceCombobox.getSelectedItem());
-           
-       }
-       
-       if (deviceListModel.getSize() > 0) {
-           
-           removeDeviceButton.setEnabled(true);
-           
-       }
-       
-       //ProgressPanel code
-       SwingUtilities.invokeLater(new Runnable() { //execute our task
-           
-           public void run() {
-               
-               try {
-                   
-                   progressBar.setString("Contacting MP ...");
-                   progressBar.setStringPainted(true);
-                   progressBar.setIndeterminate(true);
-                   
-                   Thread performer = new Thread(new Runnable(){
-                       
-                       public void run() {
-                           
-                           busy = true;
-                           
-                           if (webserviceComboboxModel != null &&
-                                   webserviceComboboxModel.getSelectedItem()
-                                   != null &&
-                                   deviceComboboxModel.getSelectedItem()
-                                   != null &&
-                                   functionComboboxModel.getSelectedItem()
-                                   != null) {
-                               /**
-                                * Document request = SOAPBuilder.
-                                * createRequestDocument(deviceListModel.
-                                * getAllElements(),
-                                * (String)functionCombobox.
-                                * getSelectedItem(), parameterListModel.
-                                * getAllElements());
-                                */
-                               Document request = null;
-                               if (functionComboboxModel.isSymbolic()) {
-                                   //request = 
SOAPBuilder.createRequestDocument(
-                                   //       deviceListModel.getAllElements(),
-                                   //        
(String)functionCombobox.getSelectedItem(),
-                                   //        
parameterStringTextField.getText());
-                                   JOptionPane.showMessageDialog(null,
-                                           "Sending a request ",
-                                           "Sending...",
-                                           JOptionPane.INFORMATION_MESSAGE);
-                               } else {
-                                   //System.out.println("TEST: " + 
functionComboboxModel.getSymbolic((String)functionCombobox.getSelectedItem(), 
(String)deviceCombobox.getSelectedItem()));
-                                   //request = 
SOAPBuilder.createRequestDocument(
-                                   //        
deviceListModel.getAllElements(),
-                                   //        
functionComboboxModel.getSymbolic((String)functionCombobox.getSelectedItem(), 
(String)deviceCombobox.getSelectedItem()),
-                                   //        
parameterStringTextField.getText());
-                                   JOptionPane.showMessageDialog(null,
-                                           "Sending a request ",
-                                           "Sending...",
-                                           JOptionPane.INFORMATION_MESSAGE);
-                               }
-                               
-                               try {
-                                   
//System.out.println(System.currentTimeMillis());
-                                   model.send(request, 
webserviceComboboxModel.getUrl((String)webserviceComboboxModel.getSelectedItem()),deviceListModel.getSize()*2);
 // request eventType + resultcode for every device
-                               } catch (Exception ex) {
-                                   JOptionPane.showMessageDialog(null,
-                                           "An error occured while executing 
" +
-                                           "your task!",
-                                           "Sending ---- Error",
-                                           JOptionPane.ERROR_MESSAGE);
-                                   resultTextArea.setText("An error occured 
" +
-                                           "-- probably too many requests!");
-                                   ex.printStackTrace();
-                               }
-                               
-                           }
-                           
-                           while (busy) {
-                               
-                               try {
-                                   
-                                   Thread.sleep(1000);
-                                   
-                               } catch (InterruptedException ex) {
-                                   
-                                   ex.printStackTrace();
-                                   
-                               }
-                               
-                           }
-                           
-                           progressBar.setString("");
-                           progressBar.setStringPainted(false);
-                           progressBar.setIndeterminate(false);
-                           
-                       }
-                       
-                   });
-                   
-                   performer.start();
-                   
-               } catch (Exception e) {
-                   
-               }}});
-               
-    }
-    
+            
     private void addDeviceButtonActionPerformed(java.awt.event.ActionEvent 
evt) {
        
        if (deviceCombobox.getSelectedIndex() > -1) {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-10-11 12:18:30 UTC (rev 2942)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-10-11 12:56:25 UTC (rev 2943)
@@ -1,8 +1,8 @@
 /*
-Copyright (C) 2005-2006  
-
+Copyright (C) 2005-2006
+ 
 Contact: 

-
+ 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public License
 as published by the Free Software Foundation; either version 2.1
@@ -11,16 +11,16 @@
 - but is not limited to - adding the above copyright notice to the beginning
 of your source code files, and to any copyright notice that you may 
distribute
 with programs based on this work.
-
+ 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU Lesser General Public License for more details.
-
+ 
 You should have received a copy of the GNU Lesser General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-*/
+ */
 
 package org.perfsonar.perfsonarui.lookingglass;
 
@@ -44,54 +44,64 @@
 /**
  *  @author Stijn Melis
  *  @author Nina Jeliazkova (skeleton framework)
- */    
+ */
 public class LookingGlassTab extends PerfsonarModel {
-
-       @Override
-       protected PerfsonarRequestAction createMetadataRequestAction() {
-               //the idea is to fill in dataList with entries coming from 
the response. MetadataListResponseListener is responsible for processing the 
request
-               metadataRequestAction = new 
MetadataRequestAction(request,userData,dataList,endpointList,"Meta data 
request");
-               
metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupQuery);
-               return metadataRequestAction;
-       }
-
-
-       @Override
-       protected SmartMARequest createSmartRequest() {
-               return new SmartMARequest() {
-                       @Override
-                       public IPerfsonarRequest createMARequest(MAEndpoint 
endpoint) throws PSException {
-                               return new LGRequest();
-                       }
-               };
-       }
-
-       @Override
-       public List<IPerfsonarSchema> getSupportedRequests() {
-               ArrayList<IPerfsonarSchema> list = new 
ArrayList<IPerfsonarSchema>();
-               list.add(new PerfsonarSchema("lg"));
-               //this is the string appearing in MA.conf
-               //is LG dealing with a single schema/service, or there is a 
need to support more? 
-               return list;
-       }
-
-       public PluginMainPanel createMainComponent(Component parentComponent) 
{
-               return new LookingGlassMainPanel(parentComponent,this);
-       }
-
-       public int getOrder() {
-
-               return 90;
-       }
-       @Override
-       public String toString() {
-               return "Looking Glass";
-       }
-       @Override
-       public ITimeValueResponse createTimeValueResponseListener() {
-
-               return super.createTimeValueResponseListener();
-       }
+    
+    private LookingGlassMainPanel panel;
+    
+    @Override
+    protected PerfsonarRequestAction createMetadataRequestAction() {
+       //the idea is to fill in dataList with entries coming from the 
response. MetadataListResponseListener is responsible for processing the 
request
+       metadataRequestAction = new 
MetadataRequestAction(request,userData,dataList,endpointList,"Meta data 
request");
+       //metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupQuery);
+       return metadataRequestAction;
+       //return null
+    }
+    
+    //@overide
+    //public PerfsonarRequestAction createDataRequestAction() {
+    
+    // return null;
+    //}
+    
+    @Override
+    protected SmartMARequest createSmartRequest() {
+       return new SmartMARequest() {
+           @Override
+           public IPerfsonarRequest createMARequest(MAEndpoint endpoint) 
throws PSException {
+               return new LGRequest();
+           }
+       };
+    }
+    
+    @Override
+    public List<IPerfsonarSchema> getSupportedRequests() {
+       ArrayList<IPerfsonarSchema> list = new ArrayList<IPerfsonarSchema>();
+       list.add(new PerfsonarSchema("lg"));
+       //this is the string appearing in MA.conf
+       //is LG dealing with a single schema/service, or there is a need to 
support more?
+       return list;
+    }
+    
+    public PluginMainPanel createMainComponent(Component parentComponent) {
+       panel = new LookingGlassMainPanel(parentComponent,this);
+       
+       return panel;
+    }
+    
+    public int getOrder() {
+       
+       return 90;
+    }
+    @Override
+    public String toString() {
+       return "Looking Glass";
+    }
+    @Override
+    public ITimeValueResponse createTimeValueResponseListener() {
+       
+       return super.createTimeValueResponseListener();
+    }
 }
 
 

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyResponseListener.java

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-10-11 12:18:30 UTC (rev 2942)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-10-11 12:56:25 UTC (rev 2943)
@@ -9,14 +9,10 @@
  */
 
 package org.perfsonar.perfsonarui.lookingglass.model;
-
+ 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
@@ -128,7 +124,8 @@
     public void send(Document request, String endPoint, int size)
     throws Exception {
        System.out.println("*** 
LookingGlassClientModel.send("+request+","+endPoint+","+size+") called ***");
-       /*try {
+       
+       try {
         
            resultStringTable = new String[size];
            resultTimeTypeTable = new String[size];
@@ -272,7 +269,7 @@
            throw ex;
         
        }
-        */
+       
     }
     
     
@@ -284,25 +281,29 @@
        try {
            
            // Get current classloader
-           ClassLoader cl = this.getClass().getClassLoader();
+           //ClassLoader cl = this.getClass().getClassLoader();
            devices.clear();
            metadata.clear();
            
            // Create file
-           URI uri = null;
-           URL url = null;
+           //URI uri = null;
+           //URL url = null;
            
-           url = cl.getResource("configRequest.xml");
+           //System.out.println("ClassLoader: "+ cl);
+               
+           //url = cl.getResource("configRequest.xml");
            
-           uri = new URI(url.toString());
+           //System.out.println("url: "+ url);
            
+           //uri = new URI(url.toString());
+           
            Document request = null;
            DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
            factory.setNamespaceAware(true);
            DocumentBuilder builder;
            
            builder = factory.newDocumentBuilder();
-           request = builder.parse(uri.toString());
+           request = builder.parse(new File("../../configRequest.xml"));
            
            Service service = new Service();
            Call call = (Call)service.createCall();
@@ -411,7 +412,7 @@
                    }
                }
            }
-       } catch (URISyntaxException ex) {
+       } /*catch (URISyntaxException ex) {
            
            JOptionPane.showMessageDialog(null,
                    "An error occured while executing your task!",
@@ -419,7 +420,7 @@
                    JOptionPane.ERROR_MESSAGE);
            ex.printStackTrace();
            
-       } catch (RemoteException ex) {
+       } */catch (RemoteException ex) {
            
            JOptionPane.showMessageDialog(null,
                    "An error occured while executing your task!",

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
  2007-10-11 12:18:30 UTC (rev 2942)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
  2007-10-11 12:56:25 UTC (rev 2943)
@@ -9,12 +9,15 @@
 
 package org.perfsonar.perfsonarui.lookingglass.model;
 
+import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringTokenizer;
 import java.util.Vector;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JOptionPane;
@@ -53,37 +56,35 @@
         try {
             
             webservicesMap = new HashMap();
-            if (first) {
-                
-                webservicesMap.put("chaos169",
-                        
"http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.0/services/TelnetSSH";);
-                first = false;
-                
-            }
             
-            FileInputStream in = new FileInputStream("webservices.config");
-            ObjectInputStream s = new ObjectInputStream(in);
-            Vector vector = (Vector)s.readObject();
+            FileInputStream in = new 
FileInputStream("org/perfsonar/perfsonarui/config/MA.conf");
+            BufferedReader br = new BufferedReader(new 
InputStreamReader(in));
+           
+           String line = br.readLine();
+           StringTokenizer tok;
+           
+           String title;
+           String endpoint;
+           String type;
+           
+           while (line != null) {
+               if (line.charAt(0) != ';') { //endpoint is enabled
+                  line.substring(1); //remove the first character (';')
+                  tok =  new StringTokenizer (line, ",");
+                  title = tok.nextToken();
+                  endpoint = tok.nextToken();
+                  type = tok.nextToken();
+                  if (type.equals("lg"))
+                      webservicesMap.put(title, endpoint);
+               }
+               line = br.readLine();
+           }
+
             
-            for (int i = 0; i < vector.size(); i++) {
-                
-                
webservicesMap.put(((Vector)vector.elementAt(i)).elementAt(0),
-                        ((Vector)vector.elementAt(i)).elementAt(1));
-                
-            }
-            
         } catch (FileNotFoundException ex) {
             
             ex.printStackTrace();
             
-        } catch (ClassNotFoundException ex) {
-            
-            JOptionPane.showMessageDialog(null,
-                    "The configuration file could not be initialized!",
-                    "Configruration Error",
-                    JOptionPane.ERROR_MESSAGE);
-            ex.printStackTrace();
-            
         } catch (IOException ex) {
             
             JOptionPane.showMessageDialog(null,
@@ -109,16 +110,29 @@
         try {
             
             webservicesMap = new HashMap();
-            FileInputStream in = new FileInputStream("webservices.config");
-            ObjectInputStream s = new ObjectInputStream(in);
-            Vector vector = (Vector)s.readObject();
             
-            for (int i = 0; i < vector.size(); i++) {
-                
-                
webservicesMap.put(((Vector)vector.elementAt(i)).elementAt(0).toString(),
-                        
((Vector)vector.elementAt(i)).elementAt(1).toString());
-                
-            }
+            FileInputStream in = new 
FileInputStream("org/perfsonar/perfsonarui/config/MA.conf");
+            BufferedReader br = new BufferedReader(new 
InputStreamReader(in));
+           
+           String line = br.readLine();
+           StringTokenizer tok;
+           
+           String title;
+           String endpoint;
+           String type;
+           
+           while (line != null) {
+               if (line.charAt(0) != ';') { //endpoint is enabled
+                  line.substring(1); //remove the first character (';')
+                  tok =  new StringTokenizer (line, ",");
+                  title = tok.nextToken();
+                  endpoint = tok.nextToken();
+                  type = tok.nextToken();
+                  if (type.equals("lg"))
+                      webservicesMap.put(title, endpoint);
+               }
+               line = br.readLine();
+           }
             
         } catch (FileNotFoundException ex) {
             
@@ -130,14 +144,6 @@
              **/
             ex.printStackTrace();
             
-        } catch (ClassNotFoundException ex) {
-            
-            JOptionPane.showMessageDialog(null,
-                    "The configuration file could not be initialized!",
-                    "Configruration Error",
-                    JOptionPane.ERROR_MESSAGE);
-            ex.printStackTrace();
-            
         } catch (IOException ex) {
             
             JOptionPane.showMessageDialog(null,