perfsonar development work

Author: nina
Date: 2007-11-09 11:04:24 -0500 (Fri, 09 Nov 2007)
New Revision: 3030

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/PSErrorCodeException.java
Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/MANIFEST_PLAYGROUND_plugin.MFT
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
Log:
- new option -sURL , used to retrieve and copy ClientSASLCA.jks to a local 
directory;
- better error reporting;
- fixed a bug in threads processing;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java 
  2007-11-09 16:01:15 UTC (rev 3029)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java 
  2007-11-09 16:04:24 UTC (rev 3030)
@@ -72,6 +72,7 @@
 public abstract class AbstractMARequest extends Observable implements 
IPerfsonarRequest, Runnable {
        public static String NMWG = "http://ggf.org/ns/nmwg/";;
        public static String NMWG2 = "http://ggf.org/ns/nmwg/base/2.0/";;
+       protected static String URI_nmwgr = 
"http://ggf.org/ns/nmwg/result/2.0/";;
        protected static PSLogger logger = new 
PSLogger(AbstractMARequest.class);
        protected long id;
        protected PropertyChangeSupport propertyChangeSupport;
@@ -123,6 +124,7 @@
                propertyChangeSupport.firePropertyChange(new 
PerfsonarResponseEvent(this, userData,result));
        }
        public synchronized void fireResultProcessingCompleted(IUserData 
userData) {
+               PSLogger.threadlog("---- " + getClass().getName() + " 
fireResultProcessingCompleted ----");
                propertyChangeSupport.firePropertyChange(new 
PerfsonarResponseEvent(this,PerfsonarResponseEvent.COMMAND_PROCESSINGCOMPLETED,
 userData, null));
        }
        /* (non-Javadoc)
@@ -255,7 +257,7 @@
                    query = uData;
                    queries = null;
                    if (runInThread)  {
-                           Thread t = new 
Thread(this,uData.getEndpoint().getEndpoint());
+                           Thread t = new 
Thread(this,uData.getEndpoint().getTitle());
                            t.start();
                    } else run();
         } catch (Exception x) {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
   2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractPerfsonarResponse.java
   2007-11-09 16:04:24 UTC (rev 3030)
@@ -23,7 +23,6 @@
 import java.beans.PropertyChangeEvent;
 import java.util.Vector;
 
-
 import org.apache.axis.message.SOAPBodyElement;
 import org.apache.axis.message.SOAPEnvelope;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -65,6 +64,7 @@
                if (arg instanceof PerfsonarResponseEvent) {
                        PerfsonarResponseEvent e = (PerfsonarResponseEvent) 
arg;
                        String property = e.getPropertyName();
+                       
PSLogger.threadlog(getClass().getName()+"\tRequest\t"+property+"\t"+e.getRequest());
                        if 
(property.equals(PerfsonarResponseEvent.COMMAND_CALLINITIATED)) {
                                callInitiated(e.getRequest(),e.getQuery());
                        } else if 
(property.equals(PerfsonarResponseEvent.COMMAND_CALLEXCEPTION)) {
@@ -115,6 +115,7 @@
         * Increments 
{@link
 #getCountResultProcessed()} counter.
         */
        public synchronized  void processingCompleted(IPerfsonarRequest 
request) {
+                       PSLogger.threadlog("----" + getClass().getName() + " 
Invoked in response to 
{@link
 PerfsonarResponseEvent#COMMAND_PROCESSINGCOMPLETED} event. ");
                        countResultProcessed++;
                        request.removePropertyChangeListener(this);
        }
@@ -179,6 +180,7 @@
                            processVector(request,uData,((SOAPEnvelope) 
response).getBodyElements());
             }
                }               
+               PSLogger.threadlog(getClass().getName() + " ABOUT TO 
fireResultProcessingCompleted");
                request.fireResultProcessingCompleted(uData);
        }       
     protected void processVector(IPerfsonarRequest request,IUserData 
uData,Vector response) {

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/PSErrorCodeException.java

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java 
2007-11-09 16:01:15 UTC (rev 3029)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java 
2007-11-09 16:04:24 UTC (rev 3030)
@@ -115,4 +115,8 @@
                return super.toString();
     }
 
+       public MAEndpoint getMaEndpoint() {
+               return maEndpoint;
+       }
+
 }

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java    
2007-11-09 16:01:15 UTC (rev 3029)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PSLogger.java    
2007-11-09 16:04:24 UTC (rev 3030)
@@ -1,5 +1,5 @@
 /*
-Copyright perfsonar.acad.bg (C) 2005-2007  
+Copyright perfsonar.acad.bg (C) 2005-2007
 Contact: 

 
 This program is free software; you can redistribute it and/or
@@ -38,11 +38,11 @@
     private String classname;
 
     //private int stackLength;  // NOPMD
-    
+
     /** Default number of StackTraceElements to be printed by 
debug(Exception). */
     public final int DEFAULT_STACK_LENGTH = 5;
 
