Author: husted
Date: Sun Aug 20 17:29:52 2006
New Revision: 433103
URL: http://svn.apache.org/viewvc?rev=433103&view=rev
Log:
WW-1353 Move the MailReader iBATIS code to the sandbox, until it is ready.
Removed:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppService.java
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/service/
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/
struts/struts2/trunk/apps/mailreader/src/test/resources/
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Welcome.java
struts/struts2/trunk/apps/mailreader/src/main/resources/applicationContext.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Welcome.jsp
struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java?rev=433103&r1=433102&r2=433103&view=diff
==============================================================================
---
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
(original)
+++
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
Sun Aug 20 17:29:52 2006
@@ -51,32 +51,7 @@
* avoids creating unnecessary local properties. Pick your poison.</p>
*/
public class MailreaderSupport extends ActionSupport
- implements SessionAware, ApplicationAware, ModelDriven {
-
- private AppService appService;
-
- public AppService getAppService() {
- return appService;
- }
-
- public void setAppService(AppService appService) {
- this.appService = appService;
- }
-
- private AppData appData = new AppData();
-
- public Object getModel() {
- return appData;
- }
-
- public void setAppData(AppData appData) {
- this.appData = appData;
- }
-
- public AppData getAppData() {
- return appData;
- }
-
+ implements SessionAware, ApplicationAware {
/**
* Return CANCEL so apropriate result can be selected.
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Welcome.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Welcome.java?rev=433103&r1=433102&r2=433103&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Welcome.java
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Welcome.java
Sun Aug 20 17:29:52 2006
@@ -7,12 +7,7 @@
/**
* Verify that essential resources are available.
*/
-public class Welcome extends MailreaderSupport implements Preparable {
-
- public void prepare() throws Exception {
- List value = getAppService().getLocaleList();
- getAppData().setLocale_list(value);
- }
+public class Welcome extends MailreaderSupport {
public String execute() {
@@ -33,5 +28,4 @@
return SUCCESS;
}
}
-
}
Modified:
struts/struts2/trunk/apps/mailreader/src/main/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/applicationContext.xml?rev=433103&r1=433102&r2=433103&view=diff
==============================================================================
---
struts/struts2/trunk/apps/mailreader/src/main/resources/applicationContext.xml
(original)
+++
struts/struts2/trunk/apps/mailreader/src/main/resources/applicationContext.xml
Sun Aug 20 17:29:52 2006
@@ -2,10 +2,5 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
<beans default-autowire="autodetect">
-
- <bean id="appService" class="mailreader2.service.SqlMapAppService">
- <property name="testMode" value="true"/>
- </bean>
-
<!-- add your spring beans here -->
</beans>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Welcome.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Welcome.jsp?rev=433103&r1=433102&r2=433103&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Welcome.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Welcome.jsp Sun
Aug 20 17:29:52 2006
@@ -24,7 +24,6 @@
</li>
</ul>
-<!--
<h3>Language Options</h3>
<ul>
<li>
@@ -46,17 +45,6 @@
<s:a href="%{ru}">Russian</s:a>
</li>
</ul>
--->
-<h3>Language Options</h3>
-<form>
-<s:select
- name="request_locale"
- list="locale_list"
- listKey="locale_code"
- listValue="locale_name"
- />
-<s:submit />
-</form>
<hr/>
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties?rev=433103&r1=433102&r2=433103&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.properties Sun
Aug 20 17:29:52 2006
@@ -9,4 +9,4 @@
struts.freemarker.manager.classname=customFreemarkerManager
struts.serve.static=true
struts.serve.static.browserCache=false
-struts.compatibilityMode = true
+struts.compatibilityMode.WebWork = true
