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: <pe...@us...> - 2004-01-13 23:38:30
|
Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/auth
In directory sc8-pr-cvs1:/tmp/cvs-serv25435/src/test-cactus/org/neuclear/auth
Modified Files:
AuthenticationFilterTest.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
Index: AuthenticationFilterTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/auth/AuthenticationFilterTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AuthenticationFilterTest.java 12 Dec 2003 19:28:03 -0000 1.1
--- AuthenticationFilterTest.java 13 Jan 2004 23:38:26 -0000 1.2
***************
*** 35,38 ****
--- 35,41 ----
$Id$
$Log$
+ Revision 1.2 2004/01/13 23:38:26 pelle
+ Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+
Revision 1.1 2003/12/12 19:28:03 pelle
All the Cactus tests now for signing servlet.
***************
*** 58,62 ****
AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost");
! SignedNamedObject signed = authreq.sign(signer);
theRequest.setContentType("application/x-www-form-urlencoded");
String b64 = Base64.encode(signed.getEncoded().getBytes());
--- 61,65 ----
AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://localhost");
! SignedNamedObject signed = authreq.convert("neu://bob@test",signer);
theRequest.setContentType("application/x-www-form-urlencoded");
String b64 = Base64.encode(signed.getEncoded().getBytes());
|
|
From: <pe...@us...> - 2004-01-13 23:38:30
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv25435/src/test/org/neuclear/id
Modified Files:
NeuClearBenchmark.java SignedNamedCoreTest.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
Index: NeuClearBenchmark.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NeuClearBenchmark.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NeuClearBenchmark.java 22 Dec 2003 13:45:31 -0000 1.1
--- NeuClearBenchmark.java 13 Jan 2004 23:38:26 -0000 1.2
***************
*** 1,13 ****
package org.neuclear.id;
import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.commons.crypto.signers.TestCaseSigner;
- import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
- import org.neuclear.commons.crypto.signers.NonExistingSignerException;
- import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
- import org.neuclear.commons.crypto.passphraseagents.GuiDialogAgent;
- import org.neuclear.commons.NeuClearException;
import org.neuclear.id.builders.AuthenticationTicketBuilder;
- import org.neuclear.auth.AuthenticationTicket;
/**
--- 1,9 ----
package org.neuclear.id;
+ import org.neuclear.auth.AuthenticationTicket;
+ import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.commons.crypto.signers.TestCaseSigner;
import org.neuclear.id.builders.AuthenticationTicketBuilder;
/**
***************
*** 68,80 ****
AuthenticationTicketBuilder builder=new AuthenticationTicketBuilder("neu://alice@test","neu://test","http://test.com");
! AuthenticationTicket ticket=(AuthenticationTicket) builder.sign(signer);
}
finished();
} catch (InvalidNamedObjectException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
- } catch (NonExistingSignerException e) {
- e.printStackTrace(); //To change body of catch statement use Options | File Templates.
- } catch (UserCancellationException e) {
- e.printStackTrace(); //To change body of catch statement use Options | File Templates.
} catch (NameResolutionException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
--- 64,72 ----
AuthenticationTicketBuilder builder=new AuthenticationTicketBuilder("neu://alice@test","neu://test","http://test.com");
! AuthenticationTicket ticket=(AuthenticationTicket) builder.convert("neu://bob@test",signer);
}
finished();
} catch (InvalidNamedObjectException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
} catch (NameResolutionException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
Index: SignedNamedCoreTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/SignedNamedCoreTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SignedNamedCoreTest.java 12 Jan 2004 22:39:26 -0000 1.5
--- SignedNamedCoreTest.java 13 Jan 2004 23:38:26 -0000 1.6
***************
*** 3,7 ****
import junit.framework.TestCase;
import org.neuclear.commons.NeuClearException;
! import org.neuclear.commons.crypto.signers.JCESigner;
import org.neuclear.commons.crypto.signers.TestCaseSigner;
import org.neuclear.id.builders.AuthenticationTicketBuilder;
--- 3,8 ----
import junit.framework.TestCase;
import org.neuclear.commons.NeuClearException;
! import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.neuclear.commons.crypto.signers.NonExistingSignerException;
import org.neuclear.commons.crypto.signers.TestCaseSigner;
import org.neuclear.id.builders.AuthenticationTicketBuilder;
***************
*** 32,35 ****
--- 33,39 ----
$Id$
$Log$
+ Revision 1.6 2004/01/13 23:38:26 pelle
+ Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+
Revision 1.5 2004/01/12 22:39:26 pelle
Completed all the builders and contracts.
***************
*** 68,71 ****
--- 72,80 ----
public final class SignedNamedCoreTest extends TestCase {
+ public SignedNamedCoreTest(String string) throws NeuClearException {
+ super(string);
+ signer = new TestCaseSigner();
+ }
+
public final void testCreateRoot() {
final SignedNamedCore core = SignedNamedCore.createRootCore();
***************
*** 75,83 ****
}
public final void testRead() throws NeuClearException, GeneralSecurityException, XMLException, FileNotFoundException {
final String name = "neu://bob@test";
final Builder builder = new AuthenticationTicketBuilder(name, "neu://test", "http://slashdot.org");
! final JCESigner signer = new TestCaseSigner();
builder.sign(name, signer);
assertTrue(builder.verifySignature(signer.getPublicKey(name)));
try {
--- 84,107 ----
}
+ public final void testCreateNymous() throws InvalidNamedObjectException, XMLException, NonExistingSignerException, UserCancellationException {
+ final String name = "neu://bob@test";
+ Identity bobx=SignedNamedCore.createSimpleIdentity(signer.getPublicKey(name));
+ assertNotNull(bobx);
+ assertNotNull(bobx.getName());
+ System.out.println(bobx.getName());
+ assertNotNull(bobx.getEncoded());
+ assertNull(bobx.getSigner());
+ assertNotNull(bobx.getPublicKey());
+ }
+
public final void testRead() throws NeuClearException, GeneralSecurityException, XMLException, FileNotFoundException {
final String name = "neu://bob@test";
final Builder builder = new AuthenticationTicketBuilder(name, "neu://test", "http://slashdot.org");
! System.out.println("=====");
! System.out.println(builder.asXML());
!
builder.sign(name, signer);
+ System.out.println(builder.asXML());
+
assertTrue(builder.verifySignature(signer.getPublicKey(name)));
try {
***************
*** 87,92 ****
assertTrue(e.getLocalizedMessage(), false);
}
-
-
}
}
--- 111,116 ----
assertTrue(e.getLocalizedMessage(), false);
}
}
+
+ private TestCaseSigner signer;
}
|
|
From: <pe...@us...> - 2004-01-13 23:38:29
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv25435/src/test/org/neuclear/id/builders
Modified Files:
AuthenticationBuilderTest.java SigningRequestBuilderTest.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
Index: AuthenticationBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/AuthenticationBuilderTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AuthenticationBuilderTest.java 13 Jan 2004 15:11:35 -0000 1.6
--- AuthenticationBuilderTest.java 13 Jan 2004 23:38:26 -0000 1.7
***************
*** 29,32 ****
--- 29,35 ----
$Id$
$Log$
+ Revision 1.7 2004/01/13 23:38:26 pelle
+ Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+
Revision 1.6 2004/01/13 15:11:35 pelle
Now builds.
***************
*** 79,85 ****
// assertEquals(authreq.getSignatory().getName(), "neu://bob@test");
try {
! final AuthenticationTicket auth = (AuthenticationTicket) authreq.sign(signer);
assertTrue(authreq.isSigned());
! assertEquals(auth.getName(), authreq.getName());
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
} catch (InvalidNamedObjectException e) {
--- 82,88 ----
// assertEquals(authreq.getSignatory().getName(), "neu://bob@test");
try {
! final AuthenticationTicket auth = (AuthenticationTicket) authreq.convert("neu://bob@test",signer);
assertTrue(authreq.isSigned());
! // assertEquals(auth.getName(), authreq.);
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
} catch (InvalidNamedObjectException e) {
Index: SigningRequestBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/SigningRequestBuilderTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SigningRequestBuilderTest.java 13 Jan 2004 15:11:35 -0000 1.7
--- SigningRequestBuilderTest.java 13 Jan 2004 23:38:26 -0000 1.8
***************
*** 30,33 ****
--- 30,36 ----
$Id$
$Log$
+ Revision 1.8 2004/01/13 23:38:26 pelle
+ Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+
Revision 1.7 2004/01/13 15:11:35 pelle
Now builds.
***************
*** 94,98 ****
final AuthenticationTicket auth = (AuthenticationTicket) auth2.convert("neu://bob@test",signer);
assertTrue(auth2.isSigned());
! assertEquals(auth.getName(), authreq.getName());
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
} catch (InvalidNamedObjectException e) {
--- 97,101 ----
final AuthenticationTicket auth = (AuthenticationTicket) auth2.convert("neu://bob@test",signer);
assertTrue(auth2.isSigned());
! // assertEquals(auth.getName(), authreq.getName());
assertEquals(auth.getSiteHref(), "http://users.neuclear.org:8080");
} catch (InvalidNamedObjectException e) {
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv25435/src/java/org/neuclear/id/builders
Modified Files:
AuthenticationTicketBuilder.java
EmbeddedSignedObjectBuilder.java NamedObjectBuilder.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
Index: AuthenticationTicketBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/AuthenticationTicketBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AuthenticationTicketBuilder.java 13 Jan 2004 15:11:35 -0000 1.9
--- AuthenticationTicketBuilder.java 13 Jan 2004 23:38:26 -0000 1.10
***************
*** 2,11 ****
import org.dom4j.DocumentHelper;
- import org.dom4j.QName;
import org.neuclear.auth.AuthenticationTicket;
- import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.time.TimeTools;
- import org.neuclear.id.NSTools;
import org.neuclear.id.InvalidNamedObjectException;
import java.sql.Timestamp;
--- 2,9 ----
import org.dom4j.DocumentHelper;
import org.neuclear.auth.AuthenticationTicket;
import org.neuclear.commons.time.TimeTools;
import org.neuclear.id.InvalidNamedObjectException;
+ import org.neuclear.id.NSTools;
import java.sql.Timestamp;
***************
*** 32,35 ****
--- 30,36 ----
$Id$
$Log$
+ Revision 1.10 2004/01/13 23:38:26 pelle
+ Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+
Revision 1.9 2004/01/13 15:11:35 pelle
Now builds.
***************
*** 84,88 ****
* Time: 11:59:58 AM
*/
! public final class AuthenticationTicketBuilder extends NamedObjectBuilder {
public AuthenticationTicketBuilder(final String user, final String requester, final String site) throws InvalidNamedObjectException {
this(user, requester, new Timestamp(new Date().getTime() + 1800000), site);
--- 85,89 ----
* Time: 11:59:58 AM
*/
! public final class AuthenticationTicketBuilder extends Builder {
public AuthenticationTicketBuilder(final String user, final String requester, final String site) throws InvalidNamedObjectException {
this(user, requester, new Timestamp(new Date().getTime() + 1800000), site);
***************
*** 90,94 ****
public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws InvalidNamedObjectException {
! super(NSTools.createUniqueTransactionID(user, requester), AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH);
createAttribute("requester", NSTools.normalizeNameURI(requester));
createAttribute("validto", TimeTools.formatTimeStamp(validto));
--- 91,96 ----
public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws InvalidNamedObjectException {
! super(DocumentHelper.createQName(AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH));
! createAttribute("userid",user);
createAttribute("requester", NSTools.normalizeNameURI(requester));
createAttribute("validto", TimeTools.formatTimeStamp(validto));
Index: EmbeddedSignedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/EmbeddedSignedObjectBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EmbeddedSignedObjectBuilder.java 13 Jan 2004 15:11:35 -0000 1.3
--- EmbeddedSignedObjectBuilder.java 13 Jan 2004 23:38:26 -0000 1.4
***************
*** 1,15 ****
package org.neuclear.id.builders;
- import org.neuclear.xml.xmlsec.SignedElement;
- import org.neuclear.xml.xmlsec.XMLSecurityException;
- import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.NameResolutionException;
- import org.neuclear.id.InvalidNamedObjectException;
- import org.neuclear.commons.crypto.signers.Signer;
- import org.neuclear.commons.crypto.signers.NonExistingSignerException;
- import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
- import org.dom4j.QName;
- import org.dom4j.DocumentHelper;
import org.dom4j.DocumentException;
/**
--- 1,8 ----
package org.neuclear.id.builders;
import org.dom4j.DocumentException;
+ import org.dom4j.DocumentHelper;
+ import org.dom4j.QName;
+ import org.neuclear.id.SignedNamedObject;
/**
***************
*** 30,36 ****
}
- public String getURI() throws XMLSecurityException {
- return "#"; //To change body of implemented methods use Options | File Templates.
- }
-
}
--- 23,25 ----
Index: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** NamedObjectBuilder.java 13 Jan 2004 15:11:35 -0000 1.23
--- NamedObjectBuilder.java 13 Jan 2004 23:38:26 -0000 1.24
***************
*** 2,5 ****
--- 2,8 ----
* $Id$
* $Log$
+ * Revision 1.24 2004/01/13 23:38:26 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.23 2004/01/13 15:11:35 pelle
* Now builds.
***************
*** 231,250 ****
import org.dom4j.*;
- import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.Utility;
- import org.neuclear.commons.crypto.signers.Signer;
- import org.neuclear.commons.crypto.signers.NonExistingSignerException;
import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.neuclear.commons.time.TimeTools;
import org.neuclear.id.*;
import org.neuclear.id.resolver.NSResolver;
- import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.xml.XMLException;
- import org.neuclear.xml.xmlsec.SignedElement;
import org.neuclear.xml.xmlsec.XMLSecurityException;
- import java.sql.Timestamp;
- import java.text.ParseException;
-
/**
* This simple wrapper takes most of the contents of a NamedObject and puts it into a Serializable form that can be signed.
--- 234,244 ----
import org.dom4j.*;
import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.neuclear.commons.crypto.signers.NonExistingSignerException;
! import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.id.*;
import org.neuclear.id.resolver.NSResolver;
import org.neuclear.xml.xmlsec.XMLSecurityException;
/**
* This simple wrapper takes most of the contents of a NamedObject and puts it into a Serializable form that can be signed.
***************
*** 357,367 ****
}
- /**
- * @return the URI of the object. In this case the same as getName();
- */
- public final String getURI() throws XMLSecurityException {
- return getName();
- }
-
/**
--- 351,354 ----
|
|
From: <pe...@us...> - 2004-01-13 23:38:29
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv25435/src/java/org/neuclear/id
Modified Files:
SignedNamedCore.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
Index: SignedNamedCore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedCore.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SignedNamedCore.java 10 Jan 2004 00:03:21 -0000 1.11
--- SignedNamedCore.java 13 Jan 2004 23:38:26 -0000 1.12
***************
*** 2,5 ****
--- 2,8 ----
* $Id$
* $Log$
+ * Revision 1.12 2004/01/13 23:38:26 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.11 2004/01/10 00:03:21 pelle
* Implemented new Schema for Transfer*
***************
*** 474,477 ****
--- 477,483 ----
return encoded.equals(((SignedNamedCore)object).getEncoded()); //To change body of overriden methods use Options | File Templates.
}
+ static Identity createSimpleIdentity(PublicKey pub){
+ return new Identity(new SignedNamedCore(pub),pub);
+ }
private final String name;
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1:/tmp/cvs-serv25308/src/java/org/neuclear/xml/xmlsec
Modified Files:
QuickEmbeddedSignature.java Reference.java SignatureInfo.java
SignedElement.java XMLSecTools.java XMLSignature.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
Index: QuickEmbeddedSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/QuickEmbeddedSignature.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** QuickEmbeddedSignature.java 10 Jan 2004 00:02:02 -0000 1.6
--- QuickEmbeddedSignature.java 13 Jan 2004 23:37:59 -0000 1.7
***************
*** 8,11 ****
--- 8,14 ----
* $Id$
* $Log$
+ * Revision 1.7 2004/01/13 23:37:59 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.6 2004/01/10 00:02:02 pelle
* Implemented new Schema for Transfer*
***************
*** 136,141 ****
*/
public final class QuickEmbeddedSignature extends XMLSignature {
! public QuickEmbeddedSignature(final KeyPair keypair, final Element root, final String uri) throws XMLSecurityException, CryptoException {
! this(keypair.getPrivate(), root, uri);
final Element sig = getElement();
final KeyInfo key = new KeyInfo(keypair.getPublic());
--- 139,144 ----
*/
public final class QuickEmbeddedSignature extends XMLSignature {
! public QuickEmbeddedSignature(final KeyPair keypair, final Element root) throws XMLSecurityException, CryptoException {
! this(keypair.getPrivate(), root);
final Element sig = getElement();
final KeyInfo key = new KeyInfo(keypair.getPublic());
***************
*** 143,151 ****
}
! public QuickEmbeddedSignature(final PrivateKey key, final Element root, final String uri) throws XMLSecurityException, CryptoException {
super(getSignatureElement(root, key));
final Element sig = getElement();
! getSi().getReference().setDigest();
final byte[] canonicalizedSignedInfo = XMLSecTools.canonicalize(sig.element("SignedInfo"));
--- 146,154 ----
}
! public QuickEmbeddedSignature(final PrivateKey key, final Element root) throws XMLSecurityException, CryptoException {
super(getSignatureElement(root, key));
final Element sig = getElement();
! // getSi().getReference().setDigest();
final byte[] canonicalizedSignedInfo = XMLSecTools.canonicalize(sig.element("SignedInfo"));
***************
*** 153,161 ****
}
! public QuickEmbeddedSignature(final String name, final Signer signer, final Element root, final String uri) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
super(getSignatureElement(root,signer.getKeyType(name)));
final Element sig = getElement();
! getSi().getReference().setDigest();
if (signer instanceof PublicKeySource){
final KeyInfo key = new KeyInfo(((PublicKeySource)signer).getPublicKey(name),name);
--- 156,164 ----
}
! public QuickEmbeddedSignature(final String name, final Signer signer, final Element root) throws XMLSecurityException, UserCancellationException, NonExistingSignerException {
super(getSignatureElement(root,signer.getKeyType(name)));
final Element sig = getElement();
! // getSi().getReference().setDigest();
if (signer instanceof PublicKeySource){
final KeyInfo key = new KeyInfo(((PublicKeySource)signer).getPublicKey(name),name);
Index: Reference.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/Reference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Reference.java 10 Dec 2003 23:57:05 -0000 1.4
--- Reference.java 13 Jan 2004 23:37:59 -0000 1.5
***************
*** 1,4 ****
--- 1,7 ----
/* $Id$
* $Log$
+ * Revision 1.5 2004/01/13 23:37:59 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.4 2003/12/10 23:57:05 pelle
* Did some cleaning up in the builders
***************
*** 117,132 ****
import org.neuclear.commons.Utility;
import org.neuclear.commons.crypto.Base64;
- import org.neuclear.commons.crypto.CryptoException;
import org.neuclear.commons.crypto.CryptoTools;
import org.neuclear.xml.XMLException;
import org.neuclear.xml.XMLTools;
import org.neuclear.xml.c14.Canonicalizer;
- import org.neuclear.xml.c14.CanonicalizerWithComments;
import org.neuclear.xml.c14.CanonicalizerWithoutSignature;
- import org.neuclear.xml.transforms.Transform;
! import java.io.File;
! import java.util.Iterator;
! import java.util.LinkedList;
import java.util.List;
--- 120,130 ----
import org.neuclear.commons.Utility;
import org.neuclear.commons.crypto.Base64;
import org.neuclear.commons.crypto.CryptoTools;
import org.neuclear.xml.XMLException;
import org.neuclear.xml.XMLTools;
import org.neuclear.xml.c14.Canonicalizer;
import org.neuclear.xml.c14.CanonicalizerWithoutSignature;
! import java.io.IOException;
import java.util.List;
***************
*** 134,218 ****
/**
! * Currently only RSA
*/
! public Reference(Element root, final String uri, final SignatureInfo si, final int sigtype) throws XMLException {
super(Reference.TAG_NAME);
! this.root = root;
! this.si = si;
! xmlsigType = sigtype;
! // findRefElement();
! if (root == null)
! loadReference(uri);
! if (getSigType() == XMLSIGTYPE_ENVELOPED)
! addTransform("http://www.w3.org/2000/09/xmldsig#enveloped-signature");
! else if (getSigType() == XMLSIGTYPE_ENVELOPING) {
! root = si.getSig().getElement().element("Object");
! // System.out.println(new String(canonicalizeReference()));// Just debugging here
}
! addTransform("http://www.w3.org/TR/2001/REC-xml-c14n-20010315");
! final Element digMethod = XMLSecTools.createElementInSignatureSpace("DigestMethod");
! digMethod.addAttribute("Algorithm", "http://www.w3.org/2000/09/xmldsig#sha1");
! addElement(digMethod);
! setDigest();
}
! public Reference(final Element elem, final SignatureInfo si) throws XMLSecurityException {
super(elem);
if (!elem.getQName().getName().equals(TAG_NAME))
throw new XMLSecurityException("Element: " + elem.getQualifiedName() + " is not a valid: " + XMLSecTools.NS_DS.getPrefix() + ":" + TAG_NAME);
! this.si = si;
! // Here we will try to get work out Root
! findRefElement();
! // TODO parse Transforms
}
! private void findRefElement() throws XMLSecurityException {
! final Element sigElement = si.getSig().getElement();
! final Element objectElem = sigElement.element(XMLSecTools.createQName("Object"));
!
! if (objectElem != null) { // Enveloping
! xmlsigType = XMLSIGTYPE_ENVELOPING;
! final List contents = objectElem.content();
if (contents.size() == 1)
! root = contents.get(0);
else
! root = contents;
! root = objectElem;
! } else if (sigElement.getParent() != null) { // Enveloped
! xmlsigType = XMLSIGTYPE_ENVELOPED;
! root = getElement().getDocument();
} else {// Detached
! xmlsigType = XMLSIGTYPE_DETACHED;
! loadReference(getElement().attributeValue("URI"));
}
}
! private void loadReference(final String refuri) throws XMLSecurityException {
if (Utility.isEmpty(refuri))
throw new XMLSecurityException("XMLSignature is not linked to Document");
try {
! root = XMLTools.loadDocument(new File(refuri)).getRootElement();
} catch (XMLException e) {
! XMLSecTools.rethrowException(e);
! }
! }
!
! private void addTransform(final String algorithm) throws XMLException {
! if (transforms == null) {
! transforms = new LinkedList();
! // if (transformsElement==null)
! transformsElement = XMLSecTools.createElementInSignatureSpace("Transforms");
! addElement(transformsElement);
}
-
- // Transform tran = TransformerFactory.make(algorithm);
- // if (tran == null) {
- // System.err.println("Couldn't resolve Transform: " + algorithm);
- // tran = new ClearTransform();
- // }
- // transforms.add(tran);
- transformsElement.addElement(XMLSecTools.createQName("Transform")).addAttribute("Algorithm", algorithm);
}
--- 132,224 ----
/**
! * Creates a Reference to a Element, with the given signature type:
! * <ul>
! * <li>
! * Reference.XMLSIGTYPE_ENVELOPED
! * <li>
! * Reference.XMLSIGTYPE_ENVELOPING
! * <ul>
*/
! public Reference(Element root, final int sigtype) throws XMLSecurityException {
super(Reference.TAG_NAME);
! try {
! final Canonicalizer canon;
! Element transformsElement = addElement("Transforms");
! if (sigtype == XMLSIGTYPE_ENVELOPED){
! canon=new CanonicalizerWithoutSignature();
! transformsElement.addElement(XMLSecTools.createQName("Transform")).addAttribute("Algorithm","http://www.w3.org/2000/09/xmldsig#enveloped-signature");
! }else {
! canon= new Canonicalizer();
! }
! transformsElement.addElement(XMLSecTools.createQName("Transform")).addAttribute("Algorithm","http://www.w3.org/TR/2001/REC-xml-c14n-20010315");
! type=sigtype;
! final String id = root.attributeValue("id");
! if (!Utility.isEmpty(id))
! createAttribute("URI","#"+id);
!
! digest=createDigest(canon, root);
! addDigest();
! } catch (IOException e) {
! throw new XMLSecurityException(e);
}
! }
! private void addDigest() {
! addElement("DigestMethod").addAttribute(XMLSecTools.createQName("Algorithm"),"http://www.w3.org/2000/09/xmldsig#sha1");
! getElement().add(XMLSecTools.base64ToElement("DigestValue",digest.getBytes()));
}
! private static String createDigest(final Canonicalizer canon, Object root) throws IOException {
! return new String(Base64.encode(CryptoTools.digest(canon.canonicalize(root))));
! }
!
! public Reference(final String uri) throws XMLSecurityException {
! super(Reference.TAG_NAME);
! type=XMLSIGTYPE_DETACHED;
! try {
! createAttribute("URI",uri);
! digest=createDigest(new Canonicalizer(),loadReference(uri));
! addDigest();
! } catch (IOException e) {
! throw new XMLSecurityException(e);
! }
! }
! /**
! * Build this from XML Reference Element
! * @param elem
! * @throws XMLSecurityException
! */
! public Reference(final Element elem) throws XMLSecurityException {
super(elem);
+ type=0;
if (!elem.getQName().getName().equals(TAG_NAME))
throw new XMLSecurityException("Element: " + elem.getQualifiedName() + " is not a valid: " + XMLSecTools.NS_DS.getPrefix() + ":" + TAG_NAME);
! digest=new String(XMLSecTools.decodeBase64Element(getElement().element(XMLSecTools.createQName("DigestValue"))));
! // findRefElement(elem);
}
! private static Object findRefElement(Element elem) throws XMLSecurityException {
! if (elem.getParent() != null&&elem.getParent().getParent() != null&&elem.getParent().getParent().getParent() != null) { // Enveloped
! return elem.getDocument();
! } else if (elem.getParent() != null&&elem.getParent().getParent() != null&&elem.getParent().getParent().element("Object") != null) { // Enveloped
! final List contents = elem.getParent().getParent().element("Object").content();
if (contents.size() == 1)
! return contents.get(0);
else
! return contents;
} else {// Detached
! return loadReference(elem.attributeValue("URI"));
}
}
! private static Object loadReference(final String refuri) throws XMLSecurityException {
if (Utility.isEmpty(refuri))
throw new XMLSecurityException("XMLSignature is not linked to Document");
try {
! return XMLTools.loadDocument(refuri).getRootElement();
} catch (XMLException e) {
! throw new XMLSecurityException(e);
}
}
***************
*** 221,267 ****
* This returns the Digest
*
! * @return
! * @throws XMLSecurityException
*/
! public final byte[] getDigest() throws XMLSecurityException, CryptoException {
! final Element sv = (Element) getElement().element(XMLSecTools.createQName("DigestValue"));
! if (sv != null)
! return XMLSecTools.decodeBase64Element(sv);
! return null;
! }
!
! final void setDigest() throws XMLSecurityException {
! final Element sv = (Element) getElement().element(XMLSecTools.createQName("DigestValue"));
! final byte[] dig = generateRefenceDigest();
! if (sv == null)
! getElement().add(XMLSecTools.base64ToElement("DigestValue", dig));
! else
! sv.addText(Base64.encode(dig));
}
- //TODO Rewrite this bit
- private final Object performTransforms() {
- // Element subject = root;//(Element) root.clone();
- Object subject = root;
- final Iterator iter = transforms.iterator();
- while (iter.hasNext() && root != null) {
- final Transform transform = (Transform) iter.next();
- subject = transform.transformNode(subject);
- }
- return subject;
- }
private Canonicalizer getCanonicalizer() {
if (getSigType() == Reference.XMLSIGTYPE_ENVELOPED)
return new CanonicalizerWithoutSignature();
else if (c14nType == Canonicalizer.C14NTYPE_WITH_COMMENTS)
return new CanonicalizerWithComments();
return new Canonicalizer();
}
- private Object getReferenceElement() {
- return root;
- }
protected final byte[] canonicalizeReference() {
return XMLSecTools.canonicalize(getCanonicalizer(), getReferenceElement());
--- 227,250 ----
* This returns the Digest
*
! * @return
*/
! public final String getDigest() {
! return digest;
}
private Canonicalizer getCanonicalizer() {
+ /*
if (getSigType() == Reference.XMLSIGTYPE_ENVELOPED)
return new CanonicalizerWithoutSignature();
else if (c14nType == Canonicalizer.C14NTYPE_WITH_COMMENTS)
return new CanonicalizerWithComments();
+ */
return new Canonicalizer();
}
+
+ /*
protected final byte[] canonicalizeReference() {
return XMLSecTools.canonicalize(getCanonicalizer(), getReferenceElement());
***************
*** 276,294 ****
}
! public final String getTagName() {
! return TAG_NAME;
! }
!
! public final int getSigType() {
! return xmlsigType;
}
! private Object root;
! private SignatureInfo si;
!
private static final String TAG_NAME = "Reference";
- private List transforms;
- private Element transformsElement;
- private int xmlsigType = 0;
public final static int XMLSIGTYPE_ENVELOPED = 0;
--- 259,270 ----
}
! */
! public String getUri(){
! return getElement().attributeValue("URI");
}
+ private final String digest;
! private final int type;
private static final String TAG_NAME = "Reference";
public final static int XMLSIGTYPE_ENVELOPED = 0;
***************
*** 296,302 ****
public final static int XMLSIGTYPE_DETACHED = 2;
- private int c14nType;
-
-
- // private PublicKey pub;
}
--- 272,274 ----
Index: SignatureInfo.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignatureInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SignatureInfo.java 11 Dec 2003 23:56:53 -0000 1.4
--- SignatureInfo.java 13 Jan 2004 23:37:59 -0000 1.5
***************
*** 1,4 ****
--- 1,7 ----
/* $Id$
* $Log$
+ * Revision 1.5 2004/01/13 23:37:59 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.4 2003/12/11 23:56:53 pelle
* Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
***************
*** 88,93 ****
import org.neuclear.xml.XMLException;
import org.neuclear.xml.c14.Canonicalizer;
- import org.neuclear.xml.c14.CanonicalizerWithComments;
- import org.neuclear.xml.c14.CanonicalizerWithoutSignature;
import java.security.NoSuchAlgorithmException;
--- 91,94 ----
***************
*** 113,117 ****
addElement(sm);
! ref = new Reference(root, uri, this, sigtype);
addElement(ref);
} catch (XMLException e) {
--- 114,118 ----
addElement(sm);
! ref = new Reference(root, sigtype);
addElement(ref);
} catch (XMLException e) {
***************
*** 130,134 ****
final Element refElem = elem.element(XMLSecTools.createQName("Reference"));
if (refElem != null)
! ref = new Reference(refElem, this);
//Check reference element if signature is enveloped
--- 131,135 ----
final Element refElem = elem.element(XMLSecTools.createQName("Reference"));
if (refElem != null)
! ref = new Reference(refElem);
//Check reference element if signature is enveloped
***************
*** 147,154 ****
final Canonicalizer getCanonicalizer() {
! if (ref.getSigType() == Reference.XMLSIGTYPE_ENVELOPED)
! return new CanonicalizerWithoutSignature();
! else if (c14nType == Canonicalizer.C14NTYPE_WITH_COMMENTS)
! return new CanonicalizerWithComments();
return new Canonicalizer();
}
--- 148,155 ----
final Canonicalizer getCanonicalizer() {
! // if (ref.getSigType() == Reference.XMLSIGTYPE_ENVELOPED)
! // return new CanonicalizerWithoutSignature();
! // else if (c14nType == Canonicalizer.C14NTYPE_WITH_COMMENTS)
! // return new CanonicalizerWithComments();
return new Canonicalizer();
}
Index: SignedElement.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/SignedElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SignedElement.java 11 Jan 2004 00:39:19 -0000 1.8
--- SignedElement.java 13 Jan 2004 23:37:59 -0000 1.9
***************
*** 1,4 ****
--- 1,7 ----
/* $Id$
* $Log$
+ * Revision 1.9 2004/01/13 23:37:59 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.8 2004/01/11 00:39:19 pelle
* Cleaned up the schemas even more they now all verifiy.
***************
*** 142,147 ****
import org.neuclear.commons.crypto.CryptoException;
import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
- import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.commons.crypto.signers.NonExistingSignerException;
import org.neuclear.xml.AbstractElementProxy;
import org.neuclear.xml.XMLException;
--- 145,150 ----
import org.neuclear.commons.crypto.CryptoException;
import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
import org.neuclear.commons.crypto.signers.NonExistingSignerException;
+ import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.xml.AbstractElementProxy;
import org.neuclear.xml.XMLException;
***************
*** 235,239 ****
public final void sign(final PrivateKey priv) throws XMLSecurityException, CryptoException {
preSign();
! sig = XMLSecTools.signElement(getURI(), getElement(), priv);
postSign();
}
--- 238,242 ----
public final void sign(final PrivateKey priv) throws XMLSecurityException, CryptoException {
preSign();
! sig = XMLSecTools.signElement(getElement(), priv);
postSign();
}
***************
*** 241,265 ****
public final void sign(final String name, final Signer signer) throws XMLSecurityException, NonExistingSignerException, UserCancellationException {
preSign();
! sig = XMLSecTools.signElement(getURI(), getElement(), name, signer);
postSign();
}
- /**
- * @return
- * @throws XMLSecurityException
- */
-
- public final byte[] getDigest() throws XMLSecurityException, CryptoException {
- if (sig == null)
- throw new XMLSecurityException("The object can not be verified as it doesnt contain a signature");
- return sig.getDigest();
- }
-
- /**
- * Returns the URI of the Element. This is used in the signing process.
- */
- public String getURI() throws XMLSecurityException {
- return "#" ;
- }
-
}
--- 244,250 ----
public final void sign(final String name, final Signer signer) throws XMLSecurityException, NonExistingSignerException, UserCancellationException {
preSign();
! sig = XMLSecTools.signElement( getElement(), name, signer);
postSign();
}
}
Index: XMLSecTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSecTools.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** XMLSecTools.java 19 Dec 2003 18:03:07 -0000 1.5
--- XMLSecTools.java 13 Jan 2004 23:37:59 -0000 1.6
***************
*** 1,4 ****
--- 1,7 ----
/* $Id$
* $Log$
+ * Revision 1.6 2004/01/13 23:37:59 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.5 2003/12/19 18:03:07 pelle
* Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 183,193 ****
* Signs an element with a given keypair and envelopes the signature within.
*
- * @param baseURI Unique ID of the Element to be signed
* @param root Element to be signed
* @param keypair RSA/DSA KeyPair
* @throws XMLSecurityException
*/
! public static XMLSignature signElement(final String baseURI, final Element root, final KeyPair keypair) throws XMLSecurityException, CryptoException {//, KeyStoreException {
! final XMLSignature sig = new QuickEmbeddedSignature(keypair, root, baseURI);
return sig;
}
--- 186,195 ----
* Signs an element with a given keypair and envelopes the signature within.
*
* @param root Element to be signed
* @param keypair RSA/DSA KeyPair
* @throws XMLSecurityException
*/
! public static XMLSignature signElement(final Element root, final KeyPair keypair) throws XMLSecurityException, CryptoException {//, KeyStoreException {
! final XMLSignature sig = new QuickEmbeddedSignature(keypair, root);
return sig;
}
***************
*** 196,206 ****
* Signs an element with a given Private Key and "Envelopes" the signature within.
*
- * @param baseURI Unique ID of the Element to be signed
* @param root Element to be signed
* @param key RSA Private Key
* @throws XMLSecurityException
*/
! public static XMLSignature signElement(final String baseURI, final Element root, final PrivateKey key) throws XMLSecurityException, CryptoException {//, KeyStoreException {
! final XMLSignature sig = new QuickEmbeddedSignature(key, root, baseURI);
return sig;
}
--- 198,207 ----
* Signs an element with a given Private Key and "Envelopes" the signature within.
*
* @param root Element to be signed
* @param key RSA Private Key
* @throws XMLSecurityException
*/
! public static XMLSignature signElement( final Element root, final PrivateKey key) throws XMLSecurityException, CryptoException {//, KeyStoreException {
! final XMLSignature sig = new QuickEmbeddedSignature(key, root);
return sig;
}
***************
*** 209,213 ****
* Signs an element with a given Private Key and "Envelopes" the signature within.
*
- * @param baseURI Unique ID of the Element to be signed
* @param root Element to be signed
* @param name Alias of key to be used for signing
--- 210,213 ----
***************
*** 215,220 ****
* @throws XMLSecurityException
*/
! public static XMLSignature signElement(final String baseURI, final Element root, final String name, final org.neuclear.commons.crypto.signers.Signer signer) throws XMLSecurityException, NonExistingSignerException, UserCancellationException {//, KeyStoreException {
! final XMLSignature sig = new QuickEmbeddedSignature(name, signer, root, baseURI);
return sig;
}
--- 215,220 ----
* @throws XMLSecurityException
*/
! public static XMLSignature signElement( final Element root, final String name, final org.neuclear.commons.crypto.signers.Signer signer) throws XMLSecurityException, NonExistingSignerException, UserCancellationException {//, KeyStoreException {
! final XMLSignature sig = new QuickEmbeddedSignature(name, signer, root);
return sig;
}
Index: XMLSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** XMLSignature.java 8 Jan 2004 23:38:06 -0000 1.8
--- XMLSignature.java 13 Jan 2004 23:37:59 -0000 1.9
***************
*** 1,4 ****
--- 1,7 ----
/* $Id$
* $Log$
+ * Revision 1.9 2004/01/13 23:37:59 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.8 2004/01/08 23:38:06 pelle
* XMLSignature can now give you the Signing key and the id of the signer.
***************
*** 280,284 ****
if (ki==null){
final Element keyInfoElem = getElement().element(XMLSecTools.createQName("KeyInfo"));
! if (keyInfoElem == null)
ki=new KeyInfo(keyInfoElem);
}
--- 283,287 ----
if (ki==null){
final Element keyInfoElem = getElement().element(XMLSecTools.createQName("KeyInfo"));
! if (keyInfoElem != null)
ki=new KeyInfo(keyInfoElem);
}
***************
*** 290,295 ****
try {
! if (!si.getReference().verifyReferences())
! return false;
final byte[] sig = getSignature();
final byte[] cansi = si.canonicalize();
--- 293,298 ----
try {
! // if (!si.getReference().verifyReferences())
! // return false;
final byte[] sig = getSignature();
final byte[] cansi = si.canonicalize();
***************
*** 303,310 ****
try {
! if (!si.getReference().verifyReferences()) {
! // System.err.println("XMLSIG: References didnt match up");
! return false;
! }
final byte[] sig = getSignature();
final byte[] cansi = si.canonicalize();
--- 306,313 ----
try {
! // if (!si.getReference().verifyReferences()) {
! //// System.err.println("XMLSIG: References didnt match up");
! // return false;
! // }
final byte[] sig = getSignature();
final byte[] cansi = si.canonicalize();
***************
*** 320,333 ****
! public final String getTagName() {
! return TAG_NAME;
! }
!
! public final byte[] getDigest() throws XMLSecurityException, CryptoException {
! if (si == null)
! throw new XMLSecurityException("The object can not be verified as it doesnt contain a signature");
! return si.getReference().getDigest();
! }
!
protected final SignatureInfo getSi() {
return si;
--- 323,327 ----
!
protected final SignatureInfo getSi() {
return si;
|
|
From: <pe...@us...> - 2004-01-13 23:38:02
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1:/tmp/cvs-serv25308/src/test/org/neuclear/xml/xmlsec
Modified Files:
SimpleXMLSigTest.java
Added Files:
RefTest.java XMLSignerTest.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
--- NEW FILE: RefTest.java ---
package org.neuclear.xml.xmlsec;
import junit.framework.TestCase;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.neuclear.commons.crypto.CryptoException;
import org.neuclear.xml.XMLException;
import java.io.File;
import java.net.MalformedURLException;
/*
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: RefTest.java,v 1.1 2004/01/13 23:37:59 pelle Exp $
$Log: RefTest.java,v $
Revision 1.1 2004/01/13 23:37:59 pelle
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
*/
/**
* User: pelleb
* Date: Jan 13, 2004
* Time: 9:49:09 PM
*/
public class RefTest extends TestCase {
public RefTest(String string) {
super(string);
}
public void testExternalReference() throws XMLException, CryptoException, MalformedURLException {
File rfile=new File("src/testdata/homegrown/signature-enveloped-rsa.xml");
final String uri = rfile.toURL().toExternalForm();
Reference ref=new Reference(uri);
assertNotNull(ref);
assertNotNull(ref.getDigest());
assertEquals(uri,ref.getUri());
System.out.println(ref.asXML());
}
public void testEnvelopedReference() throws DocumentException, XMLException, CryptoException {
Document doc=DocumentHelper.parseText("<test id=\"one\">hello</test>");
Reference ref=new Reference(doc.getRootElement(),Reference.XMLSIGTYPE_ENVELOPED);
assertNotNull(ref);
assertNotNull(ref.getDigest());
assertEquals("#one",ref.getUri());
System.out.println(ref.asXML());
}
}
--- NEW FILE: XMLSignerTest.java ---
package org.neuclear.xml.xmlsec;
import junit.framework.TestCase;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
import org.neuclear.commons.crypto.signers.NonExistingSignerException;
import org.neuclear.commons.crypto.signers.TestCaseSigner;
/*
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: XMLSignerTest.java,v 1.1 2004/01/13 23:37:59 pelle Exp $
$Log: XMLSignerTest.java,v $
Revision 1.1 2004/01/13 23:37:59 pelle
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
*/
/**
* User: pelleb
* Date: Jan 13, 2004
* Time: 8:50:32 PM
*/
public class XMLSignerTest extends TestCase{
public XMLSignerTest(String string) throws InvalidPassphraseException {
super(string);
signer=new TestCaseSigner();
}
public void testSign() throws DocumentException, XMLSecurityException, NonExistingSignerException, UserCancellationException {
Document doc=DocumentHelper.parseText("<hello>test</hello>");
XMLSignature sig=new QuickEmbeddedSignature("neu://bob@test",signer,doc.getRootElement());
assertTrue(sig.verifySignature());
}
private final TestCaseSigner signer;
}
Index: SimpleXMLSigTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleXMLSigTest.java 21 Nov 2003 04:44:31 -0000 1.5
--- SimpleXMLSigTest.java 13 Jan 2004 23:37:59 -0000 1.6
***************
*** 22,25 ****
--- 22,28 ----
* $Id$
* $Log$
+ * Revision 1.6 2004/01/13 23:37:59 pelle
+ * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+ *
* Revision 1.5 2003/11/21 04:44:31 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 153,157 ****
public final void testQuickRSASignXML() throws DocumentException, XMLException, CryptoException {
Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement("http://testsigs", doc.getRootElement(), signer);
final File outputFile = new File("target/testdata/homegrown/signature-enveloped-rsa-quick.xml");
XMLTools.writeFile(outputFile, doc);
--- 156,160 ----
public final void testQuickRSASignXML() throws DocumentException, XMLException, CryptoException {
Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement( doc.getRootElement(), signer);
final File outputFile = new File("target/testdata/homegrown/signature-enveloped-rsa-quick.xml");
XMLTools.writeFile(outputFile, doc);
***************
*** 165,169 ****
assertTrue("Test if public key is really DSA", dsaSigner.getPublic() instanceof DSAPublicKey);
Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement("http://testDSAsigs", doc.getRootElement(), dsaSigner);
final File outputFile = new File("target/testdata/homegrown/signature-enveloped-dsa-quick.xml");
--- 168,172 ----
assertTrue("Test if public key is really DSA", dsaSigner.getPublic() instanceof DSAPublicKey);
Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement( doc.getRootElement(), dsaSigner);
final File outputFile = new File("target/testdata/homegrown/signature-enveloped-dsa-quick.xml");
***************
*** 178,182 ****
final Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement("http://testsigs", doc.getRootElement(), signer);
assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement(), signer.getPublic()));
doc.getRootElement().addElement("BadElement");
--- 181,185 ----
final Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement( doc.getRootElement(), signer);
assertTrue("Test if Signature is valid", XMLSecTools.verifySignature(doc.getRootElement(), signer.getPublic()));
doc.getRootElement().addElement("BadElement");
***************
*** 189,193 ****
final Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement("http://testDSAsigs", doc.getRootElement(), dsaSigner);
assertTrue("Test if DSA Signature is valid", XMLSecTools.verifySignature(doc.getRootElement(), dsaSigner.getPublic()));
doc.getRootElement().addElement("BadElement");
--- 192,196 ----
final Document doc = DocumentHelper.parseText(TESTXML);
! XMLSecTools.signElement(doc.getRootElement(), dsaSigner);
assertTrue("Test if DSA Signature is valid", XMLSecTools.verifySignature(doc.getRootElement(), dsaSigner.getPublic()));
doc.getRootElement().addElement("BadElement");
|
|
From: <pe...@us...> - 2004-01-13 23:38:02
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml In directory sc8-pr-cvs1:/tmp/cvs-serv25308/src/java/org/neuclear/xml Modified Files: XMLTools.java Log Message: Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes. Index: XMLTools.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/XMLTools.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** XMLTools.java 10 Dec 2003 23:57:05 -0000 1.4 --- XMLTools.java 13 Jan 2004 23:37:59 -0000 1.5 *************** *** 2,5 **** --- 2,8 ---- * $Id$ * $Log$ + * Revision 1.5 2004/01/13 23:37:59 pelle + * Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes. + * * Revision 1.4 2003/12/10 23:57:05 pelle * Did some cleaning up in the builders *************** *** 147,150 **** --- 150,154 ---- import java.io.*; import java.net.MalformedURLException; + import java.net.URL; *************** *** 178,182 **** return DocumentHelper.createDocument(); } ! public static Document loadDocument(final InputStream is) throws XMLException { try { --- 182,200 ---- return DocumentHelper.createDocument(); } ! public static Document loadDocument(final String url) throws XMLException{ ! try { ! return loadDocument(new URL(url)); ! } catch (MalformedURLException e) { ! throw new XMLException(e); ! } ! } ! public static Document loadDocument(final URL url) throws XMLException { ! try { ! final SAXReader xmlReader = new SAXReader(); ! return xmlReader.read(url); ! } catch (Exception e) { ! throw new XMLException(e); ! } ! } public static Document loadDocument(final InputStream is) throws XMLException { try { *************** *** 184,190 **** return xmlReader.read(is); } catch (Exception e) { ! rethrowException(e); } - return null; } --- 202,207 ---- return xmlReader.read(is); } catch (Exception e) { ! throw new XMLException(e); } } *************** *** 194,202 **** return xmlReader.read(f); } catch (DocumentException e) { ! rethrowException(e); } catch (MalformedURLException e) { ! rethrowException(e); } - return null; } --- 211,218 ---- return xmlReader.read(f); } catch (DocumentException e) { ! throw new XMLException(e); } catch (MalformedURLException e) { ! throw new XMLException(e); } } |
|
From: <pe...@us...> - 2004-01-13 23:37:33
|
Update of /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet In directory sc8-pr-cvs1:/tmp/cvs-serv25221/src/test-cactus/org/neuclear/asset/receiver/servlet Modified Files: AssetControllerServletTest.java TransferRequestServletTest.java Log Message: Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes. Index: AssetControllerServletTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet/AssetControllerServletTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AssetControllerServletTest.java 20 Dec 2003 00:17:41 -0000 1.1 --- AssetControllerServletTest.java 13 Jan 2004 23:37:30 -0000 1.2 *************** *** 1,25 **** package org.neuclear.asset.receiver.servlet; import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; - import org.neuclear.commons.crypto.signers.TestCaseSigner; - import org.neuclear.commons.crypto.signers.JCESigner; import org.neuclear.commons.crypto.Base64; ! import org.neuclear.xml.XMLException; ! import org.neuclear.auth.AuthenticationServlet; ! import org.neuclear.id.SignedNamedObject; import org.neuclear.id.SignatureRequest; import org.neuclear.id.resolver.NSResolver; import org.neuclear.id.verifier.VerifyingReader; import org.xml.sax.SAXException; import javax.servlet.ServletException; - import java.security.GeneralSecurityException; - import java.io.IOException; import java.io.ByteArrayInputStream; ! ! import com.meterware.httpunit.WebForm; /* --- 1,24 ---- package org.neuclear.asset.receiver.servlet; + import com.meterware.httpunit.WebForm; import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; + import org.neuclear.auth.AuthenticationServlet; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; import org.neuclear.commons.crypto.Base64; ! import org.neuclear.commons.crypto.signers.JCESigner; ! import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.id.SignatureRequest; + import org.neuclear.id.SignedNamedObject; import org.neuclear.id.resolver.NSResolver; import org.neuclear.id.verifier.VerifyingReader; + import org.neuclear.xml.XMLException; import org.xml.sax.SAXException; import javax.servlet.ServletException; import java.io.ByteArrayInputStream; ! import java.io.IOException; ! import java.security.GeneralSecurityException; /* *************** *** 43,46 **** --- 42,48 ---- $Id$ $Log$ + Revision 1.2 2004/01/13 23:37:30 pelle + Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes. + Revision 1.1 2003/12/20 00:17:41 pelle overwrote the standard Object.toString(), hashCode() and equals() methods for SignedNamedObject/Core Index: TransferRequestServletTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet/TransferRequestServletTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TransferRequestServletTest.java 20 Dec 2003 00:17:41 -0000 1.1 --- TransferRequestServletTest.java 13 Jan 2004 23:37:30 -0000 1.2 *************** *** 3,25 **** import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; import org.neuclear.commons.NeuClearException; - import org.neuclear.commons.Utility; - import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.commons.crypto.signers.JCESigner; ! import org.neuclear.commons.crypto.Base64; import org.neuclear.xml.XMLException; - import org.neuclear.auth.AuthenticationServlet; - import org.neuclear.id.SignedNamedObject; - import org.neuclear.id.SignatureRequest; - import org.neuclear.id.resolver.NSResolver; - import org.neuclear.id.verifier.VerifyingReader; - import org.xml.sax.SAXException; import javax.servlet.ServletException; - import java.security.GeneralSecurityException; import java.io.IOException; ! import java.io.ByteArrayInputStream; ! ! import com.meterware.httpunit.WebForm; /* --- 3,15 ---- import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; + import org.neuclear.asset.servlet.TransferRequestServlet; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.crypto.signers.JCESigner; ! import org.neuclear.commons.crypto.signers.TestCaseSigner; import org.neuclear.xml.XMLException; import javax.servlet.ServletException; import java.io.IOException; ! import java.security.GeneralSecurityException; /* *************** *** 43,46 **** --- 33,39 ---- $Id$ $Log$ + Revision 1.2 2004/01/13 23:37:30 pelle + Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes. + Revision 1.1 2003/12/20 00:17:41 pelle overwrote the standard Object.toString(), hashCode() and equals() methods for SignedNamedObject/Core |
|
From: <pe...@us...> - 2004-01-13 23:37:33
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/remote
In directory sc8-pr-cvs1:/tmp/cvs-serv25221/src/java/org/neuclear/asset/remote
Modified Files:
AssetControlClient.java
Log Message:
Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
Index: AssetControlClient.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/remote/AssetControlClient.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AssetControlClient.java 11 Jan 2004 00:39:06 -0000 1.12
--- AssetControlClient.java 13 Jan 2004 23:37:30 -0000 1.13
***************
*** 1,4 ****
--- 1,5 ----
package org.neuclear.asset.remote;
+ import org.neuclear.asset.orders.AssetTransactionContract;
import org.neuclear.asset.orders.TransferReceipt;
import org.neuclear.asset.orders.builders.TransferOrderBuilder;
***************
*** 7,11 ****
--- 8,16 ----
import org.neuclear.exchange.orders.CancelExchangeReceipt;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
+ import org.neuclear.exchange.orders.builders.CancelExchangeOrderBuilder;
+ import org.neuclear.exchange.orders.builders.ExchangeCompletionOrderBuilder;
+ import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.SignedNamedObject;
+ import org.neuclear.id.builders.Builder;
import org.neuclear.xml.XMLException;
***************
*** 30,33 ****
--- 35,41 ----
$Id$
$Log$
+ Revision 1.13 2004/01/13 23:37:30 pelle
+ Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes.
+
Revision 1.12 2004/01/11 00:39:06 pelle
Cleaned up the schemas even more they now all verifiy.
***************
*** 129,157 ****
*/
public final class AssetControlClient {
! public AssetControlClient(final Signer signer) throws NeuClearException {
this.signer = signer;
}
! public final TransferReceipt performTransfer(final TransferRequestBuilder req) throws NeuClearException, XMLException {
return (TransferReceipt) send(req);
}
! public final ExchangeOrderReceipt performHeldTransfer(final ExchangeRequestBuilder req) throws NeuClearException, XMLException {
return (ExchangeOrderReceipt) send(req);
}
! public final TransferReceipt performCompleteHeld(final CompleteExchangeRequestBuilder req) throws NeuClearException, XMLException {
return (TransferReceipt) send(req);
}
! public final CancelExchangeReceipt performCancelHeld(final CancelExchangeRequestBuilder req) throws NeuClearException, XMLException {
! return (CancelExchangeReceipt) req.getAsset().receive(req.sign(signer));
}
! private SignedNamedObject send(final TransferOrderBuilder req) throws NeuClearException, XMLException {
! return req.getAsset().receive(req.sign(signer));
}
private final Signer signer;
}
--- 137,168 ----
*/
public final class AssetControlClient {
! public AssetControlClient(String name, final Signer signer) throws NeuClearException {
this.signer = signer;
+ this.name=name;
}
! public final TransferReceipt performTransfer(final TransferOrderBuilder req) throws NeuClearException, XMLException {
return (TransferReceipt) send(req);
}
! public final ExchangeOrderReceipt performHeldTransfer(final ExchangeOrderBuilder req) throws NeuClearException, XMLException {
return (ExchangeOrderReceipt) send(req);
}
! public final TransferReceipt performCompleteHeld(final ExchangeCompletionOrderBuilder req) throws NeuClearException, XMLException {
return (TransferReceipt) send(req);
}
! public final CancelExchangeReceipt performCancelHeld(final CancelExchangeOrderBuilder req) throws NeuClearException, XMLException {
! return (CancelExchangeReceipt) send(req);
}
! private SignedNamedObject send(final Builder req) throws NeuClearException, XMLException {
! final AssetTransactionContract object = (AssetTransactionContract) req.convert(name,signer);
! return object.getAsset().receive(object);
}
private final Signer signer;
+ private final String name;
}
|
|
From: <pe...@us...> - 2004-01-13 23:37:33
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver In directory sc8-pr-cvs1:/tmp/cvs-serv25221/src/java/org/neuclear/asset/receiver Removed Files: AssetControllerReceiver.java Log Message: Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes. --- AssetControllerReceiver.java DELETED --- |
|
From: <pe...@us...> - 2004-01-13 23:37:33
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/servlet In directory sc8-pr-cvs1:/tmp/cvs-serv25221/src/java/org/neuclear/asset/receiver/servlet Removed Files: AssetControllerServlet.java TransferRequestServlet.java Log Message: Refactoring parts of the core of XMLSignature. There shouldnt be any real API changes. --- AssetControllerServlet.java DELETED --- --- TransferRequestServlet.java DELETED --- |
|
From: <pe...@us...> - 2004-01-13 15:11:44
|
Update of /cvsroot/neuclear/neuclear-xmlsig
In directory sc8-pr-cvs1:/tmp/cvs-serv29248
Modified Files:
project.xml
Log Message:
Now builds.
Now need to do unit tests
Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** project.xml 22 Dec 2003 22:15:00 -0000 1.10
--- project.xml 13 Jan 2004 15:11:41 -0000 1.11
***************
*** 4,8 ****
<name>NeuDist XML Signature API</name>
<id>neuclear-xmlsig</id>
! <currentVersion>0.11.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<package>org.neuclear</package>
--- 4,8 ----
<name>NeuDist XML Signature API</name>
<id>neuclear-xmlsig</id>
! <currentVersion>0.12-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<package>org.neuclear</package>
***************
*** 76,80 ****
<id>neuclear-commons</id>
<name>neuclear-commons</name>
! <version>0.5.1</version>
<properties>
<war.bundle>true</war.bundle>
--- 76,80 ----
<id>neuclear-commons</id>
<name>neuclear-commons</name>
! <version>0.6-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id
In directory sc8-pr-cvs1:/tmp/cvs-serv29148
Modified Files:
neuclear.iws
Log Message:
Now builds.
Now need to do unit tests
Index: neuclear.iws
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/neuclear.iws,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** neuclear.iws 12 Jan 2004 22:39:26 -0000 1.2
--- neuclear.iws 13 Jan 2004 15:11:36 -0000 1.3
***************
*** 67,71 ****
<option name="SHOW_CHECKIN_OPTIONS" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
! <option name="LAST_COMMIT_MESSAGE" value="Cleaned up the schemas even more they now all verifiy. The Order/Receipt pairs for neuclear pay, should now work. They all have Readers using the latest Schema. The TransferBuilders are done and the ExchangeBuilders are nearly there. The new EmbeddedSignedNamedObject builder is useful for creating new Receipts. The new ReceiptBuilder uses this to create the embedded transaction. ExchangeOrders now have the concept of BidItem's, you could create an ExchangeOrder bidding on various items at the same time, to be exchanged as one atomic multiparty exchange. Still doesnt build yet, but very close now ;-)" />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
--- 67,71 ----
<option name="SHOW_CHECKIN_OPTIONS" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
! <option name="LAST_COMMIT_MESSAGE" value="Completed all the builders and contracts. Added a new abstract Value class to contain either an amount or a list of serial numbers. Now ready to finish off the AssetControllers." />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
***************
*** 81,85 ****
</component>
<component name="DebuggerManager">
! <line_breakpoints />
<exception_breakpoints>
<breakpoint_any>
--- 81,99 ----
</component>
<component name="DebuggerManager">
! <line_breakpoints>
! <breakpoint url="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java" line="279">
! <option name="ENABLED" value="true" />
! <option name="SUSPEND_VM" value="true" />
! <option name="LOG_ENABLED" value="false" />
! <option name="LOG_EXPRESSION_ENABLED" value="false" />
! <option name="LOG_MESSAGE" value="" />
! <option name="COUNT_FILTER_ENABLED" value="false" />
! <option name="COUNT_FILTER" value="0" />
! <option name="CONDITION_ENABLED" value="false" />
! <option name="CONDITION" value="" />
! <option name="CLASS_FILTERS_ENABLED" value="false" />
! <option name="INSTANCE_FILTERS_ENABLED" value="false" />
! </breakpoint>
! </line_breakpoints>
<exception_breakpoints>
<breakpoint_any>
***************
*** 107,179 ****
</component>
<component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5">
! <first-group selected-file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderBuilder.java">
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/SerialNumbers.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="22" column="26" selection-start="649" selection-end="649" vertical-scroll-proportion="0.4177215">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/TransferGlobals.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="241" column="41" selection-start="10747" selection-end="10761" vertical-scroll-proportion="0.20645161">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrder.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="21" column="19" selection-start="544" selection-end="544" vertical-scroll-proportion="-0.6967742">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/BidItem.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="27" column="57" selection-start="606" selection-end="606" vertical-scroll-proportion="0.49367088">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/schemas/exch.xsd" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="90" column="12" selection-start="4348" selection-end="4348" vertical-scroll-proportion="0.66451615">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderBuilder.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="142" column="74" selection-start="7346" selection-end="7346" vertical-scroll-proportion="0.70064515">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeCompletionOrderBuilder.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="28" column="36" selection-start="1249" selection-end="1249" vertical-scroll-proportion="0.42967743">
! <folding>
! <element signature="imports" expanded="true" />
! </folding>
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/builders/TransferOrderBuilder.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="134" column="0" selection-start="6747" selection-end="6808" vertical-scroll-proportion="0.54580647">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/NegativeTransferException.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="19" column="22" selection-start="404" selection-end="404" vertical-scroll-proportion="0.3227848">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/TransferOrder.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="24" column="22" selection-start="689" selection-end="689" vertical-scroll-proportion="0.3483871">
<folding />
</state>
--- 121,191 ----
</component>
<component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5">
! <first-group selected-file="file:///home/pelleb/code/neuclear-commons/src/java/carol.properties">
! <entry file="file://$PROJECT_DIR$-sample/src/java/org/neuclear/id/sample/MessageSenderReceiver.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="47" column="75" selection-start="1919" selection-end="1919" vertical-scroll-proportion="0.71370965">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/statements/SimpleStatementFactory.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="46" column="32" selection-start="1648" selection-end="1648" vertical-scroll-proportion="0.4717742">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/carol.properties" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="12" column="0" selection-start="258" selection-end="258" vertical-scroll-proportion="0.36290324">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="191" column="74" selection-start="9845" selection-end="9845" vertical-scroll-proportion="1.004158">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSecTools.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="325" column="28" selection-start="14964" selection-end="14964" vertical-scroll-proportion="1.3471934">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="279" column="0" selection-start="13454" selection-end="13454" vertical-scroll-proportion="0.5675676">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/test/org/neuclear/commons/sql/entities/TableDefinitionTest.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="139" column="18" selection-start="5745" selection-end="5745" vertical-scroll-proportion="0.3326613">
! <folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/entities/EntityModel.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="68" column="35" selection-start="2666" selection-end="2666" vertical-scroll-proportion="0.5302419">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/SQLContext.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="68" column="7" selection-start="2594" selection-end="2594" vertical-scroll-proportion="0.98991936">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/ConnectionSource.java" pinned="false">
<provider selected="true" editor-type-id="text-editor">
! <state line="12" column="17" selection-start="208" selection-end="208" vertical-scroll-proportion="0.30241936">
<folding />
</state>
***************
*** 196,224 ****
<component name="PackagesPane" />
<component name="ProjectPane">
<expanded_node url="file://$PROJECT_DIR$/src/schemas" module="neuclear" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay/src" module="neuclear-pay" type="directory" />
! <expanded_node url="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto" module="neuclear-commons" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src" module="neuclear" type="directory" />
- <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders" module="neuclear-pay" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay" module="neuclear-pay" type="directory" />
- <expanded_node url="file:///home/pelleb/code/neuclear-commons/src" module="neuclear-commons" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset" module="neuclear-pay" type="directory" />
- <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/contracts" module="neuclear-pay" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src/java/org/neuclear/id/builders" module="neuclear" type="directory" />
- <expanded_node url="file://$PROJECT_DIR$-sample" module="neuclear-id-sample" type="directory" />
- <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders" module="neuclear-pay" type="directory" />
- <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/builders" module="neuclear-pay" type="directory" />
- <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/builders" module="neuclear-pay" type="directory" />
<expanded_node url="file://$PROJECT_DIR$" module="neuclear" type="directory" />
! <expanded_node url="file:///home/pelleb/code/neuclear-commons" module="neuclear-commons" type="directory" />
! <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/schemas" module="neuclear-pay" type="directory" />
! <expanded_node url="file://$PROJECT_DIR$-sample/src/webapp/WEB-INF" module="neuclear-id-sample" type="directory" />
! <expanded_node url="file:///home/pelleb/code/neuclear-commons/src/java" module="neuclear-commons" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src/java/org/neuclear/id" module="neuclear" type="directory" />
- <expanded_node url="file://$PROJECT_DIR$-sample/src/webapp" module="neuclear-id-sample" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java" module="neuclear-pay" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src/java" module="neuclear" type="directory" />
- <expanded_node url="file://$PROJECT_DIR$-sample/src" module="neuclear-id-sample" type="directory" />
- <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/contracts/builders" module="neuclear-pay" type="directory" />
</component>
<component name="ProjectView">
--- 208,226 ----
<component name="PackagesPane" />
<component name="ProjectPane">
+ <expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/controllers/currency" module="neuclear-pay" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src/schemas" module="neuclear" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay/src" module="neuclear-pay" type="directory" />
! <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/test" module="NeuClear XMLSig" type="directory" />
! <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec" module="NeuClear XMLSig" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src" module="neuclear" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay" module="neuclear-pay" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset" module="neuclear-pay" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src/java/org/neuclear/id/builders" module="neuclear" type="directory" />
<expanded_node url="file://$PROJECT_DIR$" module="neuclear" type="directory" />
! <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig/src" module="NeuClear XMLSig" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src/java/org/neuclear/id" module="neuclear" type="directory" />
<expanded_node url="file:///home/pelleb/code/neuclear-pay/src/java" module="neuclear-pay" type="directory" />
+ <expanded_node url="file:///home/pelleb/code/neuclear-xmlsig" module="NeuClear XMLSig" type="directory" />
<expanded_node url="file://$PROJECT_DIR$/src/java" module="neuclear" type="directory" />
</component>
<component name="ProjectView">
***************
*** 237,241 ****
<option name="COMPILE_BEFORE_RUNNING" value="true" />
<option name="USE_LAUNCHER_FOR_RUNNING" value="false" />
! <activeType name="Application" />
<configuration name="<template>" type="Application" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
--- 239,243 ----
<option name="COMPILE_BEFORE_RUNNING" value="true" />
<option name="USE_LAUNCHER_FOR_RUNNING" value="false" />
! <activeType name="JUnit" />
<configuration name="<template>" type="Application" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
***************
*** 284,287 ****
--- 286,301 ----
<option name="WEBLOGIC_INSTANCE_CONFIGURATION_NAME" />
</configuration>
+ <configuration name="SimpleXML" type="JUnit" default="false" selected="true">
+ <module name="NeuClear XMLSig" />
+ <option name="PACKAGE_NAME" value="org.neuclear.xml.xmlsec" />
+ <option name="MAIN_CLASS_NAME" value="org.neuclear.xml.xmlsec.SimpleXMLSigTest" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="/home/pelleb/code/neuclear-xmlsig" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="INCLUDE_DEPENDENCIES" value="false" />
+ </configuration>
</component>
<component name="SelectInManager" />
***************
*** 331,335 ****
<component name="ToolWindowManager">
<frame x="4" y="25" width="1392" height="965" extended-state="6" />
! <editor active="true" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.33026466" order="8" />
--- 345,349 ----
<component name="ToolWindowManager">
<frame x="4" y="25" width="1392" height="965" extended-state="6" />
! <editor active="false" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.33026466" order="8" />
***************
*** 338,342 ****
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33026466" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
! <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.33026466" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
<window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
--- 352,356 ----
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33026466" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
! <window_info id="Messages" active="true" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="true" weight="0.33026466" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
<window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
***************
*** 419,434 ****
</component>
<component name="editorHistoryManager">
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderReceiptBuilder.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="89" column="56" selection-start="4440" selection-end="4440" vertical-scroll-proportion="0.32387096">
! <folding>
! <element signature="imports" expanded="true" />
! </folding>
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/builders/ReceiptBuilder.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="21" column="1" selection-start="663" selection-end="753" vertical-scroll-proportion="0.39873418">
<folding>
<element signature="imports" expanded="true" />
--- 433,446 ----
</component>
<component name="editorHistoryManager">
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/TestCaseSigner.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="90" column="54" selection-start="4100" selection-end="4100" vertical-scroll-proportion="0.40129033">
! <folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/servlet/AssetControllerServlet.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="108" column="36" selection-start="5144" selection-end="5144" vertical-scroll-proportion="0.75225806">
<folding>
<element signature="imports" expanded="true" />
***************
*** 437,529 ****
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/Amount.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="9" column="21" selection-start="209" selection-end="209" vertical-scroll-proportion="0.17088607">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/schemas/xfer.xsd">
<provider selected="true" editor-type-id="text-editor">
! <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.23225807">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/Value.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="11" column="9" selection-start="240" selection-end="240" vertical-scroll-proportion="0.20886075">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/SerialNumbers.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="22" column="26" selection-start="649" selection-end="649" vertical-scroll-proportion="0.4177215">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/TransferOrder.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="24" column="22" selection-start="689" selection-end="689" vertical-scroll-proportion="0.3483871">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/NegativeTransferException.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="19" column="22" selection-start="404" selection-end="404" vertical-scroll-proportion="0.3227848">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/TransferGlobals.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="241" column="41" selection-start="10747" selection-end="10761" vertical-scroll-proportion="0.20645161">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/orders/builders/TransferOrderBuilder.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="134" column="0" selection-start="6747" selection-end="6808" vertical-scroll-proportion="0.54580647">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeCompletionOrderBuilder.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="28" column="36" selection-start="1249" selection-end="1249" vertical-scroll-proportion="0.42967743">
! <folding>
! <element signature="imports" expanded="true" />
! </folding>
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/BidItem.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="27" column="57" selection-start="606" selection-end="606" vertical-scroll-proportion="0.49367088">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrder.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="21" column="19" selection-start="544" selection-end="544" vertical-scroll-proportion="-0.6967742">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderBuilder.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="142" column="74" selection-start="7346" selection-end="7346" vertical-scroll-proportion="0.70064515">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/schemas/exch.xsd">
<provider selected="true" editor-type-id="text-editor">
! <state line="90" column="12" selection-start="4348" selection-end="4348" vertical-scroll-proportion="0.66451615">
<folding />
</state>
--- 449,539 ----
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="154" column="98" selection-start="7845" selection-end="7845" vertical-scroll-proportion="0.33290324">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="242" column="47" selection-start="11800" selection-end="11800" vertical-scroll-proportion="0.59354836">
<folding />
</state>
</provider>
</entry>
! <entry file="file://$PROJECT_DIR$/src/java/org/neuclear/receiver/SimpleReceipt.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="12" column="42" selection-start="382" selection-end="382" vertical-scroll-proportion="0.1329114">
<folding />
</state>
</provider>
</entry>
! <entry file="file://$PROJECT_DIR$-sample/src/java/org/neuclear/id/sample/MessageSenderReceiver.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="47" column="75" selection-start="1919" selection-end="1919" vertical-scroll-proportion="0.71370965">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/ConnectionSource.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="12" column="17" selection-start="208" selection-end="208" vertical-scroll-proportion="0.30241936">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/SQLContext.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="68" column="7" selection-start="2594" selection-end="2594" vertical-scroll-proportion="0.98991936">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/entities/EntityModel.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="68" column="35" selection-start="2666" selection-end="2666" vertical-scroll-proportion="0.5302419">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/test/org/neuclear/commons/sql/entities/TableDefinitionTest.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="139" column="18" selection-start="5745" selection-end="5745" vertical-scroll-proportion="0.3326613">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/carol.properties">
<provider selected="true" editor-type-id="text-editor">
! <state line="12" column="0" selection-start="258" selection-end="258" vertical-scroll-proportion="0.36290324">
! <folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-commons/src/java/org/neuclear/commons/sql/statements/SimpleStatementFactory.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="46" column="32" selection-start="1648" selection-end="1648" vertical-scroll-proportion="0.4717742">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="191" column="74" selection-start="9845" selection-end="9845" vertical-scroll-proportion="1.004158">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSecTools.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="325" column="28" selection-start="14964" selection-end="14964" vertical-scroll-proportion="1.3471934">
<folding />
</state>
</provider>
</entry>
! <entry file="file:///home/pelleb/code/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java">
<provider selected="true" editor-type-id="text-editor">
! <state line="279" column="0" selection-start="13454" selection-end="13454" vertical-scroll-proportion="0.5675676">
<folding />
</state>
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store
In directory sc8-pr-cvs1:/tmp/cvs-serv29148/src/java/org/neuclear/store
Modified Files:
Store.java
Log Message:
Now builds.
Now need to do unit tests
Index: Store.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/store/Store.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Store.java 19 Dec 2003 18:03:35 -0000 1.17
--- Store.java 13 Jan 2004 15:11:35 -0000 1.18
***************
*** 2,5 ****
--- 2,9 ----
* $Id$
* $Log$
+ * Revision 1.18 2004/01/13 15:11:35 pelle
+ * Now builds.
+ * Now need to do unit tests
+ *
* Revision 1.17 2003/12/19 18:03:35 pelle
* Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 211,215 ****
* This handles the Identity checking on the object.
*/
! public final org.neuclear.xml.ElementProxy receive(final SignedNamedObject obj) throws NeuClearException {
rawStore(obj);
return null;
--- 215,219 ----
* This handles the Identity checking on the object.
*/
! public final SignedNamedObject receive(final SignedNamedObject obj) throws NeuClearException {
rawStore(obj);
return null;
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv29148/src/test/org/neuclear/id/builders
Modified Files:
AuthenticationBuilderTest.java SigningRequestBuilderTest.java
Log Message:
Now builds.
Now need to do unit tests
Index: AuthenticationBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/AuthenticationBuilderTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AuthenticationBuilderTest.java 11 Dec 2003 23:57:29 -0000 1.5
--- AuthenticationBuilderTest.java 13 Jan 2004 15:11:35 -0000 1.6
***************
*** 29,32 ****
--- 29,36 ----
$Id$
$Log$
+ Revision 1.6 2004/01/13 15:11:35 pelle
+ Now builds.
+ Now need to do unit tests
+
Revision 1.5 2003/12/11 23:57:29 pelle
Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
***************
*** 73,77 ****
public final void testAuthenticate() throws NeuClearException, XMLException {
final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
! assertEquals(authreq.getSignatory().getName(), "neu://bob@test");
try {
final AuthenticationTicket auth = (AuthenticationTicket) authreq.sign(signer);
--- 77,81 ----
public final void testAuthenticate() throws NeuClearException, XMLException {
final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
! // assertEquals(authreq.getSignatory().getName(), "neu://bob@test");
try {
final AuthenticationTicket auth = (AuthenticationTicket) authreq.sign(signer);
Index: SigningRequestBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/SigningRequestBuilderTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SigningRequestBuilderTest.java 11 Dec 2003 23:57:29 -0000 1.6
--- SigningRequestBuilderTest.java 13 Jan 2004 15:11:35 -0000 1.7
***************
*** 30,33 ****
--- 30,37 ----
$Id$
$Log$
+ Revision 1.7 2004/01/13 15:11:35 pelle
+ Now builds.
+ Now need to do unit tests
+
Revision 1.6 2003/12/11 23:57:29 pelle
Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
***************
*** 78,82 ****
final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
final SignatureRequestBuilder sigreq = new SignatureRequestBuilder("neu://test", "neu://bob@test", authreq, "For testing purposes");
! assertEquals(sigreq.getSignatory().getName(), "neu://test");
try {
final SignatureRequest tosign = (SignatureRequest) sigreq.sign(signer);
--- 82,86 ----
final AuthenticationTicketBuilder authreq = new AuthenticationTicketBuilder("neu://bob@test", "neu://test", "http://users.neuclear.org:8080");
final SignatureRequestBuilder sigreq = new SignatureRequestBuilder("neu://test", "neu://bob@test", authreq, "For testing purposes");
! // assertEquals(sigreq.getSignatory().getName(), "neu://test");
try {
final SignatureRequest tosign = (SignatureRequest) sigreq.sign(signer);
***************
*** 84,92 ****
assertEquals(tosign.getName(), sigreq.getName());
! final NamedObjectBuilder auth2 = tosign.getUnsigned();
! assertEquals(auth2.getSignatory().getName(), "neu://bob@test");
assertNotNull(auth2);
assertNotNull(auth2.getElement());
! final AuthenticationTicket auth = (AuthenticationTicket) auth2.sign(signer);
assertTrue(auth2.isSigned());
assertEquals(auth.getName(), authreq.getName());
--- 88,96 ----
assertEquals(tosign.getName(), sigreq.getName());
! final Builder auth2 = tosign.getUnsigned();
! // assertEquals(auth2.getSignatory().getName(), "neu://bob@test");
assertNotNull(auth2);
assertNotNull(auth2.getElement());
! final AuthenticationTicket auth = (AuthenticationTicket) auth2.convert("neu://bob@test",signer);
assertTrue(auth2.isSigned());
assertEquals(auth.getName(), authreq.getName());
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv29148/src/java/org/neuclear/id/builders
Modified Files:
AuthenticationTicketBuilder.java Builder.java
EmbeddedSignedObjectBuilder.java IdentityBuilder.java
NamedObjectBuilder.java SignatureRequestBuilder.java
SignedMessageBuilder.java
Log Message:
Now builds.
Now need to do unit tests
Index: AuthenticationTicketBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/AuthenticationTicketBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AuthenticationTicketBuilder.java 22 Dec 2003 13:45:31 -0000 1.8
--- AuthenticationTicketBuilder.java 13 Jan 2004 15:11:35 -0000 1.9
***************
*** 32,35 ****
--- 32,39 ----
$Id$
$Log$
+ Revision 1.9 2004/01/13 15:11:35 pelle
+ Now builds.
+ Now need to do unit tests
+
Revision 1.8 2003/12/22 13:45:31 pelle
Added a naive benchmarking tool.
Index: Builder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/Builder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Builder.java 12 Jan 2004 22:39:26 -0000 1.1
--- Builder.java 13 Jan 2004 15:11:35 -0000 1.2
***************
*** 9,12 ****
--- 9,15 ----
import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.commons.time.TimeTools;
+ import org.neuclear.commons.crypto.signers.Signer;
+ import org.neuclear.commons.crypto.signers.NonExistingSignerException;
+ import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
import org.dom4j.QName;
import org.dom4j.Namespace;
***************
*** 50,52 ****
--- 53,77 ----
getElement().addAttribute(DocumentHelper.createQName("timestamp", NSTools.NS_NEUID), TimeTools.createTimeStamp());
}
+ public Object clone() {
+ try {
+ final Element elem = (Element) getElement().clone();
+ DocumentHelper.createDocument(elem);
+ return new NamedObjectBuilder(elem);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public final SignedNamedObject convert(String name,Signer signer) throws NameResolutionException, InvalidNamedObjectException {
+ try {
+ sign(name,signer);
+ } catch (XMLSecurityException e) {
+ throw new InvalidNamedObjectException("Problem in XML Sig",e);
+ } catch (NonExistingSignerException e) {
+ throw new InvalidNamedObjectException("Can not Sign",e);
+ } catch (UserCancellationException e) {
+ throw new InvalidNamedObjectException("User Cancelled Signing",e);
+ }
+ return convert();
+ }
}
Index: EmbeddedSignedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/EmbeddedSignedObjectBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EmbeddedSignedObjectBuilder.java 12 Jan 2004 22:39:26 -0000 1.2
--- EmbeddedSignedObjectBuilder.java 13 Jan 2004 15:11:35 -0000 1.3
***************
*** 34,48 ****
}
- public final SignedNamedObject convert(String name,Signer signer) throws NameResolutionException, InvalidNamedObjectException {
- try {
- sign(name,signer);
- } catch (XMLSecurityException e) {
- throw new InvalidNamedObjectException("Problem in XML Sig",e);
- } catch (NonExistingSignerException e) {
- throw new InvalidNamedObjectException("Can not Sign",e);
- } catch (UserCancellationException e) {
- throw new InvalidNamedObjectException("User Cancelled Signing",e);
- }
- return convert();
- }
}
--- 34,36 ----
Index: IdentityBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/IdentityBuilder.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** IdentityBuilder.java 7 Jan 2004 23:12:20 -0000 1.17
--- IdentityBuilder.java 13 Jan 2004 15:11:35 -0000 1.18
***************
*** 2,5 ****
--- 2,9 ----
* $Id$
* $Log$
+ * Revision 1.18 2004/01/13 15:11:35 pelle
+ * Now builds.
+ * Now need to do unit tests
+ *
* Revision 1.17 2004/01/07 23:12:20 pelle
* XMLSig now has various added features:
Index: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** NamedObjectBuilder.java 12 Jan 2004 22:39:26 -0000 1.22
--- NamedObjectBuilder.java 13 Jan 2004 15:11:35 -0000 1.23
***************
*** 2,5 ****
--- 2,9 ----
* $Id$
* $Log$
+ * Revision 1.23 2004/01/13 15:11:35 pelle
+ * Now builds.
+ * Now need to do unit tests
+ *
* Revision 1.22 2004/01/12 22:39:26 pelle
* Completed all the builders and contracts.
***************
*** 434,451 ****
! public final Identity getSignatory() throws InvalidNamedObjectException, NameResolutionException {
return NSResolver.resolveIdentity(NSTools.getSignatoryURI(getName()));
}
! public Object clone() {
! try {
! final Element elem = (Element) getElement().clone();
! DocumentHelper.createDocument(elem);
! return new NamedObjectBuilder(elem);
! } catch (Exception e) {
! throw new RuntimeException(e);
! }
! }
}
--- 438,447 ----
! private final Identity getSignatory() throws InvalidNamedObjectException, NameResolutionException {
return NSResolver.resolveIdentity(NSTools.getSignatoryURI(getName()));
}
!
}
Index: SignatureRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignatureRequestBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SignatureRequestBuilder.java 12 Jan 2004 22:39:26 -0000 1.8
--- SignatureRequestBuilder.java 13 Jan 2004 15:11:35 -0000 1.9
***************
*** 27,30 ****
--- 27,34 ----
$Id$
$Log$
+ Revision 1.9 2004/01/13 15:11:35 pelle
+ Now builds.
+ Now need to do unit tests
+
Revision 1.8 2004/01/12 22:39:26 pelle
Completed all the builders and contracts.
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv29148/src/java/org/neuclear/signers/servlet
Modified Files:
SigningServlet.java
Log Message:
Now builds.
Now need to do unit tests
Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet/SigningServlet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** SigningServlet.java 19 Dec 2003 18:03:35 -0000 1.27
--- SigningServlet.java 13 Jan 2004 15:11:35 -0000 1.28
***************
*** 2,5 ****
--- 2,9 ----
* $Id$
* $Log$
+ * Revision 1.28 2004/01/13 15:11:35 pelle
+ * Now builds.
+ * Now need to do unit tests
+ *
* Revision 1.27 2003/12/19 18:03:35 pelle
* Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 263,266 ****
--- 267,271 ----
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.builders.NamedObjectBuilder;
+ import org.neuclear.id.builders.Builder;
import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.xml.XMLException;
***************
*** 323,332 ****
ServletTools.printHeader(out, request, getTitle());
final String endpoint = request.getParameter("endpoint");
! final NamedObjectBuilder named = sigreq.getUnsigned();
! final String parent = NSTools.getSignatoryURI(named.getName());
boolean isSigned = false;
! if (!signer.canSignFor(parent)) {
out.println("<h3>Can not Sign for:");
! out.println(parent);
out.println("</h3>");
}
--- 328,337 ----
ServletTools.printHeader(out, request, getTitle());
final String endpoint = request.getParameter("endpoint");
! final Builder named = sigreq.getUnsigned();
! final String username = sigreq.getUserid();
boolean isSigned = false;
! if (!signer.canSignFor(username)) {
out.println("<h3>Can not Sign for:");
! out.println(username);
out.println("</h3>");
}
***************
*** 352,359 ****
if (isReadyToSign(request)) {
! out.println("<div id=\"log\" style=\"background:#003;color:#EEE\"><tt><ul><li>Signing with " + parent + "...</li>");
out.flush();
try {
! isSigned = sign(named, out);
} catch (InvalidNamedObjectException e) {
--- 357,364 ----
if (isReadyToSign(request)) {
! out.println("<div id=\"log\" style=\"background:#003;color:#EEE\"><tt><ul><li>Signing with " + username + "...</li>");
out.flush();
try {
! isSigned = sign(named,username, out);
} catch (InvalidNamedObjectException e) {
***************
*** 397,404 ****
}
! private boolean sign(final NamedObjectBuilder named, final PrintWriter out) throws NeuClearException, XMLException {
boolean isSigned;
! context.log("SIGN: Signing with " + named.getSignatory().getName());
! final SignedNamedObject signed = named.sign(signer);
isSigned = true;
out.println("<li>Signed</li>");
--- 402,409 ----
}
! private boolean sign(final Builder named, String username,final PrintWriter out) throws NeuClearException, XMLException {
boolean isSigned;
! context.log("SIGN: Signing with " + username);
! final SignedNamedObject signed = named.convert(username,signer);
isSigned = true;
out.println("<li>Signed</li>");
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id
In directory sc8-pr-cvs1:/tmp/cvs-serv29148/src/java/org/neuclear/id
Modified Files:
SignatureRequest.java
Log Message:
Now builds.
Now need to do unit tests
Index: SignatureRequest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignatureRequest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SignatureRequest.java 12 Jan 2004 22:39:26 -0000 1.11
--- SignatureRequest.java 13 Jan 2004 15:11:35 -0000 1.12
***************
*** 29,32 ****
--- 29,36 ----
$Id$
$Log$
+ Revision 1.12 2004/01/13 15:11:35 pelle
+ Now builds.
+ Now need to do unit tests
+
Revision 1.11 2004/01/12 22:39:26 pelle
Completed all the builders and contracts.
***************
*** 119,124 ****
}
! public final NamedObjectBuilder getUnsigned() {
! return (NamedObjectBuilder) unsigned.clone();
}
--- 123,128 ----
}
! public final Builder getUnsigned() {
! return (Builder) unsigned.clone();
}
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv29148/src/java/org/neuclear/receiver
Modified Files:
Receiver.java ReceiverServlet.java SimpleReceipt.java
Log Message:
Now builds.
Now need to do unit tests
Index: Receiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/Receiver.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Receiver.java 10 Dec 2003 23:58:51 -0000 1.13
--- Receiver.java 13 Jan 2004 15:11:35 -0000 1.14
***************
*** 9,12 ****
--- 9,16 ----
* $Id$
* $Log$
+ * Revision 1.14 2004/01/13 15:11:35 pelle
+ * Now builds.
+ * Now need to do unit tests
+ *
* Revision 1.13 2003/12/10 23:58:51 pelle
* Did some cleaning up in the builders
***************
*** 118,124 ****
* you can not trust it.
*
! * @param obj
! * @throws UnsupportedTransaction
*/
! org.neuclear.xml.ElementProxy receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException;
}
--- 122,128 ----
* you can not trust it.
*
! * @param obj
! * @throws UnsupportedTransaction
*/
! SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException;
}
Index: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ReceiverServlet.java 15 Dec 2003 23:33:04 -0000 1.15
--- ReceiverServlet.java 13 Jan 2004 15:11:35 -0000 1.16
***************
*** 2,5 ****
--- 2,9 ----
* $Id$
* $Log$
+ * Revision 1.16 2004/01/13 15:11:35 pelle
+ * Now builds.
+ * Now need to do unit tests
+ *
* Revision 1.15 2003/12/15 23:33:04 pelle
* added ServletTools.getInitParam() which first tries the ServletConfig, then the context config.
***************
*** 168,177 ****
ctx.log("NeuClear: Got Request " + obj.getName());
ctx.log(obj.getEncoded());
! ElementProxy receipt = receiver.receive(obj);
if (isXML)
! writer.print(receipt.canonicalize());
else{
writer.print("<h1>");
! writer.print(receipt.getElement().getName());
writer.print("</h1>");
}
--- 172,181 ----
ctx.log("NeuClear: Got Request " + obj.getName());
ctx.log(obj.getEncoded());
! SignedNamedObject receipt = receiver.receive(obj);
if (isXML)
! writer.print(receipt.getEncoded());
else{
writer.print("<h1>");
! writer.print(receipt.getName());
writer.print("</h1>");
}
Index: SimpleReceipt.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/SimpleReceipt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimpleReceipt.java 16 Dec 2003 15:05:00 -0000 1.1
--- SimpleReceipt.java 13 Jan 2004 15:11:35 -0000 1.2
***************
*** 3,6 ****
--- 3,7 ----
import org.neuclear.xml.AbstractElementProxy;
import org.neuclear.id.builders.NamedObjectBuilder;
+ import org.neuclear.id.builders.Builder;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.NSTools;
***************
*** 10,14 ****
* A receipt for returning simple status from a Receiver.
*/
! public class SimpleReceipt extends AbstractElementProxy{
public SimpleReceipt(String message) {
super("Receipt", NSTools.NS_NEUID);
--- 11,15 ----
* A receipt for returning simple status from a Receiver.
*/
! public class SimpleReceipt extends Builder{
public SimpleReceipt(String message) {
super("Receipt", NSTools.NS_NEUID);
|
|
From: <pe...@us...> - 2004-01-13 15:11:39
|
Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv29148/src/test-cactus/org/neuclear/receiver
Modified Files:
MockReceiver.java
Log Message:
Now builds.
Now need to do unit tests
Index: MockReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/receiver/MockReceiver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockReceiver.java 12 Dec 2003 00:13:11 -0000 1.2
--- MockReceiver.java 13 Jan 2004 15:11:36 -0000 1.3
***************
*** 2,5 ****
--- 2,8 ----
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.InvalidPassphraseException;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.builders.AuthenticationTicketBuilder;
***************
*** 26,29 ****
--- 29,36 ----
$Id$
$Log$
+ Revision 1.3 2004/01/13 15:11:36 pelle
+ Now builds.
+ Now need to do unit tests
+
Revision 1.2 2003/12/12 00:13:11 pelle
This may actually work now. Need to put a few more test cases in to make sure.
***************
*** 41,44 ****
--- 48,58 ----
*/
public class MockReceiver implements Receiver {
+ public MockReceiver() {
+ try {
+ signer=new TestCaseSigner();
+ } catch (InvalidPassphraseException e) {
+ throw new RuntimeException(e);
+ }
+ }
/**
* Add your main transaction processing logic within this method.
***************
*** 46,55 ****
* you can not trust it.
*
! * @param obj
! * @throws UnsupportedTransaction
*/
! public ElementProxy receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
received = obj;
! return new AuthenticationTicketBuilder("neu://test", obj.getName(), "http://localhost");//Just some dummy
}
--- 60,69 ----
* you can not trust it.
*
! * @param obj
! * @throws UnsupportedTransaction
*/
! public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
received = obj;
! return new AuthenticationTicketBuilder("neu://test", obj.getName(), "http://localhost").convert("neu://bob@test",signer);//Just some dummy
}
***************
*** 57,61 ****
return received;
}
!
private SignedNamedObject received = null;
}
--- 71,75 ----
return received;
}
! private Signer signer;
private SignedNamedObject received = null;
}
|
|
From: <pe...@us...> - 2004-01-13 15:11:21
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders
In directory sc8-pr-cvs1:/tmp/cvs-serv28986/src/java/org/neuclear/exchange/orders
Modified Files:
CancelExchangeOrder.java ExchangeCompletionOrder.java
ExchangeOrder.java
Log Message:
Now builds.
Now need to do unit tests
Index: CancelExchangeOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/CancelExchangeOrder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CancelExchangeOrder.java 11 Jan 2004 00:39:06 -0000 1.4
--- CancelExchangeOrder.java 13 Jan 2004 15:11:18 -0000 1.5
***************
*** 22,26 ****
this.receipt=receipt;
}
! public ExchangeOrderReceipt getExchangeReceipt(){
return receipt;
}
--- 22,26 ----
this.receipt=receipt;
}
! public ExchangeOrderReceipt getReceipt(){
return receipt;
}
Index: ExchangeCompletionOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeCompletionOrder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExchangeCompletionOrder.java 12 Jan 2004 22:39:15 -0000 1.5
--- ExchangeCompletionOrder.java 13 Jan 2004 15:11:18 -0000 1.6
***************
*** 4,7 ****
--- 4,8 ----
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.TransferGlobals;
+ import org.neuclear.asset.orders.Value;
import org.neuclear.exchange.contracts.ExchangeAgent;
import org.neuclear.id.*;
***************
*** 17,21 ****
*/
public final class ExchangeCompletionOrder extends ExchangeTransactionContract {
! private ExchangeCompletionOrder(final SignedNamedCore core, final ExchangeOrderReceipt receipt, final Identity counterparty, final double amount, final Date exchangetime) {
super(core,receipt.getAsset(), receipt.getAgent());
this.exchangetime = exchangetime.getTime();
--- 18,22 ----
*/
public final class ExchangeCompletionOrder extends ExchangeTransactionContract {
! private ExchangeCompletionOrder(final SignedNamedCore core, final ExchangeOrderReceipt receipt, final Identity counterparty, final Value amount, final Date exchangetime,final String comment) {
super(core,receipt.getAsset(), receipt.getAgent());
this.exchangetime = exchangetime.getTime();
***************
*** 23,26 ****
--- 24,28 ----
this.counterparty=counterparty;
this.receipt=receipt;
+ this.comment=comment;
}
***************
*** 29,33 ****
}
! public final double getAmount() {
return amount;
}
--- 31,35 ----
}
! public final Value getAmount() {
return amount;
}
***************
*** 41,48 ****
}
private final long exchangetime;
! private final double amount;
private final Identity counterparty;
private final ExchangeOrderReceipt receipt;
public static final class Reader implements NamedObjectReader {
--- 43,55 ----
}
+ public String getComment() {
+ return comment;
+ }
+
private final long exchangetime;
! private final Value amount;
private final Identity counterparty;
private final ExchangeOrderReceipt receipt;
+ private final String comment;
public static final class Reader implements NamedObjectReader {
***************
*** 62,66 ****
TransferGlobals.parseRecipientTag(elem),
TransferGlobals.parseValueTag(elem),
! TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME))
);
}
--- 69,74 ----
TransferGlobals.parseRecipientTag(elem),
TransferGlobals.parseValueTag(elem),
! TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TIME_TAGNAME)),
! TransferGlobals.parseCommentElement(elem)
);
}
Index: ExchangeOrder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/ExchangeOrder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExchangeOrder.java 12 Jan 2004 22:39:15 -0000 1.5
--- ExchangeOrder.java 13 Jan 2004 15:11:18 -0000 1.6
***************
*** 91,95 ****
TransferGlobals.parseValueTag(elem),
parseBidItems(elem),
! TransferGlobals.getCommentElement(elem),
TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXPIRY_TAG))
);
--- 91,95 ----
TransferGlobals.parseValueTag(elem),
parseBidItems(elem),
! TransferGlobals.parseCommentElement(elem),
TransferGlobals.parseTimeStampElement(elem,ExchangeGlobals.createQName(ExchangeGlobals.EXPIRY_TAG))
);
|
|
From: <pe...@us...> - 2004-01-13 15:11:21
|
Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv28986/src/test/org/neuclear/asset/receiver
Modified Files:
PaymentReceiverTest.java
Log Message:
Now builds.
Now need to do unit tests
Index: PaymentReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PaymentReceiverTest.java 11 Jan 2004 00:39:06 -0000 1.14
--- PaymentReceiverTest.java 13 Jan 2004 15:11:18 -0000 1.15
***************
*** 7,12 ****
--- 7,16 ----
import org.neuclear.asset.orders.TransferGlobals;
import org.neuclear.asset.orders.TransferOrder;
+ import org.neuclear.asset.orders.Amount;
+ import org.neuclear.asset.orders.builders.TransferOrderBuilder;
import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.crypto.signers.TestCaseSigner;
import org.neuclear.commons.sql.DefaultConnectionSource;
+ import org.neuclear.commons.sql.statements.SimpleStatementFactory;
import org.neuclear.commons.time.TimeTools;
import org.neuclear.id.Identity;
***************
*** 47,50 ****
--- 51,58 ----
$Id$
$Log$
+ Revision 1.15 2004/01/13 15:11:18 pelle
+ Now builds.
+ Now need to do unit tests
+
Revision 1.14 2004/01/11 00:39:06 pelle
Cleaned up the schemas even more they now all verifiy.
***************
*** 176,185 ****
proc = new CurrencyController(
new SQLLedger(
! new DefaultConnectionSource(),
assetName
! )
! , assetName
);
! receiver = new AssetControllerReceiver(proc, getSigner());
}
--- 184,194 ----
proc = new CurrencyController(
new SQLLedger(
! new SimpleStatementFactory(new DefaultConnectionSource()),
assetName
! ),
! new TestCaseSigner(),
! assetName
);
! receiver=proc;
}
***************
*** 204,208 ****
public void performTransaction(SignedNamedObject obj) throws Exception {
Object pre = getPreTransactionState(obj);
! org.neuclear.xml.ElementProxy receipt = receiver.receive(obj);
assertTrue(verifyTransaction(obj, pre));
}
--- 213,217 ----
public void performTransaction(SignedNamedObject obj) throws Exception {
Object pre = getPreTransactionState(obj);
! SignedNamedObject receipt = receiver.receive(obj);
assertTrue(verifyTransaction(obj, pre));
}
***************
*** 212,216 ****
if (obj instanceof TransferOrder) {
final TransferOrder transfer = (TransferOrder) obj;
! final double fromBalance = proc.getBalance(transfer.getFrom(), transfer.getTimeStamp());
final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
--- 221,225 ----
if (obj instanceof TransferOrder) {
final TransferOrder transfer = (TransferOrder) obj;
! final double fromBalance = proc.getBalance(transfer.getSignatory(), transfer.getTimeStamp());
final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
***************
*** 224,233 ****
if (obj instanceof TransferOrder) {
final TransferOrder transfer = (TransferOrder) obj;
! final double fromBalance = proc.getBalance(transfer.getFrom(), transfer.getTimeStamp());
final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
final double prebalances[] = (double[]) state;
! return (fromBalance == prebalances[0] - transfer.getAmount()) &&
! (toBalance == prebalances[1] + transfer.getAmount());
}
return false;
--- 233,242 ----
if (obj instanceof TransferOrder) {
final TransferOrder transfer = (TransferOrder) obj;
! final double fromBalance = proc.getBalance(transfer.getSignatory(), transfer.getTimeStamp());
final double toBalance = proc.getBalance(transfer.getRecipient(), transfer.getTimeStamp());
final double prebalances[] = (double[]) state;
! return (fromBalance == prebalances[0] - transfer.getAmount().getAmount()) &&
! (toBalance == prebalances[1] + transfer.getAmount().getAmount());
}
return false;
***************
*** 235,240 ****
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());
}
--- 244,249 ----
public final SignedNamedObject createPayments(final Identity from, final Identity to, final double amount) throws InvalidTransferException, XMLException, NeuClearException, IOException, UnsupportedEncodingException {
! final TransferOrderBuilder transfer = new TransferOrderBuilder(asset, to, new Amount(amount), "Test One");
! return transfer.convert(from.getName(),getSigner());
}
|
|
From: <pe...@us...> - 2004-01-13 15:11:21
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv28986/src/webapp/WEB-INF
Modified Files:
web.xml
Log Message:
Now builds.
Now need to do unit tests
Index: web.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** web.xml 24 Dec 2003 00:25:17 -0000 1.6
--- web.xml 13 Jan 2004 15:11:18 -0000 1.7
***************
*** 35,39 ****
<servlet>
<servlet-name>assetcontroller</servlet-name>
! <servlet-class>org.neuclear.asset.receiver.servlet.AssetControllerServlet</servlet-class>
<init-param>
<param-name>datasource</param-name>
--- 35,39 ----
<servlet>
<servlet-name>assetcontroller</servlet-name>
! <servlet-class>org.neuclear.asset.servlet.AssetControllerServlet</servlet-class>
<init-param>
<param-name>datasource</param-name>
|
|
From: <pe...@us...> - 2004-01-13 15:11:21
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE
In directory sc8-pr-cvs1:/tmp/cvs-serv28986/src/webapp/SECURE
Modified Files:
transfer.jsp
Log Message:
Now builds.
Now need to do unit tests
Index: transfer.jsp
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE/transfer.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** transfer.jsp 5 Jan 2004 23:47:10 -0000 1.6
--- transfer.jsp 13 Jan 2004 15:11:18 -0000 1.7
***************
*** 8,12 ****
org.neuclear.asset.contracts.AssetGlobals,
org.neuclear.asset.orders.transfers.TransferGlobals,
! org.neuclear.asset.receiver.servlet.AssetControllerServlet,
org.neuclear.id.SignedNamedObject,
org.neuclear.commons.crypto.Base64,
--- 8,12 ----
org.neuclear.asset.contracts.AssetGlobals,
org.neuclear.asset.orders.transfers.TransferGlobals,
! org.neuclear.asset.servlet.AssetControllerServlet,
org.neuclear.id.SignedNamedObject,
org.neuclear.commons.crypto.Base64,
|
570 messages has been excluded from this view by a project administrator.
