[Neuclear-develop] neuclear-id/src/java/org/neuclear/id Identity.java,1.32,1.33 Service.java,1.1,1.2

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

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

Modified Files:
	Identity.java Service.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: Service.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/Service.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Service.java	5 Apr 2004 16:32:52 -0000	1.1
--- Service.java	17 Apr 2004 19:28:22 -0000	1.2
***************
*** 11,14 ****
--- 11,21 ----
  $Id$
  $Log$
+ Revision 1.2  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.1  2004/04/05 16:32:52  pelle
  Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key.
***************
*** 23,27 ****
  public class Service extends Identity {
      public Service(final SignedNamedCore core, String serviceUrl, PublicKey serviceKey, Targets targets) {
!         super(core, null, targets);
          this.serviceKey = serviceKey;
          this.serviceUrl = serviceUrl;
--- 30,34 ----
  public class Service extends Identity {
      public Service(final SignedNamedCore core, String serviceUrl, PublicKey serviceKey, Targets targets) {
!         super(core, targets);
          this.serviceKey = serviceKey;
          this.serviceUrl = serviceUrl;

Index: Identity.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/Identity.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Identity.java	1 Apr 2004 23:19:49 -0000	1.32
--- Identity.java	17 Apr 2004 19:28:22 -0000	1.33
***************
*** 2,5 ****
--- 2,12 ----
   * $Id$
   * $Log$
+  * Revision 1.33  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.32  2004/04/01 23:19:49  pelle
   * Split Identity into Signatory and Identity class.
***************
*** 326,330 ****
  import org.dom4j.Element;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.Utility;
  import org.neuclear.id.targets.Targets;
  
--- 333,336 ----
***************
*** 349,360 ****
   */
  public class Identity extends SignedNamedObject implements Principal {
!     protected Identity(final SignedNamedCore core, String signer, Targets targets) {
          super(core);
          this.targets = (targets != null) ? targets : Targets.EMPTY;
-         this.signer = Utility.denullString(signer, DEFAULT_SIGNER);
-     }
- 
-     public final String getSigner() {
-         return signer;
      }
  
--- 355,361 ----
   */
  public class Identity extends SignedNamedObject implements Principal {
!     protected Identity(final SignedNamedCore core, Targets targets) {
          super(core);
          this.targets = (targets != null) ? targets : Targets.EMPTY;
      }
  
***************
*** 370,374 ****
  
      private final Targets targets;
-     private final String signer;
  
      public static final String DEFAULT_SIGNER = "http://localhost:11870/Signer";
--- 371,374 ----
***************
*** 383,389 ****
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
              final Targets targets = Targets.parseList(elem);
!             final Element se = elem.element("Signer");
!             final String signer = (se != null) ? se.getTextTrim() : null;
!             return new Identity(core, signer, targets);
          }
  
--- 383,387 ----
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
              final Targets targets = Targets.parseList(elem);
!             return new Identity(core, targets);
          }