neuclear-develop — Support requests, cvs etc

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/resolver Resolver.java,1.1,1.2 NSResolver.java,1.20,NONE

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

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

Modified Files:
	Resolver.java 
Removed Files:
	NSResolver.java 
Log Message:
Added automatic caching of SignedNamedObject

Index: Resolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/Resolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Resolver.java	1 Apr 2004 23:19:48 -0000	1.1
--- Resolver.java	2 Apr 2004 17:33:31 -0000	1.2
***************
*** 84,87 ****
--- 84,91 ----
      }
  
+     public static SignedNamedObject cache(SignedNamedObject obj) {
+         return NSCACHE.cache(obj);
+     }
+ 
      private static String getURLString(final String name) {
          if ((name.startsWith("http://") || name.startsWith("https://")))

--- NSResolver.java DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/cache NSCache.java,1.9,1.10

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

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

Modified Files:
	NSCache.java 
Log Message:
Added automatic caching of SignedNamedObject

Index: NSCache.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/cache/NSCache.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NSCache.java	3 Jan 2004 20:36:38 -0000	1.9
--- NSCache.java	2 Apr 2004 17:33:31 -0000	1.10
***************
*** 1,13 ****
  package org.neuclear.id.cache;
  
- import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.Identity;
- import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.InvalidNamedObjectException;
  
- import java.util.Map;
- import java.util.HashMap;
  import java.lang.ref.WeakReference;
  
  /**
--- 1,9 ----
  package org.neuclear.id.cache;
  
  import org.neuclear.id.SignedNamedObject;
  
  import java.lang.ref.WeakReference;
+ import java.util.HashMap;
+ import java.util.Map;
  
  /**
***************
*** 23,27 ****
  
  
- 
      /**
       * Attempts to get a verified PublicKey for the given name from the cache
--- 19,22 ----
***************
*** 32,50 ****
      public SignedNamedObject fetchCached(final String name) {
          final WeakReference ref = (WeakReference) spaces.get(name);
!         if (ref==null)
              return null;
          return (SignedNamedObject) ref.get();
      }
  
!     public void cache(final SignedNamedObject ns)  {
!         // Only store if it's parent is already here
!         try {
!             final String parentName = NSTools.getSignatoryURI(ns.getName());
!             if ((fetchCached(parentName) != null) || (parentName.equals("neu://")||NSTools.isHttpScheme(ns.getName())!=null)) {
!                 spaces.put(ns.getName(),new WeakReference(ns));
!             }
!         } catch (InvalidNamedObjectException e) {
!             ;// If we have an issue here we will silently ignore it.
!         }
      }
  
--- 27,39 ----
      public SignedNamedObject fetchCached(final String name) {
          final WeakReference ref = (WeakReference) spaces.get(name);
!         if (ref == null)
              return null;
          return (SignedNamedObject) ref.get();
      }
  
!     public SignedNamedObject cache(final SignedNamedObject obj) {
!         if (!spaces.containsKey(obj.getDigest()))
!             spaces.put(obj.getDigest(), new WeakReference(obj));
!         return obj;
      }
  

[Neuclear-develop] [JIRA] Created: (COM-9) Add in memory caching to PublicKey Resolver

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/COM-9

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-9
    Summary: Add in memory caching to PublicKey Resolver
       Type: Improvement

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Commons
   Fix Fors:
             r_0_7
   Versions:
             r_0_7

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Fri, 2 Apr 2004 9:41 AM
    Updated: Fri, 2 Apr 2004 9:41 AM

Description:
We should have some sort of in memory cache of PublicKey's mapped with their Base32 hashes.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Work Started: (NEU-29) Improve in memory Cache facility

[<bug...@ve...>]

Message:

   Work on this issue has been started by Pelle Braendgaard (mailto:pe...@ve...)

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/NEU-29

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: NEU-29
    Summary: Improve in memory Cache facility
       Type: Improvement

     Status: In Progress
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Identity
   Fix Fors:
             0.9
   Versions:
             0.9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Fri, 2 Apr 2004 9:31 AM
    Updated: Fri, 2 Apr 2004 9:33 AM

Description:
I want any new SignedNamedObject to be automatically cached in memory.



---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Created: (NEU-29) Improve in memory Cache facility

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/NEU-29

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: NEU-29
    Summary: Improve in memory Cache facility
       Type: Improvement

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Identity
   Fix Fors:
             0.9
   Versions:
             0.9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Fri, 2 Apr 2004 9:31 AM
    Updated: Fri, 2 Apr 2004 9:31 AM

Description:
I want any new SignedNamedObject to be automatically cached in memory.



---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] neuclear-id/src/java/org/neuclear/tests AbstractObjectCreationTest.java,1.5,1.6

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

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

Modified Files:
	AbstractObjectCreationTest.java 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: AbstractObjectCreationTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractObjectCreationTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractObjectCreationTest.java	3 Mar 2004 23:26:44 -0000	1.5
--- AbstractObjectCreationTest.java	2 Apr 2004 16:59:04 -0000	1.6
***************
*** 2,6 ****
  
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.Builder;
--- 2,5 ----
***************
*** 8,11 ****
--- 7,11 ----
  
  import java.security.GeneralSecurityException;
+ import java.security.PublicKey;
  
  /**
***************
*** 22,38 ****
  
      public void testCreateObject() throws Exception, XMLException {
!         Builder builder=createBuilder();
          assertNotNull(builder);
! //        assertTrue(NSTools.isNamedObject(builder.getElement()));
!         SignedNamedObject obj=builder.convert(NAME,getSigner());
          assertNotNull(obj);
!         assertEquals(getRequiredClass(),obj.getClass());
          verifyObject(obj);
      }
  
      protected abstract void verifyObject(SignedNamedObject obj) throws Exception;
      protected abstract Class getRequiredClass();
      protected abstract Builder createBuilder() throws Exception;
  
!     public static final String NAME="test";
  }
--- 22,54 ----
  
      public void testCreateObject() throws Exception, XMLException {
!         Builder builder = createBuilder();
! //        System.out.println(builder.asXML());
          assertNotNull(builder);
!         SignedNamedObject obj = builder.convert(NAME, getSigner());
          assertNotNull(obj);
!         assertEquals(getRequiredClass(), obj.getClass());
          verifyObject(obj);
      }
  
+     protected void assertEquals(byte a[], byte b[]) {
+         if (a == null && b == null)
+             return;
+         assertFalse("neither is null", a == null || b == null);
+         assertEquals("same length", a.length, b.length);
+         for (int i = 0; i < a.length; i++)
+             assertEquals("content same", a[i], b[i]);
+     }
+ 
+     protected void assertEqualPublicKeys(PublicKey a, PublicKey b) {
+         assertEquals(a.getClass(), b.getClass());
+         assertEquals(a.getEncoded(), b.getEncoded());
+     }
+ 
      protected abstract void verifyObject(SignedNamedObject obj) throws Exception;
+ 
      protected abstract Class getRequiredClass();
+ 
      protected abstract Builder createBuilder() throws Exception;
  
!     public static final String NAME = "neu://test";
  }

[Neuclear-develop] neuclear-id/src/schemas neuid.xsd,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-id/src/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28262/src/schemas

Modified Files:
	neuid.xsd 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: neuid.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/schemas/neuid.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** neuid.xsd	11 Jan 2004 00:39:14 -0000	1.5
--- neuid.xsd	2 Apr 2004 16:59:04 -0000	1.6
***************
*** 3,6 ****
--- 3,10 ----
  <!--$Id$
  $Log$
+ Revision 1.6  2004/04/02 16:59:04  pelle
+ Updated Asset and Asset Builder with semi fully featured functionality.
+ It now has Issuer, Service etc.
+ 
  Revision 1.5  2004/01/11 00:39:14  pelle
  Cleaned up the schemas even more they now all verifiy.
***************
*** 42,45 ****
--- 46,50 ----
  
      <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+     <xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="XMLSchema.xsd"/>
  
      <xs:simpleType name="sha1">
***************
*** 63,77 ****
      <xs:element name="TimeStamp" type="xs:dateTime"/>
  
! 	<xs:group name="SignedObjectGroup">
! 		<xs:sequence>
              <xs:element ref="TimeStamp" minOccurs="0" maxOccurs="1"/>
! 			<xs:element ref="ds:Signature" maxOccurs="1" minOccurs="1"/>
! 		</xs:sequence>
! 	</xs:group>
  
!     <xs:element name="Allow">
          <xs:complexType>
              <xs:sequence>
                  <xs:element ref="ds:KeyInfo" maxOccurs="1" minOccurs="1"/>
              </xs:sequence>
          </xs:complexType>
--- 68,83 ----
      <xs:element name="TimeStamp" type="xs:dateTime"/>
  
!     <xs:group name="SignedObjectGroup">
!         <xs:sequence>
              <xs:element ref="TimeStamp" minOccurs="0" maxOccurs="1"/>
!             <xs:element ref="ds:Signature" maxOccurs="1" minOccurs="1"/>
!         </xs:sequence>
!     </xs:group>
  
!     <xs:element name="Service">
          <xs:complexType>
              <xs:sequence>
                  <xs:element ref="ds:KeyInfo" maxOccurs="1" minOccurs="1"/>
+                 <xs:element name="Url" type="xs:anyURI"/>
              </xs:sequence>
          </xs:complexType>
***************
*** 80,92 ****
      <xs:element name="Repository" type="xs:anyURI" nillable="false"/>
  
! 	<xs:element name="Identity" type="IdentityType"/>
  
      <xs:element name="Target">
!          <xs:complexType>
!              <xs:attribute name="href" type="xs:anyURI"/>
!              <xs:attribute name="type" type="xs:string"/>
          </xs:complexType>
      </xs:element>
!  
      <xs:element name="TargetList">
          <xs:complexType>
--- 86,98 ----
      <xs:element name="Repository" type="xs:anyURI" nillable="false"/>
  
!     <xs:element name="Identity" type="IdentityType"/>
  
      <xs:element name="Target">
!         <xs:complexType>
!             <xs:attribute name="href" type="xs:anyURI"/>
!             <xs:attribute name="type" type="xs:string"/>
          </xs:complexType>
      </xs:element>
! 
      <xs:element name="TargetList">
          <xs:complexType>
***************
*** 97,108 ****
      </xs:element>
  
! 	<xs:complexType name="IdentityType">
          <xs:sequence>
              <xs:element ref="Repository" minOccurs="0" maxOccurs="1"/>
              <xs:element ref="TargetList" minOccurs="0" maxOccurs="1"/>
-             <xs:element ref="Allow"  minOccurs="1" maxOccurs="1"/>
              <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
          </xs:sequence>
! 	</xs:complexType>
  
  </xs:schema>
--- 103,113 ----
      </xs:element>
  
!     <xs:complexType name="IdentityType">
          <xs:sequence>
              <xs:element ref="Repository" minOccurs="0" maxOccurs="1"/>
              <xs:element ref="TargetList" minOccurs="0" maxOccurs="1"/>
              <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
          </xs:sequence>
!     </xs:complexType>
  
  </xs:schema>

[Neuclear-develop] neuclear-pay/src/schemas asset.xsd,1.2,1.3 exch.xsd,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-pay/src/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28155/src/schemas

Modified Files:
	asset.xsd exch.xsd 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: asset.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/schemas/asset.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** asset.xsd	18 Feb 2004 00:13:31 -0000	1.2
--- asset.xsd	2 Apr 2004 16:58:54 -0000	1.3
***************
*** 7,52 ****
      xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
  
!     elementFormDefault="qualified" version="0.3" id="asset">
!  	<xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" />
      <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../../../neuclear-id/src/schemas/xmldsig-core-schema.xsd"/>
  
-     <xs:element name="Asset" type="id:NamedObjectReference" nillable="false"/>
-     <xs:element name="Recipient" type="id:NamedObjectReference" nillable="false"/>
-     <xs:element name="ValueTime" type="xs:dateTime" nillable="true"/>
-     <xs:element name="Comment" type="xs:string" nillable="true"/>
  
!     <!-- Generic Value Identifier -->
!     <xs:element name="Value" abstract="true" nillable="false"/>
!     <!-- Specific numeric amount -->
!     <xs:element name="Amount" substitutionGroup="Value" type="xs:double"/>
!     <!-- All the serials numbers included in this Value. The numeric amount is always equals to the amount of items in
!     the list -->
!     <xs:element name="SerialNumbers" substitutionGroup="Value">
!         <xs:simpleType>
!             <xs:list itemType="id:NamedObjectReference"/>
!         </xs:simpleType>
!     </xs:element>
  
!     <xs:element name="TransferOrder" nillable="false">
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="Recipient" minOccurs="1" maxOccurs="1"/>
!                 <xs:element ref="Asset" minOccurs="1" maxOccurs="1"/>
!                 <xs:element ref="Value" minOccurs="1" maxOccurs="1"/>
!                 <xs:element ref="Comment"  minOccurs="0" maxOccurs="1"/>
!                 <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
              </xs:sequence>
          </xs:complexType>
      </xs:element>
  
-     <xs:element name="TransferReceipt" nillable="false">
-         <xs:complexType >
-             <xs:sequence>
-                 <xs:element ref="ValueTime" minOccurs="1" maxOccurs="1"/>
-                 <xs:element ref="Value" minOccurs="0" maxOccurs="1"/>
-                 <xs:element ref="TransferOrder" minOccurs="1" maxOccurs="1"/>
-                 <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
-             </xs:sequence>
-         </xs:complexType>
-     </xs:element>
  </xs:schema>
--- 7,39 ----
      xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
  
!     elementFormDefault="qualified" version="0.3" id="as">
!     <xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd"/>
      <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../../../neuclear-id/src/schemas/xmldsig-core-schema.xsd"/>
+     <xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="../../../neuclear-id/src/schemas/XMLSchema.xsd"/>
  
  
!     <xs:element name="Asset" type="AssetType" nillable="false"/>
  
!     <xs:element name="Issuer">
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="ds:KeyInfo" maxOccurs="1" minOccurs="1"/>
              </xs:sequence>
          </xs:complexType>
      </xs:element>
+     <xs:complexType name="AssetType">
+         <xs:sequence>
+             <xs:element ref="id:Repository" minOccurs="0" maxOccurs="1"/>
+             <xs:element ref="id:Service" minOccurs="1" maxOccurs="1"/>
+             <xs:element ref="Issuer" minOccurs="1" maxOccurs="1"/>
+             <xs:element name="DecimalPoints" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+             <xs:element name="MinimumTransaction" type="xs:double" minOccurs="0" maxOccurs="1"/>
+ 
+             <xs:element ref="id:TargetList" minOccurs="0" maxOccurs="1"/>
+ 
+ 
+             <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
+         </xs:sequence>
+     </xs:complexType>
  
  </xs:schema>

Index: exch.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/schemas/exch.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** exch.xsd	12 Jan 2004 22:39:15 -0000	1.5
--- exch.xsd	2 Apr 2004 16:58:54 -0000	1.6
***************
*** 3,6 ****
--- 3,10 ----
  $Id$
  $Log$
+ Revision 1.6  2004/04/02 16:58:54  pelle
+ Updated Asset and Asset Builder with semi fully featured functionality.
+ It now has Issuer, Service etc.
+ 
  Revision 1.5  2004/01/12 22:39:15  pelle
  Completed all the builders and contracts.
***************
*** 34,39 ****
      xmlns:xfer="http://neuclear.org/neu/xfer.xsd"
      xmlns:id="http://neuclear.org/neu/neuid.xsd"
!     elementFormDefault="qualified" version="0.3" id="xfer">
!  	<xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" />
      <xs:import namespace="http://neuclear.org/neu/xfer.xsd" schemaLocation="xfer.xsd"/>
  
--- 38,43 ----
      xmlns:xfer="http://neuclear.org/neu/xfer.xsd"
      xmlns:id="http://neuclear.org/neu/neuid.xsd"
!     elementFormDefault="qualified" version="0.3" id="ex">
!     <xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd"/>
      <xs:import namespace="http://neuclear.org/neu/xfer.xsd" schemaLocation="xfer.xsd"/>
  
***************
*** 66,75 ****
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="Agent" minOccurs="1" maxOccurs="1" />
!                 <xs:element ref="xfer:Asset" minOccurs="1" maxOccurs="1" />
                  <xs:element ref="ExpiryTime" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="BidItem" minOccurs="1" maxOccurs="unbounded"/>
!                 <xs:element ref="xfer:Comment"  minOccurs="0" maxOccurs="1" />
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
              </xs:sequence>
--- 70,79 ----
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="Agent" minOccurs="1" maxOccurs="1"/>
!                 <xs:element ref="xfer:Asset" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="ExpiryTime" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="BidItem" minOccurs="1" maxOccurs="unbounded"/>
!                 <xs:element ref="xfer:Comment" minOccurs="0" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
              </xs:sequence>
***************
*** 97,101 ****
                  <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="ExchangeOrderReceipt" minOccurs="1" maxOccurs="1"/>
!                 <xs:element ref="xfer:Comment"  minOccurs="0" maxOccurs="1" />
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
              </xs:sequence>
--- 101,105 ----
                  <xs:element ref="xfer:Value" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="ExchangeOrderReceipt" minOccurs="1" maxOccurs="1"/>
!                 <xs:element ref="xfer:Comment" minOccurs="0" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
              </xs:sequence>
***************
*** 106,120 ****
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="xfer:ValueTime"  minOccurs="1" maxOccurs="1" />
                  <xs:element ref="ExchangeOrder" minOccurs="1" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
!            </xs:sequence>
          </xs:complexType>
      </xs:element>
  
!     <xs:element name="CancelExchangeOrderReceipt" nillable="false" >
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="xfer:ValueTime"  minOccurs="1" maxOccurs="1" />
                  <xs:element ref="CancelExchangeOrder" minOccurs="1" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
--- 110,124 ----
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="ExchangeOrder" minOccurs="1" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
!             </xs:sequence>
          </xs:complexType>
      </xs:element>
  
!     <xs:element name="CancelExchangeOrderReceipt" nillable="false">
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="CancelExchangeOrder" minOccurs="1" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
***************
*** 126,130 ****
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="xfer:ValueTime"  minOccurs="1" maxOccurs="1" />
                  <xs:element ref="ExchangeCompletionOrder" minOccurs="1" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
--- 130,134 ----
          <xs:complexType>
              <xs:sequence>
!                 <xs:element ref="xfer:ValueTime" minOccurs="1" maxOccurs="1"/>
                  <xs:element ref="ExchangeCompletionOrder" minOccurs="1" maxOccurs="1"/>
                  <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>

[Neuclear-develop] neuclear-pay/src/test/org/neuclear/asset/contracts/builders AssetBuilderTest.java,NONE,1.1

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/contracts/builders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28155/src/test/org/neuclear/asset/contracts/builders

Added Files:
	AssetBuilderTest.java 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

--- NEW FILE: AssetBuilderTest.java ---
package org.neuclear.asset.contracts.builders;

import org.neuclear.asset.contracts.Asset;
import org.neuclear.commons.NeuClearException;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.builders.Builder;
import org.neuclear.tests.AbstractObjectCreationTest;

import java.security.GeneralSecurityException;

/*
$Id: AssetBuilderTest.java,v 1.1 2004/04/02 16:58:55 pelle Exp $
$Log: AssetBuilderTest.java,v $
Revision 1.1  2004/04/02 16:58:55  pelle
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

*/

/**
 * User: pelleb
 * Date: Apr 2, 2004
 * Time: 10:40:20 AM
 */
public class AssetBuilderTest extends AbstractObjectCreationTest {
    public AssetBuilderTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
    }

    protected void verifyObject(SignedNamedObject obj) throws Exception {
        Asset asset = (Asset) obj;
        assertNotNull(asset.getServiceKey());
        assertEqualPublicKeys(getSigner().getPublicKey("neu://test/bux"), asset.getServiceKey());
        assertNotNull(asset.getServiceUrl());
        assertEquals(URL, asset.getServiceUrl());
        assertNotNull(asset.getIssuerKey());
        assertEqualPublicKeys(getAlice().getPublicKey(), asset.getIssuerKey());
        assertEquals(DECIMAL, asset.getDecimal());
        assertEquals(MINIMUM, asset.getMinimumTransaction(), 0);
    }

    protected Class getRequiredClass() {
        return Asset.class;
    }

    protected Builder createBuilder() throws Exception {
        return new AssetBuilder(URL,
                getSigner().getPublicKey("neu://test/bux"),
                getAlice().getPublicKey(),
                DECIMAL, MINIMUM);
    }

    private static final String URL = "http://bux.neuclear.org";
    private static final int DECIMAL = 2;
    private static final int MINIMUM = 0;


}

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts Asset.java,1.15,1.16 AssetGlobals.java,1.9,1.10

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28155/src/java/org/neuclear/asset/contracts

