neuclear-develop — Support requests, cvs etc

[Neuclear-develop] neuclear-id/src/testdata/simple - New directory

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

Update of /cvsroot/neuclear/neuclear-id/src/testdata/simple
In directory sc8-pr-cvs1:/tmp/cvs-serv8910/src/testdata/simple

Log Message:
Directory /cvsroot/neuclear/neuclear-id/src/testdata/simple added to the repository

[Neuclear-develop] neuclear-id/src/test/org/neuclear/id/verifier - New directory

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

Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/verifier
In directory sc8-pr-cvs1:/tmp/cvs-serv6911/src/test/org/neuclear/id/verifier

Log Message:
Directory /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/verifier added to the repository

[Neuclear-develop] neuclear-pay project.xml,1.2,1.3

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

Update of /cvsroot/neuclear/neuclear-pay
In directory sc8-pr-cvs1:/tmp/cvs-serv6445

Modified Files:
	project.xml 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** project.xml	22 Sep 2003 19:58:11 -0000	1.2
--- project.xml	26 Sep 2003 23:51:33 -0000	1.3
***************
*** 37,41 ****
        <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
        <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-announce</archive>
      </mailingList>
      <mailingList>
--- 37,41 ----
        <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
        <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!       <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive>
      </mailingList>
      <mailingList>
***************
*** 43,47 ****
        <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe>
        <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-general</archive>
      </mailingList>
        <mailingList>
--- 43,47 ----
        <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe>
        <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe>
!       <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive>
      </mailingList>
        <mailingList>
***************
*** 49,53 ****
          <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe>
          <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe>
!         <archive>http://www.geocrawler.com/redir-sf.php3?list=neuclear-develop</archive>
        </mailingList>
    </mailingLists>
--- 49,53 ----
          <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe>
          <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe>
!         <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive>
        </mailingList>
    </mailingLists>
***************
*** 81,85 ****
             <version>1.0-beta-1</version>
         </dependency>
! 
  <!--    <dependency>
     	<id>neudistframework</id>
--- 81,114 ----
             <version>1.0-beta-1</version>
         </dependency>
!        <dependency>
!           <id>neuclear-id</id>
!        <name>neuclear-id</name>
!        <version>0.7-SNAPSHOT</version>
!        </dependency>
!        <dependency>
!            <id>neudist-xmlsig</id>
!            <name>neudist-xmlsig</name>
!            <version>0.9-SNAPSHOT</version>
!            <properties>
!                  <war.bundle.jar>true</war.bundle.jar>
!            </properties>
!        </dependency>
!     <dependency>
!     	<id>commons-collections</id>
!       <name>commons-collections</name>
!       <version>2.1</version>
!       <jar>commons-collections-2.1.jar</jar>
!       <properties>
!             <war.bundle.jar>true</war.bundle.jar>
!       </properties>
!     </dependency>
!     <dependency>
!       <id>dom4j</id>
!       <version>1.4</version>
!       <jar>dom4j-1.4.jar</jar>
!       <properties>
!             <war.bundle.jar>true</war.bundle.jar>
!       </properties>
!     </dependency>
  <!--    <dependency>
     	<id>neudistframework</id>

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/pay/receiver PaymentReceiver.java,NONE,1.1

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/pay/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv6445/src/java/org/neuclear/pay/receiver

Added Files:
	PaymentReceiver.java 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

--- NEW FILE: PaymentReceiver.java ---
package org.neuclear.pay.receiver;

import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnBalancedTransactionException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.pay.*;
import org.neuclear.pay.contracts.TransferContract;
import org.neuclear.receiver.Receiver;
import org.neuclear.receiver.UnsupportedTransaction;
import org.neudist.utils.NeudistException;

/*
NeuClear Distributed Transaction Clearing Platform
(C) 2003 Pelle Braendgaard

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

/**
 * 
 * User: pelleb
 * Date: Sep 23, 2003
 * Time: 3:03:03 PM
 */
public class PaymentReceiver implements Receiver {

    public PaymentReceiver(PaymentProcessor proc, String asset) {
        this.proc = proc;
        this.asset = asset;
    }

    /**
     * Add your main transaction processing logic within this method.
     * @param obj
     * @throws UnsupportedTransaction
     */
    public void receive(SignedNamedObject obj) throws UnsupportedTransaction {
        if (obj instanceof TransferContract) {
            TransferContract transfer = (TransferContract) obj;
            if (!transfer.getAsset().equals(asset))
                throw new UnsupportedTransaction(obj);
            try {
                Account from = proc.getAccount(transfer.getName());
                Account to = proc.getAccount(transfer.getName());
                PaymentReceipt receipt = from.pay(to, transfer.getAmount(), transfer.getTimeStamp(), "transfer");
                //TODO do something with receipt
            } catch (UnknownBookException e) {
                throw new UnsupportedTransaction(obj);
            } catch (LowlevelLedgerException e) {
                e.printStackTrace();
            } catch (NeudistException e) {
                e.printStackTrace();
            } catch (InsufficientFundsException e) {
                e.printStackTrace();
            } catch (InvalidTransactionException e) {
                e.printStackTrace();
            } catch (UnBalancedTransactionException e) {
                e.printStackTrace();
            } catch (NegativePaymentException e) {
                e.printStackTrace();
            }
        } else
            throw new UnsupportedTransaction(obj);
    }

    private PaymentProcessor proc;
    private String asset;
}

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/pay/contracts TransferContract.java,NONE,1.1

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/pay/contracts
In directory sc8-pr-cvs1:/tmp/cvs-serv6445/src/java/org/neuclear/pay/contracts

Added Files:
	TransferContract.java 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

--- NEW FILE: TransferContract.java ---
package org.neuclear.pay.contracts;

import org.dom4j.Element;
import org.neuclear.id.Identity;
import org.neuclear.id.NamedObjectReader;
import org.neuclear.id.SignedNamedObject;
import org.neudist.utils.NeudistException;

import java.sql.Timestamp;

