perfsonar development work

Author: nina
Date: 2008-06-24 11:26:43 -0400 (Tue, 24 Jun 2008)
New Revision: 4055

Added:
   branches/perfsonarui/dist/PerfsonarUI-v0.12a.zip
Modified:
   branches/perfsonarui/ant/build.xml
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/SearchPanel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
Log:
perfsonarUI 0.12a with gLS enabled Traceroute

Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml  2008-06-24 13:26:20 UTC (rev 4054)
+++ branches/perfsonarui/ant/build.xml  2008-06-24 15:26:43 UTC (rev 4055)
@@ -22,7 +22,7 @@
 -->
 <project basedir="../" default="all" name="perfsonar">
 
-       <property name="version" value="0.12" />
+       <property name="version" value="0.12a" />
     <!-- compile options -->
      <property name="build.sysclasspath" value="ignore" />
      <property name="build.compiler" value="modern" />

Added: branches/perfsonarui/dist/PerfsonarUI-v0.12a.zip


Property changes on: branches/perfsonarui/dist/PerfsonarUI-v0.12a.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
      2008-06-24 13:26:20 UTC (rev 4054)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SearchByIPAction.java
      2008-06-24 15:26:43 UTC (rev 4055)
@@ -26,6 +26,7 @@
 
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.ls.Lookup;
 import org.perfsonar.perfsonarui.ma.UpdateListResponseListener;
 import org.perfsonar.perfsonarui.ma.UserData;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -42,6 +43,7 @@
 public class SearchByIPAction extends SetupDataRefreshActionAll {
     //protected MetaDataList searchList = null;
     protected Vector searchText = null;
+       protected static boolean useGLS= false;    
     /**
      * Comment for <code>serialVersionUID</code>
      */
@@ -111,108 +113,50 @@
         return list;
     }
     
