Author: mrdon
Date: Mon Nov 20 12:26:44 2006
New Revision: 477318
URL: http://svn.apache.org/viewvc?view=rev&rev=477318
Log:
Fixed submit button values, updated jetty plugin
WW-1483
Modified:
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp
Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?view=diff&rev=477318&r1=477317&r2=477318
==============================================================================
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Mon Nov 20 12:26:44 2006
@@ -52,18 +52,11 @@
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty6-plugin</artifactId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.0.1</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp?view=diff&rev=477318&r1=477317&r2=477318
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Login.jsp Mon Nov 20
12:26:44 2006
@@ -17,11 +17,11 @@
<s:password key="password" showPassword="true"/>
- <s:submit key="button.save"/>
+ <s:submit value="%{getText('button.save')}"/>
- <s:reset key="button.reset"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <s:submit action="Login_cancel" key="button.cancel}"
+ <s:submit action="Login_cancel" value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
</s:form>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp?view=diff&rev=477318&r1=477317&r2=477318
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Registration.jsp Mon
Nov 20 12:26:44 2006
@@ -42,19 +42,19 @@
name="user.replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit key="button.save" action="Registration_save"/>
+ <s:submit value="%{getText('button.save')}"
action="Registration_save"/>
- <s:reset key="button.reset"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <s:submit action="Welcome" key="button.cancel"
+ <s:submit action="Welcome" value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit key="button.save" action="Registration"/>
+ <s:submit value="%{getText('button.save')}" action="Registration"/>
- <s:reset key="button.reset"/>
+ <s:reset value="%{getText('button.reset')}"/>
- <s:submit action="MainMenu" key="button.cancel"
+ <s:submit action="MainMenu" value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
</s:else>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp?view=diff&rev=477318&r1=477317&r2=477318
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/Subscription.jsp Mon
Nov 20 12:26:44 2006
@@ -42,7 +42,7 @@
name="subscription.type"/>
<s:label key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit key="button.confirm"/>
+ <s:submit value="%{getText('button.confirm')}"/>
</s:if>
<s:else>
<s:textfield key="mailUsername"
@@ -53,12 +53,12 @@
name="subscription.type" list="types"/>
<s:checkbox key="autoConnect"
name="subscription.autoConnect"/>
- <s:submit key="button.save"/>
- <s:reset key="button.reset"/>
+ <s:submit value="%{getText('button.save')}"/>
+ <s:reset value="%{getText('button.reset')}"/>
</s:else>
<s:submit action="Registration_input"
- key="button.cancel"
+ value="%{getText('button.cancel')}"
onclick="form.onsubmit=null"/>
</s:form>
