From d44cc0bcc29ccf83f6702e8c0d76f4254b6a5ea6 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Mon, 2 Aug 2010 15:37:24 +0200 Subject: [PATCH] Rename from xidvc to kiss4web. Cleaning classes. --- src/fr/devinsy/{xidvc => kiss4web}/Page.java | 0 src/fr/devinsy/{xidvc => kiss4web}/PageManager.java | 0 .../{xidvc => kiss4web}/ServletDispatcher.java | 0 .../SimpleServletDispatcher.java | 3 ++- .../devinsy/{xidvc => kiss4web}/security/Group.java | 7 ++++--- .../{xidvc => kiss4web}/security/Groups.java | 4 +--- .../security/GroupsFileReader.java | 13 +++++-------- .../{xidvc => kiss4web}/security/SecurityAgent.java | 7 ++----- .../devinsy/{xidvc => kiss4web}/security/User.java | 4 +--- .../devinsy/{xidvc => kiss4web}/security/Users.java | 0 .../security/UsersFileReader.java | 0 11 files changed, 15 insertions(+), 23 deletions(-) rename src/fr/devinsy/{xidvc => kiss4web}/Page.java (100%) rename src/fr/devinsy/{xidvc => kiss4web}/PageManager.java (100%) rename src/fr/devinsy/{xidvc => kiss4web}/ServletDispatcher.java (100%) rename src/fr/devinsy/{xidvc => kiss4web}/SimpleServletDispatcher.java (95%) rename src/fr/devinsy/{xidvc => kiss4web}/security/Group.java (88%) rename src/fr/devinsy/{xidvc => kiss4web}/security/Groups.java (93%) rename src/fr/devinsy/{xidvc => kiss4web}/security/GroupsFileReader.java (66%) rename src/fr/devinsy/{xidvc => kiss4web}/security/SecurityAgent.java (89%) rename src/fr/devinsy/{xidvc => kiss4web}/security/User.java (90%) rename src/fr/devinsy/{xidvc => kiss4web}/security/Users.java (100%) rename src/fr/devinsy/{xidvc => kiss4web}/security/UsersFileReader.java (100%) diff --git a/src/fr/devinsy/xidvc/Page.java b/src/fr/devinsy/kiss4web/Page.java similarity index 100% rename from src/fr/devinsy/xidvc/Page.java rename to src/fr/devinsy/kiss4web/Page.java diff --git a/src/fr/devinsy/xidvc/PageManager.java b/src/fr/devinsy/kiss4web/PageManager.java similarity index 100% rename from src/fr/devinsy/xidvc/PageManager.java rename to src/fr/devinsy/kiss4web/PageManager.java diff --git a/src/fr/devinsy/xidvc/ServletDispatcher.java b/src/fr/devinsy/kiss4web/ServletDispatcher.java similarity index 100% rename from src/fr/devinsy/xidvc/ServletDispatcher.java rename to src/fr/devinsy/kiss4web/ServletDispatcher.java diff --git a/src/fr/devinsy/xidvc/SimpleServletDispatcher.java b/src/fr/devinsy/kiss4web/SimpleServletDispatcher.java similarity index 95% rename from src/fr/devinsy/xidvc/SimpleServletDispatcher.java rename to src/fr/devinsy/kiss4web/SimpleServletDispatcher.java index 01174e5..a89c155 100644 --- a/src/fr/devinsy/xidvc/SimpleServletDispatcher.java +++ b/src/fr/devinsy/kiss4web/SimpleServletDispatcher.java @@ -244,7 +244,8 @@ public class SimpleServletDispatcher extends HttpServlet } else { -/* + /* + * TODO // response.setContentType ("text/html"); PrintWriter out = response.getWriter(); diff --git a/src/fr/devinsy/xidvc/security/Group.java b/src/fr/devinsy/kiss4web/security/Group.java similarity index 88% rename from src/fr/devinsy/xidvc/security/Group.java rename to src/fr/devinsy/kiss4web/security/Group.java index e9ef33a..94bd321 100644 --- a/src/fr/devinsy/xidvc/security/Group.java +++ b/src/fr/devinsy/kiss4web/security/Group.java @@ -1,4 +1,4 @@ -package fr.devinsy.xidvc.security; +package fr.devinsy.kiss4web.security; import java.util.*; @@ -8,8 +8,6 @@ import java.util.*; */ public class Group { - static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (Group.class); - protected String name; protected Vector members; @@ -49,6 +47,7 @@ public class Group return (result); } + /** * */ @@ -76,6 +75,7 @@ public class Group return (result); } + /** * */ @@ -84,6 +84,7 @@ public class Group this.name = name; } + /** * */ diff --git a/src/fr/devinsy/xidvc/security/Groups.java b/src/fr/devinsy/kiss4web/security/Groups.java similarity index 93% rename from src/fr/devinsy/xidvc/security/Groups.java rename to src/fr/devinsy/kiss4web/security/Groups.java index e60019a..350363d 100644 --- a/src/fr/devinsy/xidvc/security/Groups.java +++ b/src/fr/devinsy/kiss4web/security/Groups.java @@ -1,4 +1,4 @@ -package fr.devinsy.xidvc.security; +package fr.devinsy.kiss4web.security; import java.util.*; @@ -9,8 +9,6 @@ import java.util.*; public class Groups extends Vector { private static final long serialVersionUID = 6238581648850758903L; - static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (Groups.class); - /** * diff --git a/src/fr/devinsy/xidvc/security/GroupsFileReader.java b/src/fr/devinsy/kiss4web/security/GroupsFileReader.java similarity index 66% rename from src/fr/devinsy/xidvc/security/GroupsFileReader.java rename to src/fr/devinsy/kiss4web/security/GroupsFileReader.java index 1b76acc..ab44853 100644 --- a/src/fr/devinsy/xidvc/security/GroupsFileReader.java +++ b/src/fr/devinsy/kiss4web/security/GroupsFileReader.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 GroupsFileReader { - static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (GroupsFileReader.class); - - /** * */ - static public Groups load (String fileName) + static public Groups load (String fileName) throws Exception { Groups result; @@ -26,7 +23,7 @@ public class GroupsFileReader { properties.load (new FileInputStream(fileName)); - Iterator iterator = properties.keySet ().iterator (); + Iterator iterator = properties.keySet ().iterator (); while (iterator.hasNext ()) { String key = (String) iterator.next (); @@ -45,9 +42,9 @@ public class GroupsFileReader result.add (group); } } - catch (Exception e) + catch (Exception exception) { - logger.fatal ("can't load (" + fileName + ")"); + throw new Exception ("can't load (" + fileName + ")", exception); } // diff --git a/src/fr/devinsy/xidvc/security/SecurityAgent.java b/src/fr/devinsy/kiss4web/security/SecurityAgent.java similarity index 89% rename from src/fr/devinsy/xidvc/security/SecurityAgent.java rename to src/fr/devinsy/kiss4web/security/SecurityAgent.java index 464ffdb..72a926b 100644 --- a/src/fr/devinsy/xidvc/security/SecurityAgent.java +++ b/src/fr/devinsy/kiss4web/security/SecurityAgent.java @@ -1,4 +1,4 @@ -package fr.devinsy.xidvc.security; +package fr.devinsy.kiss4web.security; import java.util.*; @@ -10,8 +10,6 @@ import java.util.*; */ public class SecurityAgent { - static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (SecurityAgent.class); - protected Users users; protected Groups groups; protected Groups permissions; @@ -20,7 +18,7 @@ public class SecurityAgent /** * */ - public SecurityAgent (String path) + public SecurityAgent (String path) throws Exception { this.users = UsersFileReader.load (path + "users.conf"); this.groups = GroupsFileReader.load (path + "groups.conf"); @@ -78,7 +76,6 @@ public class SecurityAgent if (user == null) { - logger.info ("unknow login try to connect."); result = false; } else if (user.password ().equals (password)) diff --git a/src/fr/devinsy/xidvc/security/User.java b/src/fr/devinsy/kiss4web/security/User.java similarity index 90% rename from src/fr/devinsy/xidvc/security/User.java rename to src/fr/devinsy/kiss4web/security/User.java index ca456ae..352671f 100644 --- a/src/fr/devinsy/xidvc/security/User.java +++ b/src/fr/devinsy/kiss4web/security/User.java @@ -1,4 +1,4 @@ -package fr.devinsy.xidvc.security; +package fr.devinsy.kiss4web.security; @@ -8,8 +8,6 @@ package fr.devinsy.xidvc.security; */ public class User { - static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (User.class); - protected String login; protected String password; protected String realName; diff --git a/src/fr/devinsy/xidvc/security/Users.java b/src/fr/devinsy/kiss4web/security/Users.java similarity index 100% rename from src/fr/devinsy/xidvc/security/Users.java rename to src/fr/devinsy/kiss4web/security/Users.java diff --git a/src/fr/devinsy/xidvc/security/UsersFileReader.java b/src/fr/devinsy/kiss4web/security/UsersFileReader.java similarity index 100% rename from src/fr/devinsy/xidvc/security/UsersFileReader.java rename to src/fr/devinsy/kiss4web/security/UsersFileReader.java