-    /*
-       public void run(ActionEvent arg0) {
-               setSearchList(searchText);
-               if (request == null) return;
+    
+       @Override
+       public Object run(ActionEvent arg0) {
                
+               if (request == null) return null; //TODO check if this should 
silently fail
+               
                        dataList.clear();
+                       updateSearchList(searchText, dataList);
                        
-                       int count = 0;
-                       boolean added = false;
-                       
-            
-                       for (int j=0;j<searchList.size();j++) {
-                               if (interrupted) break;
-                           IUserData searchData = searchList.get(j);
-                           searchData.lastDay();
-                           added = false;
+                       if (isUseGLS()) {
+                               Lookup lookup =new Lookup();
+                               try {
+                                       lookup.lookup(dataList);
+                               } catch (Exception x) {
+                                       
request.fireStatusMessage(x.getMessage());
+                                       
request.fireAxisCallException(dataList, x);
+                                       return null;
+                               }
+                       } else {
+                                       
+                               //the old way of looking through the endpoints
                                for (int i=0; i < endpoints.size();i++) {
-                                       if (interrupted) break;
+                                       if (isInterrupted()) break;
                                    MAEndpoint mae = endpoints.get(i);
                                    if (mae.isEnabled()) {
-                                               searchData.setEndpoint(mae);  
                          
-                                               
request.fireStatusMessage("Sending request to "+ searchData.getEndpoint());
+                                       MetaDataList searchList =  
getSearchList(searchText);    
+                                               
request.fireStatusMessage("Sending request to "+ mae);
                                                try {
                                                        
//request.makeSearchRequest(searchData,dataList);
-                             for (int k=0; k < dataList.size();k++) {
-                                    UserData data = 
(UserData)dataList.get(k);
-                                    
data.setDirection(UserData.DIRECTION_UNKNOWN);
-                             }                            
-                                                       request.makeRequest( 
searchData, IPerfsonarRequest.MA_MetadataKeyRequest, new 
MetadataListResponseListener(dataList), false);
-                                                       if (dataList.size() > 
count) {
-                                                               added = true;
-                                                               count = 
dataList.size();
-                                                               break;
-                                                       }
-                                                       
request.fireStatusMessage("Received response from "+ 
searchData.getEndpoint());
+       
+                                                       for (int e=0; e < 
searchList.size();e++)
+                                                               
searchList.get(e).setEndpoint(mae);
                                                        
+                               request.makeRequest(mae,searchList, 
IPerfsonarRequest.MA_MetadataKeyRequest, new 
UpdateListResponseListener(dataList), true);
+                                                       
                                                } catch (Exception x) {
-                                                   
request.fireStatusMessage("Error when quering "+ searchData.getEndpoint());
-                                                       if 
(JOptionPane.showConfirmDialog(frame,
-                                                               
x.getMessage() + "\nContinue querying this service?"
-                                                               ,"Please 
confirm",
-                                                               
JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE) == 
JOptionPane.NO_OPTION)
-                                                          
mae.setEnabled(false);
-
+                                                       logger.error(x);
                                                }
                                    }
-                               }
-                               if (!added) dataList.add(searchData);
-                               count = dataList.size();
-                               
+                               }    
+                   
+                               if (request instanceof SmartMARequest)
+                                   ((SmartMARequest) request).isReady();
                        }
-                       request.fireStatusMessage("Metadata retrieved");
-                       //actions.getJobStatus().setPercent(0);
-                       //actions.getJobStatus().setIndeterminate(false);     
                  
-                       request.fireStatusMessage("Preparing queries for each 
interface ...");
-
-                       //long timeNow = 
Calendar.getInstance(TimeZone.getDefault()).getTimeInMillis()/1000 - 600;
-                       for (int i=0; i < dataList.size();i++) {
-//                             responce --> query
-                               dataList.get(i).makeQueryFromResponse();
-                               dataList.get(i).lastHour();
-                       }
-                       request.fireStatusMessage("Data retrieved from " + 
dataList.size() + " interfaces.");                   
-                       if (!interrupted) {
-                           super.run(arg0);
-                       } else {
-                           request.fireStatusMessage("Query cancelled. Data 
retrieved from " + dataList.size() + " interfaces.");                         
     
-                       }
-       }
-       */
-
-       @Override
-       public Object run(ActionEvent arg0) {
-               
-               if (request == null) return null; //TODO check if this should 
silently fail
-               
-                       dataList.clear();
-                       updateSearchList(searchText, dataList);
-                       //dataList.sortBy(-1);
-                       for (int i=0; i < endpoints.size();i++) {
-                               if (isInterrupted()) break;
-                           MAEndpoint mae = endpoints.get(i);
-                           if (mae.isEnabled()) {
-                               MetaDataList searchList =  
getSearchList(searchText);    
-                                       request.fireStatusMessage("Sending 
request to "+ mae);
-                                       try {
-                                               
//request.makeSearchRequest(searchData,dataList);
-
-                                               for (int e=0; e < 
searchList.size();e++)
-                                                       
searchList.get(e).setEndpoint(mae);
-                                               
-                        request.makeRequest(mae,searchList, 
IPerfsonarRequest.MA_MetadataKeyRequest, new 
UpdateListResponseListener(dataList), true);
-                                               
-                                       } catch (Exception x) {
-                                               logger.error(x);
-                                       }
-                           }
-                       }    
-            
-                       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 ...");
@@ -240,4 +184,12 @@
     public synchronized void setSearchText(Vector searchText) {
         this.searchText = searchText;
     }
+       public boolean isUseGLS() {
+               return useGLS;
+       }
+
+       public void setUseGLS(boolean useGLS) {
+               
+               this.useGLS = useGLS;
+       }    
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
      2008-06-24 13:26:20 UTC (rev 4054)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
      2008-06-24 15:26:43 UTC (rev 4055)
@@ -40,6 +40,7 @@
        private static final long serialVersionUID = 8090077760328367182L;
        protected TracerouteShell shell;
 
+
        public TracerouteAction(IPerfsonarRequest request, UserData userData,
                        MetaDataList dataList, MAEndpointList endpoints, 
Vector searchText,TracerouteShell shell,
                        String arg0) {
@@ -67,6 +68,8 @@
                }
                return null;
        }
+
+
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/SearchPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/SearchPanel.java
    2008-06-24 13:26:20 UTC (rev 4054)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/SearchPanel.java
    2008-06-24 15:26:43 UTC (rev 4055)
@@ -21,6 +21,8 @@
 
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
@@ -28,6 +30,7 @@
 
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -98,14 +101,24 @@
        super.addWidgets(title);
        textArea.setToolTipText("Enter one IP address per row or paste a 
traceroute output");
     }
-    protected JComponent createMenuPanel(MAPerfsonarModel psModel) {
+    protected JComponent createMenuPanel(final MAPerfsonarModel psModel) {
        JToolBar bar = new JToolBar(SwingConstants.VERTICAL);
        bar.add(new JButton(loadFromFileAction));
        bar.add(new JButton(pasteAction));
        bar.add(new JButton(psModel.getSearchAction()));
        bar.add(new JButton(psModel.getTraceAction()));
+       JCheckBox gls = new JCheckBox("Use Lookup Service");
+       gls.setSelected(psModel.getTraceAction().isUseGLS());
+       gls.addItemListener(new ItemListener() {
+               public void itemStateChanged(ItemEvent e) {
+                       psModel.getTraceAction().setUseGLS(
+                                       e.getStateChange() == 
ItemEvent.SELECTED
+                                       );
+                       
System.out.println(psModel.getTraceAction().isUseGLS());
+               }
+       });
+       bar.add(gls);
 
-
        return bar;
     }
     /*

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT     
  2008-06-24 13:26:20 UTC (rev 4054)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT     
  2008-06-24 15:26:43 UTC (rev 4055)
@@ -2,11 +2,11 @@
 Main-Class: org.perfsonar.perfsonarui.ui.PerfSonarApp
 Class-Path: jars/ui/swing-layout-1.0.jar jars/axis/saaj.jar 
jars/axis/axis.jar jars/axis/axis-ant.jar jars/axis/commons-discovery-0.2.jar 
jars/axis/commons-logging-1.0.4.jar jars/axis/jaxrpc.jar 
jars/axis/log4j-1.2.15.jar jars/axis/wsdl4j-1.5.1.jar jars/xml/activation.jar 
jars/xml/mail.jar jars/xml/jdom.jar jars/ui/jcommon-1.0.10.jar 
jars/ui/jfreechart-1.0.6.jar jars/l2fprod/l2fprod-common-all.jar 
jars/xml/commons-cli-1.0.jar jars/dns/dnsjava-2.0.3.jar 
jars/axis/codec-1.0.jar jars/axis/bcprov-jdk15-138.jar 
jars/axis/edugain-0.6.jar jars/axis/javolution-3.7.jar 
jars/axis/joda-time-1.4.jar jars/axis/opensaml1-1.1.jar 
jars/axis/opensaml-2.0-TP2-jdk-1.5.jar 
jars/axis/perfsonar-base-1.0.20080225.jar jars/axis/sasl-ca-1.0.jar 
jars/axis/wsdl4j-1.5.1.jar jars/axis/wss4j-1.5.3.jar 
jars/axis/xmlsec-1.4.1.jar jars/axis/xmltooling-1.0-TP2-jdk-1.5.jar 
jars/xalan/xalan-2.7.0.jar jars/xalan/xalan-serializer-2.7.0.jar 
jars/xalan/xercesImpl-2.8.0.jar jars/xalan/xerces-xml-apis-2.8.0.jar
 Specification-Title: perfSonar test application
-Specification-Version: 0.12
+Specification-Version: 0.12a
 Specification-Vendor: perfsonar.acad.bg
 Package-Title: org.perfsonar.perfsonarui
-Package-Version: 0.12
+Package-Version: 0.12a
 Package-Vendor: acad.bg
 Implementation-Title: Perfsonar UI
-Implementation-Version: 0.12
+Implementation-Version: 0.12a
 Implementation-Vendor: 

\ No newline at end of file