[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts AssetTransactionContract.java,1.7,1.8 TransferGlobals.java,1.4,1.5

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

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

Modified Files:
	AssetTransactionContract.java TransferGlobals.java 
Log Message:
Getting the NeuClear web transactions working.

Index: AssetTransactionContract.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/AssetTransactionContract.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssetTransactionContract.java	22 Nov 2003 00:22:28 -0000	1.7
--- AssetTransactionContract.java	28 Nov 2003 00:11:50 -0000	1.8
***************
*** 21,24 ****
--- 21,27 ----
   * $Id$
   * $Log$
+  * Revision 1.8  2003/11/28 00:11:50  pelle
+  * Getting the NeuClear web transactions working.
+  *
   * Revision 1.7  2003/11/22 00:22:28  pelle
   * All unit tests in commons, id and xmlsec now work.
***************
*** 26,30 ****
   * Payment Web App has working form that creates a TransferRequest presents it to the signer
   * and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
!  *
   * Revision 1.6  2003/11/21 04:43:04  pelle
   * EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
--- 29,33 ----
   * Payment Web App has working form that creates a TransferRequest presents it to the signer
   * and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
!  * <p/>
   * Revision 1.6  2003/11/21 04:43:04  pelle
   * EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 85,88 ****
--- 88,92 ----
  
              final Asset asset = (Asset) NSResolver.resolveIdentity(elem.attributeValue("assetName"));
+ 
              final String holdid = elem.attributeValue("holdid");
              if (elem.getName().equals(TransferGlobals.CANCEL_TAGNAME))
***************
*** 94,98 ****
              final Date valuetime = TimeTools.parseTimeStamp(elem.attributeValue("valuetime"));
              final Identity to = NSResolver.resolveIdentity(elem.attributeValue("recipient"));
!             final String comment = elem.attributeValue("comment");
              if (elem.getName().equals(TransferGlobals.XFER_TAGNAME))
                  return new TransferRequest(core, asset, to, amount, valuetime, comment);
--- 98,104 ----
              final Date valuetime = TimeTools.parseTimeStamp(elem.attributeValue("valuetime"));
              final Identity to = NSResolver.resolveIdentity(elem.attributeValue("recipient"));
!             final Element commentElement = elem.element(TransferGlobals.createQName("comment"));
! 
!             final String comment = (commentElement != null) ? commentElement.getText() : "";
              if (elem.getName().equals(TransferGlobals.XFER_TAGNAME))
                  return new TransferRequest(core, asset, to, amount, valuetime, comment);

Index: TransferGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/TransferGlobals.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferGlobals.java	22 Nov 2003 00:22:28 -0000	1.4
--- TransferGlobals.java	28 Nov 2003 00:11:50 -0000	1.5
***************
*** 24,27 ****
--- 24,30 ----
  $Id$
  $Log$
+ Revision 1.5  2003/11/28 00:11:50  pelle
+ Getting the NeuClear web transactions working.
+ 
  Revision 1.4  2003/11/22 00:22:28  pelle
  All unit tests in commons, id and xmlsec now work.
***************
*** 91,94 ****
--- 94,103 ----
  
      public static Element createElement(final String name, final String value) {
+         Element elem = createElement(name);
+         elem.setText(value);
+         return elem;
+     }
+ 
+     public static Element createElement(final String name) {
          return DocumentHelper.createElement(createQName(name));
      }