|
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.
|