Cleanup of the phonebook-portlet sample.

spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/phonebook-portlet-config.xml

@@ -6,7 +6,8 @@
        http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
        
 	<!-- PortletMode controller Map -->
-	<bean id="portletModeControllerMapping" class="org.springframework.web.portlet.handler.PortletModeHandlerMapping">
+	<bean id="portletModeControllerMapping"
+		class="org.springframework.web.portlet.handler.PortletModeHandlerMapping">
 		<property name="portletModeMap">
 			<map>
 				<entry key="view" value-ref="flowController"/>
@@ -15,11 +16,11 @@
 	</bean>
 
 	<!--
-		- Front controller for VIEW PortletMode. A view that kicks off a new flow
-		- execution may parameterize this controller with a _flowId parameter.
-		- A view participating in an existing flow execution may simply pass it the
-		- appropriate _flowExecutionId and _eventId.
-	-->
+	  - Front controller for VIEW PortletMode. A view that kicks off a new flow
+	  - execution may parameterize this controller with a _flowId parameter.
+	  - A view participating in an existing flow execution may simply pass it the
+	  - appropriate _flowExecutionKey and _eventId.
+	  -->
 	<bean id="flowController" class="org.springframework.webflow.executor.mvc.PortletFlowController">
 		<property name="flowExecutor" ref="flowExecutor"/>
 		<property name="defaultFlowId" value="search-flow"/>

spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/portlet.xml

@@ -6,7 +6,7 @@
 
 	<portlet>
 		<portlet-name>phonebook</portlet-name>
-		<display-name>Phone Book</display-name>
+		<display-name>Phonebook</display-name>
 
 		<portlet-class>
 			org.springframework.web.portlet.DispatcherPortlet
@@ -32,7 +32,7 @@
 		</supports>
 
 		<portlet-info>
-			<title>Phone Book</title>
+			<title>Phonebook</title>
 		</portlet-info>
 
 		<portlet-preferences>
@@ -41,7 +41,6 @@
 				<value>2</value>
 			</preference>
 		</portlet-preferences>
-
 	</portlet>
 
 </portlet-app>

spring-webflow-samples/phonebook-portlet/src/main/webapp/WEB-INF/web.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <web-app>
 
 	<context-param>
@@ -35,21 +34,12 @@
 	
 	<servlet>
 		<servlet-name>phonebook</servlet-name>
-		<display-name>phonebook Wrapper</display-name>
-		<description>Automated generated Portlet Wrapper</description>
-		<servlet-class>
-			org.apache.pluto.core.PortletServlet
-		</servlet-class>
+		<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
 		<init-param>
-			<param-name>portlet-guid</param-name>
-			<param-value>swf-phonebook-portlet.phonebook</param-value>
-		</init-param>
-		<init-param>
-			<param-name>portlet-class</param-name>
-			<param-value>
-				org.springframework.web.portlet.DispatcherPortlet
-			</param-value>
+			<param-name>portlet-name</param-name>
+			<param-value>phonebook</param-value>
 		</init-param>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
 
 	<!-- Portlet MVC Specific -->
@@ -61,14 +51,14 @@
 		</servlet-class>
 	</servlet>
 
-   <servlet-mapping>
-      <servlet-name>phonebook</servlet-name>
-      <url-pattern>/phonebook/*</url-pattern>
-    </servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>phonebook</servlet-name>
+		<url-pattern>/PlutoInvoker/phonebook</url-pattern>
+	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>viewRendererServlet</servlet-name>
 		<url-pattern>/WEB-INF/servlet/view</url-pattern>
 	</servlet-mapping>
 
-</web-app>
+</web-app>