-    
+
     public PSLogger() {
         this(PSLogger.class);
     }
@@ -58,7 +58,7 @@
     }
     public static void configureLog4j(boolean console) {
 
-       if (console) 
+       if (console)
                configureLog4j("/org/perfsonar/perfsonarui/log4.console");
        else
                configureLog4j("/org/perfsonar/perfsonarui/log4.properties");
@@ -71,7 +71,7 @@
         } catch (NullPointerException e) { // NOPMD
             System.err.println("Properties file not found: " + 
e.getMessage());
             //e.printStackTrace();
-            
+
         } catch (Exception e) {
                System.err.println("Unknown error occured: " + 
e.getMessage());
                e.printStackTrace();
@@ -89,7 +89,7 @@
              * security is checked, which is with the PluginManager, as it
              * uses the java.net.URLClassLoader. */
             //if (false) throw new ClassNotFoundException(); // NOPMD
-            
+
             log4jLogger = org.apache.log4j.Category.getInstance( classname );
             /*
         } catch (ClassNotFoundException e) {
@@ -131,7 +131,7 @@
           }
         }
     }
-    
+
     /**
      * Forces the <code>LoggingTool</code> to configurate the Log4J toolkit.
      * Normally this should be done by the application that uses the CDK 
library,
@@ -163,14 +163,14 @@
     public void setStackLength(int length) {
         //this.stackLength = length;
     }
-    
+
     /**
      * Outputs the system property for java.class.path.
      */
     public void dumpClasspath() {
         debug("java.class.path: " + System.getProperty("java.class.path"));
     }
-    
+
     /**
      * Shows DEBUG output for the Object. If the object is an instanceof
      * Throwable it will output the trace. Otherwise it will use the
@@ -206,9 +206,9 @@
             StringWriter w = new StringWriter();
             problem.printStackTrace(new PrintWriter(w));
             log4jLogger.debug(w.toString());
-            
+
             //StackTraceElement[] stack = problem.getStackTrace();
-            
+
             /*
             java.io.StringWriter stackTraceWriter = new 
java.io.StringWriter();
             problem.printStackTrace(new PrintWriter(stackTraceWriter));
@@ -223,14 +223,14 @@
                     }
                 }
             } catch (Exception ioException) {
-                error("Serious error in LoggingTool while printing exception 
stack trace: " + 
+                error("Serious error in LoggingTool while printing exception 
stack trace: " +
                       ioException.getMessage());
                 logger.debug(ioException);
             }
             */
         }
     }
-    
+
     /**
      * Shows ERROR output for the Object. It uses the toString() method.
      *
@@ -246,12 +246,12 @@
        log4jLogger.error(object.toString()+x.toString());
        if (debug) debug(x);
     }
-    
+
     public void fatal(Object object) {
        log4jLogger.fatal(object.toString());
     }
 
-    
+
     public void info(Object object) {
        log4jLogger.info(object.toString());
     }
@@ -268,6 +268,10 @@
     public boolean isDebugEnabled() {
         return debug;
     }
-    
-   
+
+    public static void threadlog(String message) {
+
+       //System.out.println("[Thread "+ Thread.currentThread().getName() + 
"]\t"+ message);
+    }
+
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-11-09 16:01:15 UTC (rev 3029)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-11-09 16:04:24 UTC (rev 3030)
@@ -75,6 +75,9 @@
        public SmartMARequest() {
                super();
                propertyChangeListener = new AbstractPerfsonarResponse() {
+                       public void process(IPerfsonarRequest 
request,IUserData uData,Object response) throws Exception {
+                               PSLogger.threadlog(getClass().getName() + " 
dummy processing");
+                       }
                        /**
                         * return 
{@link
 IPerfsonarRequest} object if processing is already completed
                         */