Modified Files:
	Asset.java AssetGlobals.java 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: AssetGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/AssetGlobals.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssetGlobals.java	5 Jan 2004 23:47:09 -0000	1.9
--- AssetGlobals.java	2 Apr 2004 16:58:54 -0000	1.10
***************
*** 1,5 ****
  package org.neuclear.asset.contracts;
  
! import org.dom4j.*;
  import org.neuclear.id.verifier.VerifyingReader;
  
--- 1,8 ----
  package org.neuclear.asset.contracts;
  
! import org.dom4j.DocumentHelper;
! import org.dom4j.Element;
! import org.dom4j.Namespace;
! import org.dom4j.QName;
  import org.neuclear.id.verifier.VerifyingReader;
  
***************
*** 24,27 ****
--- 27,34 ----
  $Id$
  $Log$
+ Revision 1.10  2004/04/02 16:58:54  pelle
+ Updated Asset and Asset Builder with semi fully featured functionality.
+ It now has Issuer, Service etc.
+ 
  Revision 1.9  2004/01/05 23:47:09  pelle
  Create new Document classification "order", which is really just inherint in the new
***************
*** 120,128 ****
      }
  
!     public static Attribute createAttribute(final Element elem, final String name, final String value) {
!         return DocumentHelper.createAttribute(elem, createQName(name), value);
      }
  
!     public static Element createElement(final String name, final String value) {
          return DocumentHelper.createElement(createQName(name));
      }
--- 127,135 ----
      }
  
!     public static void addAttribute(final Element elem, final String name, final String value) {
!         elem.addAttribute(createQName(name), value);
      }
  
!     public static Element createElement(final String name) {
          return DocumentHelper.createElement(createQName(name));
      }
***************
*** 130,135 ****
      public static final String ASSET_TAGNAME = "Asset";
      public static final String XFER_ASSETS = "http://neuclear.org/neu/assets";
!     public static final String ASSET_NSPREFIX = "asset";
!     public static final Namespace NS_ASSET=createNameSpace();
      public static void registerReaders() {
          VerifyingReader.getInstance().registerReader(AssetGlobals.ASSET_TAGNAME, new Asset.Reader());
--- 137,146 ----
      public static final String ASSET_TAGNAME = "Asset";
      public static final String XFER_ASSETS = "http://neuclear.org/neu/assets";
!     public static final String ASSET_NSPREFIX = "as";
!     public static final String ISSUER_TAGNAME = "Issuer";
!     public static final String DECIMAL_POINT_TAGNAME = "DecimalPoints";
!     public static final String MINIMUM_TAGNAME = "MinimumTransaction";
!     public static final Namespace NS_ASSET = createNameSpace();
! 
      public static void registerReaders() {
          VerifyingReader.getInstance().registerReader(AssetGlobals.ASSET_TAGNAME, new Asset.Reader());

Index: Asset.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/Asset.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Asset.java	1 Apr 2004 23:18:32 -0000	1.15
--- Asset.java	2 Apr 2004 16:58:53 -0000	1.16
***************
*** 5,8 ****
--- 5,13 ----
  import org.neuclear.id.*;
  import org.neuclear.id.targets.Targets;
+ import org.neuclear.xml.xmlsec.KeyInfo;
+ import org.neuclear.xml.xmlsec.XMLSecTools;
+ import org.neuclear.xml.xmlsec.XMLSecurityException;
+ 
+ import java.security.PublicKey;
  
  /*
***************
*** 26,29 ****
--- 31,38 ----
  $Id$
  $Log$
+ Revision 1.16  2004/04/02 16:58:53  pelle
+ Updated Asset and Asset Builder with semi fully featured functionality.
+ It now has Issuer, Service etc.
+ 
  Revision 1.15  2004/04/01 23:18:32  pelle
  Split Identity into Signatory and Identity class.
***************
*** 123,128 ****
   */
  public final class Asset extends Identity {
!     protected Asset(final SignedNamedCore core, final Targets targets, final int decimal, final double minimumTransaction) {
!         super(core, null, targets); //Web services dont have signing urls
          this.decimal = decimal;
          this.multiplier = (int) Math.round(Math.pow(10, -decimal));
--- 132,140 ----
   */
  public final class Asset extends Identity {
!     protected Asset(final SignedNamedCore core, final String serviceUrl, final PublicKey servicekey, final PublicKey issuerKey, final Targets targets, final int decimal, final double minimumTransaction) {
!         super(core, null, targets);
!         this.serviceUrl = serviceUrl;
!         this.issuerKey = issuerKey;
!         this.serviceKey = servicekey;
          this.decimal = decimal;
          this.multiplier = (int) Math.round(Math.pow(10, -decimal));
***************
*** 165,168 ****
--- 177,203 ----
      }
  
+     public final PublicKey getIssuerKey() {
+         return issuerKey;
+     }
+ 
+     public final PublicKey getServiceKey() {
+         return serviceKey;
+     }
+ 
+     public final String getServiceUrl() {
+         return serviceUrl;
+     }
+ 
+     public int getDecimal() {
+         return decimal;
+     }
+ 
+     public int getMultiplier() {
+         return multiplier;
+     }
+ 
+     public double getMinimumTransaction() {
+         return minimumTransaction;
+     }
  
      public static final class Reader implements NamedObjectReader {
***************
*** 176,186 ****
              if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET))
                  throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI());
! 
!             final String dec = elem.attributeValue("decimalpoints");
!             final int decimal = (!Utility.isEmpty(dec)) ? Integer.parseInt(dec) : 0;
!             final String min = elem.attributeValue("minimumxact");
!             final double minimum = (!Utility.isEmpty(min)) ? Double.parseDouble(min) : 0;
!             final Targets targets = Targets.parseList(elem);
!             return new Asset(core, targets, decimal, minimum);
          }
  
--- 211,229 ----
              if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET))
                  throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI());
!             final Element issuerElement = InvalidNamedObjectException.assertContainsElementQName(core, elem, AssetGlobals.createQName("Issuer"));
!             final Element serviceElement = InvalidNamedObjectException.assertContainsElementQName(core, elem, AssetGlobals.createQName("Service"));
!             final Element serviceKeyElement = InvalidNamedObjectException.assertContainsElementQName(core, serviceElement, XMLSecTools.createQName("KeyInfo"));
!             final Element serviceUrlElement = InvalidNamedObjectException.assertContainsElementQName(core, serviceElement, AssetGlobals.createQName("Url"));
!             try {
!                 final PublicKey sPub = extractPublicKey(serviceKeyElement);
!                 final String serviceurl = serviceUrlElement.getTextTrim();
!                 final PublicKey iPub = extractPublicKey(InvalidNamedObjectException.assertContainsElementQName(issuerElement, XMLSecTools.createQName("KeyInfo")));
!                 final int decimal = extractDecimalPoints(elem);
!                 final double minimum = extractMinimumTransactionAmount(elem);
!                 final Targets targets = Targets.parseList(elem);
!                 return new Asset(core, serviceurl, sPub, iPub, targets, decimal, minimum);
!             } catch (XMLSecurityException e) {
!                 throw new InvalidNamedObjectException("invalid asset xml");
!             }
          }
  
