pyxida-cvs-commits

[Jonathan L. <le...@us...>]

Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25217/src/edu/harvard/syrah/pyxida/api

Modified Files:
	ExternalAPI.java ExternalAPIIF.java 
Log Message:
untested proxy code compiles

Index: ExternalAPIIF.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPIIF.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExternalAPIIF.java	1 Dec 2006 18:10:54 -0000	1.6
--- ExternalAPIIF.java	5 Dec 2006 03:59:26 -0000	1.7
***************
*** 24,33 ****
  	// lease is given in ms
  	// lease of 0 will expire in one hour
! 	public void createProxyCoord(String remoteNode, long lease, CB1<Object> cbResult);
  
  	// Renew proxy coord lease
! 	public void renewProxyCoord(String remoteNode, long lease, CB1<Object> cbResult);
  
! 	public void destroyProxyCoord(String remoteNode, CB1<Object> cbResult);
  
  	// TODO Add routing methods
--- 24,35 ----
  	// lease is given in ms
  	// lease of 0 will expire in one hour
! 	public void createProxyCoord(String remoteNode, long lease, CB1<Boolean> cbResult);
! 
! 	public void getProxyCoord(String remoteNode, CB1<Vector<Double>> cbProxyCoord);
  
  	// Renew proxy coord lease
! 	public void renewProxyCoord(String remoteNode, long lease, CB1<Boolean> cbResult);
  
! 	public void destroyProxyCoord(String remoteNode, CB1<Boolean> cbResult);
  
  	// TODO Add routing methods

Index: ExternalAPI.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/api/ExternalAPI.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ExternalAPI.java	4 Dec 2006 17:15:48 -0000	1.7
--- ExternalAPI.java	5 Dec 2006 03:59:26 -0000	1.8
***************
*** 21,33 ****
  		this.ncManager = ncManager;
  	}
! 	
! 	public void createProxyCoord(String remoteNode, long lease, CB1<Object> cbResult) {
! 		// TODO Auto-generated method stub
! 		
  	}
  
! 	public void destroyProxyCoord(String remoteNode, CB1<Object> cbResult) {
! 		// TODO Auto-generated method stub
! 		
  	}
  
--- 21,90 ----
  		this.ncManager = ncManager;
  	}
! 
! 	public void createProxyCoord(String remoteNodeStr, final long lease, 
! 															 final CB1<Boolean> cbResult) {
! 		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
! 			protected void cb(CBResult nsResult, AddressIF remoteNode) {
! 				switch (nsResult.state) {
! 					case OK: {
! 						log.debug("resolved node="+remoteNode);
! 						boolean res = ncManager.createProxyCoord(remoteNode, lease);
! 						cbResult.call(CBResult.OK(),res);
! 						break;
! 					}
! 					case TIMEOUT:
! 					case ERROR: {
! 						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,false);
! 						break;
! 					}
! 				}
! 			}
! 			});
  	}
  
! 	public void getProxyCoord(String remoteNodeStr, 
! 														final CB1<Vector<Double>> cbProxyCoord) {
! 		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
! 			protected void cb(CBResult nsResult, AddressIF remoteNode) {
! 				switch (nsResult.state) {
! 					case OK: {
! 						log.debug("resolved node="+remoteNode);
! 						Coordinate coord = ncManager.getProxyCoord(remoteNode);
! 						Vector<Double> listCoord = getVectorFromCoord(coord);
! 						cbProxyCoord.call(CBResult.OK(),listCoord);
! 						break;
! 					}
! 					case TIMEOUT:
! 					case ERROR: {
! 						log.warn(nsResult.toString());
! 						cbProxyCoord.call(nsResult,null);
! 						break;
! 					}
! 				}
! 			}
! 			});
! 	}
! 
! 	public void destroyProxyCoord(String remoteNodeStr, 
! 																final CB1<Boolean> cbResult) {
! 		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
! 			protected void cb(CBResult nsResult, AddressIF remoteNode) {
! 				switch (nsResult.state) {
! 					case OK: {
! 						log.debug("resolved node="+remoteNode);
! 						boolean res = ncManager.destroyProxyCoord(remoteNode);
! 						cbResult.call(CBResult.OK(),res);
! 						break;
! 					}
! 					case TIMEOUT:
! 					case ERROR: {
! 						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,false);
! 						break;
! 					}
! 				}
! 			}
! 			});
  	}
  
***************
*** 108,114 ****
  	}
  
! 	public void renewProxyCoord(String remoteNode, long lease, CB1<Object> cbResult) {
! 		// TODO Auto-generated method stub
! 		
  	}
  
--- 165,188 ----
  	}
  
! 	public void renewProxyCoord(String remoteNodeStr, final long lease,
! 															final CB1<Boolean> cbResult) {
! 		AddressFactory.createResolved(remoteNodeStr, new CB1<AddressIF>() {
! 			protected void cb(CBResult nsResult, AddressIF remoteNode) {
! 				switch (nsResult.state) {
! 					case OK: {
! 						log.debug("resolved node="+remoteNode);
! 						boolean res = ncManager.renewLeaseOnProxyCoord(remoteNode, lease);
! 						cbResult.call(CBResult.OK(),res);
! 						break;
! 					}
! 					case TIMEOUT:
! 					case ERROR: {
! 						log.warn(nsResult.toString());
! 						cbResult.call(nsResult,false);
! 						break;
! 					}
! 				}
! 			}
! 			});
  	}