Fix Ajax submits when deploying as servlet; Add ERXServletApplication…

… class

Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXServletApplication.java

@@ -0,0 +1,44 @@
+package er.extensions.appserver;
+
+import javax.servlet.ServletContext;
+
+import com.webobjects.appserver.WORequest;
+import com.webobjects.appserver.WOResponse;
+
+/**
+ * <p>If you are deploying in a servlet container like Tomcat, this application class
+ * allows you automatically serve static resources from the "static" directory using
+ * the static resource servlet that is built into Tomcat and Jetty.
+ * <p>
+ * When building you need to copy the static resources into the "static" folder by
+ * adding some lines to the end of the "ssdd" target in build.xml:
+ * <ul>
+ * <li>1) Change the WOAppMode to Deployment</li>
+ * <li>2) Copy "WebServerResources/" to "/static/YourApp.woa/Contents/WebServerResources/" directly inside the root of the .war file</li>
+ * <li>3) Copy "*.Framework/WebServerResources/" to "/static/Frameworks/*.Framework/WebServerResources/"</li>
+ * </ul>
+ *
+ * @see <a href="http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/servlets/DefaultServlet.html">Tomcat 7.0 DefaultServlet Docs</a>
+ * 
+ * @author john
+ *
+ */
+public class ERXServletApplication extends ERXApplication {
+
+    private boolean didSetBaseUrl = false;
+
+    @Override
+    public WOResponse dispatchRequest(WORequest request) {
+    	if (!didSetBaseUrl) {
+    		didSetBaseUrl = true;
+    		ServletContext servletContext = (ServletContext) request.userInfo().get("ServletContext");
+    		if (servletContext != null) {
+    			setApplicationBaseURL(servletContext.getContextPath() + "/static/"); // "static" is the built-in static resource servlet for Tomcat and Jetty
+    			setFrameworksBaseURL(servletContext.getContextPath() + "/static/Frameworks/");
+    		}
+    	}
+
+    	return super.dispatchRequest(request);
+    }
+
+}

Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXWOServletContext.java

@@ -2,15 +2,15 @@
 
 import com.webobjects.appserver.WORequest;
 import com.webobjects.foundation.NSMutableDictionary;
-import com.webobjects.jspservlet.WOServletContext;
 
+import er.extensions.appserver.ajax.ERXAjaxServletContext;
 import er.extensions.foundation.ERXMutableUserInfoHolderInterface;
 
 /**
  * Replacement of WOServletContext.
  * This subclass is installed when the frameworks loads.
  */
-public class ERXWOServletContext extends WOServletContext implements ERXMutableUserInfoHolderInterface {
+public class ERXWOServletContext extends ERXAjaxServletContext implements ERXMutableUserInfoHolderInterface {
     public ERXWOServletContext(WORequest worequest) {
         super(worequest);
     }

Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ajax/ERXAjaxContext.java

@@ -34,6 +34,9 @@ public boolean wasFormSubmitted() {
 		return _wasFormSubmitted();
 	}
 
+	/*
+	 * NOTE: ERXAjaxServletContext is a direct copy of this class.  Keep it in sync with this.
+	 */
 	@Override
 	@Deprecated
 	public boolean _wasFormSubmitted() {

Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ajax/ERXAjaxServletContext.java

@@ -0,0 +1,60 @@
+//
+// ERXAjaxContext.java
+// Project armehaut
+//
+// Created by ak on Mon Apr 01 2002
+//
+package er.extensions.appserver.ajax;
+
+import com.webobjects.appserver.WOContext;
+import com.webobjects.appserver.WORequest;
+import com.webobjects.jspservlet.WOServletContext;
+
+/**
+ * <span class="en">
+ * ERXAjaxContext provides the overrides necessary methods for partial form
+ * submits to work. If you want to use the Ajax framework without using other
+ * parts of Project Wonder (i.e. ERXSession or ERXApplication), you should steal
+ * all of the code in ERXAjaxSession, ERXAjaxApplication, and ERXAjaxContext.
+ * </span>
+ * 
+ * <span class="ja">
+ * ERXAjaxContext は部分的なフォーム・サブミットの機能を提供します。
+ * </span>
+ * 
+ * @author mschrag
+ */
+public class ERXAjaxServletContext extends WOServletContext {
+
+	public ERXAjaxServletContext(WORequest request) {
+		super(request);
+	}
+
+	/*
+	 * NOTE: This class was copied directly from ERXAjaxContext.  Keep it in sync with that.
+	 */
+	@Override
+	public boolean wasFormSubmitted() {
+		boolean wasFormSubmitted = super.wasFormSubmitted();
+		if (wasFormSubmitted) {
+			WORequest request = request();
+			String partialSubmitSenderID = ERXAjaxApplication.partialFormSenderID(request);
+			if (partialSubmitSenderID != null) {
+				// TODO When explicitly setting the "name" binding on an input, 
+				// the following will fail in the takeValuesFromRequest phase.
+				String elementID = elementID();
+				if (!partialSubmitSenderID.equals(elementID) 
+						&& !partialSubmitSenderID.startsWith(elementID + ",") 
+						&& !partialSubmitSenderID.endsWith("," + elementID) 
+						&& !partialSubmitSenderID.contains("," + elementID + ",")) {
+					String ajaxSubmitButtonID = ERXAjaxApplication.ajaxSubmitButtonName(request);
+					if (ajaxSubmitButtonID == null || !ajaxSubmitButtonID.equals(elementID)) {
+						wasFormSubmitted = false;
+					}
+				}
+			}
+		}
+		return wasFormSubmitted;
+	}
+
+}

Frameworks/Core/ERJars/.classpath

@@ -20,5 +20,6 @@
 	<classpathentry exported="true" kind="lib" path="Libraries/httpclient-cache-4.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/httpcore-4.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="Libraries/httpmime-4.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="Libraries/servlet-api-3.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>