@@ -101,25 +104,29 @@
                         */
                        public synchronized void 
callException(PerfsonarResponseEvent e) {
                                super.callException(e);
-                               
-                               setRequestsRunning(countInitiated 
-(countCompleted + countErrors));
-                               returnRequest(e.getRequest());
-                Exception x = e.getException();
-                
-                               /*
-                               firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_BUSY,null,
-                                               new Boolean((countCompleted + 
countErrors) < countInitiated)));
-                               */
-                               if (countInitiated > 0)
-                               firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_PERCENT,
-                                       null,new Double(100*(countCompleted + 
countErrors)/countInitiated)
-                                               ));
-                               firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_MESSAGE,
-                                       "","Errors "+ 
Integer.toString(countErrors) + '\t' + x.toString()
-                                               ));
-                               firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_ERROR,
-                                       null,x
-                                               ));
+                               Exception x = e.getException();
+                               if (x instanceof PSErrorCodeException) {
+                                       
fireAxisCallException((IUserData)null, x);
+                               } else {
+                                       setRequestsRunning(countInitiated 
-(countCompleted + countErrors));
+                                       returnRequest(e.getRequest());
+                       
+                       
+                                       /*
+                                       firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_BUSY,null,
+                                                       new 
Boolean((countCompleted + countErrors) < countInitiated)));
+                                       */
+                                       if (countInitiated > 0)
+                                       firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_PERCENT,
+                                               null,new 
Double(100*(countCompleted + countErrors)/countInitiated)
+                                                       ));
+                                       firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_MESSAGE,
+                                               "","Errors "+ 
Integer.toString(countErrors) + '\t' + x.toString()
+                                                       ));
+                                       firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_ERROR,
+                                               null,x
+                                                       ));
+                               }
 
                        }
                        /* (non-Javadoc)
@@ -163,16 +170,19 @@
      * @return
      */
     public synchronized int isReady() {
-
+       PSLogger.threadlog("--- isReady");
         while (getRequestsRunning() > 0) {
             try {
                    //wait for requests to complete
+               PSLogger.threadlog("--- wait");
                 wait();
+                
             } catch (InterruptedException e) {
                 logger.warn(e);
             }
         }
         propertyChangeListener.clear();
+        PSLogger.threadlog("--- READY");
         return getRequestsRunning();
     }
     public synchronized int getRequestsRunning() {
@@ -188,7 +198,7 @@
     }
        protected synchronized void returnRequest(IPerfsonarRequest request) {
                
//request.removePropertyChangeListener(propertyChangeListener); already done 
in the super class
-
+               PSLogger.threadlog("Return request\t"+request);
                request.removePropertyChangeListener(propertyChangeListener);
         request.removePropertyChangeListeners();
                Enumeration keys = requestsPool.keys();
@@ -266,8 +276,10 @@
                     null,messageType
                     ));
                //Makes different nodes for each endpoint, in order to create 
aggregated requests
-            for (int i=0; i < queryList.size();i++)
+            for (int i=0; i < queryList.size();i++) {
                 queryList.get(i).setResponse(IUserData.C_STATUS, 
AbstractUserData.NULL_DATA);
+                PSLogger.threadlog("--\t"+queryList.get(i).getEndpoint());
+            }    
 
                List<MetaDataList> queries = new ArrayList<MetaDataList>();
                Hashtable<String,MetaDataList> list = new 
