devinsy/kiss4web
devinsy/kiss4web
1
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Improve code organization.

Browse source
This commit is contained in:
Christian P. MOMON 2013-08-19 16:18:54 +02:00
parent d08172840b
commit 61168e5b32
2 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO Normal file
View file

@ -0,0 +1 @@
Block *.class

53
src/fr/devinsy/kiss4web/SimpleServletDispatcher.java
View file

@ -75,20 +75,11 @@ public class SimpleServletDispatcher extends HttpServlet
/* E0 */'a', 'a', 'a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i',
/* F0 */'o', 'n', 'o', 'o', 'o', 'o', 'o', '\u00F7', '-', 'u', 'u', 'u', 'u', 'y', '-', 'y' };
/**
*
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
doIt(request, response);
}
/**
*
*
*/
public void doIt(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
public void dispatch(final HttpServletRequest request, final HttpServletResponse response, final String webClassesRootPath) throws IOException, ServletException
{
logger.info("==================================================");
logger.info("getContextPath=[" + request.getContextPath() + "]");
@ -141,7 +132,7 @@ public class SimpleServletDispatcher extends HttpServlet
{
// If file is not in WebContent root, search it in packaged
// classes.
path = getServletContext().getRealPath("/") + "WEB-INF/classes/" + this.webclassesRootPath.replaceAll("\\.", "/") + request.getPathInfo();
path = getServletContext().getRealPath("/") + "WEB-INF/classes/" + webClassesRootPath.replaceAll("\\.", "/") + request.getPathInfo();
}
logger.debug("path2=" + path);
@ -150,7 +141,7 @@ public class SimpleServletDispatcher extends HttpServlet
}
else
{
String className = pathInfoToClassName(path, this.webclassesRootPath);
String className = pathInfoToClassName(path, webClassesRootPath);
logger.info("className=[" + className + "]");
HttpServlet servlet = instanciateServlet(className);
@ -176,7 +167,9 @@ public class SimpleServletDispatcher extends HttpServlet
else
{
/*
* TODO // response.setContentType ("text/html"); PrintWriter
* TODO
*
* response.setContentType ("text/html"); PrintWriter
* out = response.getWriter();
*
* out.println ("<html><head></head><body>"); out.println
@ -186,13 +179,30 @@ public class SimpleServletDispatcher extends HttpServlet
}
}
/**
*
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
dispatch(request, response, this.webclassesRootPath);
}
/**
* Backward compatibility.
*/
public void doIt(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
dispatch(request, response, this.webclassesRootPath);
}
/**
*
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
{
doIt(request, response);
dispatch(request, response, this.webclassesRootPath);
}
/**
@ -307,14 +317,13 @@ public class SimpleServletDispatcher extends HttpServlet
* Convert a path in a class name, using easy conventions.
*
* <pre>
* "/"
* => "Index_xhtml" "/good/"
* => "good.Good_xhtml" "/good/morning.xhtml"
* => "good.Morning_xhtml" "/good/morning_girl.xhtml"
* => "good.Morning_girl_xhtml" "/good/morning-123.xhtml"
* => "good.Morning_xhtml" ('123' is detected as a parameter, it will be
* decoded in the class called later). "/good/morning-/12/toto.jpg"
* => "good.Morning" ('12' and 'toto.jpg" are detected as a parameter, they
* "/" => "Index_xhtml"
* "/good/" => "good.Good_xhtml"
* "/good/morning.xhtml" => "good.Morning_xhtml"
* "/good/morning_girl.xhtml" => "good.Morning_girl_xhtml"
* "/good/morning-123.xhtml" => "good.Morning_xhtml" ('123' is detected as a parameter, it will be
* decoded in the class called later).
* "/good/morning-/12/toto.jpg" => "good.Morning" ('12' and 'toto.jpg" are detected as a parameter, they
* will be decoded in the class called later).
* </pre>
*