/*
NeuClear Distributed Transaction Clearing Platform
(C) 2003 Pelle Braendgaard

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

/**
 * 
 * User: pelleb
 * Date: Sep 23, 2003
 * Time: 3:07:54 PM
 */
public class TransferContract extends SignedNamedObject {
    TransferContract(String name, Identity signer, Timestamp timestamp, String digest, String asset, String toaccount, double amount) throws NeudistException {
        super(name, signer, timestamp, digest);
        this.asset = asset;
        this.amount = amount;
        this.toaccount = toaccount;
    }

    public double getAmount() {
        return amount;
    }

    public String getAsset() {
        return asset;
    }

    public String getRecipient() {
        return toaccount;
    }

    private double amount;
    private String toaccount;
    private String asset;

    public static class Reader implements NamedObjectReader {
        /**
         * Read object from Element and fill in its details
         * @param elem
         * @return
         */
        public SignedNamedObject read(Element elem, String name, Identity signatory, String digest, Timestamp timestamp) throws NeudistException {
            double amount = Double.parseDouble(elem.attributeValue("amount"));
            String asset = elem.attributeValue("asset");
            String to = elem.attributeValue("recipient");
            return new TransferContract(name, signatory, timestamp, digest, asset, to, amount);
        }

    }

}

[Neuclear-develop] neuclear-id/src/webapp index.jsp,1.4,1.5 login.jsp,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-id/src/webapp
In directory sc8-pr-cvs1:/tmp/cvs-serv6861/src/webapp

Modified Files:
	index.jsp login.jsp 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: index.jsp
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/webapp/index.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.jsp	24 Sep 2003 23:56:49 -0000	1.4
--- index.jsp	26 Sep 2003 23:53:10 -0000	1.5
***************
*** 5,10 ****
                   org.neuclear.contracts.nsauth.AuthenticationTicket,
                   org.neuclear.id.NSTools,
!                  org.neudist.utils.ServletTools,
!                  org.neuclear.id.NamedObjectFactory"%>
   <%
      response.setHeader("Pragma","no-cache");
--- 5,10 ----
                   org.neuclear.contracts.nsauth.AuthenticationTicket,
                   org.neuclear.id.NSTools,
!                  org.neudist.utils.ServletTools
!                 "%>
   <%
      response.setHeader("Pragma","no-cache");
***************
*** 22,26 ****
      String ticketname=(String)sess.getAttribute("nsauth");
          if (ticket==null&&!Utility.isEmpty(ticketname)) {
!             SignedNamedObject named=NamedObjectFactory.fetchNamedObject(ticketname);
              if (named!=null){
                  if (named instanceof AuthenticationTicket) {
--- 22,26 ----
      String ticketname=(String)sess.getAttribute("nsauth");
          if (ticket==null&&!Utility.isEmpty(ticketname)) {
!             SignedNamedObject named=null;//=NamedObjectFactory.fetchNamedObject(ticketname);
              if (named!=null){
                  if (named instanceof AuthenticationTicket) {

Index: login.jsp
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/webapp/login.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** login.jsp	23 Sep 2003 19:16:30 -0000	1.3
--- login.jsp	26 Sep 2003 23:53:10 -0000	1.4
***************
*** 7,13 ****
                  org.neudist.utils.ServletTools,
                  org.neuclear.id.Identity,
!                 org.neuclear.id.NamedObjectFactory,
!                 org.neudist.utils.NeudistException,
!                 org.neuclear.id.signrequest.SignatureRequest"%>
  <%
      response.setHeader("Pragma","no-cache");
--- 7,12 ----
                  org.neudist.utils.ServletTools,
                  org.neuclear.id.Identity,
! 
!                 org.neudist.utils.NeudistException"%>
  <%
      response.setHeader("Pragma","no-cache");
***************
*** 24,31 ****
      usercookie.setMaxAge(2592000);
      response.addCookie(usercookie);
!     SignatureRequest auth=null;
      try {
          // TODO: This needs a signer and a targeturl
!         auth = AuthenticationTicket.createAuthenticationRequest(
                      userns,
                      "neu://neu/testapp",
--- 23,30 ----
      usercookie.setMaxAge(2592000);
      response.addCookie(usercookie);
! //    SignatureRequest auth=null;
      try {
          // TODO: This needs a signer and a targeturl
!   /*      auth = AuthenticationTicket.createAuthenticationRequest(
                      userns,
                      "neu://neu/testapp",
***************
*** 35,39 ****
                      null
              );
!         // For this simple example we will fetch the object from the store later on.
  //        auth.addTarget(new TargetReference(auth,ServletTools.getAbsoluteURL(request,"/Store"),"store"));
          request.getSession(true).setAttribute("nsauth",auth.getPayload().getName());
--- 34,38 ----
                      null
              );
!   */      // For this simple example we will fetch the object from the store later on.
  //        auth.addTarget(new TargetReference(auth,ServletTools.getAbsoluteURL(request,"/Store"),"store"));
          request.getSession(true).setAttribute("nsauth",auth.getPayload().getName());

[Neuclear-develop] neuclear-id/src/java/org/neuclear/store EncryptedFileStore.java,1.5,1.6 Store.java,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store
In directory sc8-pr-cvs1:/tmp/cvs-serv6861/src/java/org/neuclear/store

Modified Files:
	EncryptedFileStore.java Store.java 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: EncryptedFileStore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/EncryptedFileStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EncryptedFileStore.java	26 Sep 2003 00:22:07 -0000	1.5
--- EncryptedFileStore.java	26 Sep 2003 23:53:10 -0000	1.6
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.6  2003/09/26 23:53:10  pelle
+  * Changes mainly in receiver and related fun.
+  * First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.
+  *
   * Revision 1.5  2003/09/26 00:22:07  pelle
   * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
***************
*** 133,146 ****
  package org.neuclear.store;
  
- import org.dom4j.DocumentException;
- import org.dom4j.DocumentHelper;
- import org.neuclear.id.NSTools;
- import org.neuclear.id.SignedNamedObject;
- import org.neudist.crypto.CryptoTools;
- import org.neudist.utils.NeudistException;
- import org.neudist.utils.Utility;
- import org.neudist.xml.xmlsec.XMLSecTools;
  
- import java.io.*;
  
  /**
--- 137,141 ----
***************
*** 151,157 ****
--- 146,154 ----
   */
  public class EncryptedFileStore extends FileStore {
+ 
      public EncryptedFileStore(String base) {
          super(base);
      }
+ /*
  
      protected void rawStore(SignedNamedObject obj) throws IOException, NeudistException {
***************
*** 227,230 ****
--- 224,228 ----
      }
  
+ */
  
  }

Index: Store.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/Store.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Store.java	26 Sep 2003 00:22:07 -0000	1.5
--- Store.java	26 Sep 2003 23:53:10 -0000	1.6
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.6  2003/09/26 23:53:10  pelle
+  * Changes mainly in receiver and related fun.
+  * First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.
+  *
   * Revision 1.5  2003/09/26 00:22:07  pelle
   * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
***************
*** 130,136 ****
  package org.neuclear.store;
  
- import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.receiver.Receiver;
  import org.neudist.utils.NeudistException;
  
--- 134,140 ----
  package org.neuclear.store;
  
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.receiver.Receiver;
+ import org.neuclear.receiver.UnsupportedTransaction;
  import org.neudist.utils.NeudistException;
  
***************
*** 144,148 ****
       *  This handles the Identity checking on the object.
       */
!     public final void receive(SignedNamedObject obj) throws InvalidIdentityException, NeudistException {
          try {
              // Dont allow overwrites
--- 148,152 ----
       *  This handles the Identity checking on the object.
       */
!     public final void receive(SignedNamedObject obj) throws UnsupportedTransaction {
          try {
              // Dont allow overwrites
***************
*** 152,159 ****
--- 156,166 ----
  
              rawStore(obj);
+ 
              if (next != null)
                  next.receive(obj);
  
          } catch (IOException e) {
+             e.printStackTrace();
+         } catch (NeudistException e) {
              e.printStackTrace();
          }

[Neuclear-develop] neuclear-id project.properties,1.1.1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-id
In directory sc8-pr-cvs1:/tmp/cvs-serv6861

Modified Files:
	project.properties 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/project.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** project.properties	19 Sep 2003 14:40:52 -0000	1.1.1.1
--- project.properties	26 Sep 2003 23:53:10 -0000	1.2
***************
*** 18,21 ****
  maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/
  
! 
  maven.uberjar.main = org.neuclear.signers.commandline.CommandLineSigner
--- 18,21 ----
  maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/
  
! maven.test.skip=true
  maven.uberjar.main = org.neuclear.signers.commandline.CommandLineSigner

[Neuclear-develop] neuclear-id/src/java/org/neuclear/senders LogSender.java,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders
In directory sc8-pr-cvs1:/tmp/cvs-serv6861/src/java/org/neuclear/senders

Modified Files:
	LogSender.java 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: LogSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/LogSender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LogSender.java	26 Sep 2003 00:22:07 -0000	1.5
--- LogSender.java	26 Sep 2003 23:53:10 -0000	1.6
***************
*** 2,6 ****
  
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.NamedObjectFactory;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.time.TimeTools;
--- 2,5 ----
***************
*** 24,27 ****
--- 23,30 ----
   * $Id$
   * $Log$
+  * Revision 1.6  2003/09/26 23:53:10  pelle
+  * Changes mainly in receiver and related fun.
+  * First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.
+  *
   * Revision 1.5  2003/09/26 00:22:07  pelle
   * Cleanups and final changes to code for refactoring of the Verifier and Reader part.

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/resolver NSResolver.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver
In directory sc8-pr-cvs1:/tmp/cvs-serv6861/src/java/org/neuclear/id/resolver

Modified Files:
	NSResolver.java 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: NSResolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/NSResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NSResolver.java	24 Sep 2003 23:56:48 -0000	1.4
--- NSResolver.java	26 Sep 2003 23:53:10 -0000	1.5
***************
*** 1,14 ****
  package org.neuclear.id.resolver;
  
  import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.NSTools;
- import org.neuclear.id.Identity;
  import org.neuclear.id.cache.NSCache;
- import org.neuclear.id.verifier.NSVerifier;
  import org.neuclear.source.Source;
  import org.neudist.utils.NeudistException;
  
- import java.security.PublicKey;
- 
  /**
   * Secure Identity resolver
--- 1,11 ----
  package org.neuclear.id.resolver;
  
+ import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.NSTools;
  import org.neuclear.id.cache.NSCache;
  import org.neuclear.source.Source;
  import org.neudist.utils.NeudistException;
  
  /**
   * Secure Identity resolver
***************
*** 34,38 ****
          String parentname = NSTools.getParentNSURI(name);
          String store = NSROOTSTORE;
!         if ( parentname == null || parentname.equals("neu://"))
              return Identity.getRootIdentity();
          Identity parent = resolveIdentity(parentname);
--- 31,35 ----
          String parentname = NSTools.getParentNSURI(name);
          String store = NSROOTSTORE;
!         if (parentname == null || parentname.equals("neu://"))
              return Identity.getRootIdentity();
          Identity parent = resolveIdentity(parentname);

[Neuclear-develop] neuclear-id/src/java/org/neuclear/receiver UnsupportedTransaction.java,NONE,1.1 Receiver.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv6861/src/java/org/neuclear/receiver

Modified Files:
	Receiver.java 
Added Files:
	UnsupportedTransaction.java 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

--- NEW FILE: UnsupportedTransaction.java ---
package org.neuclear.receiver;

import org.neuclear.id.SignedNamedObject;
import org.neudist.utils.NeudistException;

/*
NeuClear Distributed Transaction Clearing Platform
(C) 2003 Pelle Braendgaard

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

$Id: UnsupportedTransaction.java,v 1.1 2003/09/26 23:53:10 pelle Exp $
$Log: UnsupportedTransaction.java,v $
Revision 1.1  2003/09/26 23:53:10  pelle
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

*/

/**
 * 
 * User: pelleb
 * Date: Sep 26, 2003
 * Time: 1:48:58 PM
 */
public class UnsupportedTransaction extends NeudistException {
    /**
     *
     * @param obj
     */
    public UnsupportedTransaction(SignedNamedObject obj) {
        super("NeuClear Transaction not Supported by this Receiver: " + obj.getClass().getName());
    }
}

Index: Receiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/Receiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Receiver.java	24 Sep 2003 23:56:48 -0000	1.4
--- Receiver.java	26 Sep 2003 23:53:10 -0000	1.5
***************
*** 9,12 ****
--- 9,16 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 23:53:10  pelle
+  * Changes mainly in receiver and related fun.
+  * First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.
+  *
   * Revision 1.4  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 42,48 ****
   */
  
- import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.SignedNamedObject;
- import org.neudist.utils.NeudistException;
  
  /**
--- 46,50 ----
***************
*** 57,63 ****
       * you can not trust it.
       * @param obj
!      * @throws InvalidIdentityException
!      * @throws NeudistException
       */
!     void receive(SignedNamedObject obj) throws InvalidIdentityException, NeudistException;
  }
--- 59,64 ----
       * you can not trust it.
       * @param obj
!      * @throws UnsupportedTransaction
       */
!     void receive(SignedNamedObject obj) throws UnsupportedTransaction;
  }

[Neuclear-develop] neuclear-id/src/java/org/neuclear/source HttpSource.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/source
In directory sc8-pr-cvs1:/tmp/cvs-serv6861/src/java/org/neuclear/source

Modified Files:
	HttpSource.java 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: HttpSource.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/source/HttpSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HttpSource.java	24 Sep 2003 23:56:49 -0000	1.3
--- HttpSource.java	26 Sep 2003 23:53:10 -0000	1.4
***************
*** 1,14 ****
  package org.neuclear.source;
  
- import org.dom4j.Document;
- import org.dom4j.DocumentException;
  import org.dom4j.io.SAXReader;
  import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.NamedObjectFactory;
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neudist.utils.NeudistException;
  
- import java.net.MalformedURLException;
  import java.net.URL;
  
--- 1,10 ----
***************
*** 20,23 ****
--- 16,23 ----
   * $Id$
   * $Log$
+  * Revision 1.4  2003/09/26 23:53:10  pelle
+  * Changes mainly in receiver and related fun.
+  * First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.
+  *
   * Revision 1.3  2003/09/24 23:56:49  pelle
   * Refactoring nearly done. New model for creating signed objects.

[Neuclear-develop] neuclear-commons project.xml,1.1.1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-commons
In directory sc8-pr-cvs1:/tmp/cvs-serv6628

Modified Files:
	project.xml 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/project.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** project.xml	20 Sep 2003 23:18:10 -0000	1.1.1.1
--- project.xml	26 Sep 2003 23:52:13 -0000	1.2
***************
*** 23,30 ****
      <repository>
       <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neudist:neuclear-commons
       </connection>
       <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neudist/neuclear-commons/
      </url>
    </repository>
--- 23,30 ----
      <repository>
       <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-commons
       </connection>
       <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-commons/
      </url>
    </repository>
***************
*** 32,50 ****
    <siteAddress>neuclear.org</siteAddress>
    <siteDirectory>/home/sites/neuclear.org/public_html/commons/</siteDirectory>
!   <issueTrackingUrl>http://devone.veraxpay.com:9090</issueTrackingUrl>
!   <mailingLists>
!     <mailingList>
!       <name>NeuDist Announce</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neudist-announce</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neudist-announce</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neudist-announce</archive>
!     </mailingList>
!     <mailingList>
!       <name>NeuDist Discuss</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neudist-discuss</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neudist-discuss</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neudist-discuss</archive>
!     </mailingList>
!   </mailingLists>
  
    <developers>
--- 32,56 ----
    <siteAddress>neuclear.org</siteAddress>
    <siteDirectory>/home/sites/neuclear.org/public_html/commons/</siteDirectory>
!     <mailingLists>
!       <mailingList>
!         <name>NeuClear Announce</name>
!         <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
!         <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!         <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive>
!       </mailingList>
!       <mailingList>
!         <name>NeuClear General</name>
!         <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe>
!         <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe>
!         <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive>
!       </mailingList>
!         <mailingList>
!           <name>NeuClear Develop</name>
!           <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe>
!           <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe>
!           <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive>
!         </mailingList>
!     </mailingLists>
! 
  
    <developers>

[Neuclear-develop] neuclear-bet project.xml,1.1.1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-bet
In directory sc8-pr-cvs1:/tmp/cvs-serv6394

Modified Files:
	project.xml 
Log Message:
Changes mainly in receiver and related fun.
First real neuclear stuff in the payment package. Added TransferContract and PaymentReceiver.

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-bet/project.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** project.xml	20 Sep 2003 23:19:20 -0000	1.1.1.1
--- project.xml	26 Sep 2003 23:51:11 -0000	1.2
***************
*** 33,50 ****
    <siteDirectory>/home/sites/neuclear.org/public_html/bet/</siteDirectory>
    <issueTrackingUrl>http://devone.veraxpay.com:9090</issueTrackingUrl>
!   <mailingLists>
!     <mailingList>
!       <name>NeuDist Announce</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neudist-announce</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neudist-announce</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neudist-announce</archive>
!     </mailingList>
!     <mailingList>
!       <name>NeuDist Discuss</name>
!       <subscribe>http://lists.sourceforge.net/lists/listinfo/neudist-discuss</subscribe>
!       <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neudist-discuss</unsubscribe>
!       <archive>http://www.geocrawler.com/redir-sf.php3?list=neudist-discuss</archive>
!     </mailingList>
!   </mailingLists>
  
    <developers>
--- 33,57 ----
    <siteDirectory>/home/sites/neuclear.org/public_html/bet/</siteDirectory>
    <issueTrackingUrl>http://devone.veraxpay.com:9090</issueTrackingUrl>
!     <mailingLists>
!       <mailingList>
!         <name>NeuClear Announce</name>
!         <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe>
!         <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe>
!         <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive>
!       </mailingList>
!       <mailingList>
!         <name>NeuClear General</name>
!         <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe>
!         <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe>
!         <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive>
!       </mailingList>
!         <mailingList>
!           <name>NeuClear Develop</name>
!           <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe>
!           <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe>
!           <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive>
!         </mailingList>
!     </mailingLists>
! 
  
    <developers>

[Neuclear-develop] [JIRA] Closed: (NEU-2) Refactor out the dom4j dependency

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

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Fri, 26 Sep 2003 6:41 PM

Updated this with a completely newly designed framework for contract verification. 

To implement the xmlpull api in the future we simply have to rewrite the new Reader inner classes found within them, but the grand majority of code wont change.

Still missing are builders. That is relatively easy and we will probably always use dom4j for that.
---------------------------------------------------------------------
View the issue:

  http://devone.veraxpay.com:9090/secure/ViewIssue.jspa?key=NEU-2


Here is an overview of the issue:
---------------------------------------------------------------------
        Key: NEU-2
    Summary: Refactor out the dom4j dependency
       Type: New Feature

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Identity
   Fix Fors:
             0.7
   Versions:
             0.7

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 22 Sep 2003 11:59 AM
    Updated: Fri, 26 Sep 2003 6:41 PM

Description:
The ID library at the moment is way to reliant on dom4j.
We should really be able to use some other kind of method for actually verifying the items.



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

If you think it was sent incorrectly contact one of the administrators:
   http://devone.veraxpay.com:9090/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/store EncryptedFileStore.java,1.4,1.5 FileStore.java,1.4,1.5 Store.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/store

Modified Files:
	EncryptedFileStore.java FileStore.java Store.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



Index: EncryptedFileStore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/EncryptedFileStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EncryptedFileStore.java	24 Sep 2003 23:56:49 -0000	1.4
--- EncryptedFileStore.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:49  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 134,138 ****
  import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.NamedObjectFactory;
  import org.neudist.crypto.CryptoTools;
  import org.neudist.utils.NeudistException;
--- 137,140 ----
***************
*** 161,168 ****
          // Quick and dirty encryption for now.
  //        String xmlData=obj.getElement().asXML();
!         byte encrypted[] = CryptoTools.encrypt(obj.getName(), XMLSecTools.getElementBytes(obj.getElement()));
  
          BufferedOutputStream os = new BufferedOutputStream(new FileOutputStream(outputFile));
!         os.write(encrypted);
          os.close();
      }
--- 163,170 ----
          // Quick and dirty encryption for now.
  //        String xmlData=obj.getElement().asXML();
! //TODO Find alternative        byte encrypted[] = CryptoTools.encrypt(obj.getName(), XMLSecTools.getElementBytes(obj.getElement()));
  
          BufferedOutputStream os = new BufferedOutputStream(new FileOutputStream(outputFile));
! //TODO Find alternative        os.write(encrypted);
          os.close();
      }
***************
*** 188,192 ****
  //            System.out.println(clearString);
              org.dom4j.Document doc = DocumentHelper.parseText(clearString);
!             ns = NamedObjectFactory.createNamedObject(doc);
  //            Utility.rethrowException(e);
          } catch (IOException e) {
--- 190,194 ----
  //            System.out.println(clearString);
              org.dom4j.Document doc = DocumentHelper.parseText(clearString);
! //TODO Find alternative            ns = NamedObjectFactory.createNamedObject(doc);
  //            Utility.rethrowException(e);
          } catch (IOException e) {

Index: FileStore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/FileStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileStore.java	24 Sep 2003 23:56:49 -0000	1.4
--- FileStore.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:49  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 120,124 ****
  import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.NamedObjectFactory;
  import org.neudist.utils.NeudistException;
  import org.neudist.xml.XMLTools;
--- 123,126 ----
***************
*** 145,149 ****
          File outputFile = new File(outputFilename);
          outputFile.getParentFile().mkdirs();
!         XMLTools.writeFile(outputFile, obj.getElement());
      }
  
--- 147,151 ----
          File outputFile = new File(outputFilename);
          outputFile.getParentFile().mkdirs();
! //TODO Find alternative        XMLTools.writeFile(outputFile, obj.getElement());
      }
  
***************
*** 162,166 ****
          try {
              Document doc = XMLTools.loadDocument(new FileInputStream(fin));
!             ns = NamedObjectFactory.createNamedObject(doc);
  //           System.out.println("NEUDIST: Fetched SignedNamedObject tag:"+rootName.getName()+" URI:"+rootName.getNamespaceURI());
  //        } catch (ParserConfigurationException e) {
--- 164,168 ----
          try {
              Document doc = XMLTools.loadDocument(new FileInputStream(fin));
! //TODO Find alternative            ns = NamedObjectFactory.createNamedObject(doc);
  //           System.out.println("NEUDIST: Fetched SignedNamedObject tag:"+rootName.getName()+" URI:"+rootName.getNamespaceURI());
  //        } catch (ParserConfigurationException e) {

Index: Store.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/Store.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Store.java	24 Sep 2003 23:56:49 -0000	1.4
--- Store.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:49  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 129,133 ****
  import org.neuclear.id.InvalidIdentityException;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.verifier.NSVerifier;
  import org.neuclear.receiver.Receiver;
  import org.neudist.utils.NeudistException;
--- 132,135 ----
***************
*** 149,154 ****
  //                throw new InvalidIdentityException("The name: "+obj.getName()+" already exists");
  
-             if (!NSVerifier.isNameValid(obj))
-                 throw new InvalidIdentityException("The name: " + obj.getName() + " is not allowed");
              rawStore(obj);
              if (next != null)
--- 151,154 ----

[Neuclear-develop] neuclear-id/src/java/org/neuclear/signers/commandline CommandLineSigner.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/commandline
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/signers/commandline

Modified Files:
	CommandLineSigner.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/commandline/CommandLineSigner.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CommandLineSigner.java	24 Sep 2003 23:56:48 -0000	1.4
--- CommandLineSigner.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 1,4 ****
--- 1,7 ----
  /* $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 120,124 ****
  import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
! import org.neuclear.id.NamedObjectFactory;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.senders.LogSender;
--- 123,127 ----
  import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
! 
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.senders.LogSender;
***************
*** 144,147 ****
--- 147,151 ----
          CryptoTools.ensureProvider();
          String keystore = System.getProperty("user.home") + "/.keystore";
+ /*
  
          try {
***************
*** 235,240 ****
--- 239,246 ----
              e.printStackTrace(System.err);
          }
+ */
  
      }
+ /*
  
      private static SignedNamedObject loadNamedObject(String sf) throws FileNotFoundException, NeudistException {
***************
*** 248,251 ****
--- 254,258 ----
          return subject;
      }
+ */
  
      private static Options createOptions() {

[Neuclear-develop] neuclear-id/src/java/org/neuclear/senders LogSender.java,1.4,1.5 SmtpSender.java,1.4,1.5 SoapSender.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/senders

Modified Files:
	LogSender.java SmtpSender.java SoapSender.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



Index: LogSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/LogSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LogSender.java	24 Sep 2003 23:56:48 -0000	1.4
--- LogSender.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 3,6 ****
--- 3,7 ----
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.NamedObjectFactory;
+ import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.time.TimeTools;
  import org.neudist.crypto.Base64;
***************
*** 23,26 ****
--- 24,30 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 63,67 ****
      public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
          try {
!             String digest = URLEncoder.encode(Base64.encode(obj.getDigest()), "UTF-8");
              String name = URLEncoder.encode(obj.getName(), "UTF-8");
              URL url = new URL(Utility.denullString(endpoint, LOGGER) + "?nohtml=1&name=" + name + "&digest=" + digest);
--- 67,71 ----
      public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
          try {
!             String digest = URLEncoder.encode(Base64.encode(obj.getDigest().getBytes()), "UTF-8");
              String name = URLEncoder.encode(obj.getName(), "UTF-8");
              URL url = new URL(Utility.denullString(endpoint, LOGGER) + "?nohtml=1&name=" + name + "&digest=" + digest);
***************
*** 86,90 ****
              logObject("neu://free/pelle");
              logObject("neu://pelle");
!             System.out.println("Object neu://free/pelle was logged at: " + getTimeStamp(NamedObjectFactory.fetchNamedObject("neu://free/pelle")));
          } catch (NeudistException e) {
              e.printStackTrace();  //To change body of catch statement use Options | File Templates.
--- 90,94 ----
              logObject("neu://free/pelle");
              logObject("neu://pelle");
!             System.out.println("Object neu://free/pelle was logged at: " + getTimeStamp(NSResolver.resolveIdentity("neu://free/pelle")));
          } catch (NeudistException e) {
              e.printStackTrace();  //To change body of catch statement use Options | File Templates.
***************
*** 117,121 ****
  
      public static Timestamp getTimeStamp(SignedNamedObject obj) throws NeudistException {
!         return getTimeStamp(Utility.denullString(obj.getParent().getLogger(), LOGGER), obj.getDigest());
  
      }
--- 121,125 ----
  
      public static Timestamp getTimeStamp(SignedNamedObject obj) throws NeudistException {
!         return getTimeStamp(Utility.denullString(obj.getSignatory().getLogger(), LOGGER), obj.getDigest().getBytes());
  
      }
***************
*** 123,127 ****
      private static void logObject(String name) throws NeudistException {
          System.out.print("Fetching...");
!         SignedNamedObject obj = NamedObjectFactory.fetchNamedObject(name);
          System.out.println("Got " + obj.getName());
          Sender log = new LogSender();
--- 127,131 ----
      private static void logObject(String name) throws NeudistException {
          System.out.print("Fetching...");
!         SignedNamedObject obj = NSResolver.resolveIdentity(name);
          System.out.println("Got " + obj.getName());
          Sender log = new LogSender();

Index: SmtpSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/SmtpSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SmtpSender.java	24 Sep 2003 23:56:48 -0000	1.4
--- SmtpSender.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 8,11 ****
--- 8,14 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 86,90 ****
              multi.addBodyPart(body);
              BodyPart objpart = new MimeBodyPart();
!             objpart.setText(obj.asXML());
              objpart.setHeader("Content-type", "application/nsdl");
              multi.addBodyPart(objpart);
--- 89,93 ----
              multi.addBodyPart(body);
              BodyPart objpart = new MimeBodyPart();
! //TODO How do we replace this            objpart.setText(obj.asXML());
              objpart.setHeader("Content-type", "application/nsdl");
              multi.addBodyPart(objpart);

Index: SoapSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/SoapSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SoapSender.java	24 Sep 2003 23:56:48 -0000	1.4
--- SoapSender.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 8,11 ****
--- 8,14 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 49,53 ****
  public class SoapSender extends Sender {
      public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
!         SOAPTools.soapRequest(endpoint, obj.getElement(), "/receive");
      }
  }
--- 52,56 ----
  public class SoapSender extends Sender {
      public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
!         //SOAPTools.soapRequest(endpoint, obj.getElement(), "/receive");TODO Rething this
      }
  }

[Neuclear-develop] neuclear-id/src/java/org/neuclear/signers/servlet DemoSigningServlet.java,1.4,1.5 SigningServlet.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/signers/servlet

Modified Files:
	DemoSigningServlet.java SigningServlet.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



Index: DemoSigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet/DemoSigningServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DemoSigningServlet.java	24 Sep 2003 23:56:48 -0000	1.4
--- DemoSigningServlet.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 128,131 ****
--- 131,135 ----
  
  public class DemoSigningServlet extends SigningServlet {
+ /*
  
      private void buildTree() throws GeneralSecurityException, NeudistException, IOException {
***************
*** 184,187 ****
--- 188,192 ----
      }
  
+ */
      private KeyPairGenerator kpg;
  

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet/SigningServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SigningServlet.java	24 Sep 2003 23:56:49 -0000	1.4
--- SigningServlet.java	26 Sep 2003 00:22:07 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:49  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 136,140 ****
  import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.signrequest.SignatureRequest;
  import org.neuclear.receiver.ReceiverServlet;
  import org.neudist.crypto.signerstores.InvalidPassphraseException;
--- 139,142 ----
***************
*** 224,229 ****
          String endpoint = request.getParameter("endpoint");
          String passphrase = request.getParameter("passphrase");
-         SignatureRequest sigreq;
          SignedNamedObject named;
          boolean isSigned = false;
          Element elem = null;
--- 226,231 ----
          String endpoint = request.getParameter("endpoint");
          String passphrase = request.getParameter("passphrase");
          SignedNamedObject named;
+ /*
          boolean isSigned = false;
          Element elem = null;
***************
*** 296,299 ****
--- 298,302 ----
          }
          out.println("<p align\"left\"><img src=\"images/neubia40x40.png\"><br><a href=\"http://www.neubia.com\"><i>&copy; 2002 Antilles Software Ventures SA</i></a></body></html>");
+ */
      }
  
***************
*** 311,314 ****
--- 314,318 ----
      }
  
+ /*
      public Element receiveNamedObject(SignedNamedObject obj, String soapAction) throws SOAPException {
          try {
***************
*** 346,349 ****
--- 350,354 ----
      }
  
+ */
      protected javax.servlet.ServletContext context;
      private static SignerStore ks;

[Neuclear-develop] neuclear-id/src/java/org/neuclear/receiver ReceiverServlet.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/receiver

Modified Files:
	ReceiverServlet.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



Index: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReceiverServlet.java	24 Sep 2003 23:56:48 -0000	1.3
--- ReceiverServlet.java	26 Sep 2003 00:22:07 -0000	1.4
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.4  2003/09/26 00:22:07  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.3  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 64,92 ****
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
! import org.neuclear.id.SignedNamedObject;
! import org.neuclear.id.NamedObjectFactory;
  import org.neudist.utils.NeudistException;
! import org.neudist.xml.soap.SOAPException;
! import org.neudist.xml.soap.SOAPServlet;
  
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
  
! public abstract class ReceiverServlet extends SOAPServlet {
      public void init(ServletConfig config) throws ServletException {
          super.init(config);
      }
  
!     protected Element handleSOAPRequest(Element request, String soapAction) throws SOAPException {
          try {
!             System.out.println("NEUDIST: Got Storage Request " + soapAction);
!             System.out.println(request.asXML());
!             SignedNamedObject named = NamedObjectFactory.createNamedObject(request);
!             receiver.receive(named);
!             return OK;
          } catch (NeudistException e) {
!             e.printStackTrace(System.out);
!             throw new SOAPException(e);
          }
      }
  
--- 67,93 ----
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
! import org.neuclear.id.verifier.VerifyingReader;
  import org.neudist.utils.NeudistException;
! import org.neudist.xml.soap.XMLInputStreamServlet;
  
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ import java.io.IOException;
+ import java.io.InputStream;
  
! public abstract class ReceiverServlet extends XMLInputStreamServlet {
      public void init(ServletConfig config) throws ServletException {
          super.init(config);
      }
  
!     protected void handleInputStream(InputStream is, HttpServletRequest request, HttpServletResponse response) throws IOException {
          try {
!             receiver.receive(VerifyingReader.getInstance().read(is));
          } catch (NeudistException e) {
!             e.printStackTrace();
          }
+ 
      }
  

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/signrequest SignatureRequest.java,1.4,NONE

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signrequest
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/id/signrequest

Removed Files:
	SignatureRequest.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



--- SignatureRequest.java DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/contracts/transfer Asset.java,1.4,NONE Transfer.java,1.4,NONE

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/contracts/transfer
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/contracts/transfer

Removed Files:
	Asset.java Transfer.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



--- Asset.java DELETED ---

--- Transfer.java DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id Identity.java,1.2,1.3 NSTools.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/id

Modified Files:
	Identity.java NSTools.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



Index: Identity.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/Identity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Identity.java	24 Sep 2003 23:56:48 -0000	1.2
--- Identity.java	26 Sep 2003 00:22:06 -0000	1.3
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.3  2003/09/26 00:22:06  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.2  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 255,259 ****
  
      //TODO I dont like this being public
!     final static class Reader implements NamedObjectReader {
          /**
           * Read object from Element and fill in its details
--- 258,262 ----
  
      //TODO I dont like this being public
!     public final static class Reader implements NamedObjectReader {
          /**
           * Read object from Element and fill in its details

Index: NSTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/NSTools.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NSTools.java	24 Sep 2003 23:56:48 -0000	1.4
--- NSTools.java	26 Sep 2003 00:22:06 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/09/26 00:22:06  pelle
+  * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+  *
   * Revision 1.4  2003/09/24 23:56:48  pelle
   * Refactoring nearly done. New model for creating signed objects.
***************
*** 104,107 ****
--- 107,111 ----
  import org.neudist.utils.NeudistException;
  import org.neudist.utils.Utility;
+ import org.neuclear.id.resolver.NSResolver;
  
  import java.util.Random;
***************
*** 204,214 ****
      public static void main(String args[]) {
          try {
!             SignedNamedObject obj = NamedObjectFactory.fetchNamedObject("neu://free/pelle");
              System.out.println("Got: " + obj.getName());
!             obj = NamedObjectFactory.fetchNamedObject("neu://pelle");
              System.out.println("Got: " + obj.getName());
!             obj = NamedObjectFactory.fetchNamedObject("neu://free");
              System.out.println("Got: " + obj.getName());
!             obj = NamedObjectFactory.fetchNamedObject("neu://free/pelle");
              System.out.println("Got: " + obj.getName());
  //            obj=NamedObjectFactory.fetchNamedObject("neu://free/trix");
--- 208,218 ----
      public static void main(String args[]) {
          try {
!             SignedNamedObject obj = NSResolver.resolveIdentity("neu://free/pelle");
              System.out.println("Got: " + obj.getName());
!             obj = NSResolver.resolveIdentity("neu://pelle");
              System.out.println("Got: " + obj.getName());
!             obj = NSResolver.resolveIdentity("neu://free");
              System.out.println("Got: " + obj.getName());
!             obj = NSResolver.resolveIdentity("neu://free/pelle");
              System.out.println("Got: " + obj.getName());
  //            obj=NamedObjectFactory.fetchNamedObject("neu://free/trix");

[Neuclear-develop] neuclear-id/src/java/org/neuclear/contracts/nsauth AuthenticationTicket.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/contracts/nsauth
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/contracts/nsauth

Modified Files:
	AuthenticationTicket.java 
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.



Index: AuthenticationTicket.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/contracts/nsauth/AuthenticationTicket.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AuthenticationTicket.java	24 Sep 2003 23:56:47 -0000	1.4
--- AuthenticationTicket.java	26 Sep 2003 00:22:06 -0000	1.5
***************
*** 10,24 ****
  
  import org.dom4j.DocumentHelper;
- import org.dom4j.Element;
  import org.dom4j.Namespace;
  import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.signrequest.SignatureRequest;
- import org.neuclear.time.TimeTools;
  import org.neudist.crypto.CryptoTools;
  import org.neudist.utils.NeudistException;
- import org.neudist.utils.Utility;
  
- import java.security.PrivateKey;
  import java.sql.Timestamp;
  import java.util.Date;
--- 10,19 ----

[Neuclear-develop] neuclear-id/src/java/org/neuclear/receiver Receiver.java,1.3,1.4 ReceiverServlet.java,1.2,1.3

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv524/src/java/org/neuclear/receiver

Modified Files:
	Receiver.java ReceiverServlet.java 
Log Message:
Refactoring nearly done. New model for creating signed objects.
With view for supporting the xmlpull api shortly for performance reasons.
Currently still uses dom4j but that has been refactored out that it
should now be very quick to implement a xmlpull implementation.

A side benefit of this is that the API has been further simplified. I still have some work
todo with regards to cleaning up some of the outlying parts of the code.




Index: Receiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/Receiver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Receiver.java	23 Sep 2003 19:16:28 -0000	1.3
--- Receiver.java	24 Sep 2003 23:56:48 -0000	1.4
***************
*** 9,12 ****
--- 9,21 ----
   * $Id$
   * $Log$
+  * Revision 1.4  2003/09/24 23:56:48  pelle
+  * Refactoring nearly done. New model for creating signed objects.
+  * With view for supporting the xmlpull api shortly for performance reasons.
+  * Currently still uses dom4j but that has been refactored out that it
+  * should now be very quick to implement a xmlpull implementation.
+  *
+  * A side benefit of this is that the API has been further simplified. I still have some work
+  * todo with regards to cleaning up some of the outlying parts of the code.
+  *
   * Revision 1.3  2003/09/23 19:16:28  pelle
   * Changed NameSpace to Identity.
***************
*** 34,38 ****
  
  import org.neuclear.id.InvalidIdentityException;
! import org.neuclear.id.NamedObject;
  import org.neudist.utils.NeudistException;
  
--- 43,47 ----
  
  import org.neuclear.id.InvalidIdentityException;
! import org.neuclear.id.SignedNamedObject;
  import org.neudist.utils.NeudistException;
  
***************
*** 45,49 ****
      /**
       * Add your main transaction processing logic within this method.
!      * Remember you must check the validity of the NamedObject here. Until you do so
       * you can not trust it.
       * @param obj
--- 54,58 ----
      /**
       * Add your main transaction processing logic within this method.
!      * Remember you must check the validity of the SignedNamedObject here. Until you do so
       * you can not trust it.
       * @param obj
***************
*** 51,54 ****
       * @throws NeudistException
       */
!     void receive(NamedObject obj) throws InvalidIdentityException, NeudistException;
  }
--- 60,63 ----
       * @throws NeudistException
       */
!     void receive(SignedNamedObject obj) throws InvalidIdentityException, NeudistException;
  }

Index: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReceiverServlet.java	22 Sep 2003 19:24:02 -0000	1.2
--- ReceiverServlet.java	24 Sep 2003 23:56:48 -0000	1.3
***************
*** 2,5 ****
--- 2,14 ----
   * $Id$
   * $Log$
+  * Revision 1.3  2003/09/24 23:56:48  pelle
+  * Refactoring nearly done. New model for creating signed objects.
+  * With view for supporting the xmlpull api shortly for performance reasons.
+  * Currently still uses dom4j but that has been refactored out that it
+  * should now be very quick to implement a xmlpull implementation.
+  *
+  * A side benefit of this is that the API has been further simplified. I still have some work
+  * todo with regards to cleaning up some of the outlying parts of the code.
+  *
   * Revision 1.2  2003/09/22 19:24:02  pelle
   * More fixes throughout to problems caused by renaming.
***************
*** 55,59 ****
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
! import org.neuclear.id.NamedObject;
  import org.neuclear.id.NamedObjectFactory;
  import org.neudist.utils.NeudistException;
--- 64,68 ----
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
! import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.NamedObjectFactory;
  import org.neudist.utils.NeudistException;
***************
*** 73,77 ****
              System.out.println("NEUDIST: Got Storage Request " + soapAction);
              System.out.println(request.asXML());
!             NamedObject named = NamedObjectFactory.createNamedObject(request);
              receiver.receive(named);
              return OK;
--- 82,86 ----
              System.out.println("NEUDIST: Got Storage Request " + soapAction);
              System.out.println(request.asXML());
!             SignedNamedObject named = NamedObjectFactory.createNamedObject(request);
              receiver.receive(named);
              return OK;