|
From: <pe...@us...> - 2003-09-26 00:22:12
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/java/org/neuclear/senders
Modified Files:
LogSender.java SmtpSender.java SoapSender.java
Log Message:
Cleanups and final changes to code for refactoring of the Verifier and Reader part.
Index: LogSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/LogSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LogSender.java 24 Sep 2003 23:56:48 -0000 1.4
--- LogSender.java 26 Sep 2003 00:22:07 -0000 1.5
***************
*** 3,6 ****
--- 3,7 ----
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.NamedObjectFactory;
+ import org.neuclear.id.resolver.NSResolver;
import org.neuclear.time.TimeTools;
import org.neudist.crypto.Base64;
***************
*** 23,26 ****
--- 24,30 ----
* $Id$
* $Log$
+ * Revision 1.5 2003/09/26 00:22:07 pelle
+ * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+ *
* Revision 1.4 2003/09/24 23:56:48 pelle
* Refactoring nearly done. New model for creating signed objects.
***************
*** 63,67 ****
public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
try {
! String digest = URLEncoder.encode(Base64.encode(obj.getDigest()), "UTF-8");
String name = URLEncoder.encode(obj.getName(), "UTF-8");
URL url = new URL(Utility.denullString(endpoint, LOGGER) + "?nohtml=1&name=" + name + "&digest=" + digest);
--- 67,71 ----
public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
try {
! String digest = URLEncoder.encode(Base64.encode(obj.getDigest().getBytes()), "UTF-8");
String name = URLEncoder.encode(obj.getName(), "UTF-8");
URL url = new URL(Utility.denullString(endpoint, LOGGER) + "?nohtml=1&name=" + name + "&digest=" + digest);
***************
*** 86,90 ****
logObject("neu://free/pelle");
logObject("neu://pelle");
! System.out.println("Object neu://free/pelle was logged at: " + getTimeStamp(NamedObjectFactory.fetchNamedObject("neu://free/pelle")));
} catch (NeudistException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
--- 90,94 ----
logObject("neu://free/pelle");
logObject("neu://pelle");
! System.out.println("Object neu://free/pelle was logged at: " + getTimeStamp(NSResolver.resolveIdentity("neu://free/pelle")));
} catch (NeudistException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
***************
*** 117,121 ****
public static Timestamp getTimeStamp(SignedNamedObject obj) throws NeudistException {
! return getTimeStamp(Utility.denullString(obj.getParent().getLogger(), LOGGER), obj.getDigest());
}
--- 121,125 ----
public static Timestamp getTimeStamp(SignedNamedObject obj) throws NeudistException {
! return getTimeStamp(Utility.denullString(obj.getSignatory().getLogger(), LOGGER), obj.getDigest().getBytes());
}
***************
*** 123,127 ****
private static void logObject(String name) throws NeudistException {
System.out.print("Fetching...");
! SignedNamedObject obj = NamedObjectFactory.fetchNamedObject(name);
System.out.println("Got " + obj.getName());
Sender log = new LogSender();
--- 127,131 ----
private static void logObject(String name) throws NeudistException {
System.out.print("Fetching...");
! SignedNamedObject obj = NSResolver.resolveIdentity(name);
System.out.println("Got " + obj.getName());
Sender log = new LogSender();
Index: SmtpSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/SmtpSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SmtpSender.java 24 Sep 2003 23:56:48 -0000 1.4
--- SmtpSender.java 26 Sep 2003 00:22:07 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
* $Id$
* $Log$
+ * Revision 1.5 2003/09/26 00:22:07 pelle
+ * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+ *
* Revision 1.4 2003/09/24 23:56:48 pelle
* Refactoring nearly done. New model for creating signed objects.
***************
*** 86,90 ****
multi.addBodyPart(body);
BodyPart objpart = new MimeBodyPart();
! objpart.setText(obj.asXML());
objpart.setHeader("Content-type", "application/nsdl");
multi.addBodyPart(objpart);
--- 89,93 ----
multi.addBodyPart(body);
BodyPart objpart = new MimeBodyPart();
! //TODO How do we replace this objpart.setText(obj.asXML());
objpart.setHeader("Content-type", "application/nsdl");
multi.addBodyPart(objpart);
Index: SoapSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/SoapSender.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SoapSender.java 24 Sep 2003 23:56:48 -0000 1.4
--- SoapSender.java 26 Sep 2003 00:22:07 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
* $Id$
* $Log$
+ * Revision 1.5 2003/09/26 00:22:07 pelle
+ * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
+ *
* Revision 1.4 2003/09/24 23:56:48 pelle
* Refactoring nearly done. New model for creating signed objects.
***************
*** 49,53 ****
public class SoapSender extends Sender {
public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
! SOAPTools.soapRequest(endpoint, obj.getElement(), "/receive");
}
}
--- 52,56 ----
public class SoapSender extends Sender {
public void send(String endpoint, SignedNamedObject obj) throws NeudistException {
! //SOAPTools.soapRequest(endpoint, obj.getElement(), "/receive");TODO Rething this
}
}
|