Menu
▾
▴
[Neuclear-develop] neuclear-id/src/java/org/neuclear/contracts/transfer Asset.java,1.1.1.1,1.2 Transfer.java,1.1.1.1,1.2
|
From: <pe...@us...> - 2003-09-22 19:24:37
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/contracts/transfer
In directory sc8-pr-cvs1:/tmp/cvs-serv4908/src/java/org/neuclear/contracts/transfer
Modified Files:
Asset.java Transfer.java
Log Message:
More fixes throughout to problems caused by renaming.
Index: Asset.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/contracts/transfer/Asset.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Asset.java 19 Sep 2003 14:41:40 -0000 1.1.1.1
--- Asset.java 22 Sep 2003 19:24:01 -0000 1.2
***************
*** 2,5 ****
--- 2,8 ----
* $Id$
* $Log$
+ * Revision 1.2 2003/09/22 19:24:01 pelle
+ * More fixes throughout to problems caused by renaming.
+ *
* Revision 1.1.1.1 2003/09/19 14:41:40 pelle
* First import into the neuclear project. This was originally under the SF neudist
***************
*** 55,68 ****
import org.neuclear.id.NamedObject;
import org.neuclear.receiver.Receiver;
! import org.neuclear.utils.NeudistException;
public class Asset extends NamedObject implements Receiver {
! public Asset(String name,String service, String interactive,String description) {//TODO Add validity fields
! super(name, TAG_NAME,NS_NSASSET);
! Element root=getElement();
! root.addElement(DocumentHelper.createQName("Description",NS_NSASSET)).addText(description);
! root.addAttribute(DocumentHelper.createQName("service",NS_NSASSET),service);
! root.addAttribute(DocumentHelper.createQName("interactive",NS_NSASSET),interactive);
--- 58,71 ----
import org.neuclear.id.NamedObject;
import org.neuclear.receiver.Receiver;
! import org.neudist.utils.NeudistException;
public class Asset extends NamedObject implements Receiver {
! public Asset(String name, String service, String interactive, String description) {//TODO Add validity fields
! super(name, TAG_NAME, NS_NSASSET);
! Element root = getElement();
! root.addElement(DocumentHelper.createQName("Description", NS_NSASSET)).addText(description);
! root.addAttribute(DocumentHelper.createQName("service", NS_NSASSET), service);
! root.addAttribute(DocumentHelper.createQName("interactive", NS_NSASSET), interactive);
***************
*** 74,92 ****
public String getTagName() {
! return TAG_NAME;
! }
! /**
! * @return the XML NameSpace object
! */
! public Namespace getNS() {
! return NS_NSASSET;
! }
! public String getInteractiveURL() {
! return getElement().attributeValue(DocumentHelper.createQName("interactive",NS_NSASSET));
! }
public String getServiceURL() {
! return getElement().attributeValue(DocumentHelper.createQName("service",NS_NSASSET));
}
--- 77,96 ----
public String getTagName() {
! return TAG_NAME;
! }
! /**
! * @return the XML NameSpace object
! */
! public Namespace getNS() {
! return NS_NSASSET;
! }
!
! public String getInteractiveURL() {
! return getElement().attributeValue(DocumentHelper.createQName("interactive", NS_NSASSET));
! }
public String getServiceURL() {
! return getElement().attributeValue(DocumentHelper.createQName("service", NS_NSASSET));
}
***************
*** 95,101 ****
}
! private static final String TAG_NAME="Asset";
! public static final String URI_NSASSET="http://neuclear.org/neu/nsasset";
! public static final Namespace NS_NSASSET=DocumentHelper.createNamespace("nsasset",URI_NSASSET);
}
--- 99,105 ----
}
! private static final String TAG_NAME = "Asset";
! public static final String URI_NSASSET = "http://neuclear.org/neu/nsasset";
! public static final Namespace NS_NSASSET = DocumentHelper.createNamespace("nsasset", URI_NSASSET);
}
Index: Transfer.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/contracts/transfer/Transfer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Transfer.java 19 Sep 2003 14:41:42 -0000 1.1.1.1
--- Transfer.java 22 Sep 2003 19:24:01 -0000 1.2
***************
*** 2,5 ****
--- 2,8 ----
* $Id$
* $Log$
+ * Revision 1.2 2003/09/22 19:24:01 pelle
+ * More fixes throughout to problems caused by renaming.
+ *
* Revision 1.1.1.1 2003/09/19 14:41:42 pelle
* First import into the neuclear project. This was originally under the SF neudist
***************
*** 37,55 ****
import org.dom4j.Element;
import org.dom4j.Namespace;
- import org.neuclear.crypto.CryptoTools;
import org.neuclear.id.NamedObject;
import org.neuclear.id.NamedObjectFactory;
! import org.neuclear.utils.NeudistException;
import java.util.Date;
! public class Transfer extends NamedObject{
! public Transfer(String userNameSpace,String recipient,String assetType,double amount) {//TODO Add validity fields
! super(createUniqueTransferName(userNameSpace,recipient), DocumentHelper.createQName(TAG_NAME,NS_NSASSET));
! Element root=getElement();
! root.addElement(DocumentHelper.createQName("Recipient",NS_NSASSET)).addText(recipient);
! root.addElement(DocumentHelper.createQName("AssetType",NS_NSASSET)).addText(assetType);
! root.addElement(DocumentHelper.createQName("Amount",NS_NSASSET)).addText(Double.toString(amount));
--- 40,58 ----
import org.dom4j.Element;
import org.dom4j.Namespace;
import org.neuclear.id.NamedObject;
import org.neuclear.id.NamedObjectFactory;
! import org.neudist.crypto.CryptoTools;
! import org.neudist.utils.NeudistException;
import java.util.Date;
! public class Transfer extends NamedObject {
! public Transfer(String userNameSpace, String recipient, String assetType, double amount) {//TODO Add validity fields
! super(createUniqueTransferName(userNameSpace, recipient), DocumentHelper.createQName(TAG_NAME, NS_NSASSET));
! Element root = getElement();
! root.addElement(DocumentHelper.createQName("Recipient", NS_NSASSET)).addText(recipient);
! root.addElement(DocumentHelper.createQName("AssetType", NS_NSASSET)).addText(assetType);
! root.addElement(DocumentHelper.createQName("Amount", NS_NSASSET)).addText(Double.toString(amount));
***************
*** 60,79 ****
}
! private static String createUniqueTransferName(String userNameSpace,String reqNameSpace) {
// Yeah, yeah there are better ways to do this
! String ms=new Long(new Date().getTime()).toString();
! byte ticketsrc[]=new byte[ms.length()+reqNameSpace.length()];
! System.arraycopy(ms.getBytes(),0,ticketsrc,0,ms.length());
! System.arraycopy(reqNameSpace.getBytes(),0,ticketsrc,ms.length(),reqNameSpace.length());
! String ticket=CryptoTools.formatAsURLSafe(CryptoTools.digest256(ticketsrc));
//Lets reuse ticketsrc for memory reasons
! int offset=ms.length()+1;
if (reqNameSpace.startsWith("neu://"))
! offset+=5;
! for (int i=offset;i<ticketsrc.length;i++) {
! if (ticketsrc[i]==(byte)'/')
! ticketsrc[i]=(byte)'.';
}
/*
--- 63,82 ----
}
! private static String createUniqueTransferName(String userNameSpace, String reqNameSpace) {
// Yeah, yeah there are better ways to do this
! String ms = new Long(new Date().getTime()).toString();
! byte ticketsrc[] = new byte[ms.length() + reqNameSpace.length()];
! System.arraycopy(ms.getBytes(), 0, ticketsrc, 0, ms.length());
! System.arraycopy(reqNameSpace.getBytes(), 0, ticketsrc, ms.length(), reqNameSpace.length());
! String ticket = CryptoTools.formatAsURLSafe(CryptoTools.digest256(ticketsrc));
//Lets reuse ticketsrc for memory reasons
! int offset = ms.length() + 1;
if (reqNameSpace.startsWith("neu://"))
! offset += 5;
! for (int i = offset; i < ticketsrc.length; i++) {
! if (ticketsrc[i] == (byte) '/')
! ticketsrc[i] = (byte) '.';
}
/*
***************
*** 83,113 ****
System.arraycopy(ticket,0,ticketName,userNameSpace.length()+1,ticket.length);
*/
! return userNameSpace+'/'+new String(ticketsrc,offset,ticketsrc.length-offset)+'.'+ticket;
}
public String getTagName() {
! return TAG_NAME;
! }
- /**
- * @return the XML NameSpace object
- */
- public Namespace getNS() {
- return NS_NSASSET;
- }
public String getAssetType() {
! return getElement().attributeValue(DocumentHelper.createQName("AssetType",NS_NSASSET));
}
/**
* Perform this Transfer
* @throws NeudistException
*/
! public void performTransfer() throws NeudistException{
! Asset asset=(Asset)NamedObjectFactory.fetchNamedObject(getAssetType());
asset.receive(this);
}
! private static final String TAG_NAME="TransferRequest";
! public static final String URI_NSASSET="http://neuclear.org/neu/nsasset";
! public static final Namespace NS_NSASSET=DocumentHelper.createNamespace("nsasset",URI_NSASSET);
}
--- 86,119 ----
System.arraycopy(ticket,0,ticketName,userNameSpace.length()+1,ticket.length);
*/
! return userNameSpace + '/' + new String(ticketsrc, offset, ticketsrc.length - offset) + '.' + ticket;
}
+
public String getTagName() {
! return TAG_NAME;
! }
!
! /**
! * @return the XML NameSpace object
! */
! public Namespace getNS() {
! return NS_NSASSET;
! }
public String getAssetType() {
! return getElement().attributeValue(DocumentHelper.createQName("AssetType", NS_NSASSET));
}
+
/**
* Perform this Transfer
* @throws NeudistException
*/
! public void performTransfer() throws NeudistException {
! Asset asset = (Asset) NamedObjectFactory.fetchNamedObject(getAssetType());
asset.receive(this);
}
! private static final String TAG_NAME = "TransferRequest";
! public static final String URI_NSASSET = "http://neuclear.org/neu/nsasset";
! public static final Namespace NS_NSASSET = DocumentHelper.createNamespace("nsasset", URI_NSASSET);
}
|
