perfsonar development work

Author: nina
Date: 2007-10-30 13:00:15 -0400 (Tue, 30 Oct 2007)
New Revision: 3008

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/SwingCredentialListener.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
Log:
Final updates for AA - now functional! Try AAMARequestTest.java

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java 
      2007-10-30 15:39:38 UTC (rev 3007)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java 
      2007-10-30 17:00:15 UTC (rev 3008)
@@ -2,6 +2,7 @@
 
 import java.security.KeyPair;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.soap.SOAPBodyElement;
@@ -55,7 +56,7 @@
                        CAInterface cai = queryMDS(mds.getEndpoint());
                        if (cai == null) throw new PSException(new 
MAEndpoint("MDS,"),"No CA online");
                        int p = cai.getContactURL().lastIndexOf(':');
-                       String saslhost = 
cai.getContactURL().substring(0,p-1);
+                       String saslhost = cai.getContactURL().substring(0,p);
                        int saslport;
                        try {
                                saslport = 
Integer.parseInt(cai.getContactURL().substring(p+1,cai.getContactURL().length()));
@@ -64,7 +65,7 @@
                        }
                        
                        if (credentialsListener.getInput()) {
-                               
+                               
System.out.println("Querying\t"+saslhost+":"+saslport);
                                SASLCAClient client = 
querySASL(credentialsListener.getUserName(),
                                                
credentialsListener.getPassword(), saslhost, saslport);
                                //The method generateKeyPair() of the class 
SASLCAClient returns a new pair of private and public keys. 
@@ -107,20 +108,20 @@
                        List<BEMetaData> bes= null;
                        
                        bes = EduGAINMetadataService.getOrganizationList(mds);
-               
+                       ArrayList<CAInterface> idProviders = new 
ArrayList<CAInterface>();
                        for (int i=0; i<bes.size(); i++) {
                        BEMetaData be=bes.get(i);
-                          logger.info("Bridging Element 
"+be.getComponentID());
+                          //logger.info("Bridging Element 
"+be.getComponentID());
                                                   
                           CAInterface caonline=be.getCAInterface();
                           if (caonline!=null) {
+                                  idProviders.add(caonline);
                              logger.info("*** CA online: 
"+caonline.getContactURL() + "\t" + caonline.getDescription() + "\t" + 
caonline.getName());
                              
-                             return caonline;
                           }
                           
                        }
-                       return null;
+                       return 
credentialsListener.selectIdentityProvider(idProviders);
        }
        public ICredentialsListener getCredentialsListener() {
                return credentialsListener;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
     2007-10-30 15:39:38 UTC (rev 3007)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
     2007-10-30 17:00:15 UTC (rev 3008)
@@ -1,7 +1,14 @@
 package org.perfsonar.perfsonarui.aa;
 
+import java.awt.Component;
+import java.util.List;
+
+import net.geant.edugain.meta.metadata.CAInterface;
+
 public interface ICredentialsListener {
        boolean getInput();
        String getUserName();
        String getPassword();
-}
+       CAInterface selectIdentityProvider(List<CAInterface> idProviders);
+       void setDialogParentComponent(Component parent);
+}      
\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/SwingCredentialListener.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/SwingCredentialListener.java
  2007-10-30 15:39:38 UTC (rev 3007)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/SwingCredentialListener.java
  2007-10-30 17:00:15 UTC (rev 3008)
@@ -1,17 +1,23 @@
 package org.perfsonar.perfsonarui.aa;
 
+import java.awt.Component;
+import java.util.List;
+
 import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 
+import net.geant.edugain.meta.metadata.CAInterface;
+
 import org.jdesktop.layout.GroupLayout;
 import org.jdesktop.layout.GroupLayout.SequentialGroup;
 
 public class SwingCredentialListener extends JPanel implements 
ICredentialsListener{
        protected JFormattedTextField usernameField;
        protected JPasswordField passwordField;
+       protected Component parent = null;
        /**
         * 
         */
@@ -74,5 +80,24 @@
        public String getPassword() {
                return new String(passwordField.getPassword());
        }
+       public CAInterface selectIdentityProvider(List<CAInterface> 
idProviders) {
+               if (idProviders==null) return null;
+               if (idProviders.size() == 0) return null;
+               String[] idp = new String[idProviders.size()];
+               for (int i=0; i < idProviders.size();i++) 
+                       idp[i] = idProviders.get(i).getContactURL();
 
+               Object choice = JOptionPane.showInputDialog(parent, 
"","Select identity provider", 
+                               JOptionPane.PLAIN_MESSAGE, null, idp, 
idProviders.get(0));
+               
+               for (int i=0; i < idProviders.size();i++) 
+                       if (choice.equals(idProviders.get(i).getContactURL()))
+                               return idProviders.get(i);
+               return null;
+       }
+       
+
+       public void setDialogParentComponent(Component parent) {
+               this.parent = parent;
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java   
  2007-10-30 15:39:38 UTC (rev 3007)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java   
  2007-10-30 17:00:15 UTC (rev 3008)
@@ -140,8 +140,13 @@
                
metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupQuery);
                return metadataRequestAction;
        }
-
        @Override
+       public ITimeValueResponse createTimeValueResponseListener() {
+               //Simple version
+               //return new ResponseData();
+               return new CombinedTimeValueResponseListener();
+       }       
+       @Override
        /**
         * The string will appear on the tab. 
         */
@@ -155,13 +160,6 @@
                return Integer.MAX_VALUE;
        }
        
-       @Override
-       public ITimeValueResponse createTimeValueResponseListener() {
-               //Simple version
-               //return new ResponseData();
-               return new CombinedTimeValueResponseListener();
-       }
-       
        public PluginMainPanel createMainComponent(Component parentComponent) 
{
                return new DemoPluginMainPanel(parentComponent,this);
        }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
     2007-10-30 15:39:38 UTC (rev 3007)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
     2007-10-30 17:00:15 UTC (rev 3008)
@@ -16,7 +16,7 @@
        public void test() {
                try {
                IUserData data = new AbstractUserData();
-               data.setEndpoint(new 
MAEndpoint("TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2/services/TelnetSSH,lg,,lg,lg";));
+               data.setEndpoint(new 
MAEndpoint("TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2-1.2-dev/services/TelnetSSH,lg,,lg,lg";));
                FileAARequest request = new FileAARequest(
                                new File("data/aa/metadatarequest.xml")
                                        );