- From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 11 Aug 2009 16:05:44 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/action
In directory hutz:/tmp/cvs-serv2609/src/org/w3c/unicorn/action
Modified Files:
Tag: dev2
ObserveAction.java IndexAction.java
Removed Files:
Tag: dev2
Error404Action.java RedirectAction.java
Log Message:
all initialization actions in Init.java
+ compatibility windows/linux
Index: IndexAction.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/action/Attic/IndexAction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- IndexAction.java 7 Aug 2009 12:03:42 -0000 1.1.2.4
+++ IndexAction.java 11 Aug 2009 16:05:42 -0000 1.1.2.5
@@ -12,11 +12,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.apache.velocity.VelocityContext;
-import org.w3c.unicorn.Parameters;
import org.w3c.unicorn.language.Language;
import org.w3c.unicorn.language.LanguageNegociator;
-import org.w3c.unicorn.message.Message;
-import org.w3c.unicorn.output.Output;
import org.w3c.unicorn.util.Property;
public class IndexAction extends Action{
@@ -34,8 +31,8 @@
}
-
- protected void doGet(HttpServletRequest req, HttpServletResponse resp, List<Message> messages) throws Exception {
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
templateList.clear();
// Language negotiation
@@ -44,20 +41,11 @@
resp.setLocale(lang);
velocityContext.put("lang", lang.getLanguage());
- // Output mime type
- String outputParameter = req.getParameter("output");
- if (outputParameter == null)
- resp.setContentType("text/html");
- else {
- for (String key : Parameters.outputParams.keySet())
- if (outputParameter.equals(key))
- resp.setContentType(Parameters.outputParams.get(key));
- }
velocityContext.put("param_prefix", Property.get("UNICORN_PARAMETER_PREFIX"));
// Contains a message ?
- if (messages == null) {
+ /*if (messages == null) {
templateList.add("index.vm");
Language.addToContext(velocityContext, lang);
Output.write(templateList, velocityContext, resp);
@@ -67,7 +55,7 @@
}
- }
+ }*/
// Is response cached ?
File cachedIndex = new File(Property.get("PATH_TO_CACHE") + "index/index." + lang + ".html");
@@ -111,16 +99,6 @@
private static VelocityEngine engine = new VelocityEngine();*/
}
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- try {
- doGet(req, resp, null);
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
Index: ObserveAction.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/action/Attic/ObserveAction.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- ObserveAction.java 6 Aug 2009 12:46:56 -0000 1.1.2.3
+++ ObserveAction.java 11 Aug 2009 16:05:42 -0000 1.1.2.4
@@ -4,6 +4,7 @@
import javax.servlet.http.HttpServletResponse;
public class ObserveAction extends Action {
+ private static final long serialVersionUID = 1L;
public ObserveAction() {
// TODO Auto-generated constructor stub
--- Error404Action.java DELETED ---
--- RedirectAction.java DELETED ---
Received on Tuesday, 11 August 2009 16:08:56 UTC