Menu
▾
▴
[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts AssetGlobals.java,1.5,1.6 AssetTransactionContract.java,1.6,1.7 TransferGlobals.java,1.3,1.4
|
From: <pe...@us...> - 2003-11-22 00:22:31
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/java/org/neuclear/asset/contracts
Modified Files:
AssetGlobals.java AssetTransactionContract.java
TransferGlobals.java
Log Message:
All unit tests in commons, id and xmlsec now work.
AssetController now successfully processes payments in the unit test.
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.
Index: AssetGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/AssetGlobals.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssetGlobals.java 21 Nov 2003 04:43:04 -0000 1.5
--- AssetGlobals.java 22 Nov 2003 00:22:28 -0000 1.6
***************
*** 24,27 ****
--- 24,33 ----
$Id$
$Log$
+ Revision 1.6 2003/11/22 00:22:28 pelle
+ All unit tests in commons, id and xmlsec now work.
+ AssetController now successfully processes payments in the unit test.
+ 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.5 2003/11/21 04:43:04 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 107,112 ****
public static final String XFER_ASSETS = "http://neuclear.org/neu/assets";
public static final String ASSET_NSPREFIX = "asset";
static {
! VerifyingReader.getInstance().registerReader(AssetGlobals.ASSET_TAGNAME,new Asset.Reader());
}
--- 113,123 ----
public static final String XFER_ASSETS = "http://neuclear.org/neu/assets";
public static final String ASSET_NSPREFIX = "asset";
+
+ public static void registerReaders() {
+ VerifyingReader.getInstance().registerReader(AssetGlobals.ASSET_TAGNAME, new Asset.Reader());
+ }
+
static {
! registerReaders();
}
Index: AssetTransactionContract.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/AssetTransactionContract.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssetTransactionContract.java 21 Nov 2003 04:43:04 -0000 1.6
--- AssetTransactionContract.java 22 Nov 2003 00:22:28 -0000 1.7
***************
*** 7,17 ****
import org.neuclear.id.Identity;
import org.neuclear.id.NamedObjectReader;
- import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.id.resolver.NSResolver;
import org.neuclear.receiver.UnsupportedTransaction;
- import java.sql.Timestamp;
import java.util.Date;
--- 7,15 ----
import org.neuclear.id.Identity;
import org.neuclear.id.NamedObjectReader;
import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.resolver.NSResolver;
import org.neuclear.receiver.UnsupportedTransaction;
import java.util.Date;
***************
*** 23,26 ****
--- 21,30 ----
* $Id$
* $Log$
+ * Revision 1.7 2003/11/22 00:22:28 pelle
+ * All unit tests in commons, id and xmlsec now work.
+ * AssetController now successfully processes payments in the unit test.
+ * 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.
***************
*** 28,35 ****
* Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
* This should hopefully make everything more stable (and secure).
! *
* Revision 1.5 2003/11/20 16:01:59 pelle
* Updated all the Contracts to use the new security model.
! *
* Revision 1.4 2003/11/19 23:32:20 pelle
* Signers now can generatekeys via the generateKey() method.
--- 32,39 ----
* Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
* This should hopefully make everything more stable (and secure).
! * <p/>
* Revision 1.5 2003/11/20 16:01:59 pelle
* Updated all the Contracts to use the new security model.
! * <p/>
* Revision 1.4 2003/11/19 23:32:20 pelle
* Signers now can generatekeys via the generateKey() method.
***************
*** 40,44 ****
* 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.3 2003/11/12 23:47:04 pelle
* Much work done in creating good test environment.
--- 44,48 ----
* 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.
! * <p/>
* Revision 1.3 2003/11/12 23:47:04 pelle
* Much work done in creating good test environment.
***************
*** 77,82 ****
*/
public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws NeuClearException {
! if (elem.getNamespaceURI().equals(TransferGlobals.XFER_NSURI))
! throw new UnsupportedTransaction(null);
final Asset asset = (Asset) NSResolver.resolveIdentity(elem.attributeValue("assetName"));
--- 81,86 ----
*/
public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws NeuClearException {
! if (!elem.getNamespaceURI().equals(TransferGlobals.XFER_NSURI))
! throw new UnsupportedTransaction(core);
final Asset asset = (Asset) NSResolver.resolveIdentity(elem.attributeValue("assetName"));
***************
*** 111,115 ****
return new CompleteHeldTransferRequest(core, asset, from, to, amount, valuetime, comment, holdid);
! throw new UnsupportedTransaction(null);
}
--- 115,119 ----
return new CompleteHeldTransferRequest(core, asset, from, to, amount, valuetime, comment, holdid);
! throw new UnsupportedTransaction(core);
}
Index: TransferGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/TransferGlobals.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferGlobals.java 21 Nov 2003 04:43:04 -0000 1.3
--- TransferGlobals.java 22 Nov 2003 00:22:28 -0000 1.4
***************
*** 24,27 ****
--- 24,33 ----
$Id$
$Log$
+ Revision 1.4 2003/11/22 00:22:28 pelle
+ All unit tests in commons, id and xmlsec now work.
+ AssetController now successfully processes payments in the unit test.
+ 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.3 2003/11/21 04:43:04 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 87,99 ****
return DocumentHelper.createElement(createQName(name));
}
- static {
- VerifyingReader.getInstance().registerReader(TransferGlobals.CANCEL_RCPT_TAGNAME,new AssetTransactionContract.Reader());
- VerifyingReader.getInstance().registerReader(TransferGlobals.CANCEL_TAGNAME,new AssetTransactionContract.Reader());
- VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_TAGNAME,new AssetTransactionContract.Reader());
- VerifyingReader.getInstance().registerReader(TransferGlobals.HELD_XFER_TAGNAME,new AssetTransactionContract.Reader());
- VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_RCPT_TAGNAME,new AssetTransactionContract.Reader());
- VerifyingReader.getInstance().registerReader(TransferGlobals.HELD_XFER_RCPT_TAGNAME,new AssetTransactionContract.Reader());
- VerifyingReader.getInstance().registerReader(TransferGlobals.COMPLETE_TAGNAME,new AssetTransactionContract.Reader());
}
--- 93,110 ----
return DocumentHelper.createElement(createQName(name));
}
+ public static void registerReaders() {
+ VerifyingReader.getInstance().registerReader(TransferGlobals.CANCEL_RCPT_TAGNAME, new AssetTransactionContract.Reader());
+ VerifyingReader.getInstance().registerReader(TransferGlobals.CANCEL_TAGNAME, new AssetTransactionContract.Reader());
+ VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_TAGNAME, new AssetTransactionContract.Reader());
+ VerifyingReader.getInstance().registerReader(TransferGlobals.HELD_XFER_TAGNAME, new AssetTransactionContract.Reader());
+ VerifyingReader.getInstance().registerReader(TransferGlobals.XFER_RCPT_TAGNAME, new AssetTransactionContract.Reader());
+ VerifyingReader.getInstance().registerReader(TransferGlobals.HELD_XFER_RCPT_TAGNAME, new AssetTransactionContract.Reader());
+ VerifyingReader.getInstance().registerReader(TransferGlobals.COMPLETE_TAGNAME, new AssetTransactionContract.Reader());
+
+ }
+
+ static {
+ registerReaders();
}
|
