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?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml (original) +++ struts/sandbox/trunk/mailreader-course/struts2/subscribe/subscribe.iml Sat Jan 20 20:32:26 2007 @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server"> + <component name="AppServerSpecificValidatorsManager" /> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://C:/opt/Apache/Tomcat-5.5/webapps/subscribe/WEB-INF/classes" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/subscribe/WEB-INF/classes" /> <exclude-output /> - <exploded url="file://C:/opt/Apache/Tomcat-5.5/webapps/subscribe" /> + <exploded url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/subscribe" /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> @@ -12,256 +13,41 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-core-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/freemarker-2.3.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-web-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/ognl-2.6.7.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-aop-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-collections-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-logging-1.0.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-digester-1.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-context-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-beans-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/oscore-2.2.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://C:/opt/Apache/Tomcat-5.5/common/lib/servlet-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> + <orderEntry type="library" name="Struts2" level="project" /> + <orderEntry type="library" name="Mailreader-dao" level="project" /> + <orderEntry type="library" name="junit" level="application" /> + <orderEntry type="library" name="servlet-api" level="application" /> <orderEntryProperties /> </component> <component name="WebModuleBuildComponent"> - <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.5/webapps/subscribe" /> + <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/subscribe" /> <setting name="EXPLODED_ENABLED" value="true" /> <setting name="JAR_URL" value="file://" /> <setting name="JAR_ENABLED" value="false" /> <setting name="SYNC_EXPLODED_DIR" value="true" /> - <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" /> + <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> + <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> <setting name="RUN_JASPER_VALIDATION" value="false" /> </component> <component name="WebModuleProperties"> - <containerElement type="library" level="module"> + <containerElement type="library" name="junit" level="application"> <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> + <attribute name="URI" value="/WEB-INF/lib" /> </containerElement> - <containerElement type="library" level="module"> + <containerElement type="library" name="Mailreader-dao" level="project"> <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> + <attribute name="URI" value="/WEB-INF/lib" /> </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <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-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-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/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/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-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-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-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/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/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/struts2-core-2.0.0-SNAPSHOT.jar" /> - <url>jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/</url> + <containerElement type="library" name="servlet-api" level="application"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="library" level="module"> + <containerElement type="library" name="Struts2" level="project"> <attribute name="method" value="1" /> - <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-2.0-SNAPSHOT.jar" /> - <url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib" /> </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="" /> @@ -273,8 +59,6 @@ <root url="file://$MODULE_DIR$/src/test" relative="/WEB-INF/src/test" /> </webroots> </component> - <component name="WeblogicWebModuleProperties"> - <option name="IS_RUN_APPC" value="false" /> - </component> + <component name="WeblogicWebModuleProperties" /> </module>
Modified: struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml (original) +++ struts/sandbox/trunk/mailreader-course/struts2/theme/src/java/struts.xml Sat Jan 20 20:32:26 2007 @@ -4,6 +4,9 @@ "http://struts.apache.org/dtds/struts-2.0.dtd";> <struts> + <constant name="struts.devMode" value="true" /> + <constant name="struts.enable.DynamicMethodInvocation" value="false" /> + <include file="struts-default.xml"/> <package name="default" extends="struts-default"> 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?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- 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 Sat Jan 20 20:32:26 2007 @@ -4,38 +4,32 @@ <display-name>Struts 2 Mailreader</display-name> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:applicationContext*.xml</param-value> - </context-param> - + <filter> + <filter-name>struts-cleanup</filter-name> + <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> + </filter> <filter> <filter-name>sitemesh</filter-name> - <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> + <filter-class>org.apache.struts2.sitemesh.FreeMarkerPageFilter</filter-class> </filter> - <filter> - <filter-name>Struts2</filter-name> - <filter-class> - org.apache.struts2.dispatcher.FilterDispatcher - </filter-class> + <filter-name>struts2</filter-name> + <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> </filter> <filter-mapping> + <filter-name>struts-cleanup</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> <filter-name>sitemesh</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <filter-mapping> - <filter-name>Struts2</filter-name> + <filter-name>struts2</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <listener> - <listener-class> - org.springframework.web.context.ContextLoaderListener - </listener-class> - </listener> <!-- Application Listener for Mailreader database --> <listener> Modified: struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml (original) +++ struts/sandbox/trunk/mailreader-course/struts2/theme/theme.iml Sat Jan 20 20:32:26 2007 @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server"> + <component name="AppServerSpecificValidatorsManager" /> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://C:/opt/Apache/Tomcat-5.5/webapps/theme/WEB-INF/classes" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/theme/WEB-INF/classes" /> <exclude-output /> - <exploded url="file://C:/opt/Apache/Tomcat-5.5/webapps/theme" /> + <exploded url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/theme" /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> @@ -12,10 +13,13 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="junit" level="application" /> + <orderEntry type="library" name="servlet-api" level="application" /> + <orderEntry type="library" name="Struts2" level="project" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/struts2-sitemesh-plugin-2.0.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -24,244 +28,54 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-collections-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-digester-1.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/ognl-2.6.7.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-context-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-aop-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-web-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-beans-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-logging-1.0.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/oscore-2.2.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/freemarker-2.3.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-core-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://C:/opt/Apache/Tomcat-5.5/common/lib/servlet-api.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/sitemesh-2.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="Mailreader-dao" level="project" /> <orderEntryProperties /> </component> <component name="WebModuleBuildComponent"> - <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.5/webapps/theme" /> + <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/../../../../../../../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" /> <setting name="SYNC_EXPLODED_DIR" value="true" /> - <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" /> + <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> + <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> <setting name="RUN_JASPER_VALIDATION" value="false" /> </component> <component name="WebModuleProperties"> <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> - </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> - </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <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-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-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/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/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-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-core-1.2.6.jar" /> - <url>jar://$MODULE_DIR$/../lib/spring-core-1.2.6.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/sitemesh-2.2.jar" /> + <url>jar://$MODULE_DIR$/../lib/sitemesh-2.2.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <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> + <attribute name="URI" value="/WEB-INF/lib/struts2-sitemesh-plugin-2.0.3.jar" /> + <url>jar://$MODULE_DIR$/../lib/struts2-sitemesh-plugin-2.0.3.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.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/struts2-api-2.0.0-SNAPSHOT.jar" /> - <url>jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.jar!/</url> + <containerElement type="library" name="junit" level="application"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="library" level="module"> + <containerElement type="library" name="Mailreader-dao" level="project"> <attribute name="method" value="1" /> - <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> + <attribute name="URI" value="/WEB-INF/lib" /> </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <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 type="library" name="servlet-api" level="application"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="library" level="module"> + <containerElement type="library" name="Struts2" level="project"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/xwork-2.0-SNAPSHOT.jar" /> - <url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib" /> </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="" /> @@ -273,8 +87,6 @@ <root url="file://$MODULE_DIR$/src/test" relative="/WEB-INF/src/test" /> </webroots> </component> - <component name="WeblogicWebModuleProperties"> - <option name="IS_RUN_APPC" value="false" /> - </component> + <component name="WeblogicWebModuleProperties" /> </module> Modified: struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/Hello.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/Hello.java?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/Hello.java (original) +++ struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/Hello.java Sat Jan 20 20:32:26 2007 @@ -8,7 +8,7 @@ /** * An example implementation that does nothing and returns "success". * - * @return [EMAIL PROTECTED] #SUCCESS} + * @return [EMAIL PROTECTED] #SUCCESS} default result */ public String execute() throws Exception { return SUCCESS; Modified: struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml (original) +++ struts/sandbox/trunk/mailreader-course/struts2/welcome/src/java/struts.xml Sat Jan 20 20:32:26 2007 @@ -4,6 +4,9 @@ "http://struts.apache.org/dtds/struts-2.0.dtd";> <struts> + <constant name="struts.devMode" value="true" /> + <constant name="struts.enable.DynamicMethodInvocation" value="false" /> + <include file="struts-default.xml"/> <package name="default" extends="struts-default"> Modified: struts/sandbox/trunk/mailreader-course/struts2/welcome/src/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/welcome/src/webapp/WEB-INF/web.xml?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- struts/sandbox/trunk/mailreader-course/struts2/welcome/src/webapp/WEB-INF/web.xml (original) +++ struts/sandbox/trunk/mailreader-course/struts2/welcome/src/webapp/WEB-INF/web.xml Sat Jan 20 20:32:26 2007 @@ -4,11 +4,6 @@ <display-name>Struts 2 Mailreader</display-name> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:applicationContext*.xml</param-value> - </context-param> - <filter> <filter-name>Struts2</filter-name> <filter-class> @@ -20,12 +15,6 @@ <filter-name>Struts2</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - - <listener> - <listener-class> - org.springframework.web.context.ContextLoaderListener - </listener-class> - </listener> <welcome-file-list> <welcome-file>index.html</welcome-file> Modified: struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml?view=diff&rev=498243&r1=498242&r2=498243 ============================================================================== --- struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml (original) +++ struts/sandbox/trunk/mailreader-course/struts2/welcome/welcome.iml Sat Jan 20 20:32:26 2007 @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server"> + <component name="AppServerSpecificValidatorsManager" /> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://C:/opt/Apache/Tomcat-5.5/webapps/welcome/WEB-INF/classes" /> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/welcome/WEB-INF/classes" /> <exclude-output /> - <exploded url="file://C:/opt/Apache/Tomcat-5.5/webapps/welcome" /> + <exploded url="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/welcome" /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> @@ -12,247 +13,36 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-beans-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-aop-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-collections-2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-digester-1.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts-mailreader-dao-1.3.5-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/ognl-2.6.7.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/freemarker-2.3.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-api-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-core-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/commons-logging-1.0.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-core-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/struts2-extras-2.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/oscore-2.2.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-web-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../lib/spring-context-1.2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> + <orderEntry type="library" name="Struts2" level="project" /> + <orderEntry type="library" name="junit" level="application" /> + <orderEntry type="library" name="servlet-api" level="application" /> <orderEntryProperties /> </component> <component name="WebModuleBuildComponent"> - <setting name="EXPLODED_URL" value="file://C:/opt/Apache/Tomcat-5.5/webapps/welcome" /> + <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/../../../../../../../opt/Apache/Tomcat-5.5/webapps/welcome" /> <setting name="EXPLODED_ENABLED" value="true" /> <setting name="JAR_URL" value="file://" /> <setting name="JAR_ENABLED" value="false" /> <setting name="SYNC_EXPLODED_DIR" value="true" /> - <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" /> + <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" /> + <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" /> <setting name="RUN_JASPER_VALIDATION" value="false" /> </component> <component name="WebModuleProperties"> - <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> - </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> - </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <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-2.6.7.jar" /> - <url>jar://$MODULE_DIR$/../lib/ognl-2.6.7.jar!/</url> + <containerElement type="library" name="junit" level="application"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <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/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/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-context-1.2.6.jar" /> - <url>jar://$MODULE_DIR$/../lib/spring-context-1.2.6.jar!/</url> + <containerElement type="library" name="servlet-api" level="application"> + <attribute name="method" value="0" /> + <attribute name="URI" value="<N/A>" /> </containerElement> - <containerElement type="library" level="module"> + <containerElement type="library" name="Struts2" level="project"> <attribute name="method" value="1" /> - <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-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/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/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/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/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-2.0-SNAPSHOT.jar" /> - <url>jar://$MODULE_DIR$/../lib/xwork-2.0-SNAPSHOT.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib" /> </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="" /> @@ -264,8 +54,6 @@ <root url="file://$MODULE_DIR$/src/test" relative="/WEB-INF/src/test" /> </webroots> </component> - <component name="WeblogicWebModuleProperties"> - <option name="IS_RUN_APPC" value="false" /> - </component> + <component name="WeblogicWebModuleProperties" /> </module>
