added weekly forecasting

src/com/hourlyweather/web/HourlyWeatherByCityForward.java

@@ -20,8 +20,17 @@ protected void doGet(HttpServletRequest request,
 	city = city.replaceAll("%20", " ");
 	request.setAttribute("city", city);
 
+	Location location = CityLocationUtil.getLocation(city);
+
+	if (location == null) 
+	    throw new LocationException(city + " wasn't found.");
+
+	request.setAttribute("lat", location.getLat());
+	request.setAttribute("lon", location.getLon());
+	request.setAttribute("timeOffset", location.getTimeZone());
+
 	RequestDispatcher dispatcher = getServletContext()
-		.getRequestDispatcher("/hourlyWeatherByCity.jsp");
+		.getRequestDispatcher("/");
 	dispatcher.forward(request, response);
     }
 }

src/com/hourlyweather/web/HourlyWeatherByLocationServlet.java

@@ -36,9 +36,9 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
 	    return;
 	}
 
-	// get the forecast
+	// get the forecast for a full week
 	HourlyForecast forecast = new HourlyForecast(lat,
-		lon, new DateTime(), 36, timezoneOffset);
+		lon, new DateTime(), 168, timezoneOffset);
 
 	// get the forecast
 	ForecastFetcher.getHourlyForecast(forecast);

src/com/hourlyweather/web/LocationException.java

@@ -4,4 +4,6 @@
 
 public class LocationException extends ServletException {
     private static final long serialVersionUID = 1L;
+
+    public LocationException(String msg) {super(msg);}
 }

war/WEB-INF/web.xml

@@ -4,23 +4,24 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
 http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
 	version="2.5">
-	<servlet>
-		<servlet-name>HourlyWeatherByCity</servlet-name>
-		<servlet-class>com.hourlyweather.web.HourlyWeatherByCityForward</servlet-class>
-	</servlet>
 	<servlet>
 		<servlet-name>HourlyWeatherByLocation</servlet-name>
 		<servlet-class>com.hourlyweather.web.HourlyWeatherByLocationServlet</servlet-class>
 	</servlet>
+
+	<servlet>
+		<servlet-name>HourlyWeatherByCity</servlet-name>
+		<servlet-class>com.hourlyweather.web.HourlyWeatherByCityForward</servlet-class>
+	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>HourlyWeatherByLocation</servlet-name>
-		<url-pattern>/HourlyWeatherByLocation</url-pattern>
+		<servlet-name>HourlyWeatherByCity</servlet-name>
+		<url-pattern>/forecast/*</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
-		<servlet-name>HourlyWeatherByCity</servlet-name>
-		<url-pattern>/city/*</url-pattern>
+		<servlet-name>HourlyWeatherByLocation</servlet-name>
+		<url-pattern>/HourlyWeatherByLocation</url-pattern>
 	</servlet-mapping>
 
 	<welcome-file-list>