Revision: 8099
Author: [email protected]
Date: Tue May 11 18:52:23 2010
Log: Removed ExpensesDataServlet, updated the URL mapping in web.xml.
Updated client code to use URL relative to the host page.
Patch by: amitmanjhi
Review by: rjrjr (desk review)
Review at http://gwt-code-reviews.appspot.com/498802
http://code.google.com/p/google-web-toolkit/source/detail?r=8099
Deleted:
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/ExpensesDataServlet.java
Modified:
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/client/impl/RequestFactoryJsonImpl.java
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/shared/RequestFactory.java
/branches/2.1/bikeshed/war/WEB-INF/web.xml
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/ExpensesDataServlet.java
Mon May 10 18:33:18 2010
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
- * use this file except in compliance with the License. You may obtain a
copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package com.google.gwt.sample.expenses.server;
-
-import com.google.gwt.requestfactory.server.RequestFactoryServlet;
-import com.google.gwt.sample.expenses.server.domain.Employee;
-import com.google.gwt.sample.expenses.server.domain.Expense;
-import com.google.gwt.sample.expenses.server.domain.Report;
-
-import java.util.List;
-
-/**
- * Dwindling interim servlet that calls our mock storage backend directly
- * instead of reflectively. Should soon vanish completely.
- */
-...@suppresswarnings("serial")
-public class ExpensesDataServlet extends RequestFactoryServlet {
-
- private static final boolean DISABLED = true;
-
- @Override
- protected void initDb() {
- if (DISABLED) {
- return;
- }
-
- long size = Employee.countEmployees();
- if (size > 1) {
- return;
- }
- List<Object> objectList = new DataGenerator().generateData(100);
- for (Object object : objectList) {
- if (object instanceof Employee) {
- ((Employee) object).persist();
- }
- if (object instanceof Report) {
- ((Report) object).persist();
- }
- if (object instanceof Expense) {
- ((Expense) object).persist();
- }
- }
- }
-}
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/client/impl/RequestFactoryJsonImpl.java
Tue May 11 06:22:47 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/client/impl/RequestFactoryJsonImpl.java
Tue May 11 18:52:23 2010
@@ -15,6 +15,7 @@
*/
package com.google.gwt.requestfactory.client.impl;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
@@ -48,7 +49,7 @@
public void fire(final RequestObject<?> requestObject) {
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST,
- RequestFactory.URL);
+ GWT.getHostPageBaseURL() + RequestFactory.URL);
builder.setRequestData(requestObject.getRequestData());
builder.setCallback(new RequestCallback() {
@@ -91,7 +92,7 @@
assert null != receiver : "to(Receiver) was not called";
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST,
- RequestFactory.URL);
+ GWT.getHostPageBaseURL() + RequestFactory.URL);
builder.setRequestData(ClientRequestHelper.getRequestString(RequestDataManager.getRequestMap(
RequestFactory.SYNC, null, jsonDeltas.toJson())));
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/shared/RequestFactory.java
Thu May 6 16:34:06 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/shared/RequestFactory.java
Tue May 11 18:52:23 2010
@@ -94,7 +94,7 @@
}
// TODO: this must be configurable
- String URL = "/expenses/data";
+ String URL = "gwtRequest";
String SYNC = "SYNC";
=======================================
--- /branches/2.1/bikeshed/war/WEB-INF/web.xml Tue May 11 10:56:00 2010
+++ /branches/2.1/bikeshed/war/WEB-INF/web.xml Tue May 11 18:52:23 2010
@@ -13,8 +13,8 @@
<!-- Servlets -->
<servlet>
- <servlet-name>expensesData</servlet-name>
-
<servlet-class>com.google.gwt.sample.expenses.server.ExpensesDataServlet</servlet-class>
+ <servlet-name>requestFactoryServlet</servlet-name>
+
<servlet-class>com.google.gwt.requestfactory.server.RequestFactoryServlet</servlet-class>
</servlet>
<servlet>
@@ -33,8 +33,8 @@
</servlet>
<servlet-mapping>
- <servlet-name>expensesData</servlet-name>
- <url-pattern>/expenses/data</url-pattern>
+ <servlet-name>requestFactoryServlet</servlet-name>
+ <url-pattern>gwtRequest</url-pattern>
</servlet-mapping>
<servlet-mapping>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
