[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/verifier VerifyingReader.java,1.23,1.24

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30148/src/java/org/neuclear/id/verifier

Modified Files:
	VerifyingReader.java 
Log Message:
Identity is now fully html based as is the ServiceBuilder.
VerifyingReader correctly identifies html files and parses them as such.
Targets and Target now parse html link tags
AssetBuilder and ExchangeAgentBuilder have been updated to support it and provide html formatted contracts.
The Asset.Reader and ExchangeAgent.Reader still need to be updated.

Index: VerifyingReader.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier/VerifyingReader.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** VerifyingReader.java	2 Apr 2004 17:33:31 -0000	1.23
--- VerifyingReader.java	17 Apr 2004 19:28:22 -0000	1.24
***************
*** 1,4 ****
--- 1,5 ----
  package org.neuclear.id.verifier;
  
+ import org.dom4j.Attribute;
  import org.dom4j.Element;
  import org.neuclear.id.*;
***************
*** 32,35 ****
--- 33,43 ----
  $Id$
  $Log$
+ Revision 1.24  2004/04/17 19:28:22  pelle
+ Identity is now fully html based as is the ServiceBuilder.
+ VerifyingReader correctly identifies html files and parses them as such.
+ Targets and Target now parse html link tags
+ AssetBuilder and ExchangeAgentBuilder have been updated to support it and provide html formatted contracts.
+ The Asset.Reader and ExchangeAgent.Reader still need to be updated.
+ 
  Revision 1.23  2004/04/02 17:33:31  pelle
  Added automatic caching of SignedNamedObject
***************
*** 204,208 ****
  
      private NamedObjectReader resolveReader(final Element elem) {
!         NamedObjectReader reader = (NamedObjectReader) readers.get(elem.getName());
          if (reader == null)
              reader = defaultReader;
--- 212,216 ----
  
      private NamedObjectReader resolveReader(final Element elem) {
!         NamedObjectReader reader = (NamedObjectReader) readers.get(extractName(elem));
          if (reader == null)
              reader = defaultReader;
***************
*** 210,213 ****
--- 218,231 ----
      }
  
+     private String extractName(final Element elem) {
+         if (elem.getName().equals("html")) {
+             Attribute type = (Attribute) elem.selectSingleNode("//html/head/meta[@name='neu:type']/@content");
+             if (type != null && type.getValue() != null)
+                 return type.getValue();
+             return "Identity"; //default to identity
+         }
+         return elem.getName();
+     }
+ 
  
      public final void registerReader(final String name, final NamedObjectReader reader) {