Hashtable<String,MetaDataList>();

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-11-09 16:04:24 UTC (rev 3030)
@@ -174,9 +174,10 @@
                return new SmartMARequest() {
                        @Override
                        public IPerfsonarRequest createMARequest(MAEndpoint 
endpoint) throws PSException {
+                               
                 if ((endpoint == null) || 
(endpoint.getEndpoint().equals(""))) 
                         throw new PSException("No service address!");
-
+                System.out.println(endpoint.getEndpoint());
                                IPerfsonarSchema schema = 
endpoint.getSchema();
                                if (schema.equals("NMWG2v2")) return new 
MARequest_NMWG2();
                                else if (schema.equals("NMWG2v2_netutil")) 
return new MARequest_NMWG2_Netutil();

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
    2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequestPerfsonar2_0.java
    2007-11-09 16:04:24 UTC (rev 3030)
@@ -22,11 +22,12 @@
 
 import org.jdom.Namespace;
 import org.perfsonar.perfsonarui.AbstractUserData;
-import org.perfsonar.perfsonarui.PSException;
+import org.perfsonar.perfsonarui.PSErrorCodeException;
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.UnsupportedTypeException;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
+import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.PSCountsDatum;
 import org.perfsonar.perfsonarui.plugins.PSTime;
 import org.perfsonar.perfsonarui.plugins.PSUtilizationDatum;
@@ -39,9 +40,7 @@
        public static String S_timevalue= "value";
        public static String S_valueUnits= "valueUnits";
        public static String schemaID  = "http://schemas.perfsonar.net/2.0";; 
-       protected static String URI_nmwgr = 
"http://ggf.org/ns/nmwg/result/2.0/";;
- 
-
+       
        protected Namespace nmwgr = null;
        
        public MARequestPerfsonar2_0() {
@@ -68,15 +67,28 @@
                if (nmwgr == null) nmwgr = 
Namespace.getNamespace("nmwgr",URI_nmwgr);           
     }
     protected synchronized void processResultCode(Node data, UserData 
userData) {
-        NodeList datum  = 
((org.w3c.dom.Element)data).getElementsByTagNameNS(URI_nmwgr,IUserData.C_DATUM);
-        
-        if (datum.getLength()>0)
-            for (int i=0; i < datum.getLength();i++) {
-                 org.w3c.dom.Element d = (org.w3c.dom.Element)datum.item(i);
-                 
userData.setResponse(AbstractUserData.C_STATUS,userData.getEventTypes().toString()
 + "\t" + d.getTextContent());
-                 //logger.warn(">>\t" + userData.getId() + '\t'+ 
userData.getHostname(AbstractUserData.ID_RESPONSE) + '\t' + 
d.getTextContent());
-            }
-        else userData.setResponse(AbstractUserData.C_STATUS,"OK");
+       try {
+               NodeList datum  = 
((org.w3c.dom.Element)data).getElementsByTagNameNS(URI_nmwgr,IUserData.C_DATUM);
+               
+               if ((datum!=null) && (datum.getLength()>0))
+                   for (int i=0; i < datum.getLength();i++) {
+                        org.w3c.dom.Element d = 
(org.w3c.dom.Element)datum.item(i);
+                        String event = d.getTextContent();
+                        
userData.setResponse(AbstractUserData.C_STATUS,userData.getEventTypes().toString()
 + "\t" + event);
+                        logger.error(event);
+                        PSErrorCodeException x;
+                        if (userData!=null)
+                                x = new 
PSErrorCodeException(userData,"",event);
+                        else 
+                                x = new 
PSErrorCodeException((MAEndpoint)null,"",event);
+                                               
+                        fireAxisCallException(userData, x);
+                        //logger.warn(">>\t" + userData.getId() + '\t'+ 
userData.getHostname(AbstractUserData.ID_RESPONSE) + '\t' + 
d.getTextContent());
+                   }
+               else userData.setResponse(AbstractUserData.C_STATUS,"OK");
+       } catch (Throwable x) {
+               x.printStackTrace();
+       }
     }
   
     protected void processMetadata(Node metadata, UserData userData) {
@@ -122,7 +134,7 @@
         if (eventType != null) {
             String event = eventType.getFirstChild().getNodeValue();
             if (event.startsWith("error.")) {
-                PSException x = new PSException(userData,event);
+                PSErrorCodeException x = new 
PSErrorCodeException((MAEndpoint)null,event,"");
                 logger.error(event);
                 fireAxisCallException(userData, x);
                 userData.setResponse(AbstractUserData.C_STATUS,event);

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java  
2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java  
2007-11-09 16:04:24 UTC (rev 3030)
@@ -337,7 +337,7 @@
     }
     
     public Element createEmptyMetadataSection(UserData userData){
-        
+       try {
         Element MetElem = new Element(E_METADATA,nmwg);
         
         MetElem.setAttribute(E_ID, "meta1");  
@@ -359,6 +359,10 @@
                MetElem.addContent(new Element("eventType", 
nmwg).setText("utilization"));
         
         return MetElem;
+       } catch (Exception x) {
+               x.printStackTrace();
+               return null;
+       }
 }
     
     public Element createSearchMetadataSection(UserData userData, int 
metaId){

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
      2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
      2007-11-09 16:04:24 UTC (rev 3030)
@@ -24,6 +24,7 @@
 
 import javax.swing.Icon;
 
+import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.ma.UpdateListResponseListener;
 import org.perfsonar.perfsonarui.ma.UserData;
@@ -212,6 +213,7 @@
                        if (request instanceof SmartMARequest)
                            ((SmartMARequest) request).isReady();
                        
+                       PSLogger.threadlog("Preparing queries for each 
interface ...");
                        request.fireStatusMessage("Metadata retrieved");
                        request.fireStatusMessage("Preparing queries for each 
interface ...");
                        for (int i=0; i < dataList.size();i++) {
@@ -220,6 +222,7 @@
                                dataList.get(i).lastSeconds(timeInterval);
                 UserData data = (UserData)dataList.get(i);
                 data.setDirection(UserData.DIRECTION_UNKNOWN);               
          
+                
PSLogger.threadlog(getClass().getName()+"\t"+dataList.get(i).getEndpoint());
                        }
                        request.fireStatusMessage("Data retrieved from " + 
dataList.size() + " interfaces.");                   
                        if (!isInterrupted()) {
@@ -227,7 +230,7 @@
                        } else {
                            request.fireStatusMessage("Query cancelled. Data 
retrieved from " + dataList.size() + " interfaces.");                         
     
                        }
-                       
+
                        return null;
        }
     

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
    2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
    2007-11-09 16:04:24 UTC (rev 3030)
@@ -25,6 +25,7 @@
 import javax.swing.JOptionPane;
 
 import org.perfsonar.perfsonarui.MetadataListResponseListener;
+import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.ma.UserData;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -97,10 +98,10 @@
                                        
                            }
                        }
-                       /*
+
                        if (request instanceof SmartMARequest)
                                    ((SmartMARequest) request).isReady();
-                       */
+                       
                        if (isInterrupted()) return null;
                        if (dataList.size() > 0) {
                                request.fireStatusMessage("Metadata 
retrieved.");                       

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
  2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
  2007-11-09 16:04:24 UTC (rev 3030)
@@ -367,9 +367,9 @@
         
         barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_CAPACITY, 1);
         barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_IN,1);
-        barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_OUT,0.8);
-        barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_ERRORS,0.6);
-        barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_DISCARDS,0.4);
+        barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_OUT,0.7);
+        barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_ERRORS,0.5);
+        barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_DISCARDS,0.3);
         
barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_UNICASTPACKETS,0.2);    
  
         
barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_NONUNICASTPACKETS,0.1); 
     
         

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/MANIFEST_PLAYGROUND_plugin.MFT
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/MANIFEST_PLAYGROUND_plugin.MFT
        2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/MANIFEST_PLAYGROUND_plugin.MFT
        2007-11-09 16:04:24 UTC (rev 3030)
@@ -3,9 +3,9 @@
 Specification-Title: PerfsonarUI extensions
 Specification-Version: 1.00
 Specification-Vendor: Nina Jeliazkova
-Implementation-Title: PerfsonarUI extensions
+Implementation-Title: PerfsonarUI Playground plug-in
 Implementation-Version: 1.00
 Implementation-Vendor: Nina Jeliazkova
 Package-Title: org.perfsonar.perfsonarui.playground
-Package-Version: 0.9
+Package-Version: 0.11
 Package-Vendor: Nina Jeliazkova
\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2007-11-09 16:04:24 UTC (rev 3030)
@@ -124,7 +124,7 @@
                        protected  SwingCredentialListener l = new 
SwingCredentialListener();
                        @Override
                        public IPerfsonarRequest createMARequest(MAEndpoint 
endpoint) {
-                               return new PlaygroundRequest();
+                               return new PlaygroundRequest(endpoint);
                        }
                        @Override
                        public ICredentialsListener getCredentialsListener() {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
        2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
        2007-11-09 16:04:24 UTC (rev 3030)
@@ -32,6 +32,8 @@
 
 import org.perfsonar.perfsonarui.AbstractMARequest;
 import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.EchoMARequest;
+import org.perfsonar.perfsonarui.EchoSmartRequest;
 import org.perfsonar.perfsonarui.aa.AAPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -52,10 +54,24 @@
 
     
     public DocumentBuilderFactory factory;
+    protected AbstractMARequest echoRequest;
+    protected String messageType = MA_EchoRequest;
 
     public PlaygroundRequest() {
+        this(null);
+    }
+
+    public PlaygroundRequest(MAEndpoint endpoint) {
         super();
         factory = DocumentBuilderFactory.newInstance();
+        echoRequest = null;
+        try {
+               if (endpoint != null)
+                       echoRequest =  (EchoMARequest)new 
EchoSmartRequest().createMARequest(endpoint);
+        } catch (Exception x) {
+               logger.error(x);
+               echoRequest = null;
+        }
     }
 
     @Override
@@ -64,20 +80,22 @@
        uData.setResponse(null);
         Object o = uData.getQuery(AbstractUserData.DOCUMENT_QUERY);
         if ((o==null) || (AbstractUserData.NULL_DATA.equals(o))) {
-//             throw new Exception("Request not defined!");
-               o = getEchoRequest(); 
-               uData.setQuery(AbstractUserData.DOCUMENT_QUERY, o.toString());
-        }
-        
-        factory.setNamespaceAware(true);
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        if (o instanceof Document) return (Document)o; 
-        else try {
-               return builder.parse(new InputSource(new 
StringReader(o.toString())));
-               } catch (Exception x) {
-                       uData.setResponse(AbstractUserData.DOCUMENT_RESPONSE, 
x.toString());
-                       throw new Exception(x);
-               }
+
+               Document d =  getDemoRequest(uData, messageType);
+               
uData.setQuery(AbstractUserData.DOCUMENT_QUERY,AbstractMARequest.document2string(d));
+               return d;
+               
+        } else {
+               factory.setNamespaceAware(true);
+               DocumentBuilder builder = factory.newDocumentBuilder();
+               if (o instanceof Document) return (Document)o; 
+               else try {
+                       return builder.parse(new InputSource(new 
StringReader(o.toString())));
+                       } catch (Exception x) {
+                               
uData.setResponse(AbstractUserData.DOCUMENT_RESPONSE, x.toString());
+                               throw new Exception(x);
+                       }
+        }      
     }
 
     @Override
