You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/05/26 15:24:28 UTC
svn commit: r778692 - in /incubator/pivot/trunk:
web/src/pivot/web/server/ProxyServlet.java
web/test/pivot/web/test/WebQueryTestClient.java
web/test/pivot/web/test/server/WebQueryTestServlet.java
wtk/src/pivot/wtk/Window.java
Author: gbrown
Date: Tue May 26 13:24:28 2009
New Revision: 778692
URL: http://svn.apache.org/viewvc?rev=778692&view=rev
Log:
Fix minor bug in Window#setTitle(); add header examples to web query test; remove debug output from web query proxy servlet.
Modified:
incubator/pivot/trunk/web/src/pivot/web/server/ProxyServlet.java
incubator/pivot/trunk/web/test/pivot/web/test/WebQueryTestClient.java
incubator/pivot/trunk/web/test/pivot/web/test/server/WebQueryTestServlet.java
incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java
Modified: incubator/pivot/trunk/web/src/pivot/web/server/ProxyServlet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/web/src/pivot/web/server/ProxyServlet.java?rev=778692&r1=778691&r2=778692&view=diff
==============================================================================
--- incubator/pivot/trunk/web/src/pivot/web/server/ProxyServlet.java (original)
+++ incubator/pivot/trunk/web/src/pivot/web/server/ProxyServlet.java Tue May 26 13:24:28 2009
@@ -145,7 +145,6 @@
connection.setUseCaches(false);
// Write request headers to connection
- System.out.println("[Request Headers]");
Enumeration<String> headerNames = (Enumeration<String>)request.getHeaderNames();
if (headerNames != null) {
@@ -157,7 +156,6 @@
while (headerValues.hasMoreElements()) {
String headerValue = headerValues.nextElement();
- System.out.println(headerName + ": " + headerValue);
if (connection.getRequestProperty(headerName) == null) {
connection.setRequestProperty(headerName, headerValue);
@@ -197,8 +195,6 @@
// Set the response status
int status = connection.getResponseCode();
- System.out.println("[Status] " + status);
-
int statusPrefix = status / 100;
if (statusPrefix == 1
@@ -210,15 +206,12 @@
// Write response headers
// NOTE Header indexes start at 1, not 0
- System.out.println("[Response Headers]");
-
int i = 1;
for (String key = connection.getHeaderFieldKey(i);
key != null;
key = connection.getHeaderFieldKey(++i)) {
if (key != null && !ignoreResponseHeaders.contains(key)) {
String value = connection.getHeaderField(i);
- System.out.println(key + ": " + value);
if (response.containsHeader(key)) {
response.addHeader(key, value);
Modified: incubator/pivot/trunk/web/test/pivot/web/test/WebQueryTestClient.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/web/test/pivot/web/test/WebQueryTestClient.java?rev=778692&r1=778691&r2=778692&view=diff
==============================================================================
--- incubator/pivot/trunk/web/test/pivot/web/test/WebQueryTestClient.java (original)
+++ incubator/pivot/trunk/web/test/pivot/web/test/WebQueryTestClient.java Tue May 26 13:24:28 2009
@@ -28,6 +28,7 @@
import pivot.web.DeleteQuery;
import pivot.web.PostQuery;
import pivot.web.PutQuery;
+import pivot.web.Query.QueryDictionary;
public class WebQueryTestClient {
final static boolean useProxy = true;
@@ -44,6 +45,8 @@
final GetQuery getQuery = new GetQuery(HOSTNAME, PORT, PATH, SECURE);
getQuery.getParameters().put("a", "b");
getQuery.setSerializer(new BinarySerializer());
+ getQuery.getRequestHeaders().add("bar", "hello");
+ getQuery.getRequestHeaders().add("bar", "world");
authentication.authenticate(getQuery);
getQuery.execute(new TaskListener<Object>() {
@@ -57,6 +60,17 @@
+ "pathInfo: " + result.get("pathInfo") + ", "
+ "queryString: " + result.get("queryString") + ", "
+ "status: " + getQuery.getStatus());
+
+ QueryDictionary responseHeaders = getQuery.getResponseHeaders();
+ for (String headerName : responseHeaders) {
+ System.out.print(headerName + "=");
+
+ for (int i = 0, n = responseHeaders.getLength(headerName); i < n; i++) {
+ System.out.print(responseHeaders.get(headerName, i) + ";");
+ }
+
+ System.out.print("\n");
+ }
}
public void executeFailed(Task<Object> task) {
Modified: incubator/pivot/trunk/web/test/pivot/web/test/server/WebQueryTestServlet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/web/test/pivot/web/test/server/WebQueryTestServlet.java?rev=778692&r1=778691&r2=778692&view=diff
==============================================================================
--- incubator/pivot/trunk/web/test/pivot/web/test/server/WebQueryTestServlet.java (original)
+++ incubator/pivot/trunk/web/test/pivot/web/test/server/WebQueryTestServlet.java Tue May 26 13:24:28 2009
@@ -17,6 +17,8 @@
package pivot.web.test.server;
import java.io.IOException;
+import java.util.Enumeration;
+
import javax.servlet.ServletInputStream;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -45,6 +47,7 @@
}
@Override
+ @SuppressWarnings("unchecked")
protected void service(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
String authorization = request.getHeader("Authorization");
@@ -64,6 +67,21 @@
// TODO Parse query string
+ // Dump headers
+ System.out.println("[Request Headers]");
+ Enumeration<String> headerNames = (Enumeration<String>)request.getHeaderNames();
+ while(headerNames.hasMoreElements()) {
+ String headerName = headerNames.nextElement();
+ System.out.print(headerName + "=");
+
+ Enumeration<String> headers = request.getHeaders(headerName);
+ while(headers.hasMoreElements()) {
+ String header = headers.nextElement();
+ System.out.print(header + ";");
+ }
+
+ System.out.print("\n");
+ }
super.service(request, response);
}
}
@@ -80,6 +98,8 @@
map.put("queryString", queryString);
response.setStatus(200);
+ response.setHeader("foo", "hello");
+ response.addHeader("foo", "world");
BinarySerializer serializer = new BinarySerializer();
response.setContentType(serializer.getMIMEType(map));
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java?rev=778692&r1=778691&r2=778692&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/Window.java Tue May 26 13:24:28 2009
@@ -548,7 +548,7 @@
public void setTitle(String title) {
String previousTitle = this.title;
- if (previousTitle == null ^ title == null) {
+ if (previousTitle != title) {
this.title = title;
windowListeners.titleChanged(this, previousTitle);
}