[Aglets-commits] aglets/src/com/ibm/maf/atp Handler.java, 1.6, 1.7 Daemon.java, 1.6, 1.7 ConnectionHandler.java, 1.2, 1.3 HttpFilter.java, 1.2, 1.3

[Luca F. <cat...@us...>]

Update of /cvsroot/aglets/aglets/src/com/ibm/maf/atp
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18746/src/com/ibm/maf/atp

Modified Files:
	Handler.java Daemon.java ConnectionHandler.java 
	HttpFilter.java 
Log Message:
Merge of experimental branch.

Index: Daemon.java
===================================================================
RCS file: /cvsroot/aglets/aglets/src/com/ibm/maf/atp/Daemon.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Daemon.java	27 Jul 2009 10:31:41 -0000	1.6
+++ Daemon.java	28 Jul 2009 07:04:53 -0000	1.7
@@ -68,7 +68,7 @@
  * @author	ONO Kouichi
  */
 final public class Daemon {
-    public static final LogCategory log = LogInitializer.getCategory(Daemon.class.getName() );
+    	private static AgletsLogger logger =  AgletsLogger.getLogger(Daemon.class.getName());
     
 	static Hashtable locals = new Hashtable();
 
@@ -299,17 +299,17 @@
 
 		Randoms.setUseSecureRandomSeed(secureseed);
 		if (secureseed) {
-			log.info("USE SECURE RANDOM SEED.");
+			logger.info("USE SECURE RANDOM SEED.");
 		} else {
-			log.info("USE UNSECURE PSEUDO RANDOM SEED.");
+			logger.info("USE UNSECURE PSEUDO RANDOM SEED.");
 		} 
 		if (auth) {
-			log.info("Generating random seed ... wait for a while.");
+			logger.info("Generating random seed ... wait for a while.");
 			Randoms.getRandomGenerator(Challenge.LENGTH);
-			log.info("done.");
+			logger.info("done.");
 		} 
 		if (auth && SharedSecrets.getSharedSecrets() == null) {
-			log.error("No shared secret file for authentication."+
+			logger.error("No shared secret file for authentication."+
 			    "Authentication requires a shared secret file"+
                 "which is duplicated from other host,"+
                 "or newly created file.");
@@ -318,9 +318,9 @@
 			auth = false;
 		} 
 		if (auth) {
-			log.info("AUTHENTICATION MODE ON.");
+			logger.info("AUTHENTICATION MODE ON.");
 		} else {
-			log.info("AUTHENTICATION MODE OFF.");
+			logger.info("AUTHENTICATION MODE OFF.");
 		} 
 		ServerSocket socket = null;
 



Index: Handler.java
===================================================================
RCS file: /cvsroot/aglets/aglets/src/com/ibm/maf/atp/Handler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Handler.java	27 Jul 2009 10:31:41 -0000	1.6
+++ Handler.java	28 Jul 2009 07:04:53 -0000	1.7
@@ -37,9 +37,7 @@
 import org.aglets.log.*;
 
 public class Handler implements AgentSystemHandler {
-    static private final LogCategory log 
-            = LogInitializer.getCategory(Handler.class.getName() );
-            
+    private static AgletsLogger logger =  AgletsLogger.getLogger(Handler.class.getName());            
 	static final int DEFAULT_PORT = 4434;
 
 	static boolean initialized = false;
@@ -67,7 +65,7 @@
 		} 
 
         if( res.getBoolean("atp.useip", false) ) {
-            log.debug("Hostname: "+ipaddr);
+            logger.debug("Hostname: "+ipaddr);
             return ipaddr;
         }