@@ -109,7 +127,11 @@
 
     }
 
-    protected String getEchoRequest() {
+    protected Document getDemoRequest(IUserData uData,String messageType) 
throws Exception {
+       if (echoRequest!= null)
+               return echoRequest.createRequest(uData, messageType);
+       else return null;
+       /*
        StringBuffer b = new StringBuffer();
        b.append("<nmwg:message type=\"EchoRequest\" id=\"id1\" 
xmlns:nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";>\n");
        b.append("\t<nmwg:metadata id=\"meta\">\n");
@@ -118,5 +140,6 @@
        b.append("\t<nmwg:data id=\"data\" metadataIdRef=\"meta\"/>\n");
        b.append("</nmwg:message>\n");
        return b.toString();
+       */
     }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-11-09 16:01:15 UTC (rev 3029)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-11-09 16:04:24 UTC (rev 3030)
@@ -21,6 +21,8 @@
 
 import java.awt.Component;
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Iterator;
 import java.util.List;
@@ -44,7 +46,6 @@
 import org.perfsonar.perfsonarui.ResponseData;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
-import org.perfsonar.perfsonarui.ma.ui.panels.MetricsOptionPanel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -54,7 +55,6 @@
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 import org.perfsonar.perfsonarui.ui.actions.ClearAction;
 import org.perfsonar.perfsonarui.ui.actions.EndpointsAction;
-import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
 import org.perfsonar.perfsonarui.ui.actions.MetadataRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.PSActionMap;
 import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
@@ -62,9 +62,7 @@
 import org.perfsonar.perfsonarui.ui.actions.SetOptionsAction;
 import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
-import org.perfsonar.perfsonarui.ui.panels.ActionPanel;
 import org.perfsonar.perfsonarui.ui.panels.RequestOptionsPanel;
-import org.perfsonar.perfsonarui.ui.panels.TimeOptionsPanel;
 
 
 /**
@@ -411,6 +409,13 @@
         .withDescription("URL for Visual Perfsonar")        
         .create( "r" );        
 
+       Option truststore   = OptionBuilder
+        .hasArg()
+        .withLongOpt("truststore")
+        .withArgName("URL")
+        .withDescription("URL for the temporary truststore necessary for 
SASL CA client")        
+        .create( "s" );        
+       
        Option help   = OptionBuilder
         .withLongOpt("help")
         .withDescription("This screen")              
@@ -421,6 +426,7 @@
        options.addOption(parallel);
        options.addOption(timeout);
        options.addOption(visualperfsonar);
+       options.addOption(truststore);
        options.addOption(help);
 
        return options;
@@ -452,6 +458,38 @@
     }
     
     protected void setOptions(CommandLine line) {
+           if( line.hasOption( 's' ) ) {
+               String url = line.getOptionValue( 's' );
+                   try {
+                       File file = new File("ClientSASLCA.jks");
+                       if (!file.exists()) {
+                               logger.info("Downloading "+url + " to 
"+file.getAbsolutePath());
+                               URL u = new URL(url);
+                               InputStream in = u.openStream();
+                               FileOutputStream out = new 
FileOutputStream(file);
+                                       byte[] bytes = new byte[512];
+                                       int len;
+                                       long count = 0;
+       //                               read() returns -1 on EOF
+                                       while ((len = in.read(bytes, 0, 
bytes.length)) >= 0) {
+                                               out.write(bytes, 0, len);
+                                               count += len;
+                                       }
+                                       out.flush();
+                                       out.close();
+                                       in.close();
+                       }
+                               
+                       
+                   } catch (Exception x) {
+                       try {
+                               logger.error(x);
+                       } catch (Exception ex) {
+                               logger.error(ex);
+                       }
+                   }
+           }
+           
        String url = "http://perfsonar.acad.bg/MA.conf";;
            if( line.hasOption( 'e' ) ) {
                url = line.getOptionValue( 'e' );

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java 
2007-11-09 16:01:15 UTC (rev 3029)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java 
2007-11-09 16:04:24 UTC (rev 3030)
@@ -46,8 +46,12 @@
 import javax.swing.border.BevelBorder;
 
 import org.apache.axis.AxisFault;
+import org.perfsonar.perfsonarui.PSErrorCodeException;
+import org.perfsonar.perfsonarui.PSException;
 import org.perfsonar.perfsonarui.PerfsonarResponseEvent;
+import org.perfsonar.perfsonarui.RequestInterruptedException;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
+import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 
 /**
@@ -219,12 +223,40 @@
     public void showErrorlog(Exception x) {
        if (x == null) return;
         JPanel p = new JPanel(new BorderLayout());
-        p.add(new JLabel(x.toString()),BorderLayout.NORTH);
+        
 
         JTextArea t;
+        String top = x.toString();
+        
+        if (x instanceof PSException) {
+               MAEndpoint mae = ((PSException)x).getMaEndpoint();
+               if (mae!=null) {
+                       top = mae.getTitle() +" " +mae.getEndpoint();
+               }       
+        };
+        p.add(new JLabel(top),BorderLayout.NORTH);
+        
         if (x instanceof AxisFault) {
             AxisFault axisFault = (AxisFault) x;
             t = new JTextArea(axisFault.dumpToString());
+            
+        } else if (x instanceof RequestInterruptedException) {
+               t = new JTextArea(x.getMessage());
+        } else if (x instanceof PSErrorCodeException) {
+               PSErrorCodeException  px = (PSErrorCodeException) x;
+               StringBuffer b = new StringBuffer();
+               if ((px.getErrorCode()!= null) 
&&(!"".equals(px.getErrorCode()))) {
+                       b.append("Error code \t");
+                       b.append(px.getErrorCode());
+                       b.append('\n');
+               }       
+               
+               if ((px.getErrordescription() != null) && 
(!"".equals(px.getErrordescription()))) {
+                       b.append("Error description \t");
+                       b.append(px.getErrordescription());
+                       b.append('\n');
+               }
+               t = new JTextArea(b.toString());
         } else {
                StringWriter w = new StringWriter();
                x.printStackTrace(new PrintWriter(w));