***************
*** 188,191 ****
--- 231,258 ----
      }
  
+     private static PublicKey extractPublicKey(Element kiElem) throws XMLSecurityException {
+         final KeyInfo sKi = new KeyInfo(kiElem);
+         return sKi.getPublicKey();
+     }
+ 
+     private static double extractMinimumTransactionAmount(Element elem) {
+         Element melem = elem.element(AssetGlobals.createQName(AssetGlobals.MINIMUM_TAGNAME));
+         if (melem == null || Utility.isEmpty(melem.getTextTrim()))
+             return 0.0;
+         return Double.parseDouble(melem.getTextTrim());
+ 
+     }
+ 
+     private static int extractDecimalPoints(Element elem) {
+         Element melem = elem.element(AssetGlobals.createQName(AssetGlobals.DECIMAL_POINT_TAGNAME));
+         if (melem == null || Utility.isEmpty(melem.getTextTrim()))
+             return 0;
+         return Integer.parseInt(melem.getTextTrim());
+ 
+     }
+ 
+     private final PublicKey issuerKey;
+     private final String serviceUrl;
+     private final PublicKey serviceKey;
      private final int decimal;
      private final int multiplier;

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts/builders AssetBuilder.java,1.9,1.10

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28155/src/java/org/neuclear/asset/contracts/builders

Modified Files:
	AssetBuilder.java 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssetBuilder.java	1 Apr 2004 23:18:31 -0000	1.9
--- AssetBuilder.java	2 Apr 2004 16:58:53 -0000	1.10
***************
*** 8,11 ****
--- 8,14 ----
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.builders.IdentityBuilder;
+ import org.neuclear.xml.xmlsec.KeyInfo;
+ 
+ import java.security.PublicKey;
  
  /*
***************
*** 29,32 ****
--- 32,39 ----
  $Id$
  $Log$
+ Revision 1.10  2004/04/02 16:58:53  pelle
+ Updated Asset and Asset Builder with semi fully featured functionality.
+ It now has Issuer, Service etc.
+ 
  Revision 1.9  2004/04/01 23:18:31  pelle
  Split Identity into Signatory and Identity class.
***************
*** 109,127 ****
  public final class AssetBuilder extends IdentityBuilder {
      /**
!      * Used to create new Assets
!      * 
!      * @param signer     URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
!      * @param receiver   URL of default receiver for namespace
!      * @param controller URL of AssetController This should be a http web url
!      * @param decimal    The amount of decimal points.
!      * @param minimum    Minimum transaction size
       */
!     public AssetBuilder(final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), signer, logger, receiver);
          final Element elem = getElement();
!         AssetGlobals.createAttribute(elem, "controller", controller);
!         AssetGlobals.createAttribute(elem, "decimalpoints", Integer.toString(decimal));
!         AssetGlobals.createAttribute(elem, "minimumxact", Double.toString(minimum));
! 
      }
  
--- 116,144 ----
  public final class AssetBuilder extends IdentityBuilder {
      /**
!      * @param serviceUrl
!      * @param serviceKey
!      * @param issuerKey
!      * @param decimal
!      * @param minimum
!      * @throws NeuClearException
       */
!     public AssetBuilder(final String serviceUrl, final PublicKey serviceKey, final PublicKey issuerKey, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), null);
          final Element elem = getElement();
