perfsonar development work

Author: nina
Date: 2007-11-08 12:21:46 -0500 (Thu, 08 Nov 2007)
New Revision: 3025

Added:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/JAXPCheck.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/RequestOptionsPanel.java
Removed:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RequestOptionsPanel.java
   branches/perfsonarui/src/overview.html.bak
   branches/perfsonarui/src/resources.files.bak
Modified:
   branches/perfsonarui/jnlp/perfsonar.jnlp
   branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/IAACapable.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/ippm/IPPMPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/SwingCredentialListenerTest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
Log:
Final (hopefully) modifications for AA support

Modified: branches/perfsonarui/jnlp/perfsonar.jnlp
===================================================================
--- branches/perfsonarui/jnlp/perfsonar.jnlp    2007-11-08 17:18:15 UTC (rev 
3024)
+++ branches/perfsonarui/jnlp/perfsonar.jnlp    2007-11-08 17:21:46 UTC (rev 
3025)
@@ -46,7 +46,6 @@
 
        <jar href="jars/axis/edugain-0.6.jar" download="lazy"/>
        <jar href="jars/axis/javolution-3.7.jar" download="lazy"/>
-       <jar href="jars/axis/jaxrpc.jar" download="lazy"/>
        <jar href="jars/axis/joda-time-1.4.jar" download="lazy"/>
 
 
@@ -54,10 +53,8 @@
        <jar href="jars/axis/opensaml-2.0-TP2-jdk-1.5.jar" download="lazy"/>
 
        <jar href="jars/axis/perfsonar-base-1.0.20071016.jar" 
download="lazy"/>
-       <jar href="jars/axis/saaj.jar" download="lazy"/>
 
        <jar href="jars/axis/sasl-ca-1.0.jar" download="lazy"/>
-       <jar href="jars/axis/wsdl4j-1.5.1.jar" download="lazy"/>
        <jar href="jars/axis/wss4j-1.5.3.jar" download="lazy"/>
        <jar href="jars/axis/xmlsec-1.4.1.jar" download="lazy"/>
        <jar href="jars/axis/xmltooling-1.0-TP2-jdk-1.5.jar" download="lazy"/>

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

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-11-08 17:18:15 UTC (rev 3024)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-11-08 17:21:46 UTC (rev 3025)
@@ -26,6 +26,7 @@
 import java.util.List;
 
 import org.perfsonar.perfsonarui.aa.IAACapable;
+import org.perfsonar.perfsonarui.aa.ICredentialsListener;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -58,12 +59,14 @@
  *
  */
 public abstract class SmartMARequest extends AbstractMARequest implements 
