[Microsoft.Build] Fix expected output newline from ProcessWrapper.OutputStreamChanged...

[mono.git] / mcs / class / Mainsoft.Web / Mainsoft.Web.Hosting / BaseHttpServlet.cs

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs
index d62888afcbc1961f2195a140cf7c66237af3068a..18d0c7c7dc2307ed75820473fd6e0cd8b65f5cc0 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs
@@ -83,14 +83,10 @@ namespace Mainsoft.Web.Hosting
                override public void init(ServletConfig config)
                {
                        base.init(config);
-                       InitRuntime (config, this, CreateDeserializer ());
+                       InitRuntime (config, this);
                }
 
-               protected virtual vmw.@internal.io.IObjectsDeserializer CreateDeserializer () {
-                       return null;
-               }
-
-               public static void InitRuntime (ServletConfig config, object evidence, vmw.@internal.io.IObjectsDeserializer deserializer) {
+               public static void InitRuntime (ServletConfig config, object evidence) {
 
                        ServletContext context = config.getServletContext ();
 
@@ -122,8 +118,6 @@ namespace Mainsoft.Web.Hosting
                                //servletDomain.SetData (J2EEConsts.CLASS_LOADER, vmw.common.TypeUtils.ToClass (evidence).getClassLoader ());
                                //servletDomain.SetData(J2EEConsts.SERVLET_CONFIG, config);
                                servletDomain.SetData (J2EEConsts.RESOURCE_LOADER, new ServletResourceLoader (context));
-                               if (deserializer != null)
-                                       servletDomain.SetData (J2EEConsts.DESERIALIZER_CONST, deserializer);
 
                                lock (evidence) {
                                        if (context.getAttribute (J2EEConsts.APP_DOMAIN) == null)
@@ -142,6 +136,7 @@ namespace Mainsoft.Web.Hosting
                        const string assemblies = "/assemblies";
                        const string getping = "getping";
                        const string setping = "setping";
+            const string version = "2.2";
                        string servletPath = req.getServletPath ();
 
                        if (String.CompareOrdinal (assemblies, 0, servletPath, 0, assemblies.Length) == 0) {
@@ -150,7 +145,7 @@ namespace Mainsoft.Web.Hosting
                                        string requestURI = req.getRequestURI ();
                                        bool getp = requestURI.EndsWith (getping, StringComparison.Ordinal);
                                        if (!getp && requestURI.EndsWith (setping, StringComparison.Ordinal)) {
-                                               getServletContext ().setAttribute (getping, "1");
+                        getServletContext().setAttribute(getping, version);
                                                getp = true;
                                        }
 
@@ -274,6 +269,7 @@ namespace Mainsoft.Web.Hosting
 
                                servletDomain.SetData(IAppDomainConfig.APP_PHYS_DIR, J2EEUtils.GetApplicationPhysicalPath(config.getServletContext ()));
                                servletDomain.SetData(IAppDomainConfig.WEB_APP_DIR, rootPath);
+                               servletDomain.SetData(IAppDomainConfig.SERVLET_CONFIG, config);
 
                                //Set DataDirectory substitution string (http://blogs.msdn.com/dataaccess/archive/2005/10/28/486273.aspx)
                                string dataDirectory = config.getServletContext ().getInitParameter ("DataDirectory");