From: <me...@us...> - 2002-10-03 04:14:42
|
Update of /cvsroot/cayenne/cayenne/src/tutorials/cayenne-web-app/WEB-INF In directory usw-pr-cvs1:/tmp/cvs-serv15171/src/tutorials/cayenne-web-app/WEB-INF Modified Files: struts-config.xml web.xml Log Message: fixed web tutorial Index: struts-config.xml =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/tutorials/cayenne-web-app/WEB-INF/struts-config.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- struts-config.xml 1 Oct 2002 05:12:27 -0000 1.1 +++ struts-config.xml 3 Oct 2002 04:14:39 -0000 1.2 @@ -1,71 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd"> -<!-- - - This is a blank Struts configuration file based on the example application, - - with commented examples of some items. - - - - NOTE: If you have a generator tool to create the corresponding Java classes - - for you, you could include the details in the "form-bean" declarations. - - Otherwise, you would only define the "form-bean" element itself, with the - - corresponding "name" and "type" attributes, as shown here. - ---><struts-config> - - - - - - <!-- ========== Data Source Configuration =============================== --> - -<!-- - - <data-sources> - - <data-source - - autoCommit="false" - - description="Example Data Source Configuration" - - driverClass="org.postgresql.Driver" - - maxCount="4" - - minCount="2" - - password="mypassword" - - url="jdbc:postgresql://localhost/mydatabase" - - user="myusername" - - /> - - </data-sources> - ---> - - - +<struts-config> <!-- ========== Form Bean Definitions =================================== --> <form-beans> - <form-bean name="artistForm" type="formbean.ArtistForm" /> <form-bean name="paintingForm" type="formbean.PaintingForm" /> - <form-bean name="galleryForm" type="formbean.GalleryForm" /> - + <form-bean name="galleryForm" type="formbean.GalleryForm" /> </form-beans> <!-- ========== Global Forward Definitions ============================== --> - <global-forwards> </global-forwards> @@ -117,104 +61,10 @@ <action path="/removePaintingFromGallery" type="action.RemovePaintingFromGalleryAction"> <forward name="success" path="/browseGalleries.do" /> </action> - - - <!-- Example logon action - - <action path="/logon" - - type="org.apache.struts.example.LogonAction" - - name="logonForm" - - scope="request" - - input="/logon.jsp"> - - </action> - - --> - - - - <!-- Example logoff action - - <action path="/logoff" - - type="org.apache.struts.example.LogoffAction"> - - <forward name="success" path="/index.jsp"/> - - </action> - - --> - - - - - - <!-- The standard administrative actions available with Struts --> - - <!-- These would be either omitted or protected by security --> - - <!-- in a real application deployment --> - -<!-- <action path="/admin/addFormBean" type="org.apache.struts.actions.AddFormBeanAction" /> - - <action path="/admin/addForward" type="org.apache.struts.actions.AddForwardAction" /> - - <action path="/admin/addMapping" type="org.apache.struts.actions.AddMappingAction" /> - - <action path="/admin/reload" type="org.apache.struts.actions.ReloadAction" /> - - <action path="/admin/removeFormBean" type="org.apache.struts.actions.RemoveFormBeanAction" /> - - <action path="/admin/removeForward" type="org.apache.struts.actions.RemoveForwardAction" /> - - <action path="/admin/removeMapping" type="org.apache.struts.actions.RemoveMappingAction" /> --> - - - </action-mappings> - - - <!-- ========== Message Resources Definitions =========================== --> - - - <message-resources parameter="ApplicationResources" key="org.apache.struts.action.MESSAGE" /> - - - - <!-- ========== Plug Ins Configuration ================================== --> - - - - <!-- - - Add multiple validator resource files by setting the pathname property. - - Default pluggable validator definitions are contained in validator-rules.xml. - - Add any validation rules for forms in validator.xml. - - --> - - <!-- - - <plug-in className="org.apache.struts.validator.ValidatorPlugIn"> - - <set-property property="pathname" value="/WEB-INF/validator-rules.xml"/> - - <set-property property="pathname" value="/WEB-INF/validator.xml"/> - - </plug-in> - - --> - - </struts-config> Index: web.xml =================================================================== RCS file: /cvsroot/cayenne/cayenne/src/tutorials/cayenne-web-app/WEB-INF/web.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- web.xml 1 Oct 2002 05:12:27 -0000 1.1 +++ web.xml 3 Oct 2002 04:14:39 -0000 1.2 @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd"> @@ -10,7 +8,7 @@ <!-- Configure ServletConfiguration to listen for container events. --> <listener> - <listener-class>test.CustomConfiguration</listener-class> + <listener-class>webtest.CustomConfiguration</listener-class> </listener> @@ -39,74 +37,41 @@ <!-- Standard Action Servlet Mapping --> - <servlet-mapping> <servlet-name>action</servlet-name> <url-pattern>*.do</url-pattern> </servlet-mapping> <!-- The Usual Welcome File List --> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - <!-- Example Application Tag Library Descriptor - - <taglib> - - <taglib-uri>/WEB-INF/app.tld</taglib-uri> - - <taglib-location>/WEB-INF/app.tld</taglib-location> - - </taglib> - - --> - - <!-- Struts Tag Library Descriptors --> <taglib> - <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri> - <taglib-location>/WEB-INF/struts-bean.tld</taglib-location> - </taglib> - - <taglib> - <taglib-uri>/WEB-INF/struts-html.tld</taglib-uri> - <taglib-location>/WEB-INF/struts-html.tld</taglib-location> - </taglib> - <taglib> - <taglib-uri>/WEB-INF/struts-logic.tld</taglib-uri> - <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> - </taglib> <taglib> - <taglib-uri>/WEB-INF/struts-nested.tld</taglib-uri> - <taglib-location>/WEB-INF/struts-nested.tld</taglib-location> - </taglib> - </web-app> |