Changeset 7290

Timestamp:

06/08/10 10:39:18 (11 years ago)

Author:

pjkersha

Message:

Incomplete - task 12: ESG Yadis identity service discovery

Location:

TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security/yadis

Files:

• Xrds.java (moved) (moved from TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security/yadis/Xrd.java) (3 diffs)
• XrdsServiceElem.java (moved) (moved from TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security/yadis/XrdsService.java) (3 diffs)

TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security/yadis/Xrds.java

@@ -45 +45 @@
  * @author pjkershaw
  */
-public class Xrd {
-    private static final Log _log = LogFactory.getLog(Xrd.class);
+public class Xrds {
+    private static final Log _log = LogFactory.getLog(Xrds.class);
     private static final boolean DEBUG = _log.isDebugEnabled();
     
@@ -236 +236 @@
             String delegate = (String) serviceDelegates.get(serviceNode);
 
-            XrdsService endpoint = new XrdsService(uri, 
+            XrdsServiceElem endpoint = new XrdsServiceElem(uri, 
                         typeSet, getPriority(serviceNode), getPriority(uriNode), 
                         localId, delegate, canonicalId);
@@ -277 +277 @@
                                         
         String yadisDocFilePath = "/home/pjkersha/workspace/EsgYadisParser/data/yadis.xml";
-                Xrd yadisParser = new Xrd();
+                Xrds yadisParser = new Xrds();
                 StringBuffer contents = new StringBuffer();
 

TI12-security/trunk/EsgYadisParser/src/org/earthsystemgrid/security/yadis/XrdsServiceElem.java

@@ -13 +13 @@
  * @author jbufu
  */
-public class XrdsService implements Comparable {
+public class XrdsServiceElem implements Comparable {
 
             private int servicePriority;
@@ -24 +24 @@
             private String canonicalId;
 
-            public XrdsService(String uri, Set types,
+            public XrdsServiceElem(String uri, Set types,
                                int servicePriority, int uriPriority, String localId, 
                                String delegate, String canonicalId)
@@ -99 +99 @@
 
             public int compareTo(Object o) {
-                XrdsService other = (XrdsService) o;
+                XrdsServiceElem other = (XrdsServiceElem) o;
 
                 if (servicePriority == LOWEST_PRIORITY &&