IAACapable {
+       protected String mds_url="http://mds.rediris.es:8080";;
        protected boolean aa_enabled = false;
        protected boolean parallel = true;
        protected int requestsRunning = 0;
        protected AbstractPerfsonarResponse propertyChangeListener;
        Hashtable<IPerfsonarSchema, PerfsonarRequestsPool> requestsPool;
        protected int MaxRequests = 16;
+       protected ICredentialsListener credentialsListener = null;
        
        //PerfsonarRequestsPool[] requestsPool = null;
 
@@ -210,8 +213,11 @@
                 if (newRequest == null) {
                     throw new Exception("Can't create request for 
"+endpoint);
                 }
-                if (newRequest instanceof IAACapable) 
+                if (newRequest instanceof IAACapable) { 
                        ((IAACapable)newRequest).setAAEnabled(isAAEnabled());
+                       ((IAACapable)newRequest).setMDS(getMDS());
+                       
((IAACapable)newRequest).setCredentialsListener(getCredentialsListener());
+                }      
                                newRequest.setTimeout(timeout);
                                pool.addConnection(newRequest);
                                request = pool.getRequest();
@@ -456,4 +462,19 @@
        public synchronized void setAAEnabled(boolean enable) {
                aa_enabled = enable;
        }
+       public String getMDS() {
+               return mds_url;
+       }
+       public void setMDS(String url) {
+               mds_url = url;
+               
+       }
+
+       public ICredentialsListener getCredentialsListener() {
+               return credentialsListener;
+       }
+
+       public void setCredentialsListener(ICredentialsListener 
credentialsListener) {
+               this.credentialsListener = credentialsListener;
+       }       
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java 
      2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java 
      2007-11-08 17:21:46 UTC (rev 3025)
@@ -22,6 +22,9 @@
 import org.perfsonar.perfsonarui.PSException;
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 
+
+
+
 /**
  * A request to be used when AA is required to access the service.
  * If 
{@link
 #isSkipAA()} is true:
@@ -41,6 +44,15 @@
  *
  */
 public abstract class AAPerfsonarRequest extends AbstractMARequest 
implements IAACapable {
+       /*
+       private static final String attributeComponentID="entityID";
+       private static final String elementOrganization="md:Organization";
+       private static final String 
elementOrganizationName="md:OrganizationName";
+       private static final String 
elementOrganizationDisplayName="md:OrganizationDisplayName";
+       private static final String 
elementOrganizationURL="md:OrganizationURL";
+       */
+       
+       protected String mds_url="http://mds.rediris.es:8080";;
        protected boolean aa_enabled = false;
        protected ICredentialsListener credentialsListener = null;
        public AAPerfsonarRequest() {
@@ -56,19 +68,22 @@
                                credentialsListener = new 
SwingCredentialListener();
                        }
                        
-                       MAEndpoint mds = new 
MAEndpoint("MDS,http://mds.rediris.es:8080,,,,mds,mds";);
-                       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);
-                       int saslport;
-                       try {
-                               saslport = 
Integer.parseInt(cai.getContactURL().substring(p+1,cai.getContactURL().length()));
-                       } catch (NumberFormatException x) {
-                               throw new PSException(mds,x);
-                       }
+                       MAEndpoint mds = new 
MAEndpoint("MDS,"+mds_url+",,,,mds,mds");
+                       List<CAInterface> idproviders = 
queryMDS(mds.getEndpoint());
+                       if (idproviders.size() == 0) throw new 
PSException(mds,"No CA online");
                        
-                       if (credentialsListener.getInput()) {
+
+                       CAInterface cai = 
credentialsListener.selectIdentityProvider(idproviders, "", "");
+                       if (cai != null) {
+                               
+                               int p = cai.getContactURL().lastIndexOf(':');
+                               String saslhost = 
cai.getContactURL().substring(0,p);
+                               int saslport;
+                               try {
+                                       saslport = 
Integer.parseInt(cai.getContactURL().substring(p+1,cai.getContactURL().length()));
+                               } catch (NumberFormatException x) {
+                                       throw new PSException(mds,x);
+                               }
                                
System.out.println("Querying\t"+saslhost+":"+saslport);
                                SASLCAClient client = 
querySASL(credentialsListener.getUserName(),
                                                
credentialsListener.getPassword(), saslhost, saslport);
@@ -106,13 +121,23 @@
                
 
        }
-       public CAInterface queryMDS(String mds) throws PerfSONARException{
-                       List<BEMetaData> bes= null;
+       public List<CAInterface> queryMDS(String mds) throws 
PerfSONARException{
+                       
System.setProperty("javax.xml.datatype.DatatypeFactory", 
"org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl");
+                       
System.setProperty("javax.xml.parsers.DocumentBuilderFactory", 
"org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
+                       
System.setProperty("javax.xml.parsers.SAXParserFactory", 
"org.apache.xerces.jaxp.SAXParserFactoryImpl");
+                       
System.setProperty("javax.xml.validation.SchemaFactory", 
"org.apache.xerces.jaxp.validation.XMLSchemaFactory");
+                       
System.setProperty("org.w3c.dom.DOMImplementationSourceList", 
"org.apache.xerces.dom.DOMXSImplementationSourceImpl");
+                       System.setProperty("org.xml.sax.driver", 
"org.apache.xerces.parsers.SAXParser");
+                       
System.setProperty("javax.xml.validation.SchemaFactory:http://www.w3.org/2001/XMLSchema","org.apache.xerces.jaxp.validation.XMLSchemaFactory";);
+
+                       //List<BEMetaData> bes= null;
+                       List<BEMetaData> bes = null;
                        
                        bes = EduGAINMetadataService.getOrganizationList(mds);
+                       //bes = getOrganizationList(mds);
                        ArrayList<CAInterface> idProviders = new 
ArrayList<CAInterface>();
                        for (int i=0; i<bes.size(); i++) {
-                       BEMetaData be=bes.get(i);
+                               BEMetaData be=bes.get(i);
                           //logger.info("Bridging Element 
"+be.getComponentID());
                                                   
                           CAInterface caonline=be.getCAInterface();
@@ -123,8 +148,33 @@
                           }
                           
                        }
-                       return 
credentialsListener.selectIdentityProvider(idProviders);
+                       return idProviders;
        }
+       /*
+       public static List<BEMetaData> getOrganizationList(String uriMds) 
throws PerfSONARException {
+               List<BEMetaData> list=new LinkedList<BEMetaData>();
+               try {
+                       MetaDataRequester requester=new MetaDataRequester();
+                       StringBuffer sb = requester.requestMetaData(new 
URL(uriMds));
+                       DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
+                       factory.setNamespaceAware(true);
+
+                       DocumentBuilder builder = 
factory.newDocumentBuilder();
+                       Document mdsInfo=builder.parse(new 
ByteArrayInputStream(sb.toString().getBytes()));
+                       
+                       NodeList nodelist = 
org.apache.xpath.XPathAPI.selectNodeList(mdsInfo, 
"//md:EntityDescriptor[@entityID]");
+                       for (int i=0; i<nodelist.getLength(); i++) {
+                               Element hbe=(Element)nodelist.item(i);
+                               BEMetaData m = new BEMetaData();
+                               
+                       }
+                       
+                       return list;
+               } catch (Exception e) {
+                       throw new 
PerfSONARException("error.as.mds_query","EduGAINMetadataService: a problem 
querying the MDS: "+e.getMessage());
+               }
+       }
+       */
        public ICredentialsListener getCredentialsListener() {
                return credentialsListener;
        }
@@ -137,4 +187,99 @@
        public synchronized void setAAEnabled(boolean enable) {
                this.aa_enabled = enable;
        }
+       public String getMDS() {
+               return mds_url;
+       }
+       public void setMDS(String url) {
+               mds_url = url;
+               
+       }
+       /*
+       public BEMetaData getBEMetaData(Element beElem) {
+               BEMetaData bmd = new BEMetaData();
+               bmd.setComponentID(beElem.getAttribute(attributeComponentID));
+               for (int i=0; i<beElem.getChildNodes().getLength(); i++) {
+                       Node elem=beElem.getChildNodes().item(i);
+                       if (elem.getNodeName().equals(elementOrganization)) {
+                               for (int j=0; 
j<elem.getChildNodes().getLength(); j++) {
+                                       if 
(elem.getChildNodes().item(j).getNodeName().equals(elementOrganizationName)) {
+                                               Element 
elemData=(Element)elem.getChildNodes().item(j);
+                                               
bmd.setOrganizationName(elemData.getTextContent());
+                                       }
+                                       else if 
(elem.getChildNodes().item(j).getNodeName().equals(elementOrganizationDisplayName))
 {
+                                               Element 
elemData=(Element)elem.getChildNodes().item(j);
+                                               
setOrganizationDisplayName(elemData.getTextContent());
+                                       }
+                                       else if 
(elem.getChildNodes().item(j).getNodeName().equals(elementOrganizationURL)) {
+                                               Element 
elemData=(Element)elem.getChildNodes().item(j);
+                                               
bmd.setOrganizationURL(elemData.getTextContent());
+                                       }
+                               }
+                       }
+               }
+       }
+       */
+       /*
+       public Object addX509STInMessage(Object message,PrivateKey 
privateKey,X509Certificate cert) throws PerfSONARException {
+               if (!(message instanceof SOAPBodyElement)) {
+                       throw new 
PerfSONARException("error.as.body","WSSAuthNData: the method 
addX509STInMessage requires a SOAPBodyElement object");
+               }
+               SOAPBodyElement body=(SOAPBodyElement)message;
+
+        SOAPEnvelope envelope = new org.apache.axis.message.SOAPEnvelope();
+        
((org.apache.axis.message.SOAPEnvelope)envelope).addBodyElement(body);
+
+        // add the security provider
+       BouncyCastleProvider bcp = new BouncyCastleProvider();
+        java.security.Security.addProvider((Provider)bcp);
+
+        Crypto crypto = null;
+        try {
+               crypto = new DynamicCrypto();
+        } catch (CredentialException e) {
+               throw new PerfSONARException("error.as.crypto","WSSAuthNData: 
"+e.getMessage());
+        }
+        KeyStore ks=crypto.getKeyStore();
+
+        try {
+               ks.setKeyEntry("xmlsec", (Key)privateKey, 
"security".toCharArray(), new Certificate[]{(Certificate)cert});
+        } catch (KeyStoreException e) {
+               throw new PerfSONARException("error.as.crypto","WSSAuthNData: 
"+e.getMessage());
+        }
+
+        try {
+            // Adding the certificate using WSS
+            WSSecSignature sec509 = new WSSecSignature();
+            sec509.setUserInfo("xmlsec", "security");
+            SOAPConstants soapConstants = 
WSSecurityUtil.getSOAPConstants(envelope.getAsDOM());
+            Vector<WSEncryptionPart> parts = new 
Vector<WSEncryptionPart>(1,1);
+
+            // Set up to use STRTransorm to sign the signature token
+            WSEncryptionPart encP =
+                new WSEncryptionPart(
+                    "STRTransform",
+                    soapConstants.getEnvelopeURI(),
+                    "Content");
+            parts.add(encP);
+
+            sec509.setParts(parts);
+            sec509.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+
+            Document doc = envelope.getAsDocument();
+            WSSecHeader secHeader = new WSSecHeader();
+            secHeader.setActor("ac");
+            secHeader.insertSecurityHeader(doc);
+
+            // Signing the message
+            Document signedDoc = sec509.build(doc, crypto, secHeader);
+
+            Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+            envelope = signedMsg.getSOAPEnvelope();
+        } catch (Exception e) {
+               throw new 
PerfSONARException("error.as.signing","WSSAuthNData: "+e.getMessage());
+        }
+
+        return envelope;
+       }
+       */
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/IAACapable.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/IAACapable.java     
  2007-11-08 17:18:15 UTC (rev 3024)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/IAACapable.java     
  2007-11-08 17:21:46 UTC (rev 3025)
@@ -27,6 +27,10 @@
 public interface IAACapable {
        public boolean isAAEnabled();
        public void setAAEnabled(boolean enable);
+       String getMDS();
+       void setMDS(String url);
+       public ICredentialsListener getCredentialsListener();
+       public void setCredentialsListener(ICredentialsListener 
credentialsListener);
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
     2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
     2007-11-08 17:21:46 UTC (rev 3025)
@@ -6,9 +6,8 @@
 import net.geant.edugain.meta.metadata.CAInterface;
 
 public interface ICredentialsListener {
-       boolean getInput();
-       String getUserName();
-       String getPassword();
-       CAInterface selectIdentityProvider(List<CAInterface> idProviders);
+       CAInterface selectIdentityProvider(List<CAInterface> idProviders, 
String username, String userPass);
        void setDialogParentComponent(Component parent);
+       public String getUserName();
+       public String getPassword();
 }      
\ 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-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/SwingCredentialListener.java
  2007-11-08 17:21:46 UTC (rev 3025)
@@ -1,8 +1,11 @@
 package org.perfsonar.perfsonarui.aa;
 
 import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.List;
 
+import javax.swing.JComboBox;
 import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -17,7 +20,9 @@
 public class SwingCredentialListener extends JPanel implements 
ICredentialsListener{
        protected JFormattedTextField usernameField;
        protected JPasswordField passwordField;
+       protected JComboBox idProvidersBox;
        protected Component parent = null;
+       protected String url = "";
        /**
         * 
         */
@@ -26,6 +31,16 @@
                addWidgets();
        }
        protected void addWidgets() {
+               
+               JLabel idpLabel = new JLabel("Identity provider");
+               idProvidersBox = new JComboBox();
+               idProvidersBox.addActionListener(new ActionListener() {
+                       public void actionPerformed(ActionEvent e) {
+                       JComboBox cb = (JComboBox)e.getSource();
+                       url = (String)cb.getSelectedItem();
+                       }
+               });
+               
                JLabel usernameLabel = new JLabel("User");
                JLabel passwordLabel = new JLabel("Password");
                usernameField = new JFormattedTextField();
@@ -39,12 +54,14 @@
 
                
                SequentialGroup sg = glayout.createSequentialGroup();
+
            sg.add(glayout.createParallelGroup(GroupLayout.LEADING)
+                       .add(idpLabel)
                            .add(usernameLabel)
                            .add(passwordLabel)                     
-
                        );
            sg.add(glayout.createParallelGroup(GroupLayout.LEADING)
+                       .add(idProvidersBox)
                            .add(usernameField)
                            .add(passwordField)
                        );
@@ -52,7 +69,11 @@
                glayout.setHorizontalGroup(sg);
 
                SequentialGroup sg1 = glayout.createSequentialGroup();
-               sg1.add(glayout.createParallelGroup(GroupLayout.BASELINE)
+           sg1.add(glayout.createParallelGroup(GroupLayout.BASELINE)
+                       .add(idpLabel)
+                           .add(idProvidersBox)
+                       );                      
+               sg1.add(glayout.createParallelGroup(GroupLayout.LEADING)
                            .add(usernameLabel)
                                .add(usernameField)                         
                            
@@ -63,11 +84,6 @@
                                    );
                glayout.setVerticalGroup(sg1);
        }
-       public boolean getInput() {
-               return JOptionPane.showConfirmDialog(null,this,"Enter 
",JOptionPane.OK_CANCEL_OPTION,JOptionPane.PLAIN_MESSAGE,null)
-                       == JOptionPane.OK_OPTION;
-               
-       }
        /**
         * Run 
{@link
 #getInput()} to launch user/password entry dialog.
         */
@@ -80,19 +96,24 @@
        public String getPassword() {
                return new String(passwordField.getPassword());
        }
-       public CAInterface selectIdentityProvider(List<CAInterface> 
idProviders) {
+       public CAInterface selectIdentityProvider(List<CAInterface> 
idProviders, String username, String userPass) {
                if (idProviders==null) return null;
                if (idProviders.size() == 0) return null;
-               String[] idp = new String[idProviders.size()];
+               usernameField.setText(username);
+               passwordField.setText(userPass);
+               idProvidersBox.removeAllItems();
                for (int i=0; i < idProviders.size();i++) 
-                       idp[i] = idProviders.get(i).getContactURL();
+                       
idProvidersBox.addItem(idProviders.get(i).getContactURL());
 
-               Object choice = JOptionPane.showInputDialog(parent, 
"","Select identity provider", 
-                               JOptionPane.PLAIN_MESSAGE, null, idp, 
idProviders.get(0));
+               idProvidersBox.setSelectedIndex(0);
+               url = idProvidersBox.getItemAt(0).toString();
                
+               JOptionPane.showMessageDialog(parent, this, "Enter 
credentials", JOptionPane.PLAIN_MESSAGE, null);
+
                for (int i=0; i < idProviders.size();i++) 
-                       if (choice.equals(idProviders.get(i).getContactURL()))
+                       if (url.equals(idProviders.get(i).getContactURL()))
                                return idProviders.get(i);
+       
                return null;
        }
        

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2007-11-08 17:21:46 UTC (rev 3025)
@@ -274,7 +274,7 @@
      * The smaller numbers come first. 
      */
        public int getOrder() {
-               return 20;
+               return 4;
        }
 
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-11-08 17:21:46 UTC (rev 3025)
@@ -25,13 +25,11 @@
 package org.perfsonar.perfsonarui.lookingglass;
 
 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;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
@@ -39,7 +37,10 @@
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 
+import com.sun.org.apache.xml.internal.serialize.OutputFormat;
+import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
 
+
 /**
  *  @author Stijn Melis
  *  @author Nina Jeliazkova (skeleton framework)

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-11-08 17:21:46 UTC (rev 3025)
@@ -10,12 +10,6 @@
 
 package org.perfsonar.perfsonarui.lookingglass.model;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -25,22 +19,9 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.EventListenerList;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.rpc.ServiceException;
 
-import org.apache.axis.client.Call;
-import org.apache.axis.client.Service;
-import org.apache.axis.message.MessageElement;
-import org.apache.axis.message.SOAPBodyElement;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.jdom.Namespace;
 import org.jdom.input.DOMBuilder;
-import org.perfsonar.perfsonarui.AbstractMARequest;
 import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 /**
  * Main model class for the application

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-11-08 17:21:46 UTC (rev 3025)
@@ -47,7 +47,6 @@
 import org.perfsonar.perfsonarui.ma.ui.actions.TracerouteAction;
 import org.perfsonar.perfsonarui.ma.ui.panels.MainPanelMA;
 import org.perfsonar.perfsonarui.ma.ui.panels.MetricsOptionPanel;
-import org.perfsonar.perfsonarui.ma.ui.panels.RequestOptionsPanel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -66,6 +65,7 @@
 import org.perfsonar.perfsonarui.ui.panels.InterfaceUtilizationSeries;
 import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeries;
 import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeriesDataset;
+import org.perfsonar.perfsonarui.ui.panels.RequestOptionsPanel;
 import org.perfsonar.perfsonarui.ui.panels.ResponseDetailsPane;
 import org.perfsonar.perfsonarui.ui.panels.TimeOptionsPanel;
 
@@ -381,7 +381,7 @@
      * returns 10. Used when sorting 
{@link
 PerfsonarTabsList}. The order reflects the order in which the tabs will 
appear. 
      */
     public int getOrder() {
-       return 10;
+       return 2;
     }
     public synchronized String getCurrentEventType() {
         return currentEventType;

Deleted: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RequestOptionsPanel.java

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2007-11-08 17:21:46 UTC (rev 3025)
@@ -30,7 +30,8 @@
 import org.perfsonar.perfsonarui.AbstractUserData;
 import org.perfsonar.perfsonarui.IPerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
-import org.perfsonar.perfsonarui.ma.ui.panels.RequestOptionsPanel;
+import org.perfsonar.perfsonarui.aa.ICredentialsListener;
+import org.perfsonar.perfsonarui.aa.SwingCredentialListener;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -43,6 +44,7 @@
 import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.SelectOneEndpointAction;
+import org.perfsonar.perfsonarui.ui.panels.RequestOptionsPanel;
 
 /**
  * Simple instance of 
{@link
 IPerfsonarTab}. 
@@ -119,10 +121,15 @@
        protected SmartMARequest createSmartRequest() {
                if (request != null) return request;
                return new SmartMARequest() {
+                       protected  SwingCredentialListener l = new 
SwingCredentialListener();
                        @Override
                        public IPerfsonarRequest createMARequest(MAEndpoint 
endpoint) {
                                return new PlaygroundRequest();
                        }
+                       @Override
+                       public ICredentialsListener getCredentialsListener() {
+                               return l;
+                       }
                };
        }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/SwingCredentialListenerTest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/SwingCredentialListenerTest.java
 2007-11-08 17:18:15 UTC (rev 3024)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/SwingCredentialListenerTest.java
 2007-11-08 17:21:46 UTC (rev 3025)
@@ -1,19 +1,35 @@
 package org.perfsonar.perfsonarui.test.aa;
 
-import org.perfsonar.perfsonarui.aa.SwingCredentialListener;
+import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.TestCase;
 
+import net.geant.edugain.meta.metadata.CAInterface;
+
+import org.perfsonar.perfsonarui.aa.ICredentialsListener;
+import org.perfsonar.perfsonarui.aa.SwingCredentialListener;
+
 public class SwingCredentialListenerTest extends TestCase {
 
        /*
         * Test method for 
'org.perfsonar.aa.SwingCredentialListener.getInput()'
         */
        public void testGetInput() {
-               SwingCredentialListener l = new SwingCredentialListener();
-               if (l.getInput()) {
-                       System.out.println(l.getUserName());
-                       System.out.println(l.getPassword());
+               ICredentialsListener l = new SwingCredentialListener();
+               String username ="";
+               String userPass ="";
+               List<CAInterface> idProviders = new ArrayList<CAInterface>();
+               CAInterface cai = new CAInterface();
+               cai.setContactURL("test1");
+               idProviders.add(cai);
+               cai = new CAInterface();
+               cai.setContactURL("test2");
+               idProviders.add(cai);
+               cai = l.selectIdentityProvider(idProviders, username, 
userPass);
+               if (cai != null){
+                       System.out.println(username);
+                       System.out.println(userPass);
                }
        }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT     
  2007-11-08 17:18:15 UTC (rev 3024)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT     
  2007-11-08 17:21:46 UTC (rev 3025)
@@ -1,6 +1,6 @@
 Manifest-version: 1.0
 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
+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.20071016.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.11
 Specification-Vendor: perfsonar.acad.bg

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2007-11-08 17:18:15 UTC (rev 3024)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2007-11-08 17:21:46 UTC (rev 3025)
@@ -45,15 +45,17 @@
 import javax.swing.plaf.metal.DefaultMetalTheme;
 import javax.swing.plaf.metal.MetalLookAndFeel;
 import javax.swing.plaf.metal.OceanTheme;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.perfsonar.perfsonarui.AbstractMARequest;
+import org.perfsonar.perfsonarui.JAXPCheck;
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.SmartMARequest;
-//import org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab;
+import org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab;
 import org.perfsonar.perfsonarui.demo.DemoPlugin;
 import org.perfsonar.perfsonarui.demo.DemoPluginMainPanel;
 import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
-import org.perfsonar.perfsonarui.lookingglass.LookingGlassTab;
 import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
 import org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -152,6 +154,8 @@
 
                
                PSLogger.configureLog4j(false);
+               String sp = "java.endorsed.dirs";
+               logger.debug(sp + "\t" + System.getProperty(sp));
         mainFrame = new JFrame(title);
                ImageIcon icon = 
ActionPanel.createImageIcon("org/perfsonar/perfsonarui/ui/PerfSONAR_icon.png");
                if (icon != null)
@@ -191,18 +195,22 @@
         JMenuBar menuBar = new JMenuBar();
         menuBar.add(createFileMenu());
         for (int i=0; i < perfsonarTabs.size();i++) {
-            IPerfsonarTab tab = ((IPerfsonarTab) perfsonarTabs.get(i));
-            PerfsonarTaskPane pane = new PerfsonarTaskPane(tab);
-            menuBar.add(pane.getMenu());
-            tPane.addTab(tab.toString(),pane);
-
-            PSActionMap actions = tab.getActions();
-            Object[] keys = actions.keys();
-            for (int j=0; j < keys.length; j++) {
-               Action a = actions.get(keys[j]);
-               if ((a!=null) && (a instanceof PSUIAction))
-                       ((PSUIAction)a).setFrame(mainFrame);
-            }  
+               try {
+                   IPerfsonarTab tab = ((IPerfsonarTab) 
perfsonarTabs.get(i));
+                   PerfsonarTaskPane pane = new PerfsonarTaskPane(tab);
+                   menuBar.add(pane.getMenu());
+                   tPane.addTab(tab.toString(),pane);
+       
+                   PSActionMap actions = tab.getActions();
+                   Object[] keys = actions.keys();
+                   for (int j=0; j < keys.length; j++) {
+                       Action a = actions.get(keys[j]);
+                       if ((a!=null) && (a instanceof PSUIAction))
+                               ((PSUIAction)a).setFrame(mainFrame);
+                   }   
+               } catch (Throwable x) {
+                       logger.error(x);
+               }
                
         }
                menuBar.add(createAboutMenu());
@@ -249,11 +257,9 @@
            tab.setParameters(cmdOpts);
            perfsonarTabs.add(tab);
 
-           /*
            tab = new BWCTLPerfsonarTab();
            tab.setParameters(cmdOpts);
            perfsonarTabs.add(tab);
-           */
            //for testing purposes only
            /*
            tab = new LookingGlassTab();
@@ -337,7 +343,64 @@
                }
         }) ;
         
-          
+        menu.add(new AbstractAction("XML parser") {
+               public void actionPerformed(ActionEvent e) {
+                       try {
+                               StringBuffer b = new StringBuffer();
+                               
+                               String sp = "java.endorsed.dirs";
+                               b.append(sp);
+                               b.append('=');
+                               b.append(System.getProperty(sp));
+                               b.append('\n');
+                               String ok = JAXPCheck.verifyUsableXmlParser();
+                               org.apache.xml.security.Init.init();
+
+                               b.append(ok);
+                               DocumentBuilderFactory dbf = 
DocumentBuilderFactory.newInstance();
+                               DocumentBuilder db = dbf.newDocumentBuilder();
+                               b.append("\nCurrent properties\n");
+                               getXmlProperties(b);
+                               b.append(db.getClass());
+                               b.append('\n');
+                               
+                               
System.setProperty("javax.xml.datatype.DatatypeFactory", 
"org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl");
+                               
System.setProperty("javax.xml.parsers.DocumentBuilderFactory", 
"org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
+                               
System.setProperty("javax.xml.parsers.SAXParserFactory", 
"org.apache.xerces.jaxp.SAXParserFactoryImpl");
+                               
System.setProperty("javax.xml.validation.SchemaFactory", 
"org.apache.xerces.jaxp.validation.XMLSchemaFactory");
+                               
System.setProperty("org.w3c.dom.DOMImplementationSourceList", 
"org.apache.xerces.dom.DOMXSImplementationSourceImpl");
+                               System.setProperty("org.xml.sax.driver", 
"org.apache.xerces.parsers.SAXParser");
+                               
System.setProperty("javax.xml.validation.SchemaFactory:http://www.w3.org/2001/XMLSchema","org.apache.xerces.jaxp.validation.XMLSchemaFactory";);
 
+                               
+                               DocumentBuilderFactory dbf2 = 
DocumentBuilderFactory.newInstance();
+                               DocumentBuilder db2 = 
dbf2.newDocumentBuilder();
+                               b.append("\nProperties just set\n");
+                               getXmlProperties(b);
+                               b.append(db2.getClass());
+                               
+                               
+                               
JOptionPane.showMessageDialog(mainFrame,b.toString(),"XML 
Parser",JOptionPane.PLAIN_MESSAGE);
+                       } catch (Exception x) {
+                               logger.error(x);
+                               
JOptionPane.showMessageDialog(mainFrame,x,"XML 
Parser",JOptionPane.ERROR_MESSAGE);      
+                       }
+                       
+               }
+        });
+
+        menu.add(new AbstractAction("Endorsed dirs test") {
+               public void actionPerformed(ActionEvent e) {
+                       try {
+                               String sp = "java.endorsed.dirs";
+                               
JOptionPane.showMessageDialog(mainFrame,System.getProperty(sp),sp,JOptionPane.PLAIN_MESSAGE);
+                       } catch (Exception x) {
+                               logger.error(x);
+                               
JOptionPane.showMessageDialog(mainFrame,x,"XML 
Parser",JOptionPane.ERROR_MESSAGE);      
+                       }
+                       
+               }
+        });                  
+
        return menu;
         
     }
@@ -450,5 +513,23 @@
    }
        
        
-
+       private void getXmlProperties(StringBuffer b) {
+               String[] p = {
+                               "javax.xml.datatype.DatatypeFactory",
+                               "javax.xml.parsers.DocumentBuilderFactory",
+                               "javax.xml.parsers.SAXParserFactory",
+                               "javax.xml.validation.SchemaFactory",
+                               "org.w3c.dom.DOMImplementationSourceList",
+                               "org.xml.sax.driver",
+                               
"javax.xml.validation.SchemaFactory:http://www.w3.org/2001/XMLSchema";
+               };
+               for (int i=0; i<p.length;i++) {
+                       b.append(p[i]);
+                       b.append('=');
+                       b.append(System.getProperty(p[i]));
+                       b.append('\n');
+               }
+               
+               
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-11-08 17:18:15 UTC (rev 3024)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-11-08 17:21:46 UTC (rev 3025)
@@ -45,7 +45,6 @@
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
 import org.perfsonar.perfsonarui.ma.ui.panels.MetricsOptionPanel;
-import org.perfsonar.perfsonarui.ma.ui.panels.RequestOptionsPanel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -64,6 +63,7 @@
 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;
 
 

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/RequestOptionsPanel.java

Deleted: branches/perfsonarui/src/overview.html.bak

Deleted: branches/perfsonarui/src/resources.files.bak