perfsonar development work

["Michael Bischoff" <>]

Hello all,

Log:
- EduGAINMetadataService class is able to send queries to MDS using eduGAIN 
jar >= 0.7

While that's nice, can you please bumb the dependencies and not break the 
build :(

I've now bumbed the Edugain dependency from 0.6 to 1.0RC2(as that was the 
latest in our jar
repo and 0.7alpa didn't look too appealing) but I have no idea if this is 
right or doesn't
break anything. It fixes the build. Can someone make an assertion on this? 
Should we perhaps
depend on 1.0RC3? is there a 'stable' 0.7? or roll back the changes?

Kind regards,

Michael

> 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/EduGAINMetadataSer
> vice.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/EduGAINMetadataSe
> rvice.java 
> ===================================================================
> ---
> trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataSe
> rvice.java    2008-09-24 06:40:39 UTC (rev 4540) +++
> trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINMetadataSe
> rvice.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","1234
> 5678","/tmp/ValidComponentsFile");
> for (int i=0; i<bes.size(); i++) { BEMetaData be=bes.get(i);
> System.out.println("Bridging Element "+be.getComponentID());
>
>
>