Step in renaming from xidvc to kiss4web.
This commit is contained in:
parent
d44cc0bcc2
commit
81ed21bd46
8 changed files with 22 additions and 23 deletions
|
@ -9,7 +9,7 @@ import java.util.regex.Pattern;
|
||||||
import fr.devinsy.util.cmdexec.CmdExec;
|
import fr.devinsy.util.cmdexec.CmdExec;
|
||||||
import fr.devinsy.util.cmdexec.StreamGobbler;
|
import fr.devinsy.util.cmdexec.StreamGobbler;
|
||||||
import fr.devinsy.util.unix.Unix;
|
import fr.devinsy.util.unix.Unix;
|
||||||
import fr.devinsy.xidvc.*;
|
import fr.devinsy.kiss4web.*;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
/**
|
/**
|
||||||
* XidvcTest.
|
* Kiss4Web tests.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.io.File;
|
import fr.devinsy.kiss4web.*;
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import fr.devinsy.util.unix.Unix;
|
|
||||||
import fr.devinsy.xidvc.*;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package fr.devinsy.xidvc;
|
package fr.devinsy.kiss4web;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import javax.servlet.*;
|
import javax.servlet.*;
|
||||||
import javax.servlet.http.*;
|
import javax.servlet.http.*;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package fr.devinsy.xidvc;
|
package fr.devinsy.kiss4web;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import javax.servlet.*;
|
import javax.servlet.*;
|
||||||
import javax.servlet.http.*;
|
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;
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* as published by the Free Software Foundation version 2 or any later version.
|
* 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.io.*;
|
||||||
import javax.servlet.*;
|
import javax.servlet.*;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* as published by the Free Software Foundation version 2 or any later version.
|
* 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.io.*;
|
||||||
import java.util.Enumeration;
|
import java.util.Enumeration;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package fr.devinsy.xidvc.security;
|
package fr.devinsy.kiss4web.security;
|
||||||
|
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
@ -10,7 +10,6 @@ import java.util.*;
|
||||||
public class Users extends Vector<User>
|
public class Users extends Vector<User>
|
||||||
{
|
{
|
||||||
private static final long serialVersionUID = 6140538630004281217L;
|
private static final long serialVersionUID = 6140538630004281217L;
|
||||||
static private org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger (Users.class);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package fr.devinsy.xidvc.security;
|
package fr.devinsy.kiss4web.security;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
@ -9,13 +9,10 @@ import java.util.*;
|
||||||
*/
|
*/
|
||||||
public class UsersFileReader
|
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;
|
Users result;
|
||||||
|
|
||||||
|
@ -26,7 +23,7 @@ public class UsersFileReader
|
||||||
{
|
{
|
||||||
properties.load (new FileInputStream(fileName));
|
properties.load (new FileInputStream(fileName));
|
||||||
|
|
||||||
Iterator iterator = properties.keySet ().iterator ();
|
Iterator<Object> iterator = properties.keySet ().iterator ();
|
||||||
while (iterator.hasNext ())
|
while (iterator.hasNext ())
|
||||||
{
|
{
|
||||||
String key = (String) iterator.next ();
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue