From: <bj...@us...> - 2007-11-12 09:05:22
|
Revision: 1934 http://unicore.svn.sourceforge.net/unicore/?rev=1934&view=rev Author: bjoernh Date: 2007-11-12 01:05:18 -0800 (Mon, 12 Nov 2007) Log Message: ----------- Modified Paths: -------------- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java Modified: hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java =================================================================== --- hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java 2007-11-12 08:50:16 UTC (rev 1933) +++ hila/trunk/hila-unicore6/src/main/java/de/fzj/hila/implementation/unicore6/Unicore6Grid.java 2007-11-12 09:05:18 UTC (rev 1934) @@ -47,12 +47,12 @@ import de.fzj.hila.StorageType; import de.fzj.hila.Task; import de.fzj.hila.common.baseimpl.BaseGrid; -import de.fzj.hila.common.baseimpl.BaseLocatableCollection; import de.fzj.hila.exceptions.HiLAException; import de.fzj.hila.exceptions.HiLALocationDoesNotLocateException; import de.fzj.hila.exceptions.HiLALocationSyntaxException; import de.fzj.hila.implementation.unicore6.config.Unicore6Config; import de.fzj.unicore.uas.TargetSystemFactory; +import de.fzj.unicore.uas.client.BaseUASClient; import de.fzj.unicore.uas.client.RegistryClient; /** @@ -162,11 +162,21 @@ log.debug("Accessible TSF_PORTs: " + siteEPRs.size()); for (EndpointReferenceType siteEPR : siteEPRs) { - // Chicken or egg? - // Can't get site's name w/o credentials - // Can't create site w/o site's name - Unicore6Site u6Site = new Unicore6Site(siteEPR, this, (Unicore6SecurityProperties) registryClient.getSecurityProperties()); - registrySites.add(u6Site); + try + { + log.debug("Testing accessibility of TSF"); + new BaseUASClient(siteEPR.getAddress().getStringValue(), siteEPR, registryClient.getSecurityProperties()).getCurrentTime(); + log.debug("TSF accessible"); + // Chicken or egg? + // Can't get site's name w/o credentials + // Can't create site w/o site's name + Unicore6Site u6Site = new Unicore6Site(siteEPR, this, (Unicore6SecurityProperties) registryClient.getSecurityProperties()); + registrySites.add(u6Site); + } + catch (Exception e) + { + // don't add to avail tss + } } } catch (Exception e) @@ -307,7 +317,7 @@ */ public File locateFile(Location location) throws HiLAException { - Storage storage = locateStorage(location.getStorageLocation()); + Storage storage = locateStorage(location.getStorageLocation()); return storage.asFile(location.getFilePath()); } @@ -348,7 +358,8 @@ */ public Storage locateStorage(Location location) throws HiLAException { - if(location.getStorageLocation().getParent().isTaskLocation()) { + if (location.getStorageLocation().getParent().isTaskLocation()) + { log.debug("TaskLocation is: " + location.getStorageLocation().getParent()); Task task = (Task) locateTask(location.getStorageLocation().getParent()); return (Storage) task.getLocatableChild(Location.WD); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |