perfsonar development work

Author: rodriguez
Date: 2008-09-24 06:19:05 -0400 (Wed, 24 Sep 2008)
New Revision: 4541

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
Log:
- EduGAINMetadataService class is able to send queries to MDS using eduGAIN 
jar >= 0.7

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
      2008-09-24 06:40:39 UTC (rev 4540)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataService.java
      2008-09-24 10:19:05 UTC (rev 4541)
@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Properties;
 
+import net.geant.edugain.base.Configurator;
 import net.geant.edugain.meta.metadata.BEMetaData;
 import net.geant.edugain.meta.metadata.FederationMetaData;
 import net.geant.edugain.meta.query.MetaDataRequester;
@@ -13,9 +15,21 @@
 import org.perfsonar.base.exceptions.PerfSONARException;
 
 public class EduGAINMetadataService {
-       private static final String defaultUriMDS="http://mds.ladok.umu.se/";;
+       private static final String 
defaultUriMDS="http://mds.rediris.es:8080";;
+       private static final String 
defaultUriCRL="http://sca.edugain.org/crl/cacrl.der";;
        
-       public static List<BEMetaData> getOrganizationList(String uriMds) 
throws PerfSONARException {
+       public static List<BEMetaData> getOrganizationList(String uriMds, 
String fileKeystore, String passKeystore, String fileComponents) throws 
PerfSONARException {
+               Properties p = new Properties();
+               p.put(Configurator.PROPS_KEYSTORE_FILE, fileKeystore);
+               p.put(Configurator.PROPS_KEYSTORE_PASSWD, passKeystore);
+               p.put(Configurator.PROPS_TRUSTSTORE_FILE, fileKeystore);
+               p.put(Configurator.PROPS_TRUSTSTORE_PASSWD, passKeystore);
+               p.put(Configurator.PROPS_CRL_URL, defaultUriCRL);
+               p.put(Configurator.PROPS_VALID_COMPONENTS, fileComponents);
+               p.put(Configurator.PROPS_SAML_VERSION, "1.1");
+               p.put("net.geant.edugain.strict-mode","false");
+
+               Configurator.getInstance(p);
                List<BEMetaData> list=new LinkedList<BEMetaData>();
                try {
                        MetaDataRequester requester=new MetaDataRequester();
@@ -25,12 +39,13 @@
                        list.addAll(listBEs);
                        
                        return list;
-               } catch (Exception e) {
+               } catch (Throwable e) {
+                       e.printStackTrace();
                        throw new 
PerfSONARException("error.as.mds_query","EduGAINMetadataService: a problem 
querying the MDS: "+e.getMessage());
                }
        }
        
-       public static List<BEMetaData> getOrganizationList() throws 
PerfSONARException {
-               return getOrganizationList(defaultUriMDS);
+       public static List<BEMetaData> getOrganizationList(String 
fileKeystore, String passKeystore, String fileComponents) throws 
PerfSONARException {
+               return getOrganizationList(defaultUriMDS, fileKeystore, 
passKeystore, fileComponents);
        }
 }

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
 2008-09-24 06:40:39 UTC (rev 4540)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCMDSTest.java
 2008-09-24 10:19:05 UTC (rev 4541)
@@ -16,7 +16,7 @@
                        if (args.length==1) {
                                defaultMDS=args[0];
                        }
-                       List<BEMetaData> 
bes=EduGAINMetadataService.getOrganizationList(defaultMDS);
+                       List<BEMetaData> 
bes=EduGAINMetadataService.getOrganizationList(defaultMDS,"/tmp/eduGAINtruststore.jks","12345678","/tmp/ValidComponentsFile");
                        for (int i=0; i<bes.size(); i++) {
                                BEMetaData be=bes.get(i);
                                System.out.println("Bridging Element 
"+be.getComponentID());