Commit 82265be4 authored by Fabien Triolet's avatar Fabien Triolet
Browse files

Removed static fields in the servlet,

exclude regexp namespace from ouput when maptag or modtag are used
parent 8075b379
/*
* $Id: Servlet.java,v 1.9 2003-01-30 15:47:46 triolet Exp $
* $Id: Servlet.java,v 1.10 2003-05-26 15:03:50 triolet Exp $
*
* Transmorpher
*
......@@ -129,9 +129,9 @@ public class Servlet extends MainProcess {
*@exception IOException When IO errors occur
*/
public void generateMainHeader(Writer file) throws IOException {
file.writeln(2, "static ServletContext context;");
file.writeln(2, "static Parameters servletParameters = null;");
file.writeln(2, "static String root;");
file.writeln(2, "ServletContext context;");
file.writeln(2, "Parameters servletParameters = null;");
file.writeln(2, "String root;");
file.writeln(2, "public void init(ServletConfig config) throws ServletException{");
file.writeln(4, "try{");
file.writeln(6, "context = config.getServletContext();");
......@@ -200,6 +200,8 @@ public class Servlet extends MainProcess {
file.writeln(8, "tmCurrentCompositeProcess.bindParameters(servletParameters);");
file.writeln(8, "tmCurrentCompositeProcess.execProcess(false);");
file.writeln(8, "tmProcessStack=null;");
}
/**
......
/**
* $Id: MapTag.java,v 1.2 2003-01-16 13:37:41 triolet Exp $
* $Id: MapTag.java,v 1.3 2003-05-26 15:03:50 triolet Exp $
*
* Transmorpher
*
......@@ -167,9 +167,9 @@ public class MapTag implements Rule {
file.write(context + "/");
}
file.writeln(match + "\">");
file.writeln(4, "<" + target + ">");
file.writeln(4, "<" + target + " xsl:exclude-result-prefixes=\"regexp #default\">");
file.writeln(6, "<xsl:apply-templates select=\"*|@*|text()\"/>");
file.writeln(4, "</" + target + ">");
file.writeln(4, "</" + target +">");
file.writeln(2, "</xsl:template>");
file.writeln("");
}
......
/**
* $Id: ModTag.java,v 1.3 2003-01-16 13:37:41 triolet Exp $
* $Id: ModTag.java,v 1.4 2003-05-26 15:03:50 triolet Exp $
*
* Transmorpher
*
......@@ -210,7 +210,7 @@ public class ModTag implements Rule {
}
file.writeln(match + "\">");
if (target != null) {
file.write(4, "<" + target + ">");
file.write(4, "<" + target + " xsl:exclude-result-prefixes=\"regexp #default\">");
} else {
file.writeln(4, "<xsl:copy>");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment