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