From 81ed21bd468f3fcf62f7ce51a6a5ab44ef60733f Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <cpm@devinsy.fr>
Date: Mon, 2 Aug 2010 15:44:38 +0200
Subject: [PATCH] Step in renaming from xidvc to kiss4web.

---
 src/CmdExecTester.java                              |  2 +-
 src/XidvcTester.java                                |  8 ++------
 src/fr/devinsy/kiss4web/Page.java                   |  2 +-
 src/fr/devinsy/kiss4web/PageManager.java            | 13 ++++++++++---
 src/fr/devinsy/kiss4web/ServletDispatcher.java      |  2 +-
 .../devinsy/kiss4web/SimpleServletDispatcher.java   |  2 +-
 src/fr/devinsy/kiss4web/security/Users.java         |  3 +--
 .../devinsy/kiss4web/security/UsersFileReader.java  | 13 +++++--------
 8 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/CmdExecTester.java b/src/CmdExecTester.java
index c32a911..baef9bf 100644
--- a/src/CmdExecTester.java
+++ b/src/CmdExecTester.java
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 import fr.devinsy.util.cmdexec.CmdExec;
 import fr.devinsy.util.cmdexec.StreamGobbler;
 import fr.devinsy.util.unix.Unix;
-import fr.devinsy.xidvc.*;
+import fr.devinsy.kiss4web.*;
 
 
 /**
diff --git a/src/XidvcTester.java b/src/XidvcTester.java
index fb51ac9..9044f35 100644
--- a/src/XidvcTester.java
+++ b/src/XidvcTester.java
@@ -1,12 +1,8 @@
 /**
- * XidvcTest.
+ * Kiss4Web tests.
  */
 
-import java.io.File;
-import java.util.regex.Pattern;
-
-import fr.devinsy.util.unix.Unix;
-import fr.devinsy.xidvc.*;
+import fr.devinsy.kiss4web.*;
 
 
 /**
diff --git a/src/fr/devinsy/kiss4web/Page.java b/src/fr/devinsy/kiss4web/Page.java
index 74f0d72..528b1a8 100644
--- a/src/fr/devinsy/kiss4web/Page.java
+++ b/src/fr/devinsy/kiss4web/Page.java
@@ -1,4 +1,4 @@
-package fr.devinsy.xidvc;
+package fr.devinsy.kiss4web;
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
diff --git a/src/fr/devinsy/kiss4web/PageManager.java b/src/fr/devinsy/kiss4web/PageManager.java
index cf59bfc..6824fd4 100644
--- a/src/fr/devinsy/kiss4web/PageManager.java
+++ b/src/fr/devinsy/kiss4web/PageManager.java
@@ -1,9 +1,9 @@
-package fr.devinsy.xidvc;
+package fr.devinsy.kiss4web;
 
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
-import fr.devinsy.xidvc.security.*;
+import fr.devinsy.kiss4web.security.*;
 
 /**
  *
@@ -24,7 +24,14 @@ public class PageManager extends HttpServlet
 		//
 		instance = this;
 
-		this.securityAgent = new SecurityAgent (getInitParameter ("securityDataPath"));
+		try
+		{
+			this.securityAgent = new SecurityAgent (getInitParameter ("securityDataPath"));
+		}
+		catch (Exception exception)
+		{
+			throw new ServletException("SecurityAgent initialization failed.", exception);
+		}
 	}
 
 	/**
diff --git a/src/fr/devinsy/kiss4web/ServletDispatcher.java b/src/fr/devinsy/kiss4web/ServletDispatcher.java
index 1add427..8bb54fa 100644
--- a/src/fr/devinsy/kiss4web/ServletDispatcher.java
+++ b/src/fr/devinsy/kiss4web/ServletDispatcher.java
@@ -4,7 +4,7 @@
  *  as published by the Free Software Foundation version 2 or any later version.
  */
 
-package fr.devinsy.xidvc;
+package fr.devinsy.kiss4web;
 
 import java.io.*;
 import javax.servlet.*;
diff --git a/src/fr/devinsy/kiss4web/SimpleServletDispatcher.java b/src/fr/devinsy/kiss4web/SimpleServletDispatcher.java
index a89c155..98b4635 100644
--- a/src/fr/devinsy/kiss4web/SimpleServletDispatcher.java
+++ b/src/fr/devinsy/kiss4web/SimpleServletDispatcher.java
@@ -4,7 +4,7 @@
  *  as published by the Free Software Foundation version 2 or any later version.
  */
 
-package fr.devinsy.xidvc;
+package fr.devinsy.kiss4web;
 
 import java.io.*;
 import java.util.Enumeration;
diff --git a/src/fr/devinsy/kiss4web/security/Users.java b/src/fr/devinsy/kiss4web/security/Users.java
index 3321609..479852b 100644
--- a/src/fr/devinsy/kiss4web/security/Users.java
+++ b/src/fr/devinsy/kiss4web/security/Users.java
@@ -1,4 +1,4 @@
-package fr.devinsy.xidvc.security;
+package fr.devinsy.kiss4web.security;
 
 
 import java.util.*;
@@ -10,7 +10,6 @@ import java.util.*;
 public class Users extends Vector<User>
 {
 	private static final long serialVersionUID = 6140538630004281217L;
-	static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (Users.class);
 
 
 	/**
diff --git a/src/fr/devinsy/kiss4web/security/UsersFileReader.java b/src/fr/devinsy/kiss4web/security/UsersFileReader.java
index 6fca6c2..eb07585 100644
--- a/src/fr/devinsy/kiss4web/security/UsersFileReader.java
+++ b/src/fr/devinsy/kiss4web/security/UsersFileReader.java
@@ -1,4 +1,4 @@
-package fr.devinsy.xidvc.security;
+package fr.devinsy.kiss4web.security;
 
 import java.io.*;
 import java.util.*;
@@ -9,13 +9,10 @@ import java.util.*;
  */
 public class UsersFileReader
 {
-	static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (UsersFileReader.class);
-
-
 	/**
 	 *
 	 */
-	static public Users load (String fileName)
+	static public Users load (String fileName) throws Exception
 	{
 		Users result;
 
@@ -26,7 +23,7 @@ public class UsersFileReader
 		{
 			properties.load (new FileInputStream(fileName));
 
-			Iterator iterator = properties.keySet ().iterator ();
+			Iterator<Object> iterator = properties.keySet ().iterator ();
 			while (iterator.hasNext ())
 			{
 				String key = (String) iterator.next ();
@@ -45,9 +42,9 @@ public class UsersFileReader
 				//
 			}
 		}
-		catch (Exception e)
+		catch (Exception exception)
 		{
-			logger.fatal ("can't load (" + fileName + ")");
+			throw new Exception ("can't load (" + fileName + ")", exception);
 		}