!         final Element issuerElem = AssetGlobals.createElement("Issuer");
!         issuerElem.add(new KeyInfo(issuerKey).getElement());
!         elem.add(issuerElem);
!         final Element serviceElem = AssetGlobals.createElement("Service");
!         serviceElem.add(new KeyInfo(serviceKey).getElement());
!         final Element urlElem = AssetGlobals.createElement("Url");
!         urlElem.setText(serviceUrl);
!         serviceElem.add(urlElem);
!         elem.add(serviceElem);
!         final Element dec = AssetGlobals.createElement(AssetGlobals.DECIMAL_POINT_TAGNAME);
!         dec.setText(Integer.toString(decimal));
!         elem.add(dec);
!         final Element min = AssetGlobals.createElement(AssetGlobals.MINIMUM_TAGNAME);
!         min.setText(Double.toString(minimum));
!         elem.add(min);
      }
  
***************
*** 129,143 ****
          try {
              final JCESigner signer = new TestCaseSigner();
-             String assetname = "neu://test/bux";
-             if (args.length > 0)
-                 assetname = args[0];
  
!             final AssetBuilder assetraw = new AssetBuilder("http://bux.neuclear.org:8080",
!                     "http://logger.neuclear.org",
!                     "http://bux.neuclear.org:8080",
!                     "http://bux.neuclear.org:8080",
                      2,
                      0.01);
!             final Asset asset = (Asset) assetraw.convert(assetname, signer);
  
          } catch (Exception e) {
--- 146,157 ----
          try {
              final JCESigner signer = new TestCaseSigner();
  
!             final AssetBuilder assetraw = new AssetBuilder("http://bux.neuclear.org",
!                     signer.getPublicKey("neu://test/bux"),
!                     signer.getPublicKey("neu://alice@test"),
                      2,
                      0.01);
!             final Asset asset = (Asset) assetraw.convert("neu://bob@test", signer);
! 
  
          } catch (Exception e) {

[Neuclear-develop] [JIRA] Closed: (NEU-28) Add <Service/> element to neuid xml schema

[<bug...@ve...>]

Message:

   The following issue has been closed.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/NEU-28

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: NEU-28
    Summary: Add <Service/> element to neuid xml schema
       Type: New Feature

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Identity
   Fix Fors:
             0.9
   Versions:
             0.9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Fri, 2 Apr 2004 9:00 AM
    Updated: Fri, 2 Apr 2004 9:00 AM

Description:
We need a generalized <Service/> element which contains a URL and a PublicKey as a <KeyInfo/> element.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Created: (NEU-28) Add <Service/> element to neuid xml schema

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/NEU-28

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: NEU-28
    Summary: Add <Service/> element to neuid xml schema
       Type: New Feature

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Identity
   Fix Fors:
             0.9
   Versions:
             0.9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Fri, 2 Apr 2004 9:00 AM
    Updated: Fri, 2 Apr 2004 9:00 AM

Description:
We need a generalized <Service/> element which contains a URL and a PublicKey as a <KeyInfo/> element.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (NEU-27) Get rid of <Allow/> from <Identity/> XML Schema

[<bug...@ve...>]

Message:

   The following issue has been closed.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/NEU-27

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: NEU-27
    Summary: Get rid of <Allow/> from <Identity/> XML Schema
       Type: New Feature

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Identity
   Fix Fors:
             0.9
   Versions:
             0.9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Fri, 2 Apr 2004 8:54 AM
    Updated: Fri, 2 Apr 2004 8:55 AM

Description:
Take this out.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Created: (NEU-27) Get rid of <Allow/> from <Identity/> XML Schema

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/NEU-27

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: NEU-27
    Summary: Get rid of <Allow/> from <Identity/> XML Schema
       Type: New Feature

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Identity
   Fix Fors:
             0.9
   Versions:
             0.9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Fri, 2 Apr 2004 8:54 AM
    Updated: Fri, 2 Apr 2004 8:54 AM

Description:
Take this out.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (PAY-20) Update Asset Object to reflect new Schema

[<bug...@ve...>]

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Fri, 2 Apr 2004 8:47 AM

Updated and passes Unit Tests
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-20

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-20
    Summary: Update Asset Object to reflect new Schema
       Type: Improvement

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
   Fix Fors:
             0.3
   Versions:
             0.3

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Wed, 31 Mar 2004 3:20 PM
    Updated: Fri, 2 Apr 2004 8:47 AM

Description:
Update the Asset object so it can be properly resolved using the new schema.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (PAY-19) Update Asset Schema Definition

[<bug...@ve...>]

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Fri, 2 Apr 2004 8:47 AM

Updated it with a <Issuer/>, <Service/> and misc other new features.
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-19

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-19
    Summary: Update Asset Schema Definition
       Type: Improvement

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             XML Schema
   Fix Fors:
             0.3
   Versions:
             0.3

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Wed, 31 Mar 2004 3:19 PM
    Updated: Fri, 2 Apr 2004 8:47 AM

Description:
Update the Asset definition XML Schema.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] neuclear-pay/src/test/org/neuclear/asset/contracts/builders - New directory

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/contracts/builders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10526/src/test/org/neuclear/asset/contracts/builders

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/contracts/builders added to the repository

[Neuclear-develop] neuclear-pay/src/test/org/neuclear/asset/contracts - New directory

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/contracts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/src/test/org/neuclear/asset/contracts

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/contracts added to the repository

[Neuclear-develop] [JIRA] Work Started: (COM-8) Create Timestamping Client

[<bug...@ve...>]

Message:

   Work on this issue has been started by Pelle Braendgaard (mailto:pe...@ve...)

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/COM-8

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-8
    Summary: Create Timestamping Client
       Type: New Feature

     Status: In Progress
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Commons
   Fix Fors:
             r_0_7
   Versions:
             r_0_7

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Thu, 1 Apr 2004 2:13 PM
    Updated: Thu, 1 Apr 2004 3:30 PM

Description:
Need a Timestamping Client to get the time of a hash from a timestamping service.




---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/auth AuthenticationFilter.java,1.1,1.2

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

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

Modified Files:
	AuthenticationFilter.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: AuthenticationFilter.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/auth/AuthenticationFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AuthenticationFilter.java	2 Mar 2004 18:59:10 -0000	1.1
--- AuthenticationFilter.java	1 Apr 2004 23:19:47 -0000	1.2
***************
*** 3,7 ****
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.Base64;
! import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.verifier.VerifyingReader;
--- 3,7 ----
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.Base64;
! import org.neuclear.id.Signatory;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.verifier.VerifyingReader;
***************
*** 35,38 ****
--- 35,43 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/01 23:19:47  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.1  2004/03/02 18:59:10  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 85,89 ****
              }
              if (ticket != null) {
!                 final Identity user = ticket.getSignatory();
                  request = new HttpServletRequestWrapper((HttpServletRequest) request) {
                      public String getRemoteUser() {
--- 90,94 ----
              }
              if (ticket != null) {
!                 final Signatory user = ticket.getSignatory();
                  request = new HttpServletRequestWrapper((HttpServletRequest) request) {
                      public String getRemoteUser() {

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/senders NeuSender.java,1.1,1.2

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

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

Modified Files:
	NeuSender.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: NeuSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/senders/NeuSender.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NeuSender.java	2 Mar 2004 18:59:10 -0000	1.1
--- NeuSender.java	1 Apr 2004 23:19:48 -0000	1.2
***************
*** 1,9 ****
  package org.neuclear.id.senders;
  
- import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.NSTools;
- import org.neuclear.id.Identity;
- import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.xml.XMLException;
  
--- 1,9 ----
  package org.neuclear.id.senders;
  
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.Identity;
+ import org.neuclear.id.NSTools;
+ import org.neuclear.id.SignedNamedObject;
+ import org.neuclear.id.resolver.Resolver;
  import org.neuclear.xml.XMLException;
  
***************
*** 15,25 ****
   * To change this template use Options | File Templates.
   */
! public class NeuSender extends Sender{
      public SignedNamedObject send(String endpoint, SignedNamedObject obj) throws NeuClearException, XMLException, UnsupportedEndpointException {
!         if (NSTools.isValidName(endpoint)){
!             Identity id=NSResolver.resolveIdentity(endpoint);
              return id.receive(obj);
          }
!         throw new UnsupportedEndpointException(this,endpoint);
      }
  }
--- 15,25 ----
   * To change this template use Options | File Templates.
   */
! public class NeuSender extends Sender {
      public SignedNamedObject send(String endpoint, SignedNamedObject obj) throws NeuClearException, XMLException, UnsupportedEndpointException {
!         if (NSTools.isValidName(endpoint)) {
!             Identity id = Resolver.resolveIdentity(endpoint);
              return id.receive(obj);
          }
!         throw new UnsupportedEndpointException(this, endpoint);
      }
  }

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/tools/commandline CommandLineSigner.java,1.12,1.13 IdentityCreator.java,1.10,1.11

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

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

Modified Files:
	CommandLineSigner.java IdentityCreator.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/CommandLineSigner.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CommandLineSigner.java	3 Mar 2004 23:26:43 -0000	1.12
--- CommandLineSigner.java	1 Apr 2004 23:19:49 -0000	1.13
***************
*** 1,4 ****
--- 1,9 ----
  /* $Id$
   * $Log$
+  * Revision 1.13  2004/04/01 23:19:49  pelle
+  * Split Identity into Signatory and Identity class.
+  * Identity remains a signed named object and will in the future just be used for self declared information.
+  * Signatory now contains the PublicKey etc and is NOT a signed object.
+  *
   * Revision 1.12  2004/03/03 23:26:43  pelle
   * Updated various tests to use the AbstractObjectCreationTest
***************
*** 242,246 ****
  import org.neuclear.id.Identity;
  import org.neuclear.id.builders.Builder;
! import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.XMLTools;
--- 247,251 ----
  import org.neuclear.id.Identity;
  import org.neuclear.id.builders.Builder;
! import org.neuclear.id.resolver.Resolver;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.XMLTools;
***************
*** 265,269 ****
              System.out.println("Resolving and Verifying: " + name);
              try {
!                 Identity id = NSResolver.resolveIdentity(name);
                  if (id != null) {
                      System.out.println("Signed Object: " + id.getName() + " is verified");
--- 270,274 ----
              System.out.println("Resolving and Verifying: " + name);
              try {
!                 Identity id = Resolver.resolveIdentity(name);
                  if (id != null) {
                      System.out.println("Signed Object: " + id.getName() + " is verified");

Index: IdentityCreator.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/IdentityCreator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IdentityCreator.java	3 Mar 2004 23:26:43 -0000	1.10
--- IdentityCreator.java	1 Apr 2004 23:19:49 -0000	1.11
***************
*** 1,4 ****
--- 1,9 ----
  /* $Id$
   * $Log$
+  * Revision 1.11  2004/04/01 23:19:49  pelle
+  * Split Identity into Signatory and Identity class.
+  * Identity remains a signed named object and will in the future just be used for self declared information.
+  * Signatory now contains the PublicKey etc and is NOT a signed object.
+  *
   * Revision 1.10  2004/03/03 23:26:43  pelle
   * Updated various tests to use the AbstractObjectCreationTest
***************
*** 226,230 ****
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
- import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.commons.crypto.signers.PublicKeySource;
  import org.neuclear.id.InvalidNamedObjectException;
--- 231,234 ----
***************
*** 246,250 ****
              System.exit(1);
          }
-         pksource = (PublicKeySource) sig;
          alias = cmd.getOptionValue("n");
          //final String cachedirpath = System.getProperty("user.home") + "/.neuclear/cache";
--- 250,253 ----
***************
*** 256,262 ****
  
      protected Builder build() throws UserCancellationException {
-         Builder subject = null;
          if (cmd.hasOption('i')) {//If we have an input file we load that instead of creating a new one
!             subject = super.build();
          }
          try {
--- 259,264 ----
  
      protected Builder build() throws UserCancellationException {
          if (cmd.hasOption('i')) {//If we have an input file we load that instead of creating a new one
!             return super.build();
          }
          try {
***************
*** 277,288 ****
  
              }
-             final PublicKey newkid = pksource.getPublicKey(alias);
  
!             return new IdentityBuilder(newkid, defaultsigner, defaultlogger, defaultreceiver);
          } catch (InvalidNamedObjectException e) {
              System.err.println("The name: " + e.getName() + " is not valid. ");
              System.exit(1);
-         } catch (NonExistingSignerException e) {
-             e.printStackTrace();
          }
          return null;
--- 279,287 ----
  
              }
  
!             return new IdentityBuilder(defaultsigner, defaultlogger, defaultreceiver);
          } catch (InvalidNamedObjectException e) {
              System.err.println("The name: " + e.getName() + " is not valid. ");
              System.exit(1);
          }
          return null;
***************
*** 317,320 ****
  
  
-     private final PublicKeySource pksource;
  }
--- 316,318 ----

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/jce NeuClearCertificateFactory.java,1.9,1.10

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

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

Modified Files:
	NeuClearCertificateFactory.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: NeuClearCertificateFactory.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/jce/NeuClearCertificateFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NeuClearCertificateFactory.java	19 Dec 2003 18:03:34 -0000	1.9
--- NeuClearCertificateFactory.java	1 Apr 2004 23:19:48 -0000	1.10
***************
*** 1,17 ****
  package org.neuclear.id.jce;
  
  import org.neuclear.id.Identity;
- import org.neuclear.id.NSTools;
- import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.commons.NeuClearException;
- import org.neuclear.xml.XMLException;
  
  import java.security.cert.*;
! import java.io.*;
  import java.util.Collection;
- import java.util.List;
  import java.util.LinkedList;
! import java.util.ArrayList;
  
  /*
--- 1,17 ----
  package org.neuclear.id.jce;
  
+ import org.neuclear.commons.NeuClearException;
  import org.neuclear.id.Identity;
  import org.neuclear.id.verifier.VerifyingReader;
  
+ import java.io.BufferedReader;
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.InputStreamReader;
  import java.security.cert.*;
! import java.util.ArrayList;
  import java.util.Collection;
  import java.util.LinkedList;
! import java.util.List;
  
  /*
***************
*** 35,38 ****
--- 35,43 ----
  $Id$
  $Log$
+ Revision 1.10  2004/04/01 23:19:48  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.9  2003/12/19 18:03:34  pelle
  Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 83,91 ****
   * NeuClear to be plugged in relatively easily for other types of applications such as
   * Code signing.
!  * <p>
   * Currently the provider provides a CertificateFactory with the name NeuClear. This
   * can be instantiated using:<br>
   * <tt> CertificateFactory certfact=CertificateFactory.getInstance("NeuClear");</tt><p>
!  *
   * User: pelleb
   * Date: Sep 30, 2003
--- 88,96 ----
   * NeuClear to be plugged in relatively easily for other types of applications such as
   * Code signing.
!  * <p/>
   * Currently the provider provides a CertificateFactory with the name NeuClear. This
   * can be instantiated using:<br>
   * <tt> CertificateFactory certfact=CertificateFactory.getInstance("NeuClear");</tt><p>
!  * <p/>
   * User: pelleb
   * Date: Sep 30, 2003
***************
*** 97,110 ****
              //Identity id=(Identity) VerifyingReader.getInstance().read(inputStream);
              final BufferedReader d = new BufferedReader(new InputStreamReader(inputStream));
!             return ((Identity)VerifyingReader.getInstance().read(inputStream)).getCertificate();
          } catch (NeuClearException e) {
!             throw new CertificateException("NeuClear: Problem reading Certificate:"+e.getMessage());
          }
      }
  
      final public Collection engineGenerateCertificates(final InputStream inputStream) throws CertificateException {
!         final List list=new LinkedList();
          try {
!             while(inputStream.available()>0) {
                  list.add(engineGenerateCertificate(inputStream));
              }
--- 102,115 ----
              //Identity id=(Identity) VerifyingReader.getInstance().read(inputStream);
              final BufferedReader d = new BufferedReader(new InputStreamReader(inputStream));
!             return ((Identity) VerifyingReader.getInstance().read(inputStream)).getSignatory().getCertificate();
          } catch (NeuClearException e) {
!             throw new CertificateException("NeuClear: Problem reading Certificate:" + e.getMessage());
          }
      }
  
      final public Collection engineGenerateCertificates(final InputStream inputStream) throws CertificateException {
!         final List list = new LinkedList();
          try {
!             while (inputStream.available() > 0) {
                  list.add(engineGenerateCertificate(inputStream));
              }

[Neuclear-develop] neuclear-id/src/java/org/neuclear/tests AbstractSigningTest.java,1.6,1.7

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

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

Modified Files:
	AbstractSigningTest.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: AbstractSigningTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractSigningTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractSigningTest.java	18 Feb 2004 00:14:34 -0000	1.6
--- AbstractSigningTest.java	1 Apr 2004 23:19:50 -0000	1.7
***************
*** 6,10 ****
  import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
! import org.neuclear.id.Identity;
  
  import java.security.GeneralSecurityException;
--- 6,10 ----
  import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
! import org.neuclear.id.Signatory;
  
  import java.security.GeneralSecurityException;
***************
*** 30,33 ****
--- 30,38 ----
  $Id$
  $Log$
+ Revision 1.7  2004/04/01 23:19:50  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.6  2004/02/18 00:14:34  pelle
  Many, many clean ups. I've readded Targets in a new method.
***************
*** 73,79 ****
          assertNotNull(signer.getPublicKey("neu://bob@test"));
  
!         alice = new Identity(signer.getPublicKey("neu://alice@test"));
          assertNotNull(alice);
!         bob = new Identity(signer.getPublicKey("neu://bob@test"));
          assertNotNull(bob);
      }
--- 78,84 ----
          assertNotNull(signer.getPublicKey("neu://bob@test"));
  
!         alice = new Signatory(signer.getPublicKey("neu://alice@test"));
          assertNotNull(alice);
!         bob = new Signatory(signer.getPublicKey("neu://bob@test"));
          assertNotNull(bob);
      }
***************
*** 85,89 ****
       */
  
!     protected final Identity getBob() {
          return bob;
      }
--- 90,94 ----
       */
  
!     protected final Signatory getBob() {
          return bob;
      }
***************
*** 95,99 ****
       */
  
!     protected final Identity getAlice() {
          return alice;
      }
--- 100,104 ----
       */
  
!     protected final Signatory getAlice() {
          return alice;
      }
***************
*** 103,108 ****
      }
  
!     private Identity bob;
!     private Identity alice;
      protected final JCESigner signer;
  }
--- 108,113 ----
      }
  
!     private Signatory bob;
!     private Signatory alice;
      protected final JCESigner signer;
  }