|
From: <pe...@us...> - 2003-11-19 23:33:03
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/remote
In directory sc8-pr-cvs1:/tmp/cvs-serv12523/src/java/org/neuclear/asset/remote
Modified Files:
AssetControlClient.java
Log Message:
Signers now can generatekeys via the generateKey() method.
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
This means that it is now possible to further send on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
Updated all major interfaces that used the old model to use the new model.
Index: AssetControlClient.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/remote/AssetControlClient.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssetControlClient.java 12 Nov 2003 23:47:05 -0000 1.5
--- AssetControlClient.java 19 Nov 2003 23:32:20 -0000 1.6
***************
*** 4,14 ****
import org.neuclear.asset.contracts.HeldTransferReceipt;
import org.neuclear.asset.contracts.TransferReceipt;
! import org.neuclear.asset.contracts.builders.CancelHeldTransferRequestBuilder;
! import org.neuclear.asset.contracts.builders.CompleteHeldTransferRequestBuilder;
! import org.neuclear.asset.contracts.builders.HeldTransferRequestBuilder;
! import org.neuclear.asset.contracts.builders.TransferRequestBuilder;
import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.crypto.signers.Signer;
! import org.neuclear.xml.xmlsec.XMLSecurityException;
/*
--- 4,12 ----
import org.neuclear.asset.contracts.HeldTransferReceipt;
import org.neuclear.asset.contracts.TransferReceipt;
! import org.neuclear.asset.contracts.builders.*;
import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.crypto.signers.Signer;
! import org.neuclear.id.SignedNamedObject;
! import org.neuclear.xml.XMLException;
/*
***************
*** 32,35 ****
--- 30,42 ----
$Id$
$Log$
+ Revision 1.6 2003/11/19 23:32:20 pelle
+ Signers now can generatekeys via the generateKey() method.
+ Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+ SignedNamedObject now contains the full xml which is returned with getEncoded()
+ This means that it is now possible to further send on or process a SignedNamedObject, leaving
+ NamedObjectBuilder for its original purposes of purely generating new Contracts.
+ NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+ Updated all major interfaces that used the old model to use the new model.
+
Revision 1.5 2003/11/12 23:47:05 pelle
Much work done in creating good test environment.
***************
*** 86,109 ****
}
! public TransferReceipt performTransfer(TransferRequestBuilder req) throws NeuClearException, XMLSecurityException {
! req.sign(signer);
! return (TransferReceipt) req.getAsset().send(req);
}
! public HeldTransferReceipt performHeldTransfer(HeldTransferRequestBuilder req) throws NeuClearException, XMLSecurityException {
! req.sign(signer);
! return (HeldTransferReceipt) req.getAsset().send(req);
}
! public TransferReceipt performCompleteHeld(CompleteHeldTransferRequestBuilder req) throws NeuClearException, XMLSecurityException {
! req.sign(signer);
! return (TransferReceipt) req.getAsset().send(req);
}
! public CancelHeldTransferReceipt performCancelHeld(CancelHeldTransferRequestBuilder req) throws NeuClearException, XMLSecurityException {
! req.sign(signer);
! return (CancelHeldTransferReceipt) req.getAsset().send(req);
}
private final Signer signer;
--- 93,116 ----
}
! public TransferReceipt performTransfer(TransferRequestBuilder req) throws NeuClearException, XMLException {
! return (TransferReceipt) send(req);
}
!
! public HeldTransferReceipt performHeldTransfer(HeldTransferRequestBuilder req) throws NeuClearException, XMLException {
! return (HeldTransferReceipt) send(req);
}
! public TransferReceipt performCompleteHeld(CompleteHeldTransferRequestBuilder req) throws NeuClearException, XMLException {
! return (TransferReceipt) send(req);
}
! public CancelHeldTransferReceipt performCancelHeld(CancelHeldTransferRequestBuilder req) throws NeuClearException, XMLException {
! return (CancelHeldTransferReceipt) req.getAsset().send(req.sign(signer));
}
+ private SignedNamedObject send(TransferBuilder req) throws NeuClearException, XMLException {
+ return req.getAsset().send(req.sign(signer));
+ }
private final Signer signer;
|