diff --git a/ant-build/osbuild.xml b/ant-build/osbuild.xml index 70dcddb43..ea26d5999 100644 --- a/ant-build/osbuild.xml +++ b/ant-build/osbuild.xml @@ -237,8 +237,8 @@ use="true" verbose="false" source="${compile.version}"> - - + + diff --git a/apps/mailreader/src/main/java/mailreader2/AppData.java b/apps/mailreader/src/main/java/mailreader2/AppData.java index 26ed3e63b..138d97618 100644 --- a/apps/mailreader/src/main/java/mailreader2/AppData.java +++ b/apps/mailreader/src/main/java/mailreader2/AppData.java @@ -1,12 +1,13 @@ package mailreader2; +import java.util.List; + /** *

* Provide properties to transfer data values between * the view and model layers (data transfer object). *

* - * @author Ted Husted * @version $Revision: 1.0 $ $Date: Jul 30, 2006 9:29:50 AM $ */ public class AppData { @@ -16,6 +17,7 @@ public class AppData { private String locale_key; private String locale_code; private String locale_name; + private List locale_list; private String registration_key; private String username; @@ -97,6 +99,14 @@ public class AppData { this.locale_name = locale_name; } + public List getLocale_list() { + return locale_list; + } + + public void setLocale_list(List locale_list) { + this.locale_list = locale_list; + } + public String getRegistration_key() { return registration_key; } diff --git a/apps/mailreader/src/main/java/mailreader2/AppService.java b/apps/mailreader/src/main/java/mailreader2/AppService.java new file mode 100644 index 000000000..3df603885 --- /dev/null +++ b/apps/mailreader/src/main/java/mailreader2/AppService.java @@ -0,0 +1,11 @@ +package mailreader2; + +import java.util.List; + +public interface AppService { + + public List getLocaleList() throws Exception; + + public void insertUser(AppData data) throws Exception; + +} diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java index 4382c83c1..c599a78ee 100644 --- a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java +++ b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java @@ -20,6 +20,7 @@ package mailreader2; import com.opensymphony.util.BeanUtils; import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.ModelDriven; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException; @@ -50,7 +51,32 @@ import java.util.Map; * avoids creating unnecessary local properties. Pick your poison.

*/ public class MailreaderSupport extends ActionSupport - implements SessionAware, ApplicationAware { + 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; + } + /** * Return CANCEL so apropriate result can be selected. diff --git a/apps/mailreader/src/main/java/mailreader2/Welcome.java b/apps/mailreader/src/main/java/mailreader2/Welcome.java index c7348bd21..df3f4238b 100644 --- a/apps/mailreader/src/main/java/mailreader2/Welcome.java +++ b/apps/mailreader/src/main/java/mailreader2/Welcome.java @@ -1,9 +1,18 @@ package mailreader2; +import com.opensymphony.xwork2.Preparable; +import com.opensymphony.xwork2.ModelDriven; +import java.util.List; + /** * Verify that essential resources are available. */ -public class Welcome extends MailreaderSupport { +public class Welcome extends MailreaderSupport implements Preparable { + + public void prepare() throws Exception { + List value = getAppService().getLocaleList(); + getAppData().setLocale_list(value); + } public String execute() { @@ -24,4 +33,5 @@ public class Welcome extends MailreaderSupport { return SUCCESS; } } + } diff --git a/apps/mailreader/src/main/java/mailreader2/registration/Update.java b/apps/mailreader/src/main/java/mailreader2/registration/Update.java index 39f0ea0f2..77c19b271 100644 --- a/apps/mailreader/src/main/java/mailreader2/registration/Update.java +++ b/apps/mailreader/src/main/java/mailreader2/registration/Update.java @@ -7,6 +7,9 @@ import mailreader2.Constants; */ public class Update extends Support { + + + private String fixNull(String value) { if (value == null) return null; String buffer = value.trim(); diff --git a/apps/mailreader/src/main/java/mailreader2/service/SqlMapAppConfig.java b/apps/mailreader/src/main/java/mailreader2/service/SqlMapAppConfig.java new file mode 100644 index 000000000..daf42bfe5 --- /dev/null +++ b/apps/mailreader/src/main/java/mailreader2/service/SqlMapAppConfig.java @@ -0,0 +1,99 @@ +package mailreader2.service; + +import com.ibatis.common.resources.Resources; +import com.ibatis.common.jdbc.ScriptRunner; +import com.ibatis.sqlmap.client.SqlMapClient; +import com.ibatis.sqlmap.client.SqlMapClientBuilder; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.io.Reader; +import java.util.Properties; + +public class SqlMapAppConfig { + + // ---- TEST MODE SETUP ---- + + protected void runScript(String script) throws Exception { + DataSource ds = getSqlMap().getDataSource(); + + Connection conn = ds.getConnection(); + + Reader reader = Resources.getResourceAsReader(script); + + ScriptRunner runner = new ScriptRunner(conn, false, false); + runner.setLogWriter(null); + runner.setErrorLogWriter(null); + + runner.runScript(reader); + conn.commit(); + conn.close(); + reader.close(); + } + + final static String[] CONFIG_SCRIPTS = + {"sql/mailreader-schema.sql","sql/mailreader-sample.sql"}; + + private boolean testMode = true; + + public boolean isTestMode() { + return testMode; + } + + public void setTestMode(boolean testMode) { + this.testMode = testMode; + } + + // ---- SQL MAP SETUP ---- + + final static String CONFIG_FILE = "sql-map-config.xml"; + + protected String configFile; + + public String getConfigFile() { + if (configFile==null) return CONFIG_FILE; + return configFile; + } + + public void setConfigFile(String configFile) { + this.configFile = configFile; + } + + protected Properties configProps; + + public Properties getConfigProps() { + return configProps; + } + + public void setConfigProps(Properties configProps) { + this.configProps = configProps; + } + + private SqlMapClient sqlMap; + + public SqlMapClient getSqlMap() { + return sqlMap; + } + + public void setSqlMap(SqlMapClient sqlMap) { + this.sqlMap = sqlMap; + } + + public SqlMapAppConfig() { + try { + Reader reader = + Resources.getResourceAsReader(getConfigFile()); + setSqlMap(SqlMapClientBuilder.buildSqlMapClient(reader, + getConfigProps())); + reader.close(); + + if (isTestMode()) + for (String script : CONFIG_SCRIPTS) { + runScript(script); + } + + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/apps/mailreader/src/main/java/mailreader2/service/SqlMapAppService.java b/apps/mailreader/src/main/java/mailreader2/service/SqlMapAppService.java new file mode 100644 index 000000000..d7d7f303a --- /dev/null +++ b/apps/mailreader/src/main/java/mailreader2/service/SqlMapAppService.java @@ -0,0 +1,22 @@ +package mailreader2.service; + +import mailreader2.AppService; +import mailreader2.Constants; +import mailreader2.AppData; + +import java.util.List; + +public class SqlMapAppService extends SqlMapAppConfig implements AppService { + + // ---- APPSERVICE IMPLEMENTATION ---- + + public List getLocaleList() throws Exception { + return getSqlMap().queryForList(Constants.LOCALE_LIST, null); + } + + public void insertUser(AppData data) throws Exception { + getSqlMap().insert(Constants.REGISTRATION_INSERT, data); + } + + +} diff --git a/apps/mailreader/src/main/resources/applicationContext.xml b/apps/mailreader/src/main/resources/applicationContext.xml index b98e1d8d7..3db6cf68d 100644 --- a/apps/mailreader/src/main/resources/applicationContext.xml +++ b/apps/mailreader/src/main/resources/applicationContext.xml @@ -2,5 +2,10 @@ + + + + + \ No newline at end of file diff --git a/apps/mailreader/src/main/resources/sql/sql-map.xml b/apps/mailreader/src/main/resources/sql/sql-map.xml index e6ea17ba9..a821d4d96 100644 --- a/apps/mailreader/src/main/resources/sql/sql-map.xml +++ b/apps/mailreader/src/main/resources/sql/sql-map.xml @@ -7,7 +7,7 @@ type="mailreader2.AppData"/> diff --git a/apps/mailreader/src/main/webapp/pages/Welcome.jsp b/apps/mailreader/src/main/webapp/pages/Welcome.jsp index 1916ab99e..32a62c50b 100644 --- a/apps/mailreader/src/main/webapp/pages/Welcome.jsp +++ b/apps/mailreader/src/main/webapp/pages/Welcome.jsp @@ -24,6 +24,7 @@ + +

Language Options

+
+ + +
diff --git a/apps/mailreader/src/test/java/mailreader2/BaseAppDataTest.java b/apps/mailreader/src/test/java/mailreader2/BaseAppDataTest.java new file mode 100644 index 000000000..7abc6b2c7 --- /dev/null +++ b/apps/mailreader/src/test/java/mailreader2/BaseAppDataTest.java @@ -0,0 +1,37 @@ +package mailreader2; + +import junit.framework.TestCase; + +import java.util.List; + +public class BaseAppDataTest extends TestCase { + + protected void assertNotEmpty(String value) { + assertNotNull(value); + assertTrue(value.length()>0); + } + + protected void assertNotEmpty(String message, String value, int min, int max) { + assertNotNull(message,value); + assertTrue(message,value.length()>=min); + assertTrue(message,value.length()<=max); + } + + protected void assertNotEmpty(String message, String value) { + assertNotEmpty(message,value,0,1024); + } + + protected void assertLocale_list(List list) { + assertNotNull(list); + assertTrue("Expected one or more locales",list.size()>0); + AppData entry = null; + try { + entry = (AppData) list.get(0); + } catch (Throwable t) { + fail("Expected a list of AppData objects"); + } + assertNotEmpty("Expected a locale code",entry.getLocale_code(),2,2); + assertNotEmpty("Expected a locale name",entry.getLocale_name()); + assertNotEmpty("Expected a locale kehy",entry.getLocale_key()); + } +} diff --git a/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java b/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java index 69f2c4096..f6c4fbf5c 100644 --- a/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java +++ b/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java @@ -4,7 +4,6 @@ import com.ibatis.common.jdbc.ScriptRunner; import com.ibatis.common.resources.Resources; import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapClientBuilder; -import junit.framework.TestCase; import javax.sql.DataSource; import java.io.Reader; @@ -15,18 +14,18 @@ import java.util.Properties; * @author Ted Husted * @version $Revision: 1.0 $ $Date: Jul 29, 2006 4:59:19 PM $ */ -public class BaseSqlMapTest extends TestCase { +public class BaseSqlMapTest extends BaseAppDataTest { - protected SqlMapClient sqlMap; + private SqlMapClient sqlMap; protected void initSqlMap(String configFile, Properties props) throws Exception { Reader reader = Resources.getResourceAsReader(configFile); - sqlMap = SqlMapClientBuilder.buildSqlMapClient(reader, props); + setSqlMap(SqlMapClientBuilder.buildSqlMapClient(reader, props)); reader.close(); } protected void runScript(String script) throws Exception { - DataSource ds = sqlMap.getDataSource(); + DataSource ds = getSqlMap().getDataSource(); Connection conn = ds.getConnection(); @@ -54,6 +53,14 @@ public class BaseSqlMapTest extends TestCase { } public void testInit() throws Exception { - assertNotNull(sqlMap); + assertNotNull(getSqlMap()); + } + + public SqlMapClient getSqlMap() { + return sqlMap; + } + + public void setSqlMap(SqlMapClient sqlMap) { + this.sqlMap = sqlMap; } } diff --git a/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java b/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java index 125e59637..7271e8b8a 100644 --- a/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java +++ b/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java @@ -3,7 +3,6 @@ package mailreader2; import java.util.List; /** - * @author Ted Husted * @version $Revision: 1.0 $ $Date: Jul 29, 2006 5:34:31 PM $ */ public class SqlMapTest extends BaseSqlMapTest { @@ -52,20 +51,20 @@ public class SqlMapTest extends BaseSqlMapTest { } public void testLOCALE_LIST() throws Exception { - AppData output = (AppData) sqlMap.queryForObject(Constants.LOCALE_LIST, null); - assertNotNull(output); + List list = getSqlMap().queryForList(Constants.LOCALE_LIST, null); + assertLocale_list(list); } public void testREGISTRATION_INSERT_ASSERT_fail() throws Exception { input.setUsername(username); - Object output = sqlMap.queryForObject(Constants.REGISTRATION_INSERT_ASSERT, input); + Object output = getSqlMap().queryForObject(Constants.REGISTRATION_INSERT_ASSERT, input); Long count = (Long) output; assertTrue("Expected user to already exist", count.intValue() > 0); } public void testREGISTRATION_INSERT_ASSERT() throws Exception { input.setUsername(username2); - Object output = sqlMap.queryForObject(Constants.REGISTRATION_INSERT_ASSERT, input); + Object output = getSqlMap().queryForObject(Constants.REGISTRATION_INSERT_ASSERT, input); Long count = (Long) output; assertTrue("Did not expected user to exist", count.intValue() == 0); } @@ -78,22 +77,22 @@ public class SqlMapTest extends BaseSqlMapTest { input.setFullname(fullname2); input.setEmail_from(email_from2); input.setEmail_replyto(email_replyto2); - sqlMap.insert(Constants.REGISTRATION_INSERT, input); + getSqlMap().insert(Constants.REGISTRATION_INSERT, input); // Trust but verify input.setPassword(null); - AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD, input); + AppData output = (AppData) getSqlMap().queryForObject(Constants.REGISTRATION_PASSWORD, input); assertEquals(password2, output.getPassword()); } public void testREGISTRATION_PASSWORD() throws Exception { input.setUsername(username); - AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD, input); + AppData output = (AppData) getSqlMap().queryForObject(Constants.REGISTRATION_PASSWORD, input); assertEquals(password, output.getPassword()); } public void testREGISTRATION_FULLNAME() throws Exception { input.setUsername(username); - AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_FULLNAME, input); + AppData output = (AppData) getSqlMap().queryForObject(Constants.REGISTRATION_FULLNAME, input); assertEquals(fullname, output.getFullname()); assertNull("Expected other fields to be null", output.getPassword()); assertNull("Expected other fields to be null", output.getEmail_from()); @@ -101,7 +100,7 @@ public class SqlMapTest extends BaseSqlMapTest { public void testREGISTRATION_EDIT() throws Exception { input.setRegistration_key(registration_key); - AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_EDIT, input); + AppData output = (AppData) getSqlMap().queryForObject(Constants.REGISTRATION_EDIT, input); assertNotNull("Support not found!", output); assertEquals(fullname, output.getFullname()); assertEquals(email_from, output.getEmail_from()); @@ -115,22 +114,22 @@ public class SqlMapTest extends BaseSqlMapTest { input.setFullname(fullname2); input.setEmail_from(email_from2); input.setEmail_replyto(email_replyto2); - sqlMap.update(Constants.REGISTRATION_UPDATE, input); + getSqlMap().update(Constants.REGISTRATION_UPDATE, input); // Trust but verify input.setPassword(null); - AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD, input); + AppData output = (AppData) getSqlMap().queryForObject(Constants.REGISTRATION_PASSWORD, input); assertEquals(password2, output.getPassword()); } public void testREGISTRATION_UPDATE_fails() throws Exception { input.setRegistration_key(null); - sqlMap.update(Constants.REGISTRATION_UPDATE, input); + getSqlMap().update(Constants.REGISTRATION_UPDATE, input); } public void testSUBSCRIPTION_INSERT_ASSERT_fail() throws Exception { input.setRegistration_key(registration_key); input.setSubscription_host(subscription_host); - Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); + Object output = getSqlMap().queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); Long count = (Long) output; assertTrue("Expected subscription to already exist", count.intValue() > 0); } @@ -138,7 +137,7 @@ public class SqlMapTest extends BaseSqlMapTest { public void SUBSCRIPTION_INSERT_ASSERT() throws Exception { input.setSubscription_key(subscription_key2); input.setSubscription_host(subscription_host2); - Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); + Object output = getSqlMap().queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); Long count = (Long) output; assertTrue("Did not expect subscription to exist", count.intValue() == 0); } @@ -151,9 +150,9 @@ public class SqlMapTest extends BaseSqlMapTest { input.setHost_user(host_user2); input.setHost_pass(host_pass2); input.setHost_auto(host_auto2); - sqlMap.insert(Constants.SUBSCRIPTION_INSERT, input); + getSqlMap().insert(Constants.SUBSCRIPTION_INSERT, input); // Trust but verify - Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); + Object output = getSqlMap().queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); Long count = (Long) output; assertTrue("Expected subscription to NOW exist", count.intValue() > 0); } @@ -168,7 +167,7 @@ public class SqlMapTest extends BaseSqlMapTest { public void testSUBSCRIPTION_LIST() throws Exception { input.setRegistration_key(registration_key); - Object output = sqlMap.queryForList(Constants.SUBSCRIPTION_LIST, input); + Object output = getSqlMap().queryForList(Constants.SUBSCRIPTION_LIST, input); assertNotNull("Query failed!", output); List list = (List) output; assertEquals(SAMPLE_SIZE, list.size()); @@ -178,7 +177,7 @@ public class SqlMapTest extends BaseSqlMapTest { public void testSUBSCRIPTION_EDIT() throws Exception { input.setSubscription_key(subscription_key); - AppData output = (AppData) sqlMap.queryForObject(Constants.SUBSCRIPTION_EDIT, input); + AppData output = (AppData) getSqlMap().queryForObject(Constants.SUBSCRIPTION_EDIT, input); assertNotNull("Support not found!", output); assertSubscription(output); } @@ -191,9 +190,9 @@ public class SqlMapTest extends BaseSqlMapTest { input.setHost_user(host_user2); input.setHost_pass(host_pass2); input.setHost_auto(host_auto2); - sqlMap.update(Constants.SUBSCRIPTION_UPDATE, input); + getSqlMap().update(Constants.SUBSCRIPTION_UPDATE, input); // Trust but verify - Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); + Object output = getSqlMap().queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input); Long count = (Long) output; assertTrue("Expected subscription to exist", count.intValue() > 0); } diff --git a/apps/mailreader/src/test/java/mailreader2/WelcomeTest.java b/apps/mailreader/src/test/java/mailreader2/WelcomeTest.java new file mode 100644 index 000000000..55f78406e --- /dev/null +++ b/apps/mailreader/src/test/java/mailreader2/WelcomeTest.java @@ -0,0 +1,20 @@ +package mailreader2; + +import java.util.List; + +public class WelcomeTest extends BaseAppDataTest { + + private Welcome welcome = new Welcome(); + + public void setUp() { + + } + + public void testLocaleList() throws Exception { + welcome.prepare(); + List list = welcome.getAppData().getLocale_list(); + assertLocale_list(list); + assertTrue("Expected locale list",list.size()>2); + } + +} diff --git a/apps/mailreader/src/test/resources/sql/mailreader-sample.sql b/apps/mailreader/src/test/resources/sql/mailreader-sample.sql index 67af13ca2..c637cf9d7 100644 --- a/apps/mailreader/src/test/resources/sql/mailreader-sample.sql +++ b/apps/mailreader/src/test/resources/sql/mailreader-sample.sql @@ -1,6 +1,14 @@ INSERT INTO locale (pk_locale, locale_code, locale_name) -VALUES ('01-en','en','English'), ('02-ru','ru','Russian'), ('03-ja','ja','Japanese'); +VALUES ('01-en','en','English'); + +INSERT INTO locale + (pk_locale, locale_code, locale_name) +VALUES ('02-ru','ru','Russian'); + +INSERT INTO locale + (pk_locale, locale_code, locale_name) +VALUES ('03-ja','ja','Japanese'); INSERT INTO protocol (pk_protocol, protocol_code, protocol_name) diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl b/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl index 57ea473a1..cb70dc7c4 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl +++ b/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl @@ -1,3 +1,3 @@ Hello from FreeMarker, ${firstName} ${lastName}!

-">Back to front page +">Back to front page diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl b/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl index 6336d1cb0..86ebbfbe7 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl +++ b/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl @@ -1,5 +1,5 @@ -<@saf.form action="processFreeMarkerExample" method="POST"> - <@saf.textfield label="First name" name="firstName"/> - <@saf.textfield label="Last name" name="lastName"/> - <@saf.submit value="Say hello!"/> - +<@s.form action="processFreeMarkerExample" method="POST"> + <@s.textfield label="First name" name="firstName"/> + <@s.textfield label="Last name" name="lastName"/> + <@s.submit value="Say hello!"/> + diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java index e4a2bf07b..3d2906a38 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java @@ -34,7 +34,7 @@ public class FileUploadAction extends ActionSupport { private String fileName; private String caption; - // since we are using the file name will be + // since we are using the file name will be // obtained through getter/setter of FileName public String getUploadFileName() { return fileName; @@ -44,7 +44,7 @@ public class FileUploadAction extends ActionSupport { } - // since we are using the content type will be + // since we are using the content type will be // obtained through getter/setter of ContentType public String getUploadContentType() { return contentType; @@ -54,7 +54,7 @@ public class FileUploadAction extends ActionSupport { } - // since we are using the File itself will be + // since we are using the File itself will be // obtained through getter/setter of public File getUpload() { return upload; diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java index b87009dd9..1484dc567 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java @@ -21,7 +21,7 @@ import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.ModelDriven; /** - * Action to demonstrate simple model-driven feature of WW. + * Action to demonstrate simple model-driven feature of the framework. * */ public class ModelDrivenAction extends ActionSupport implements ModelDriven { diff --git a/apps/showcase/src/main/resources/struts-token.xml b/apps/showcase/src/main/resources/struts-token.xml index e20aa2229..564449d05 100644 --- a/apps/showcase/src/main/resources/struts-token.xml +++ b/apps/showcase/src/main/resources/struts-token.xml @@ -49,7 +49,7 @@ - + example4.ftl diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl index 717939220..c533d15d0 100644 --- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl +++ b/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.ftl @@ -1,18 +1,18 @@ Example 4 - <@saf.head theme="ajax" debug="false" /> - " /> + <@s.head theme="ajax" debug="false" /> + " /> - <@saf.url id="panel1url" action="panel1" namespace="/nodecorate" includeContext="false" /> - <@saf.url id="panel2url" action="panel2" namespace="/nodecorate" includeContext="false"/> - <@saf.url id="panel3url" action="panel3" namespace="/nodecorate" includeContext="false"/> - <@saf.tabbedPanel id="tabbedpanel" > - <@saf.panel id="panel1" tabName="Panel1" remote="true" href="%{#panel1url}" theme="ajax" /> - <@saf.panel id="panel2" tabName="Panel2" remote="true" href="%{#panel2url}" theme="ajax" /> - <@saf.panel id="panel3" tabName="Panel3" remote="true" href="%{#panel3url}" theme="ajax" /> - + <@s.url id="panel1url" action="panel1" namespace="/nodecorate" includeContext="false" /> + <@s.url id="panel2url" action="panel2" namespace="/nodecorate" includeContext="false"/> + <@s.url id="panel3url" action="panel3" namespace="/nodecorate" includeContext="false"/> + <@s.tabbedPanel id="tabbedpanel" > + <@s.panel id="panel1" tabName="Panel1" remote="true" href="%{#panel1url}" theme="ajax" /> + <@s.panel id="panel2" tabName="Panel2" remote="true" href="%{#panel2url}" theme="ajax" /> + <@s.panel id="panel3" tabName="Panel3" remote="true" href="%{#panel3url}" theme="ajax" /> + diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl b/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl index 4efc6e740..b027ee088 100644 --- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl +++ b/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2.ftl @@ -1,7 +1,7 @@

-<@saf.form action="panel2Submit" namespace="/nodecorate" theme="ajax"> - <@saf.textfield label="Name" name="name" theme="ajax" /> - <@saf.submit theme="ajax" resultDivId="result" /> - +<@s.form action="panel2Submit" namespace="/nodecorate" theme="ajax"> + <@s.textfield label="Name" name="name" theme="ajax" /> + <@s.submit theme="ajax" resultDivId="result" /> + diff --git a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl b/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl index bb17b0def..1d0a374b4 100644 --- a/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl +++ b/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3.ftl @@ -2,8 +2,8 @@
-<@saf.form action="panel3Submit" namespace="/nodecorate" theme="ajax"> - <@saf.select label="Gender" name="gender" list=r"%{#{'Male':'Male','Female':'Female'}}" theme="ajax" /> - <@saf.submit theme="ajax" resultDivId="result" /> - +<@s.form action="panel3Submit" namespace="/nodecorate" theme="ajax"> + <@s.select label="Gender" name="gender" list=r"%{#{'Male':'Male','Female':'Female'}}" theme="ajax" /> + <@s.submit theme="ajax" resultDivId="result" /> + diff --git a/apps/showcase/src/main/webapp/chat/chatLogin.ftl b/apps/showcase/src/main/webapp/chat/chatLogin.ftl index 4604d5816..1dfa3ca8c 100644 --- a/apps/showcase/src/main/webapp/chat/chatLogin.ftl +++ b/apps/showcase/src/main/webapp/chat/chatLogin.ftl @@ -2,15 +2,15 @@ Showcase - Chat - Login - <@saf.head theme="ajax" /> + <@s.head theme="ajax" /> - <@saf.actionerror /> - <@saf.actionmessage /> - <@saf.fielderror /> - <@saf.form action="login" namespace="/chat" method="POST"> - <@saf.textfield name="name" label="Name" required="true" /> - <@saf.submit/> - + <@s.actionerror /> + <@s.actionmessage /> + <@s.fielderror /> + <@s.form action="login" namespace="/chat" method="POST"> + <@s.textfield name="name" label="Name" required="true" /> + <@s.submit/> + diff --git a/apps/showcase/src/main/webapp/chat/createRoom.ftl b/apps/showcase/src/main/webapp/chat/createRoom.ftl index b43790288..fbe71cc91 100644 --- a/apps/showcase/src/main/webapp/chat/createRoom.ftl +++ b/apps/showcase/src/main/webapp/chat/createRoom.ftl @@ -1,2 +1,2 @@ -<@saf.actionerror /> -<@saf.fielderror /> +<@s.actionerror /> +<@s.fielderror /> diff --git a/apps/showcase/src/main/webapp/chat/messagesAvailableInRoom.ftl b/apps/showcase/src/main/webapp/chat/messagesAvailableInRoom.ftl index 3908fec76..2550dcd2d 100644 --- a/apps/showcase/src/main/webapp/chat/messagesAvailableInRoom.ftl +++ b/apps/showcase/src/main/webapp/chat/messagesAvailableInRoom.ftl @@ -5,29 +5,29 @@ Date Message -<@saf.iterator id="message" value="%{messagesAvailableInRoom}" status="stat"> +<@s.iterator id="message" value="%{messagesAvailableInRoom}" status="stat"> <#if stat.odd> <#else> - <@saf.property value="%{#message.creator.name}" /> + <@s.property value="%{#message.creator.name}" /> <#if stat.odd> <#else> - <@saf.property value="%{#message.creationDate}" /> + <@s.property value="%{#message.creationDate}" /> <#if stat.odd> <#else> - <@saf.property value="%{#message.message}" /> + <@s.property value="%{#message.message}" /> - + diff --git a/apps/showcase/src/main/webapp/chat/roomSelection.ftl b/apps/showcase/src/main/webapp/chat/roomSelection.ftl index 7379c6ccf..2af660821 100644 --- a/apps/showcase/src/main/webapp/chat/roomSelection.ftl +++ b/apps/showcase/src/main/webapp/chat/roomSelection.ftl @@ -3,7 +3,7 @@ Showcase - Chat - Room Selection - <@saf.head theme="ajax" /> + <@s.head theme="ajax" />