perfsonar-dev - perfsonar: r4539 - in branches/perfsonarui: jars/axis src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui
Subject: perfsonar development work
List archive
perfsonar: r4539 - in branches/perfsonarui: jars/axis src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4539 - in branches/perfsonarui: jars/axis src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui
- Date: Wed, 24 Sep 2008 02:18:37 -0400
Author: nina
Date: 2008-09-24 02:18:37 -0400 (Wed, 24 Sep 2008)
New Revision: 4539
Added:
branches/perfsonarui/jars/axis/edugain-0.7alpha.jar
branches/perfsonarui/jars/axis/opensaml-1.1.jar
branches/perfsonarui/jars/axis/opensaml-trunk-jdk-1.5.jar
branches/perfsonarui/jars/axis/slf4j-api-1.4.3.jar
branches/perfsonarui/jars/axis/slf4j-simple-1.4.3.jar
branches/perfsonarui/jars/axis/xmltooling-trunk-jdk-1.5.jar
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AACertificate.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AASupport.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AASupportTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/TestAA.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
Log:
Updates for the new edugain library (edugain 0.7alpha)
Added: branches/perfsonarui/jars/axis/edugain-0.7alpha.jar
Property changes on: branches/perfsonarui/jars/axis/edugain-0.7alpha.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/axis/opensaml-1.1.jar
Property changes on: branches/perfsonarui/jars/axis/opensaml-1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/axis/opensaml-trunk-jdk-1.5.jar
Property changes on: branches/perfsonarui/jars/axis/opensaml-trunk-jdk-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/axis/slf4j-api-1.4.3.jar
Property changes on: branches/perfsonarui/jars/axis/slf4j-api-1.4.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/axis/slf4j-simple-1.4.3.jar
Property changes on: branches/perfsonarui/jars/axis/slf4j-simple-1.4.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/perfsonarui/jars/axis/xmltooling-trunk-jdk-1.5.jar
Property changes on:
branches/perfsonarui/jars/axis/xmltooling-trunk-jdk-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2008-09-23 20:27:49 UTC (rev 4538)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2008-09-24 06:18:37 UTC (rev 4539)
@@ -59,7 +59,7 @@
*
*/
public abstract class SmartMARequest extends AbstractMARequest implements
IAACapable {
- protected String mds_url="http://mds.rediris.es:8080";;
+ protected String mds_url="http://mds.edugain.org:8080";;
protected boolean aa_enabled = false;
protected boolean parallel = true;
protected int requestsRunning = 0;
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AACertificate.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AACertificate.java
2008-09-23 20:27:49 UTC (rev 4538)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AACertificate.java
2008-09-24 06:18:37 UTC (rev 4539)
@@ -132,8 +132,14 @@
//List<BEMetaData> bes= null;
List<BEMetaData> bes = null;
- bes = EduGAINMetadataService.getOrganizationList(mds);
- //bes = getOrganizationList(mds);
+ try {
+ bes =
EduGAINMetadataService.getOrganizationList(mds);
+ } catch (Throwable x){
+ throw new PerfSONARException(mds,x);
+ }
+ if ((bes == null) || (bes.size()==0))
+ throw new PerfSONARException("Can't retrieve
organization list from "+mds);
+
ArrayList<CAInterface> idProviders = new
ArrayList<CAInterface>();
for (int i=0; i<bes.size(); i++) {
BEMetaData be=bes.get(i);
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AASupport.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AASupport.java
2008-09-23 20:27:49 UTC (rev 4538)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AASupport.java
2008-09-24 06:18:37 UTC (rev 4539)
@@ -72,7 +72,7 @@
value.retrieveCertificate(mds_url,
credentialsListener);
return value;
}
- } catch (PSException x) {
+ } catch (Exception x) {
value = null;
throw new PSException(x);
} finally {
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AASupportTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AASupportTest.java
2008-09-23 20:27:49 UTC (rev 4538)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AASupportTest.java
2008-09-24 06:18:37 UTC (rev 4539)
@@ -46,7 +46,7 @@
f.add(executor.submit(new Callable<AACertificate>() {
public AACertificate call() throws Exception {
AASupport a = AASupport.getInstance();
-
a.setMds_url("http://mds.rediris.es:8080";);
+
a.setMds_url("http://mds.edugain.org:8080";);
return a.getCertificate();
}
})
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/TestAA.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/TestAA.java
2008-09-23 20:27:49 UTC (rev 4538)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/TestAA.java
2008-09-24 06:18:37 UTC (rev 4539)
@@ -167,9 +167,8 @@
*
*/
public class TestAA extends TestCase {
- public void testMDS() {
- try {
- String defaultMDS="http://mds.rediris.es:8080";;
//"http://mds.ladok.umu.se/";;
+ public void testMDS() throws Exception {
+ String defaultMDS="http://mds.edugain.org:8080";;
//"http://mds.rediris.es:8080";;
List<BEMetaData> bes= null;
bes =
EduGAINMetadataService.getOrganizationList(defaultMDS);
@@ -196,10 +195,6 @@
}
- } catch (PerfSONARException x) {
- x.printStackTrace();
- fail(x.getMessage());
- }
}
/*
public void testMDS_example() {
@@ -214,23 +209,15 @@
}
}
*/
- public void testSASL() {
+ public void testSASL() throws Exception {
final String PARAM_USERNAME="";
final String PARAM_USERPASS="perfsonar";
final String PARAM_SASLCAHOST="srv2.ams.nl.geant2.net";
final int PARAM_SASLCAPORT=4088;
- try {
- X509Certificate certificate =
querySASL(PARAM_USERNAME,PARAM_USERPASS,PARAM_SASLCAHOST,PARAM_SASLCAPORT);
- printCertificate(certificate);
- } catch (PerfSONARException x) {
- x.printStackTrace();
- fail(x.getMessage());
- } catch (CertificateParsingException x) {
- x.printStackTrace();
- fail(x.getMessage());
- }
-
+ X509Certificate certificate =
querySASL(PARAM_USERNAME,PARAM_USERPASS,PARAM_SASLCAHOST,PARAM_SASLCAPORT);
+ assertNotNull(certificate);
+ printCertificate(certificate);
}
public X509Certificate querySASL(String username, String userpass,
String saslhost, int saslport) throws PerfSONARException {
@@ -274,8 +261,7 @@
System.out.println("Valid until:
"+DateFormat.getInstance().format(certificate.getNotAfter()));
}
- public void testKeystore() {
- try {
+ public void testKeystore() throws Exception {
KeyStore ks = KeyStore.getInstance("JCEKS");
ks.load(new FileInputStream("ClientSASLCA.jks"),
"123456".toCharArray());
assertTrue(ks.containsAlias("ssl"));
@@ -283,11 +269,7 @@
Certificate certificate = ks.getCertificate("ssl");
assertNotNull(certificate);
- System.out.println(certificate);
- } catch (Exception x) {
- x.printStackTrace();
- fail(x.getMessage());
- }
+ //System.out.println(certificate);
}
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2008-09-23 20:27:49 UTC (rev 4538)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2008-09-24 06:18:37 UTC (rev 4539)
@@ -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
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
+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.7alpha.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.12b
Specification-Vendor: perfsonar.acad.bg
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2008-09-23 20:27:49 UTC (rev 4538)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
2008-09-24 06:18:37 UTC (rev 4539)
@@ -545,7 +545,7 @@
} catch (Exception x) {
logger.error(x);
}
- String mds = "http://mds.rediris.es:8080";;
+ String mds = "http://mds.edugain.org:8080";;
if( line.hasOption( 'm' ) ) {
mds = line.getOptionValue( 'm' );
}
- perfsonar: r4539 - in branches/perfsonarui: jars/axis src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui, svnlog, 09/24/2008
Archive powered by MHonArc 2.6.16.