Menu
▾
▴
neuclear-develop — Support requests, cvs etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(119) |
Oct
(111) |
Nov
(238) |
Dec
(395) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(239) |
Feb
(59) |
Mar
(354) |
Apr
(489) |
May
(23) |
Jun
(2) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(5) |
Jun
(2) |
Jul
|
Aug
|
Sep
(3) |
Oct
(14) |
Nov
(17) |
Dec
(9) |
| 2007 |
Jan
(4) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(7) |
May
(3) |
Jun
(6) |
Jul
(4) |
Aug
(3) |
Sep
(15) |
Oct
(13) |
Nov
(35) |
Dec
(40) |
| 2009 |
Jan
(19) |
Feb
(21) |
Mar
(16) |
Apr
(18) |
May
(36) |
Jun
(20) |
Jul
(32) |
Aug
(11) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
(13) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(4) |
Nov
|
Dec
(3) |
| 2012 |
Jan
(3) |
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(8) |
Jun
(4) |
Jul
(9) |
Aug
(2) |
Sep
(8) |
Oct
(3) |
Nov
(8) |
Dec
(4) |
| 2013 |
Jan
(2) |
Feb
(1) |
Mar
(5) |
Apr
(6) |
May
(10) |
Jun
(5) |
Jul
(6) |
Aug
(7) |
Sep
(5) |
Oct
(2) |
Nov
(4) |
Dec
(4) |
| 2014 |
Jan
(13) |
Feb
(4) |
Mar
(7) |
Apr
(9) |
May
(20) |
Jun
(13) |
Jul
(10) |
Aug
(3) |
Sep
(5) |
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2015 |
Jan
(3) |
Feb
(3) |
Mar
(5) |
Apr
(4) |
May
(3) |
Jun
(2) |
Jul
(4) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2016 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
(4) |
Sep
(3) |
Oct
(3) |
Nov
(4) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bug...@ve...> - 2003-11-22 00:33:03
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://devone.veraxpay.com:9090/secure/ViewIssue.jspa?key=NEU-19 Here is an overview of the issue: --------------------------------------------------------------------- Key: NEU-19 Summary: Update Look and Feel of SigningServlet Type: Task Status: Open Priority: Minor Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Identity Fix Fors: 0.8 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Fri, 21 Nov 2003 7:31 PM Updated: Fri, 21 Nov 2003 7:31 PM Description: The SigningServlet still uses the old NeuDist look and feel. This needs to be updated to NeuClear colors and logo. --------------------------------------------------------------------- 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 |
|
From: <bug...@ve...> - 2003-11-22 00:29:08
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://devone.veraxpay.com:9090/secure/ViewIssue.jspa?key=XMLSIG-1 Here is an overview of the issue: --------------------------------------------------------------------- Key: XMLSIG-1 Summary: XMLInputStreamServlet misparses base64 encoded xml Type: Bug Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear XMLSig Fix Fors: 0.10 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Fri, 21 Nov 2003 7:28 PM Updated: Fri, 21 Nov 2003 7:28 PM Description: org.neuclear.xml.XMLException: org.dom4j.DocumentException: null Nested exception: null at org.neuclear.xml.XMLTools.rethrowException(XMLTools.java:274) at org.neuclear.xml.XMLTools.loadDocument(XMLTools.java:179) at org.neuclear.id.verifier.VerifyingReader.read(VerifyingReader.java:139) at org.neuclear.receiver.ReceiverServlet.handleInputStream(ReceiverServlet.java:115) at org.neuclear.xml.soap.XMLInputStreamServlet.doPost(XMLInputStreamServlet.java:86) at javax.servlet.http.HttpServlet.service(HttpServlet.java:760) at javax.servlet.http.HttpServlet.service(HttpServlet.java:853) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:247) at --------------------------------------------------------------------- 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 |
|
From: <pe...@us...> - 2003-11-22 00:23:51
|
Update of /cvsroot/neuclear/neuclear-id In directory sc8-pr-cvs1:/tmp/cvs-serv17112 Modified Files: project.properties 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: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/project.properties,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** project.properties 20 Nov 2003 23:42:24 -0000 1.13 --- project.properties 22 Nov 2003 00:23:48 -0000 1.14 *************** *** 18,22 **** maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/ ! #maven.test.skip=true maven.uberjar.main = org.neuclear.signers.commandline.CommandLineSigner maven.repo.central = neuclear.org --- 18,22 ---- maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/ ! maven.test.skip=true maven.uberjar.main = org.neuclear.signers.commandline.CommandLineSigner maven.repo.central = neuclear.org |
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/source
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/test/org/neuclear/source
Modified Files:
HttpSourceTest.java
Added Files:
AbstractSourceTest.java CachedSourceTest.java
Removed Files:
SourceTest.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.
--- NEW FILE: AbstractSourceTest.java ---
package org.neuclear.source;
import junit.framework.TestCase;
import org.neuclear.commons.NeuClearException;
import org.neuclear.id.SignedNamedObject;
/*
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: AbstractSourceTest.java,v 1.1 2003/11/22 00:23:48 pelle Exp $
$Log: AbstractSourceTest.java,v $
Revision 1.1 2003/11/22 00:23:48 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.2 2003/11/21 04:45:17 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
Otherwise You will Finaliate.
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.1 2003/11/05 18:50:34 pelle
Refactored org.neuclear.signers.source.Source and implementing classes to provide support for a local filesystem cache.
Also added Unit tests to make sure it actually works and modified IdentityCreator to write directly to the cache if no output filename is given.
*/
/**
* User: pelleb
* Date: Nov 5, 2003
* Time: 1:21:24 PM
*/
public abstract class AbstractSourceTest extends TestCase {
public AbstractSourceTest(final String name) {
super(name);
source = createSource();
}
abstract protected Source createSource();
public final void testFetch() throws NeuClearException {
final SignedNamedObject test = source.fetch("http://repository.neuclear.org", "neu://test");
assertNotNull(test);
assertEquals("neu://test", test.getName());
final SignedNamedObject root = source.fetch("http://repository.neuclear.org", "neu://");
assertNotNull(root);
assertEquals("neu://", root.getName());
}
private final Source source;
}
--- NEW FILE: CachedSourceTest.java ---
package org.neuclear.source;
/*
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: CachedSourceTest.java,v 1.1 2003/11/22 00:23:48 pelle Exp $
$Log: CachedSourceTest.java,v $
Revision 1.1 2003/11/22 00:23:48 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.2 2003/11/21 04:45:17 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
Otherwise You will Finaliate.
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.1 2003/11/05 18:50:34 pelle
Refactored org.neuclear.signers.source.Source and implementing classes to provide support for a local filesystem cache.
Also added Unit tests to make sure it actually works and modified IdentityCreator to write directly to the cache if no output filename is given.
*/
/**
* User: pelleb
* Date: Nov 5, 2003
* Time: 1:27:17 PM
*/
public final class CachedSourceTest extends AbstractSourceTest {
public CachedSourceTest(final String name) {
super(name);
}
public final Source createSource() {
return new CachedSource(new HttpSource());
}
}
Index: HttpSourceTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/source/HttpSourceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HttpSourceTest.java 21 Nov 2003 04:45:17 -0000 1.2
--- HttpSourceTest.java 22 Nov 2003 00:23:48 -0000 1.3
***************
*** 21,24 ****
--- 21,30 ----
$Id$
$Log$
+ Revision 1.3 2003/11/22 00:23:48 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.2 2003/11/21 04:45:17 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 38,47 ****
* Time: 1:27:17 PM
*/
! public final class HttpSourceTest extends SourceTest {
public HttpSourceTest(final String name) {
super(name);
}
! protected final Source createSource() {
return new HttpSource();
}
--- 44,53 ----
* Time: 1:27:17 PM
*/
! public final class HttpSourceTest extends AbstractSourceTest {
public HttpSourceTest(final String name) {
super(name);
}
! public final Source createSource() {
return new HttpSource();
}
--- SourceTest.java DELETED ---
|
|
From: <pe...@us...> - 2003-11-22 00:23:51
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/test/org/neuclear/id
Modified Files:
SignedNamedCoreTest.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: SignedNamedCoreTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedNamedCoreTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SignedNamedCoreTest.java 21 Nov 2003 04:45:17 -0000 1.2
--- SignedNamedCoreTest.java 22 Nov 2003 00:23:48 -0000 1.3
***************
*** 3,8 ****
import junit.framework.TestCase;
import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.crypto.passphraseagents.GuiDialogAgent;
- import org.neuclear.commons.crypto.signers.DefaultSigner;
import org.neuclear.commons.crypto.signers.JCESigner;
import org.neuclear.commons.crypto.signers.TestCaseSigner;
--- 3,6 ----
***************
*** 34,37 ****
--- 32,41 ----
$Id$
$Log$
+ Revision 1.3 2003/11/22 00:23:48 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.2 2003/11/21 04:45:17 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 68,73 ****
builder.sign(name, signer);
assertTrue(builder.verifySignature(signer.getPublicKey(name)));
- assertTrue(builder.verifySignature(Identity.getRootPK()));
- assertTrue(builder.verifySignature(Identity.NEUROOT.getPublicKey()));
try {
final SignedNamedCore core = SignedNamedCore.read(builder.getElement());
--- 72,75 ----
|
|
From: <pe...@us...> - 2003-11-22 00:23:50
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/test/org/neuclear/id/builders
Modified Files:
IdentityBuilderTest.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: IdentityBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/IdentityBuilderTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IdentityBuilderTest.java 21 Nov 2003 04:45:17 -0000 1.7
--- IdentityBuilderTest.java 22 Nov 2003 00:23:47 -0000 1.8
***************
*** 2,9 ****
import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.crypto.passphraseagents.GuiDialogAgent;
- import org.neuclear.commons.crypto.signers.DefaultSigner;
import org.neuclear.commons.crypto.signers.PublicKeySource;
- import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.id.NSTools;
import org.neuclear.id.SignedNamedObject;
--- 2,6 ----
***************
*** 11,15 ****
import org.neuclear.xml.XMLException;
- import java.io.File;
import java.io.FileNotFoundException;
import java.security.GeneralSecurityException;
--- 8,11 ----
***************
*** 35,38 ****
--- 31,40 ----
$Id$
$Log$
+ Revision 1.8 2003/11/22 00:23:47 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.7 2003/11/21 04:45:17 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 78,82 ****
public IdentityBuilderTest(final String string) throws GeneralSecurityException, NeuClearException, FileNotFoundException {
super(string);
- rootsigner = new DefaultSigner(new GuiDialogAgent());
}
--- 80,83 ----
***************
*** 91,107 ****
"mailto:pe...@ne...");
! final String parent = NSTools.getParentNSURI(id.getName());
! final SignedNamedObject sec = null;
! if (getSigner().canSignFor(parent)) {
! id.sign(getSigner());
! } else if (parent.equals("neu://")) {
! id.sign(rootsigner);
! }
assertNotNull(sec);
- final File file = new File(PATH + NSTools.url2path(id.getName()) + "/root.id");
- file.getParentFile().mkdirs();
- System.out.println("Wrote: " + file.getAbsolutePath());
assertEquals(id.getName(), sec.getName());
! assertTrue(true);
} else {
// assertTrue(false);
--- 92,100 ----
"mailto:pe...@ne...");
! assertEquals("neu://test", NSTools.getParentNSURI(id.getName()));
! final SignedNamedObject sec = id.sign(getSigner());
assertNotNull(sec);
assertEquals(id.getName(), sec.getName());
!
} else {
// assertTrue(false);
***************
*** 113,117 ****
public final void testBuild() throws NeuClearException, XMLException {
// createIdentities("neu://test");
- createIdentities("neu://test/bux");
createIdentities("neu://bob@test");
createIdentities("neu://alice@test");
--- 106,109 ----
***************
*** 119,123 ****
}
- private static final String PATH = "target/testdata/unsigned";
- private final Signer rootsigner;
}
--- 111,113 ----
|
|
From: <pe...@us...> - 2003-11-22 00:23:50
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/java/org/neuclear/receiver
Modified Files:
ReceiverServlet.java UnsupportedTransaction.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: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ReceiverServlet.java 21 Nov 2003 04:45:13 -0000 1.7
--- ReceiverServlet.java 22 Nov 2003 00:23:47 -0000 1.8
***************
*** 2,5 ****
--- 2,11 ----
* $Id$
* $Log$
+ * Revision 1.8 2003/11/22 00:23:47 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.7 2003/11/21 04:45:13 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 84,91 ****
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
- import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.commons.NeuClearException;
! import org.neuclear.xml.soap.XMLInputStreamServlet;
import org.neuclear.xml.XMLException;
import javax.servlet.ServletConfig;
--- 90,98 ----
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.verifier.VerifyingReader;
! import org.neuclear.xml.ElementProxy;
import org.neuclear.xml.XMLException;
+ import org.neuclear.xml.soap.XMLInputStreamServlet;
import javax.servlet.ServletConfig;
***************
*** 95,98 ****
--- 102,106 ----
import java.io.IOException;
import java.io.InputStream;
+ import java.io.PrintWriter;
public abstract class ReceiverServlet extends XMLInputStreamServlet {
***************
*** 102,112 ****
protected final void handleInputStream(final InputStream is, final HttpServletRequest request, final HttpServletResponse response) throws IOException {
try {
! receiver.receive(VerifyingReader.getInstance().read(is));
} catch (NeuClearException e) {
! e.printStackTrace();
} catch (XMLException e) {
! e.printStackTrace();
}
}
--- 110,134 ----
protected final void handleInputStream(final InputStream is, final HttpServletRequest request, final HttpServletResponse response) throws IOException {
+ PrintWriter writer = response.getWriter();
+ final boolean isXML = request.getContentType().equals("text/xml");
+ if (isXML) {
+ response.setContentType("text/xml");
+ } else {
+ response.setContentType("text/html");
+ writer.print("<html><head><title>ReceiverServler</title></head><body>");
+ }
try {
! ElementProxy receipt = receiver.receive(VerifyingReader.getInstance().read(is));
! if (isXML)
! writer.print(receipt.canonicalize());
! else
! writer.print(receipt.getTagName());
!
} catch (NeuClearException e) {
! e.printStackTrace(writer);
} catch (XMLException e) {
! e.printStackTrace(writer);
}
+ writer.close();
}
Index: UnsupportedTransaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/UnsupportedTransaction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UnsupportedTransaction.java 21 Nov 2003 04:45:13 -0000 1.4
--- UnsupportedTransaction.java 22 Nov 2003 00:23:47 -0000 1.5
***************
*** 1,6 ****
package org.neuclear.receiver;
- import org.neuclear.id.SignedNamedObject;
import org.neuclear.commons.NeuClearException;
/*
--- 1,7 ----
package org.neuclear.receiver;
import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.SignedNamedCore;
+ import org.neuclear.id.SignedNamedObject;
/*
***************
*** 24,27 ****
--- 25,34 ----
$Id$
$Log$
+ Revision 1.5 2003/11/22 00:23:47 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.4 2003/11/21 04:45:13 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 45,49 ****
/**
- *
* User: pelleb
* Date: Sep 26, 2003
--- 52,55 ----
***************
*** 52,58 ****
public final class UnsupportedTransaction extends NeuClearException {
/**
! *
! * @param obj
*/
public UnsupportedTransaction(final SignedNamedObject obj) {
super("NeuClear Transaction not Supported by this Receiver: " + obj.getClass().getName());
--- 58,67 ----
public final class UnsupportedTransaction extends NeuClearException {
/**
! * @param obj
*/
+ public UnsupportedTransaction(final SignedNamedCore obj) {
+ super("NeuClear Transaction not Supported by this Reader: " + obj.getClass().getName());
+ }
+
public UnsupportedTransaction(final SignedNamedObject obj) {
super("NeuClear Transaction not Supported by this Receiver: " + obj.getClass().getName());
|
|
From: <pe...@us...> - 2003-11-22 00:23:50
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/java/org/neuclear/tests
Modified Files:
AbstractSigningTest.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: AbstractSigningTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractSigningTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractSigningTest.java 21 Nov 2003 04:45:16 -0000 1.3
--- AbstractSigningTest.java 22 Nov 2003 00:23:47 -0000 1.4
***************
*** 3,11 ****
import junit.framework.TestCase;
import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.crypto.signers.Signer;
- import org.neuclear.commons.crypto.signers.TestCaseSigner;
- import org.neuclear.commons.crypto.signers.JCESigner;
import org.neuclear.commons.crypto.CryptoTools;
import org.neuclear.id.Identity;
import java.security.GeneralSecurityException;
--- 3,11 ----
import junit.framework.TestCase;
import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.crypto.CryptoTools;
+ import org.neuclear.commons.crypto.signers.JCESigner;
+ import org.neuclear.commons.crypto.signers.TestCaseSigner;
import org.neuclear.id.Identity;
+ import org.neuclear.id.resolver.NSResolver;
import java.security.GeneralSecurityException;
***************
*** 31,34 ****
--- 31,40 ----
$Id$
$Log$
+ Revision 1.4 2003/11/22 00:23:47 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:45:16 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 57,62 ****
CryptoTools.ensureProvider();
signer = new TestCaseSigner();
! // alice = NSResolver.resolveIdentity("neu://alice@test");
! // bob = NSResolver.resolveIdentity("neu://bob@test");
}
--- 63,68 ----
CryptoTools.ensureProvider();
signer = new TestCaseSigner();
! alice = NSResolver.resolveIdentity("neu://alice@test");
! bob = NSResolver.resolveIdentity("neu://bob@test");
}
|
|
From: <pe...@us...> - 2003-11-22 00:23:50
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/java/org/neuclear/id
Modified Files:
SignatureRequest.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: SignatureRequest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignatureRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SignatureRequest.java 21 Nov 2003 13:57:27 -0000 1.7
--- SignatureRequest.java 22 Nov 2003 00:23:47 -0000 1.8
***************
*** 8,13 ****
import org.neuclear.xml.xmlsec.XMLSecurityException;
- import java.sql.Timestamp;
-
/*
NeuClear Distributed Transaction Clearing Platform
--- 8,11 ----
***************
*** 30,33 ****
--- 28,37 ----
$Id$
$Log$
+ Revision 1.8 2003/11/22 00:23:47 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.7 2003/11/21 13:57:27 pelle
Changed some mutable fields in immutable classes, making them truely immutable. Thus safer.
***************
*** 76,81 ****
* The SignatureRequest would typically be created using a SignatureRequestBuilder buy
* the Requesting site. The Users Signature service would present it to the user who signs it.
! *
! *
* User: pelleb
* Date: Nov 6, 2003
--- 80,85 ----
* The SignatureRequest would typically be created using a SignatureRequestBuilder buy
* the Requesting site. The Users Signature service would present it to the user who signs it.
! * <p/>
! * <p/>
* User: pelleb
* Date: Nov 6, 2003
***************
*** 90,103 ****
}
! public final String getUserid() {
return userid;
}
public final NamedObjectBuilder getUnsigned() {
! try {
! return (NamedObjectBuilder) unsigned.clone();
! } catch (CloneNotSupportedException e) {
! throw new RuntimeException(e);
! }
}
--- 94,103 ----
}
! public final String getUserid() {
return userid;
}
public final NamedObjectBuilder getUnsigned() {
! return (NamedObjectBuilder) unsigned.clone();
}
|
|
From: <pe...@us...> - 2003-11-22 00:23:50
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/java/org/neuclear/id/verifier
Modified Files:
VerifyingReader.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: VerifyingReader.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier/VerifyingReader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** VerifyingReader.java 21 Nov 2003 04:45:12 -0000 1.13
--- VerifyingReader.java 22 Nov 2003 00:23:46 -0000 1.14
***************
*** 32,35 ****
--- 32,41 ----
$Id$
$Log$
+ Revision 1.14 2003/11/22 00:23:46 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.13 2003/11/21 04:45:12 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 118,121 ****
--- 124,128 ----
readers = new HashMap();
readers.put("Identity", new Identity.Reader());
+ readers.put("Asset", new Identity.Reader());
readers.put(AuthenticationTicket.TAG_NAME, new AuthenticationTicket.Reader());
readers.put(SignatureRequest.SIGREQUEST_TAG, new SignatureRequest.Reader());
***************
*** 154,158 ****
public final void registerReader(final String name, final NamedObjectReader reader) {
! System.out.println("Registering: "+name);
readers.put(name, reader);
}
--- 161,165 ----
public final void registerReader(final String name, final NamedObjectReader reader) {
! System.out.println("Registering: " + name);
readers.put(name, reader);
}
|
|
From: <pe...@us...> - 2003-11-22 00:23:49
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv17112/src/java/org/neuclear/id/builders
Modified Files:
NamedObjectBuilder.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: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NamedObjectBuilder.java 21 Nov 2003 17:55:16 -0000 1.13
--- NamedObjectBuilder.java 22 Nov 2003 00:23:46 -0000 1.14
***************
*** 2,5 ****
--- 2,11 ----
* $Id$
* $Log$
+ * Revision 1.14 2003/11/22 00:23:46 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.13 2003/11/21 17:55:16 pelle
* misc fixes
***************
*** 203,207 ****
* This simple wrapper takes most of the contents of a NamedObject and puts it into a Serializable form that can be signed.
*/
! public class NamedObjectBuilder extends SignedElement implements Named,Cloneable {
public NamedObjectBuilder(final String name, final String tagName, final String prefix, final String nsURI) throws NeuClearException {
super(tagName, prefix, nsURI);
--- 209,213 ----
* This simple wrapper takes most of the contents of a NamedObject and puts it into a Serializable form that can be signed.
*/
! public class NamedObjectBuilder extends SignedElement implements Named, Cloneable {
public NamedObjectBuilder(final String name, final String tagName, final String prefix, final String nsURI) throws NeuClearException {
super(tagName, prefix, nsURI);
***************
*** 433,448 ****
* whose class is <tt>Object</tt> will result in throwing an
* exception at run time.
! *
* @return a clone of this instance.
- * @throws CloneNotSupportedException if the object's class does not
- * support the <code>Cloneable</code> interface. Subclasses
- * that override the <code>clone</code> method can also
- * throw this exception to indicate that an instance cannot
- * be cloned.
* @see Cloneable
*/
! public Object clone() throws CloneNotSupportedException {
try {
! return new NamedObjectBuilder(getElement().c());
} catch (XMLSecurityException e) {
throw new RuntimeException(e);
--- 439,451 ----
* whose class is <tt>Object</tt> will result in throwing an
* exception at run time.
! *
* @return a clone of this instance.
* @see Cloneable
*/
! public Object clone() {
try {
! final Element elem = (Element) getElement().clone();
! DocumentHelper.createDocument(elem);
! return new NamedObjectBuilder(elem);
} catch (XMLSecurityException e) {
throw new RuntimeException(e);
|
|
From: <pe...@us...> - 2003-11-22 00:23:21
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap
In directory sc8-pr-cvs1:/tmp/cvs-serv17047/src/java/org/neuclear/xml/soap
Modified Files:
XMLInputStreamServlet.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: XMLInputStreamServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap/XMLInputStreamServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLInputStreamServlet.java 21 Nov 2003 04:44:30 -0000 1.2
--- XMLInputStreamServlet.java 22 Nov 2003 00:23:18 -0000 1.3
***************
*** 1,8 ****
--- 1,13 ----
package org.neuclear.xml.soap;
+ import org.neuclear.commons.Utility;
+ import org.neuclear.commons.crypto.Base64;
+ import org.neuclear.commons.crypto.CryptoException;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
***************
*** 29,32 ****
--- 34,43 ----
$Id$
$Log$
+ Revision 1.3 2003/11/22 00:23:18 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.2 2003/11/21 04:44:30 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 49,53 ****
/**
- *
* User: pelleb
* Date: Sep 25, 2003
--- 60,63 ----
***************
*** 70,77 ****
protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
! if (request.getContentType().equals("text/xml")) {
! final InputStream is = request.getInputStream();
handleInputStream(is, request, response);
}
}
--- 80,97 ----
protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
! try {
! InputStream is = null;
!
! if (request.getContentType().equals("text/xml")) {
! is = request.getInputStream();
! }
! if (!Utility.isEmpty(request.getParameter("base64xml"))) {
! is = new ByteArrayInputStream(Base64.decode(request.getParameter("base64xml")));
! }
handleInputStream(is, request, response);
+ } catch (CryptoException e) {
+ throw new ServletException(e);
}
+
}
|
|
From: <pe...@us...> - 2003-11-22 00:22:56
|
Update of /cvsroot/neuclear/neuclear-commons In directory sc8-pr-cvs1:/tmp/cvs-serv16986 Modified Files: project.properties 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: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/project.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.properties 19 Nov 2003 14:37:37 -0000 1.7 --- project.properties 22 Nov 2003 00:22:52 -0000 1.8 *************** *** 20,23 **** #maven.ui.property.file = ui.properties maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/ ! maven.test.skip=true ! maven.uberjar.main = org.neuclear.commons.crypto.passphraseagents.CommandLineAgent \ No newline at end of file --- 20,23 ---- #maven.ui.property.file = ui.properties maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/ ! #maven.test.skip=true ! maven.uberjar.main = org.neuclear.commons.crypto.passphraseagents.CommandLineAgent |
|
From: <pe...@us...> - 2003-11-22 00:22:56
|
Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers
In directory sc8-pr-cvs1:/tmp/cvs-serv16986/src/java/org/neuclear/commons/crypto/signers
Modified Files:
JCESigner.java TestCaseSigner.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: JCESigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/JCESigner.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JCESigner.java 21 Nov 2003 04:43:41 -0000 1.7
--- JCESigner.java 22 Nov 2003 00:22:52 -0000 1.8
***************
*** 2,5 ****
--- 2,11 ----
* $Id$
* $Log$
+ * Revision 1.8 2003/11/22 00:22:52 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.7 2003/11/21 04:43:41 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 138,142 ****
ki = KeyStore.getInstance(type, provider);
ki.load(in, agent.getPassPhrase("KeyStore Passphrase for" + name));
! System.out.println("Successfully loaded JCESigner: " + name + " type: " + ki.getType() + " size: " + ki.size());
return ki;
} catch (KeyStoreException e) {
--- 144,148 ----
ki = KeyStore.getInstance(type, provider);
ki.load(in, agent.getPassPhrase("KeyStore Passphrase for" + name));
! // System.out.println("Successfully loaded JCESigner: " + name + " type: " + ki.getType() + " size: " + ki.size());
return ki;
} catch (KeyStoreException e) {
Index: TestCaseSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/TestCaseSigner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestCaseSigner.java 21 Nov 2003 04:43:41 -0000 1.6
--- TestCaseSigner.java 22 Nov 2003 00:22:52 -0000 1.7
***************
*** 29,32 ****
--- 29,38 ----
$Id$
$Log$
+ Revision 1.7 2003/11/22 00:22:52 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:41 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 104,108 ****
private static InputStream getKeyStore() {
final URL url = TestCaseSigner.class.getClassLoader().getResource(KEYSTORE);
! System.out.println("loading keystore from: " + url.toString());
return TestCaseSigner.class.getClassLoader().getResourceAsStream(KEYSTORE);
--- 110,114 ----
private static InputStream getKeyStore() {
final URL url = TestCaseSigner.class.getClassLoader().getResource(KEYSTORE);
! // System.out.println("loading keystore from: " + url.toString());
return TestCaseSigner.class.getClassLoader().getResourceAsStream(KEYSTORE);
|
|
From: <pe...@us...> - 2003-11-22 00:22:33
|
Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/test/org/neuclear/asset/receiver Modified Files: PaymentReceiverTest.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: PaymentReceiverTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PaymentReceiverTest.java 21 Nov 2003 04:43:04 -0000 1.6 --- PaymentReceiverTest.java 22 Nov 2003 00:22:29 -0000 1.7 *************** *** 1,7 **** package org.neuclear.asset.receiver; - import org.dom4j.DocumentException; import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.contracts.TransferRequest; import org.neuclear.asset.contracts.builders.TransferRequestBuilder; --- 1,8 ---- package org.neuclear.asset.receiver; import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.contracts.Asset; + import org.neuclear.asset.contracts.AssetGlobals; + import org.neuclear.asset.contracts.TransferGlobals; import org.neuclear.asset.contracts.TransferRequest; import org.neuclear.asset.contracts.builders.TransferRequestBuilder; *************** *** 18,25 **** import org.neuclear.ledger.implementations.SQLLedger; import org.neuclear.receiver.Receiver; ! import org.neuclear.tests.AbstractReceiverTest; import org.neuclear.xml.XMLException; ! import java.io.*; import java.security.GeneralSecurityException; --- 19,27 ---- import org.neuclear.ledger.implementations.SQLLedger; import org.neuclear.receiver.Receiver; ! import org.neuclear.tests.AbstractSigningTest; import org.neuclear.xml.XMLException; ! import java.io.IOException; ! import java.io.UnsupportedEncodingException; import java.security.GeneralSecurityException; *************** *** 44,47 **** --- 46,55 ---- $Id$ $Log$ + Revision 1.7 2003/11/22 00:22:29 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. *************** *** 118,124 **** * Time: 11:20:31 AM */ ! public final class PaymentReceiverTest extends AbstractReceiverTest { public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException { super(string); asset = (Asset) NSResolver.resolveIdentity(assetName); --- 126,134 ---- * Time: 11:20:31 AM */ ! public final class PaymentReceiverTest extends AbstractSigningTest { public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException { super(string); + AssetGlobals.registerReaders(); + TransferGlobals.registerReaders(); asset = (Asset) NSResolver.resolveIdentity(assetName); *************** *** 131,143 **** ); receiver = new AssetControllerReceiver(proc, getSigner()); - directory = new File("target/testdata/payments"); - directory.mkdirs(); - createPayments(getBob(), getAlice(), 100); - createPayments(getAlice(), getBob(), 100); } - public final void testSimple() throws Exception, DocumentException, NeuClearException, XMLException { - runDirectoryTest(directory.getAbsolutePath()); - } public final Receiver getReceiver() { --- 141,146 ---- *************** *** 153,156 **** --- 156,170 ---- } + public final void testTransactions() throws Exception, IOException, InvalidTransferException, NeuClearException { + performTransaction(createPayments(getAlice(), getBob(), 100)); + performTransaction(createPayments(getBob(), getAlice(), 100)); + } + + public void performTransaction(SignedNamedObject obj) throws Exception { + Object pre = getPreTransactionState(obj); + org.neuclear.xml.ElementProxy receipt = receiver.receive(obj); + assertTrue(verifyTransaction(obj, pre)); + } + public final Object getPreTransactionState(final SignedNamedObject obj) throws Exception { *************** *** 179,188 **** } ! public final void createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException { ! final TransferRequestBuilder transfer = new TransferRequestBuilder(asset, from, to, 100, TimeTools.now(), "Test One"); ! final SignedNamedObject signed = transfer.sign(getSigner()); ! final OutputStream out = new BufferedOutputStream(new FileOutputStream(directory.getAbsolutePath() + "/" + transfer.getLocalName() + ".xml")); ! out.write(signed.getEncoded().getBytes("UTF-8")); ! } --- 193,199 ---- } ! public final SignedNamedObject createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException { ! final TransferRequestBuilder transfer = new TransferRequestBuilder(asset, from, to, amount, TimeTools.now(), "Test One"); ! return transfer.sign(getSigner()); } *************** *** 190,196 **** private final Asset asset; - private final File directory; private final Receiver receiver; private final CurrencyController proc; private final double balance = 0.0; } --- 201,211 ---- private final Asset asset; private final Receiver receiver; private final CurrencyController proc; private final double balance = 0.0; + + static { + AssetGlobals.class.getClass(); + TransferGlobals.class.getClass(); + } } |
|
From: <pe...@us...> - 2003-11-22 00:22:33
|
Update of /cvsroot/neuclear/neuclear-pay In directory sc8-pr-cvs1:/tmp/cvs-serv16822 Modified Files: project.properties project.xml 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: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/project.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** project.properties 12 Nov 2003 23:47:05 -0000 1.5 --- project.properties 22 Nov 2003 00:22:29 -0000 1.6 *************** *** 18,22 **** #maven.ui.property.file = ui.properties maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/ ! maven.test.skip=false maven.repo.central = neuclear.org maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven --- 18,22 ---- #maven.ui.property.file = ui.properties maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/ ! maven.test.skip=true maven.repo.central = neuclear.org maven.repo.central.directory = /home/sites/neuclear.org/public_html/maven Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/project.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** project.xml 20 Nov 2003 23:40:50 -0000 1.13 --- project.xml 22 Nov 2003 00:22:29 -0000 1.14 *************** *** 71,74 **** --- 71,77 ---- <name>neuclear-ledger</name> <version>0.3</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> <dependency> *************** *** 76,83 **** --- 79,92 ---- <name>neuclear-commons</name> <version>0.5-SNAPSHOT</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> <dependency> <id>picocontainer</id> <version>1.0-beta-1</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> <dependency> *************** *** 89,92 **** --- 98,104 ---- <name>neuclear-id</name> <version>0.8-SNAPSHOT</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> <dependency> *************** *** 134,142 **** <version>3.8</version> </dependency> - <dependency> - <id>commons-cli</id> - <name>commons-cli</name> - <version>1.0-beta-2</version> - </dependency> <dependency> <id>waterken-adt</id> --- 146,149 ---- |
|
From: <pe...@us...> - 2003-11-22 00:22:32
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/webapp/WEB-INF
Modified Files:
web.xml
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: web.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web.xml 18 Nov 2003 23:34:30 -0000 1.1
--- web.xml 22 Nov 2003 00:22:29 -0000 1.2
***************
*** 19,22 ****
--- 19,39 ----
</filter>
<servlet>
+ <servlet-name>assetcontroller</servlet-name>
+ <servlet-class>org.neuclear.asset.receiver.servlet.AssetControllerServlet</servlet-class>
+ <init-param>
+ <param-name>title</param-name>
+ <param-value>NeuClear Example Application</param-value>
+ </init-param>
+ <init-param>
+ <param-name>serviceid</param-name>
+ <param-value>neu://test/bux</param-value>
+ </init-param>
+ <init-param>
+ <param-name>datasource</param-name>
+ <param-value>jdbc/AssetDS</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
<servlet-name>authenticator</servlet-name>
<servlet-class>org.neuclear.auth.AuthenticationServlet</servlet-class>
***************
*** 27,31 ****
<init-param>
<param-name>serviceid</param-name>
! <param-value>neu://test</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
--- 44,48 ----
<init-param>
<param-name>serviceid</param-name>
! <param-value>neu://test/bux</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
***************
*** 37,40 ****
--- 54,61 ----
+ <servlet-mapping>
+ <servlet-name>assetcontroller</servlet-name>
+ <url-pattern>/Asset</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
<servlet-name>authenticator</servlet-name>
|
|
From: <pe...@us...> - 2003-11-22 00:22:32
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/webapp/SECURE
Modified Files:
transfer.jsp
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: transfer.jsp
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE/transfer.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** transfer.jsp 18 Nov 2003 23:34:30 -0000 1.1
--- transfer.jsp 22 Nov 2003 00:22:29 -0000 1.2
***************
*** 5,11 ****
org.neuclear.asset.contracts.Asset,
org.neuclear.commons.time.TimeTools,
! org.neuclear.id.builders.SignatureRequestBuilder"%>
! <%@ taglib uri="http://java.sun.com/jsp/jstl/sql" prefix="sql" %>
<%
Identity userns=(Identity) request.getUserPrincipal();
--- 5,19 ----
org.neuclear.asset.contracts.Asset,
org.neuclear.commons.time.TimeTools,
! org.neuclear.id.builders.SignatureRequestBuilder,
! org.neuclear.asset.contracts.AssetGlobals,
! org.neuclear.asset.contracts.TransferGlobals,
! org.neuclear.asset.receiver.servlet.AssetControllerServlet,
! org.neuclear.id.SignedNamedObject,
! org.neuclear.commons.crypto.Base64,
! org.neuclear.commons.servlets.ServletTools"%>
<%
+ AssetGlobals.registerReaders();
+ TransferGlobals.registerReaders();
+ AssetControllerServlet controller=AssetControllerServlet.getInstance();
Identity userns=(Identity) request.getUserPrincipal();
***************
*** 39,44 ****
</p>
<% } else {
TransferRequestBuilder transfer=new TransferRequestBuilder(
! (Asset)NSResolver.resolveIdentity("neu://test/bux"),
userns,
NSResolver.resolveIdentity(recipient),
--- 47,53 ----
</p>
<% } else {
+ Servlet servlet=config.getServletContext().getServlet("");
TransferRequestBuilder transfer=new TransferRequestBuilder(
! controller.getAsset(),
userns,
NSResolver.resolveIdentity(recipient),
***************
*** 47,56 ****
comment
) ;
! SignatureRequestBuilder sigreq=new SignatureRequestBuilder("neu://test/bux",userns.getName(),transfer,comment);
!
%>
Transfering to Signing Server
!
<%
}
--- 56,73 ----
comment
) ;
! SignatureRequestBuilder sigreq=new SignatureRequestBuilder(controller.getServiceid(),userns.getName(),transfer,comment);
! SignedNamedObject sig=sigreq.sign(controller.getSigner());
%>
+ <form action="<%=userns.getSigner()%>" method="POST">
+ <input name="base64xml" value="<%=Base64.encode(sig.getEncoded().getBytes())%>" type="hidden">
+ <input name="endpoint" value="<%=ServletTools.getAbsoluteURL(request, "/Asset")%>" type="hidden">
+ </form>
Transfering to Signing Server
! <script language="javascript">
! <!--
! document.forms[0].submit();
! -->
! </script>
<%
}
|
|
From: <pe...@us...> - 2003-11-22 00:22:32
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/java/org/neuclear/asset
Modified Files:
AssetController.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: AssetController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/AssetController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssetController.java 21 Nov 2003 04:43:04 -0000 1.7
--- AssetController.java 22 Nov 2003 00:22:29 -0000 1.8
***************
*** 3,8 ****
import org.neuclear.asset.contracts.*;
import org.neuclear.asset.contracts.builders.CancelHeldTransferReceiptBuilder;
- import org.neuclear.id.builders.NamedObjectBuilder;
import org.neuclear.commons.NeuClearException;
/*
--- 3,8 ----
import org.neuclear.asset.contracts.*;
import org.neuclear.asset.contracts.builders.CancelHeldTransferReceiptBuilder;
import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.builders.NamedObjectBuilder;
/*
***************
*** 26,29 ****
--- 26,35 ----
$Id$
$Log$
+ Revision 1.8 2003/11/22 00:22:29 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.7 2003/11/21 04:43:04 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 89,99 ****
public final NamedObjectBuilder process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
if (contract instanceof TransferRequest)
! return processTransfer((TransferRequest) contract);
if (contract instanceof HeldTransferRequest)
! return processHeldTransfer((HeldTransferRequest) contract);
if (contract instanceof CompleteHeldTransferRequest)
! return processCompleteHold((CompleteHeldTransferRequest) contract);
if (contract instanceof CancelHeldTransferRequest)
! return processCancelHold((CancelHeldTransferRequest) contract);
return null;
--- 95,105 ----
public final NamedObjectBuilder process(final AssetTransactionContract contract) throws TransferDeniedException, LowLevelPaymentException, InvalidTransferException, NeuClearException {
if (contract instanceof TransferRequest)
! return process((TransferRequest) contract);
if (contract instanceof HeldTransferRequest)
! return process((HeldTransferRequest) contract);
if (contract instanceof CompleteHeldTransferRequest)
! return process((CompleteHeldTransferRequest) contract);
if (contract instanceof CancelHeldTransferRequest)
! return process((CancelHeldTransferRequest) contract);
return null;
***************
*** 118,122 ****
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder processTransfer(TransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
--- 124,128 ----
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder process(TransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
***************
*** 131,135 ****
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.HeldTransferReceiptBuilder processHeldTransfer(HeldTransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
--- 137,141 ----
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.HeldTransferReceiptBuilder process(HeldTransferRequest req) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
***************
*** 142,146 ****
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder processCompleteHold(CompleteHeldTransferRequest complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
--- 148,152 ----
* @throws InvalidTransferException
*/
! public abstract org.neuclear.asset.contracts.builders.TransferReceiptBuilder process(CompleteHeldTransferRequest complete) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
/**
***************
*** 154,158 ****
*/
! public abstract CancelHeldTransferReceiptBuilder processCancelHold(CancelHeldTransferRequest cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
//TODO Add getBalance
--- 160,166 ----
*/
! public abstract CancelHeldTransferReceiptBuilder process(CancelHeldTransferRequest cancel) throws LowLevelPaymentException, TransferDeniedException, InvalidTransferException, NeuClearException;
!
!
//TODO Add getBalance
|
|
From: <pe...@us...> - 2003-11-22 00:22:32
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/java/org/neuclear/asset/receiver
Modified Files:
AssetControllerReceiver.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: AssetControllerReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/AssetControllerReceiver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssetControllerReceiver.java 21 Nov 2003 04:43:04 -0000 1.5
--- AssetControllerReceiver.java 22 Nov 2003 00:22:29 -0000 1.6
***************
*** 1,20 ****
package org.neuclear.asset.receiver;
! import org.neuclear.asset.*;
import org.neuclear.asset.contracts.*;
! import org.neuclear.asset.contracts.builders.TransferReceiptBuilder;
! import org.neuclear.asset.contracts.builders.TransferBuilder;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.builders.NamedObjectBuilder;
import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.ledger.InvalidTransactionException;
- import org.neuclear.ledger.LowlevelLedgerException;
- import org.neuclear.ledger.UnBalancedTransactionException;
- import org.neuclear.ledger.UnknownBookException;
import org.neuclear.receiver.Receiver;
import org.neuclear.receiver.UnsupportedTransaction;
- import org.neuclear.commons.crypto.signers.Signer;
- import org.neuclear.commons.crypto.CryptoException;
- import org.neuclear.commons.NeuClearException;
import org.neuclear.xml.ElementProxy;
import org.neuclear.xml.xmlsec.XMLSecurityException;
--- 1,14 ----
package org.neuclear.asset.receiver;
! import org.neuclear.asset.AssetController;
! import org.neuclear.asset.TransferException;
import org.neuclear.asset.contracts.*;
! import org.neuclear.commons.NeuClearException;
! import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.builders.NamedObjectBuilder;
import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.receiver.Receiver;
import org.neuclear.receiver.UnsupportedTransaction;
import org.neuclear.xml.ElementProxy;
import org.neuclear.xml.xmlsec.XMLSecurityException;
***************
*** 58,62 ****
* @throws UnsupportedTransaction
*/
! public final ElementProxy receive(final SignedNamedObject obj) throws UnsupportedTransaction {
if (obj instanceof AssetTransactionContract) {
final TransferContract transfer = (TransferContract) obj;
--- 52,56 ----
* @throws UnsupportedTransaction
*/
! public final ElementProxy receive(final SignedNamedObject obj) throws NeuClearException {
if (obj instanceof AssetTransactionContract) {
final TransferContract transfer = (TransferContract) obj;
***************
*** 70,89 ****
//TODO do something with receipt
- } catch (InvalidTransferException e) {
- e.printStackTrace(); //TODO Handle exception
- } catch (LowLevelPaymentException e) {
- e.printStackTrace(); //TODO Handle exception
} catch (XMLSecurityException e) {
! e.printStackTrace(); //TODO Handle exception
! } catch (TransferDeniedException e) {
! e.printStackTrace(); //TODO Handle exception
! } catch (CryptoException e) {
! e.printStackTrace(); //TODO Handle exception
! } catch (NeuClearException e) {
! e.printStackTrace(); //TODO Handle exception
}
} else
throw new UnsupportedTransaction(obj);
- return null;
}
--- 64,75 ----
//TODO do something with receipt
} catch (XMLSecurityException e) {
! throw new NeuClearException(e);
!
! } catch (TransferException e) {
! throw new NeuClearException(e);
}
} else
throw new UnsupportedTransaction(obj);
}
|
|
From: <pe...@us...> - 2003-11-22 00:22:32
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/java/org/neuclear/asset/receiver/servlet
Modified Files:
AssetControllerServlet.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: AssetControllerServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/servlet/AssetControllerServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssetControllerServlet.java 21 Nov 2003 04:43:04 -0000 1.3
--- AssetControllerServlet.java 22 Nov 2003 00:22:28 -0000 1.4
***************
*** 2,5 ****
--- 2,7 ----
import org.neuclear.asset.contracts.Asset;
+ import org.neuclear.asset.contracts.AssetGlobals;
+ import org.neuclear.asset.contracts.TransferGlobals;
import org.neuclear.asset.controllers.currency.CurrencyController;
import org.neuclear.asset.receiver.AssetControllerReceiver;
***************
*** 33,36 ****
--- 35,44 ----
$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.
***************
*** 63,68 ****
--- 71,80 ----
serviceid = config.getInitParameter("serviceid");
datasource = config.getInitParameter("datasource");
+ AssetGlobals.registerReaders();
+ TransferGlobals.registerReaders();
+ INSTANCE = this;
try {
asset = (Asset) NSResolver.resolveIdentity(serviceid);
+ signer = new TestCaseSigner();
final AssetControllerReceiver receiver = new AssetControllerReceiver(
new CurrencyController(
***************
*** 73,77 ****
serviceid
),
! new TestCaseSigner()
);
setReceiver(receiver);
--- 85,90 ----
serviceid
),
! signer
!
);
setReceiver(receiver);
***************
*** 89,92 ****
--- 102,109 ----
}
+ public TestCaseSigner getSigner() {
+ return signer;
+ }
+
public final String getServiceid() {
return serviceid;
***************
*** 97,102 ****
--- 114,125 ----
}
+ public static AssetControllerServlet getInstance() {
+ return INSTANCE;
+ }
+
private Asset asset;
private String serviceid;
private String datasource;
+ private static AssetControllerServlet INSTANCE;
+ private TestCaseSigner signer;
}
|
|
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();
}
|
|
From: <pe...@us...> - 2003-11-22 00:22:31
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency
In directory sc8-pr-cvs1:/tmp/cvs-serv16822/src/java/org/neuclear/asset/controllers/currency
Modified Files:
CurrencyController.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: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CurrencyController.java 21 Nov 2003 04:43:04 -0000 1.6
--- CurrencyController.java 22 Nov 2003 00:22:28 -0000 1.7
***************
*** 42,46 ****
}
! public final TransferReceiptBuilder processTransfer(final TransferRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
try {
if (!req.getSignatory().equals(req.getFrom()))
--- 42,46 ----
}
! public final TransferReceiptBuilder process(final TransferRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
try {
if (!req.getSignatory().equals(req.getFrom()))
***************
*** 90,94 ****
}
! public final HeldTransferReceiptBuilder processHeldTransfer(final HeldTransferRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
try {
if (!req.getSignatory().equals(req.getFrom()))
--- 90,94 ----
}
! public final HeldTransferReceiptBuilder process(final HeldTransferRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
try {
if (!req.getSignatory().equals(req.getFrom()))
***************
*** 114,118 ****
}
! public final TransferReceiptBuilder processCompleteHold(final CompleteHeldTransferRequest complete) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
try {
if (!complete.getSignatory().equals(complete.getTo()))
--- 114,118 ----
}
! public final TransferReceiptBuilder process(final CompleteHeldTransferRequest complete) throws LowLevelPaymentException, InvalidTransferException, TransferDeniedException, NeuClearException {
try {
if (!complete.getSignatory().equals(complete.getTo()))
***************
*** 143,147 ****
}
! public final CancelHeldTransferReceiptBuilder processCancelHold(final CancelHeldTransferRequest cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
try {
final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getHoldId());
--- 143,147 ----
}
! public final CancelHeldTransferReceiptBuilder process(final CancelHeldTransferRequest cancel) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
try {
final PostedHeldTransaction heldTran = ledger.findHeldTransaction(cancel.getHoldId());
|
|
From: <pe...@us...> - 2003-11-22 00:22:03
|
Update of /cvsroot/neuclear/neuclear-bet/src/java/org/neuclear/bet
In directory sc8-pr-cvs1:/tmp/cvs-serv16756/src/java/org/neuclear/bet
Modified Files:
BetProcessor.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: BetProcessor.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-bet/src/java/org/neuclear/bet/BetProcessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BetProcessor.java 21 Nov 2003 04:42:46 -0000 1.7
--- BetProcessor.java 22 Nov 2003 00:22:00 -0000 1.8
***************
*** 8,11 ****
--- 8,12 ----
import org.neuclear.asset.contracts.HeldTransferRequest;
import org.neuclear.asset.contracts.TransferRequest;
+ import org.neuclear.asset.controllers.currency.CurrencyController;
import org.neuclear.bet.eventsource.BettingEvent;
import org.neuclear.bet.eventsource.EventOutcome;
***************
*** 17,21 ****
import org.neuclear.commons.configuration.ConfigurationException;
import org.neuclear.ledger.*;
- import org.neuclear.asset.controllers.currency.CurrencyController;
import java.util.Date;
--- 18,21 ----
***************
*** 70,74 ****
public final BetReceipt processBet(final BetRequest req) throws LowlevelLedgerException, BettingEventExpired {
try {
! final HeldTransferReceipt held = getPaymentProcessor().processHeldTransfer(new HeldTransferRequest(req.getBettor(), getPoolAccountID(req.getOutcome()), req.getAmount(), new Date(), req.getOutcome().getEvent().getClosingTime(), req.getComment()));
try {
final String ticket = req.getOutcome().bet(req.getAmount());
--- 70,74 ----
public final BetReceipt processBet(final BetRequest req) throws LowlevelLedgerException, BettingEventExpired {
try {
! final HeldTransferReceipt held = getPaymentProcessor().process(new HeldTransferRequest(req.getBettor(), getPoolAccountID(req.getOutcome()), req.getAmount(), new Date(), req.getOutcome().getEvent().getClosingTime(), req.getComment()));
try {
final String ticket = req.getOutcome().bet(req.getAmount());
***************
*** 155,159 ****
throw new LowlevelLedgerException(e);
}
! getPaymentProcessor().processTransfer(
new TransferRequest(getPoolAccountID(winner), held.getFrom(), held.getAmount() * odds, tote.getCurrentTime(), "Won Bet: " + ticket + " on: " + winner.getId() + " at: " + event.getId())
);
--- 155,159 ----
throw new LowlevelLedgerException(e);
}
! getPaymentProcessor().process(
new TransferRequest(getPoolAccountID(winner), held.getFrom(), held.getAmount() * odds, tote.getCurrentTime(), "Won Bet: " + ticket + " on: " + winner.getId() + " at: " + event.getId())
);
|
|
From: <pe...@us...> - 2003-11-21 17:55:19
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv13592/src/test/org/neuclear/id/builders
Modified Files:
SigningRequestBuilderTest.java
Log Message:
misc fixes
Index: SigningRequestBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/SigningRequestBuilderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SigningRequestBuilderTest.java 21 Nov 2003 04:45:17 -0000 1.3
--- SigningRequestBuilderTest.java 21 Nov 2003 17:55:16 -0000 1.4
***************
*** 30,33 ****
--- 30,36 ----
$Id$
$Log$
+ Revision 1.4 2003/11/21 17:55:16 pelle
+ misc fixes
+
Revision 1.3 2003/11/21 04:45:17 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 72,76 ****
final NamedObjectBuilder auth2 = tosign.getUnsigned();
assertEquals(auth2.getParent().getName(), "neu://bob@test");
!
final AuthenticationTicket auth = (AuthenticationTicket) auth2.sign(signer);
assertTrue(auth2.isSigned());
--- 75,80 ----
final NamedObjectBuilder auth2 = tosign.getUnsigned();
assertEquals(auth2.getParent().getName(), "neu://bob@test");
! assertNotNull(auth2);
! assertNotNull(auth2.getElement());
final AuthenticationTicket auth = (AuthenticationTicket) auth2.sign(signer);
assertTrue(auth2.isSigned());
|
570 messages has been excluded from this view by a project administrator.
