Author: husted
Date: Sun Aug 13 12:54:07 2006
New Revision: 431217
URL: http://svn.apache.org/viewvc?rev=431217&view=rev
Log:
Update "browse" lab for Struts 2.
Added:
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Login-validation.xml
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login-validation.xml
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register-validation.xml
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/Register-validation.xml
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.properties
(contents, props changed)
- copied, changed from r431180,
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml
(contents, props changed)
- copied, changed from r431180,
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/xwork.xml
struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml
- copied, changed from r431122,
struts/sandbox/trunk/mailreader-course/struts2/theme/lab-4-2.iml
Removed:
struts/sandbox/trunk/mailreader-course/struts2/theme/lab-4-2.iml
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/webwork.properties
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/xwork.xml
Modified:
struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp
struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml
struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml
struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java
struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/WEB-INF/web.xml
Modified:
struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/hello/src/webapp/pages/Hello.jsp
Sun Aug 13 12:54:07 2006
@@ -1,5 +1,4 @@
<%@ taglib prefix="s" uri="/tags" %>
-
<html>
<head>
<title>Hello</title>
Modified: struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/localize/localize.iml Sun
Aug 13 12:54:07 2006
@@ -263,12 +263,12 @@
<url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url>
</containerElement>
<deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false"
version="2.3" />
+ <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<deploymentDescriptor name=""
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
<option name="DESCRIPTION" value="" />
</deploymentDescriptor>
- <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<webroots>
<root url="file://$MODULE_DIR$/src/webapp" relative="/" />
<root url="file://$MODULE_DIR$/src/java" relative="/WEB-INF/src/java" />
Added:
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Login-validation.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Login-validation.xml?rev=431217&view=auto
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Login-validation.xml
(added)
+++
struts/sandbox/trunk/mailreader-course/struts2/localize/src/java/Login-validation.xml
Sun Aug 13 12:54:07 2006
@@ -0,0 +1,14 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+
+<validators>
+ <field name="username">
+ <field-validator type="requiredstring">
+ <message key="error.username.required"/>
+ </field-validator>
+ </field>
+ <field name="password">
+ <field-validator type="requiredstring">
+ <message key="error.password.required"/>
+ </field-validator>
+ </field>
+</validators>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/localize/src/test/RegisterTest.java
Sun Aug 13 12:54:07 2006
@@ -11,10 +11,11 @@
super.setUp();
action = new Register();
action.setApplication(new HashMap());
+ action.setSession(new HashMap());
action.setDatabase(database);
}
- public void testExecute() throws Exception {
+ public void testSave() throws Exception {
action.setUsername("user");
action.setPassword("pass");
Added:
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login-validation.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login-validation.xml?rev=431217&view=auto
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login-validation.xml
(added)
+++
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Login-validation.xml
Sun Aug 13 12:54:07 2006
@@ -0,0 +1,14 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+
+<validators>
+ <field name="username">
+ <field-validator type="requiredstring">
+ <message>Username is required</message>
+ </field-validator>
+ </field>
+ <field name="password">
+ <field-validator type="requiredstring">
+ <message>Password is required</message>
+ </field-validator>
+ </field>
+</validators>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/MailReaderSupport.java
Sun Aug 13 12:54:07 2006
@@ -178,7 +178,7 @@
if (user == null) {
addFieldError(PASSWORD_MISMATCH_FIELD,
- getText(ERROR_PASSWORD_MISMATCH));
+ ERROR_PASSWORD_MISMATCH);
}
return user;
Added:
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register-validation.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register-validation.xml?rev=431217&view=auto
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register-validation.xml
(added)
+++
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/Register-validation.xml
Sun Aug 13 12:54:07 2006
@@ -0,0 +1,55 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+
+<validators>
+
+ <field name="username">
+ <field-validator type="requiredstring">
+ <message>Username is required</message>
+ </field-validator>
+ </field>
+
+ <field name="fullName">
+ <field-validator type="requiredstring">
+ <message>Full Name is required</message>
+ </field-validator>
+ </field>
+
+ <field name="fromAddress">
+ <field-validator type="requiredstring">
+ <message>From Address is required</message>
+ </field-validator>
+ <field-validator type="email">
+ <message>Invalid format for From Address</message>
+ </field-validator>
+ </field>
+
+ <field name="replyToAddress">
+ <field-validator type="email">
+ <message>Invalid format for Reply To Address</message>
+ </field-validator>
+ </field>
+
+ <field name="password">
+ <field-validator type="requiredstring">
+ <message>Password is required</message>
+ </field-validator>
+ <field-validator type="stringlength">
+ <param name="trim">true</param>
+ <param name="minLength">4</param>
+ <param name="maxLength">10</param>
+ <message>Password length is not in the range 4 through
10.</message>
+ </field-validator>
+ </field>
+
+ <field name="password2">
+ <field-validator type="requiredstring">
+ <message>Confirmation password is required</message>
+ </field-validator>
+ </field>
+
+ <validator type="expression">
+ <param name="expression">password eq password2</param>
+ <message>Invalid username and/or password, please try again</message>
+ </validator>
+
+</validators>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/logout/src/java/struts.xml
Sun Aug 13 12:54:07 2006
@@ -25,15 +25,15 @@
<result name="input">/pages/Register.jsp</result>
</action>
+ <action name="Register_cancel" class="Register" method="cancel">
+ <result name="cancel" type="redirect-action">Welcome</result>
+ </action>
+
<action name="Register_save" class="Register" method="save">
<result name="input">/pages/Register.jsp</result>
<result type="redirect-action">Menu</result>
</action>
- <action name="Register_cancel" class="Register" method="cancel">
- <result name="cancel" type="redirect-action">Welcome</result>
- </action>
-
<action name="Menu" class="MailReaderSupport">
<result>/pages/Menu.jsp</result>
</action>
@@ -46,13 +46,13 @@
<result name="input">/pages/Login.jsp</result>
</action>
+ <action name="Login_cancel" class="Login" method="cancel">
+ <result name="cancel" type="redirect-action">Welcome</result>
+ </action>
+
<action name="Login_save" class="Login" method="save">
<result name="input">/pages/Login.jsp</result>
<result type="redirect-action">Menu</result>
- </action>
-
- <action name="Login_cancel" class="Login" method="cancel">
- <result name="cancel" type="redirect-action">Welcome</result>
</action>
</package>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/logout/src/test/RegisterTest.java
Sun Aug 13 12:54:07 2006
@@ -11,10 +11,11 @@
super.setUp();
action = new Register();
action.setApplication(new HashMap());
+ action.setSession(new HashMap());
action.setDatabase(database);
}
- public void testExecute() throws Exception {
+ public void testSave() throws Exception {
action.setUsername("user");
action.setPassword("pass");
Modified:
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/mailreader-course-struts2.ipr
Sun Aug 13 12:54:07 2006
@@ -185,13 +185,18 @@
</component>
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file://$PROJECT_DIR$/browse/browse.iml"
filepath="$PROJECT_DIR$/browse/browse.iml" />
<module fileurl="file://$PROJECT_DIR$/hello/hello.iml"
filepath="$PROJECT_DIR$/hello/hello.iml" />
+ <module fileurl="file://$PROJECT_DIR$/localize/localize.iml"
filepath="$PROJECT_DIR$/localize/localize.iml" />
<module fileurl="file://$PROJECT_DIR$/logout/logout.iml"
filepath="$PROJECT_DIR$/logout/logout.iml" />
<module fileurl="file://$PROJECT_DIR$/mailreader-course-struts2.iml"
filepath="$PROJECT_DIR$/mailreader-course-struts2.iml" />
<module fileurl="file://$PROJECT_DIR$/menu/menu.iml"
filepath="$PROJECT_DIR$/menu/menu.iml" />
+ <module fileurl="file://$PROJECT_DIR$/profile/profile.iml"
filepath="$PROJECT_DIR$/profile/profile.iml" />
<module fileurl="file://$PROJECT_DIR$/register/register.iml"
filepath="$PROJECT_DIR$/register/register.iml" />
<module fileurl="file://$PROJECT_DIR$/register2/register2.iml"
filepath="$PROJECT_DIR$/register2/register2.iml" />
<module fileurl="file://$PROJECT_DIR$/retain/retain.iml"
filepath="$PROJECT_DIR$/retain/retain.iml" />
+ <module fileurl="file://$PROJECT_DIR$/subscribe/subscribe.iml"
filepath="$PROJECT_DIR$/subscribe/subscribe.iml" />
+ <module fileurl="file://$PROJECT_DIR$/theme/theme.iml"
filepath="$PROJECT_DIR$/theme/theme.iml" />
<module fileurl="file://$PROJECT_DIR$/welcome/welcome.iml"
filepath="$PROJECT_DIR$/welcome/welcome.iml" />
</modules>
</component>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/menu/src/test/RegisterTest.java
Sun Aug 13 12:54:07 2006
@@ -14,7 +14,7 @@
action.setDatabase(database);
}
- public void testExecute() throws Exception {
+ public void testSave() throws Exception {
action.setUsername("user");
action.setPassword("pass");
Modified: struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/profile/profile.iml Sun Aug
13 12:54:07 2006
@@ -264,12 +264,12 @@
<url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url>
</containerElement>
<deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false"
version="2.3" />
+ <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<deploymentDescriptor name=""
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
<option name="DESCRIPTION" value="" />
</deploymentDescriptor>
- <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<webroots>
<root url="file://$MODULE_DIR$/src/webapp" relative="/" />
<root url="file://$MODULE_DIR$/src/java" relative="/WEB-INF/src/java" />
Modified:
struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/register/src/test/RegisterTest.java
Sun Aug 13 12:54:07 2006
@@ -14,7 +14,7 @@
action.setDatabase(database);
}
- public void testExecute() throws Exception {
+ public void testSave() throws Exception {
action.setUsername("user");
action.setPassword("pass");
Added:
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/Register-validation.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/Register-validation.xml?rev=431217&view=auto
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/Register-validation.xml
(added)
+++
struts/sandbox/trunk/mailreader-course/struts2/register2/src/java/Register-validation.xml
Sun Aug 13 12:54:07 2006
@@ -0,0 +1,55 @@
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd";>
+
+<validators>
+
+ <field name="username">
+ <field-validator type="requiredstring">
+ <message>Username is required</message>
+ </field-validator>
+ </field>
+
+ <field name="fullName">
+ <field-validator type="requiredstring">
+ <message>Full Name is required</message>
+ </field-validator>
+ </field>
+
+ <field name="fromAddress">
+ <field-validator type="requiredstring">
+ <message>From Address is required</message>
+ </field-validator>
+ <field-validator type="email">
+ <message>Invalid format for From Address</message>
+ </field-validator>
+ </field>
+
+ <field name="replyToAddress">
+ <field-validator type="email">
+ <message>Invalid format for Reply To Address</message>
+ </field-validator>
+ </field>
+
+ <field name="password">
+ <field-validator type="requiredstring">
+ <message>Password is required</message>
+ </field-validator>
+ <field-validator type="stringlength">
+ <param name="trim">true</param>
+ <param name="minLength">4</param>
+ <param name="maxLength">10</param>
+ <message>Password length is not in the range 4 through
10.</message>
+ </field-validator>
+ </field>
+
+ <field name="password2">
+ <field-validator type="requiredstring">
+ <message>Confirmation password is required</message>
+ </field-validator>
+ </field>
+
+ <validator type="expression">
+ <param name="expression">password eq password2</param>
+ <message>Invalid username and/or password, please try again</message>
+ </validator>
+
+</validators>
Modified:
struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/register2/src/test/RegisterTest.java
Sun Aug 13 12:54:07 2006
@@ -14,7 +14,7 @@
action.setDatabase(database);
}
- public void testExecute() throws Exception {
+ public void testSave() throws Exception {
action.setUsername("user");
action.setPassword("pass");
Modified: struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml
(original)
+++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml Sun
Aug 13 12:54:07 2006
@@ -263,12 +263,12 @@
<url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url>
</containerElement>
<deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false"
version="2.3" />
+ <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<deploymentDescriptor name=""
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
<option name="DESCRIPTION" value="" />
</deploymentDescriptor>
- <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<webroots>
<root url="file://$MODULE_DIR$/src/webapp" relative="/" />
<root url="file://$MODULE_DIR$/src/java" relative="/WEB-INF/src/java" />
Copied:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.properties
(from r431180,
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/webwork.properties)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.properties?p2=struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.properties&p1=struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/webwork.properties&r1=431180&r2=431217&rev=431217&view=diff
==============================================================================
(empty)
Propchange:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml (from
r431180,
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/xwork.xml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml?p2=struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml&p1=struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/xwork.xml&r1=431180&r2=431217&rev=431217&view=diff
==============================================================================
(empty)
Propchange:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/WEB-INF/web.xml?rev=431217&r1=431216&r2=431217&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/WEB-INF/web.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/struts2/theme/src/webapp/WEB-INF/web.xml
Sun Aug 13 12:54:07 2006
@@ -10,11 +10,21 @@
</context-param>
<filter>
+ <filter-name>sitemesh</filter-name>
+
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+ </filter>
+
+ <filter>
<filter-name>Struts2</filter-name>
<filter-class>
org.apache.struts2.dispatcher.FilterDispatcher
</filter-class>
</filter>
+
+ <filter-mapping>
+ <filter-name>sitemesh</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<filter-mapping>
<filter-name>Struts2</filter-name>
Copied: struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml (from
r431122, struts/sandbox/trunk/mailreader-course/struts2/theme/lab-4-2.iml)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml?p2=struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml&p1=struts/sandbox/trunk/mailreader-course/struts2/theme/lab-4-2.iml&r1=431122&r2=431217&rev=431217&view=diff
==============================================================================
--- struts/sandbox/trunk/mailreader-course/struts2/theme/lab-4-2.iml (original)
+++ struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml Sun Aug 13
12:54:07 2006
@@ -2,9 +2,9 @@
<module version="4" relativePaths="true" type="J2EE_WEB_MODULE"
j2ee-integration="Tomcat Server">
<component name="ModuleRootManager" />
<component name="NewModuleRootManager">
- <output
url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-2/WEB-INF/classes" />
+ <output
url="file://C:/opt/Apache/Tomcat-5.5/webapps/theme/WEB-INF/classes" />
<exclude-output />
- <exploded url="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-2" />
+ <exploded url="file://C:/opt/Apache/Tomcat-5.5/webapps/theme" />
<exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -15,7 +15,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/freemarker.jar!/" />
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,7 +24,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/commons-collections-2.1.jar!/"
/>
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -33,7 +33,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/commons-digester-1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -42,7 +42,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/ognl-2.6.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -51,7 +51,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-context.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-context-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -60,7 +60,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/ognl.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-aop-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -69,7 +69,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-web-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -78,7 +78,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/" />
+ <root
url="jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -87,7 +87,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-web.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-beans-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -96,7 +96,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-beans.jar!/" />
+ <root
url="jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -105,7 +105,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/spring-core.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/commons-logging-1.0.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -114,7 +114,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/oscore.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/oscore-2.2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -123,7 +123,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/"
/>
+ <root
url="jar://$MODULE_DIR$/../lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -132,7 +132,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/freemarker-2.3.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -141,7 +141,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/"
/>
+ <root url="jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -150,17 +150,16 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/spring-core-1.2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="Tomcat"
level="application_server_libraries" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://C:/opt/Apache/Tomcat-5.0/common/lib/servlet-api.jar!/" />
+ <root
url="jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -169,7 +168,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/sitemesh-2.2.jar!/" />
+ <root
url="jar://C:/opt/Apache/Tomcat-5.5/common/lib/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -178,7 +177,7 @@
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
- <setting name="EXPLODED_URL"
value="file://C:/opt/Apache/Tomcat-5.0/webapps/lab-4-2" />
+ <setting name="EXPLODED_URL"
value="file://C:/opt/Apache/Tomcat-5.5/webapps/theme" />
<setting name="EXPLODED_ENABLED" value="true" />
<setting name="JAR_URL" value="file://" />
<setting name="JAR_ENABLED" value="false" />
@@ -189,91 +188,80 @@
<component name="WebModuleProperties">
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
- <url>jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/commons-collections-3.1.jar" />
- <url>jar://$MODULE_DIR$/../../lib/commons-collections-3.1.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/commons-digester-1.6.jar" />
- <url>jar://$MODULE_DIR$/../../lib/commons-digester-1.6.jar!/</url>
+ <url>jar://$MODULE_DIR$/../lib/commons-digester-1.6.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/commons-logging-1.0.4.jar" />
- <url>jar://$MODULE_DIR$/../../lib/commons-logging-1.0.4.jar!/</url>
+ <url>jar://$MODULE_DIR$/../lib/commons-logging-1.0.4.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
- <url>jar://$MODULE_DIR$/../../lib/freemarker.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/freemarker-2.3.4.jar" />
+ <url>jar://$MODULE_DIR$/../lib/freemarker-2.3.4.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
- <url>jar://$MODULE_DIR$/../../lib/ognl.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/ognl-2.6.7.jar" />
+ <url>jar://$MODULE_DIR$/../lib/ognl-2.6.7.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
- <url>jar://$MODULE_DIR$/../../lib/oscore.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/oscore-2.2.4.jar" />
+ <url>jar://$MODULE_DIR$/../lib/oscore-2.2.4.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
- <url>jar://$MODULE_DIR$/../../lib/rife-continuations.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/spring-aop-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-aop-1.2.6.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/sitemesh-2.2.jar" />
- <url>jar://$MODULE_DIR$/../../lib/sitemesh-2.2.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/spring-beans-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-beans-1.2.6.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
- <url>jar://$MODULE_DIR$/../../lib/spring-beans.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/spring-context-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-context-1.2.6.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
- <url>jar://$MODULE_DIR$/../../lib/spring-context.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/spring-core-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-core-1.2.6.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
- <url>jar://$MODULE_DIR$/../../lib/spring-core.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/spring-web-1.2.6.jar" />
+ <url>jar://$MODULE_DIR$/../lib/spring-web-1.2.6.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
- <url>jar://$MODULE_DIR$/../../lib/spring-web.jar!/</url>
+ <attribute name="URI"
value="/WEB-INF/lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar" />
+
<url>jar://$MODULE_DIR$/../lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI"
value="/WEB-INF/lib/struts-mailreader-dao-1.3.0-dev.jar" />
-
<url>jar://$MODULE_DIR$/../../lib/struts-mailreader-dao-1.3.0-dev.jar!/</url>
+ <attribute name="URI"
value="/WEB-INF/lib/struts2-api-2.0.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/struts-taglib-1.3.0.jar" />
- <url>jar://$MODULE_DIR$/../../lib/struts-taglib-1.3.0.jar!/</url>
+ <attribute name="URI"
value="/WEB-INF/lib/struts2-core-2.0.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/webwork-2.2.2.jar" />
- <url>jar://$MODULE_DIR$/../../lib/webwork-2.2.2.jar!/</url>
+ <attribute name="URI"
value="/WEB-INF/lib/struts2-extras-2.0.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/xwork-1.1.2.jar" />
- <url>jar://$MODULE_DIR$/../../lib/xwork-1.1.2.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/xwork-2.0-SNAPSHOT.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url>
</containerElement>
<deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/webapp/WEB-INF/webtest.xml" optional="false"
version="2.3" />
- <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false" version="5.x" />
<deploymentDescriptor name=""
url="file://$MODULE_DIR$/META-INF/context.xml" optional="false">
<option name="DEFAULT_DIR" value="WEB-INF" />
<option name="NAME" value="" />
