1.1 --- a/src/java/isac/session/SessionDialog.java	Fri Mar 11 10:46:31 2005 +0100
     1.2 +++ b/src/java/isac/session/SessionDialog.java	Sat Mar 12 06:14:55 2005 +0100
     1.3 @@ -23,21 +23,14 @@
     1.4  import org.apache.xmlrpc.WebServer;
     1.5  
     1.6  /**
     1.7 -<<<<<<< SessionDialog.java
     1.8   * @author Andreas Griesmayer
     1.9 -=======
    1.10 - * @author gismo
    1.11 - * 
    1.12 - * To change the template for this generated type comment go to
    1.13 - * Window>Preferences>Java>Code Generation>Code and Comments
    1.14 ->>>>>>> 1.8
    1.15   */
    1.16  public class SessionDialog extends UnicastRemoteObject implements SDialog,
    1.17      Serializable {
    1.18  
    1.19  	static Logger logger_ = Logger.getLogger(SessionDialog.class.getName());
    1.20  
    1.21 -	private Map dguide_map_ = new HashMap();
    1.22 +	//private Map dguide_map_ = new HashMap();//WN0503 unused
    1.23  
    1.24    private int counter_;
    1.25  
    1.26 @@ -82,7 +75,7 @@
    1.27     * @param pass
    1.28     *          password
    1.29     * @return vector with the sessionid as first and only element on success or
    1.30 -   *         empty vector on filure
    1.31 +   *         empty vector on failure
    1.32     */
    1.33    public Vector login(String username, String pass) {
    1.34      Vector return_val = new Vector();
    1.35 @@ -115,6 +108,7 @@
    1.36     * @param session
    1.37     *          ID of the session for which the owner is requested
    1.38     * @return the name of the owner of the session
    1.39 +   * TODO.WN050311 encapsulate User#getName !!!
    1.40     */
    1.41    public String getUsername(String session) {
    1.42      Iterator keys = sessionmap_.keySet().iterator();
    1.43 @@ -153,7 +147,7 @@
    1.44      try {
    1.45        // Invoke me as <http://localhost:8080/RPC2>.
    1.46        System.out.println("SessionDialog main");
    1.47 -      WebServer server = new WebServer(1050);
    1.48 +      WebServer server = new WebServer(1050);//WN0503 fixed port !
    1.49        server.setParanoid(false);
    1.50        //			server.addHandler("sample", new JavaServer());
    1.51        server.addHandler("SDialog", getInstance());

     2.1 --- a/src/java/isac/util/InformationProcessor.java	Fri Mar 11 10:46:31 2005 +0100
     2.2 +++ b/src/java/isac/util/InformationProcessor.java	Sat Mar 12 06:14:55 2005 +0100
     2.3 @@ -45,7 +45,7 @@
     2.4  	 */
     2.5  	static protected String xmlLogin(String username, String password) {
     2.6  		try {
     2.7 -			XmlRpcClient sdialog = new XmlRpcClient("http://localhost:1050");
     2.8 +			XmlRpcClient sdialog = new XmlRpcClient("http://localhost:1050");//WN fixed port
     2.9  			Vector params = new Vector();
    2.10  			params.add(username);
    2.11  			params.add(password);