Menu
▾
▴
[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders AuthenticationTicketBuilder.java,1.6,1.7 IdentityBuilder.java,1.11,1.12 NamedObjectBuilder.java,1.16,1.17 SignatureRequestBuilder.java,1.5,1.6
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders
In directory sc8-pr-cvs1:/tmp/cvs-serv3742/src/java/org/neuclear/id/builders
Modified Files:
AuthenticationTicketBuilder.java IdentityBuilder.java
NamedObjectBuilder.java SignatureRequestBuilder.java
Log Message:
Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
Index: AuthenticationTicketBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/AuthenticationTicketBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AuthenticationTicketBuilder.java 11 Dec 2003 16:16:14 -0000 1.6
--- AuthenticationTicketBuilder.java 11 Dec 2003 16:29:26 -0000 1.7
***************
*** 31,34 ****
--- 31,37 ----
$Id$
$Log$
+ Revision 1.7 2003/12/11 16:29:26 pelle
+ Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
+
Revision 1.6 2003/12/11 16:16:14 pelle
Some changes to make the xml a bit more readable.
***************
*** 79,91 ****
public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws NeuClearException {
super(NSTools.createUniqueTransactionID(user, requester), AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH);
! getElement().addAttribute(createQName("requester"), NSTools.normalizeNameURI(requester));
! getElement().addAttribute(createQName("validto"), TimeTools.formatTimeStamp(validto));
! getElement().addAttribute(createQName("sitehref"), site);
}
- public final String getTagName() {
- return AuthenticationTicket.TAG_NAME;
- }
}
--- 82,91 ----
public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws NeuClearException {
super(NSTools.createUniqueTransactionID(user, requester), AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH);
! createAttribute("requester", NSTools.normalizeNameURI(requester));
! createAttribute("validto", TimeTools.formatTimeStamp(validto));
! createAttribute("sitehref", site);
}
}
Index: IdentityBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/IdentityBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IdentityBuilder.java 11 Dec 2003 16:16:14 -0000 1.11
--- IdentityBuilder.java 11 Dec 2003 16:29:26 -0000 1.12
***************
*** 2,5 ****
--- 2,8 ----
* $Id$
* $Log$
+ * Revision 1.12 2003/12/11 16:29:26 pelle
+ * Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
+ *
* Revision 1.11 2003/12/11 16:16:14 pelle
* Some changes to make the xml a bit more readable.
***************
*** 226,236 ****
addLineBreak();
// We have meaningful defaults for the following two
! root.addAttribute(DocumentHelper.createQName("repository", NSTools.NS_NEUID), repository);
! root.addAttribute(DocumentHelper.createQName("logger", NSTools.NS_NEUID), receiver);
if (!Utility.isEmpty(signer))
! root.addAttribute(DocumentHelper.createQName("signer", NSTools.NS_NEUID), signer);
if (!Utility.isEmpty(receiver))
! root.addAttribute(DocumentHelper.createQName("receiver", NSTools.NS_NEUID), receiver);
if (allow != null) {
--- 229,239 ----
addLineBreak();
// We have meaningful defaults for the following two
! createNEUIDAttribute("repository", repository);
! createNEUIDAttribute("logger", receiver);
if (!Utility.isEmpty(signer))
! createNEUIDAttribute("signer",signer);
if (!Utility.isEmpty(receiver))
! createNEUIDAttribute("receiver",receiver);
if (allow != null) {
Index: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** NamedObjectBuilder.java 10 Dec 2003 23:58:51 -0000 1.16
--- NamedObjectBuilder.java 11 Dec 2003 16:29:26 -0000 1.17
***************
*** 2,5 ****
--- 2,8 ----
* $Id$
* $Log$
+ * Revision 1.17 2003/12/11 16:29:26 pelle
+ * Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
+ *
* Revision 1.16 2003/12/10 23:58:51 pelle
* Did some cleaning up in the builders
***************
*** 253,257 ****
public String getTagName() {
if (getElement() == null)
! return "Object";
return getElement().getName();
}
--- 256,260 ----
public String getTagName() {
if (getElement() == null)
! return "Invalid";
return getElement().getName();
}
***************
*** 290,297 ****
private static QName getNameAttrQName() {
! return DocumentHelper.createQName("name", NSTools.NS_NEUID);
}
private void createDocument() {
final Element elem = getElement();
--- 293,316 ----
private static QName getNameAttrQName() {
! return createNEUIDQName("name");
}
+ /**
+ * Helper method to create and add an attribute to this element within the NEUID namespace
+ * @param name
+ */
+ protected final void createNEUIDAttribute(String name,String value){
+ getElement().addAttribute(createNEUIDQName(name),value);
+ }
+ /**
+ * Helper method to create a QName within the NEUID namespace
+ * @param name
+ * @return
+ */
+ protected static QName createNEUIDQName(String name) {
+ return DocumentHelper.createQName(name, NSTools.NS_NEUID);
+ }
+
private void createDocument() {
final Element elem = getElement();
***************
*** 313,320 ****
public final Namespace getNS() {
return NSTools.NS_NEUID;
- }
-
- protected final void addElement(final NamedObjectBuilder child) throws XMLException {
- addElement((AbstractElementProxy) child);
}
--- 332,335 ----
Index: SignatureRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignatureRequestBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SignatureRequestBuilder.java 10 Dec 2003 23:58:51 -0000 1.5
--- SignatureRequestBuilder.java 11 Dec 2003 16:29:26 -0000 1.6
***************
*** 28,31 ****
--- 28,34 ----
$Id$
$Log$
+ Revision 1.6 2003/12/11 16:29:26 pelle
+ Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
+
Revision 1.5 2003/12/10 23:58:51 pelle
Did some cleaning up in the builders
***************
*** 68,76 ****
public SignatureRequestBuilder(final String requestor, final String userid, final NamedObjectBuilder unsigned, final String description) throws NeuClearException {
super(NSTools.createUniqueTransactionID(requestor, userid), SignatureRequest.SIGREQUEST_TAG);
! final Element unsignedElem = getElement().addElement(DocumentHelper.createQName("Unsigned", NSTools.NS_NEUID));
unsignedElem.add(unsigned.getElement());
! getElement().addAttribute(DocumentHelper.createQName("userid", NSTools.NS_NEUID), userid);
if (!Utility.isEmpty(description))
! getElement().addElement(DocumentHelper.createQName("Description")).setText(description);
}
--- 71,79 ----
public SignatureRequestBuilder(final String requestor, final String userid, final NamedObjectBuilder unsigned, final String description) throws NeuClearException {
super(NSTools.createUniqueTransactionID(requestor, userid), SignatureRequest.SIGREQUEST_TAG);
! final Element unsignedElem = addElement("Unsigned");
unsignedElem.add(unsigned.getElement());
! createAttribute("userid", userid);
if (!Utility.isEmpty(description))
! addElement("Description").setText(description);
}
|
