From: Marcus <the...@us...> - 2004-03-23 15:14:02
|
Update of /cvsroot/junk/junk/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11093 Modified Files: struts-config.xml web.xml Log Message: splitted junk-config Index: struts-config.xml =================================================================== RCS file: /cvsroot/junk/junk/WEB-INF/struts-config.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** struts-config.xml 15 Feb 2004 18:11:30 -0000 1.5 --- struts-config.xml 23 Mar 2004 15:03:21 -0000 1.6 *************** *** 1,23 **** <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd"> <struts-config> - <!-- ======= Data Source Configuration --> - - <data-sources> - <data-source> - <!-- this is the datasource for our test server system. change the settings to fit your needs --> - <set-property property="url" value="jdbc:mysql://10.0.80.5/smbsearch?autoReconnect=true" /> <!-- change this to your db connect string --> - <set-property property="user" value="reader" /> <!-- change this to your db user --> - <set-property property="password" value="reader" /> <!--change this to your db password --> - - <set-property property="autoCommit" value="false" /> - <set-property property="description" value="Shodan Mysql Datasource Configuration" /> - <set-property property="driverClass" value="org.gjt.mm.mysql.Driver" /> - <set-property property="maxCount" value="4" /> - <set-property property="minCount" value="2" /> - </data-source> - </data-sources> - - <!-- ======================================== Form Bean Definitions --> <form-beans> --- 1,12 ---- <!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd"> + <!-- + YOU SHOULD NOT NEED TO EDIT THIS FILE! + ONLY CHANGE ANYTHING IN HERE + IF YOU KNOW WHAT YOU ARE DOING! + + To adjust the juNK settings, refer to "junk-config.xml" + --> <struts-config> <!-- ======================================== Form Bean Definitions --> <form-beans> *************** *** 94,112 **** </action> - <!-- sample input and input submit actions - <action - path="/Input" - type="org.apache.struts.actions.ForwardAction" - parameter="/pages/Input.jsp"/> - - <action - path="/InputSubmit" - type="app.InputAction" - name="inputForm" - scope="request" - validate="true" - input="/pages/Input.jsp"/> - - end samples --> </action-mappings> --- 83,86 ---- *************** *** 124,205 **** <!-- ======================================= Plug Ins Configuration --> - <!-- ========== Tiles plugin =================== --> - - <!-- --> - - <!-- - - This plugin initialize Tiles definition factory. This later can takes some - - parameters explained here after. The plugin first read parameters from web.xml, then - - overload them with parameters defined here. All parameters are optional. - - The plugin should be declared in each struts-config file. - - - definitions-config: (optional) - - Specify configuration file names. There can be several comma - - separated file names (default: ?? ) - - - moduleAware: (optional - struts1.1) - - Specify if the Tiles definition factory is module aware. If true (default), - - there will be one factory for each Struts module. - - If false, there will be one common factory for all module. In this later case, - - it is still needed to declare one plugin per module. The factory will be - - initialized with parameters found in the first initialized plugin (generally the - - one associated with the default module). - - true : One factory per module. (default) - - false : one single shared factory for all modules - - - definitions-parser-validate: (optional) - - Specify if xml parser should validate the Tiles configuration file. - - true : validate. DTD should be specified in file header. (default) - - false : no validation - - - - Paths found in Tiles definitions are relative to the main context. - - --> - - <!-- comment following if struts1.0.x --> - <plug-in className="org.apache.struts.tiles.TilesPlugin"> - <set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml" /> - <set-property property="moduleAware" value="true" /> - <set-property property="definitions-parser-validate" value="true" /> - </plug-in> - <!-- end comment if struts1.0.x --> - <plug-in className="org.apache.struts.validator.ValidatorPlugIn"> <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml" /> </plug-in> - <plug-in className="junk.plugin.scanner.ScannerPlugin"> - <set-property property="scan-interval" value="300000" /><!--5 minutes --> - <set-property property="thread-sleep" value="10000" /><!--10 seconds--> - <set-property property="ip-range" value="10.0.80.0/24" /><!-- a.b.c.d/s,e.f.g.h/t --> - <set-property property="tcp-timeout" value="100" /><!-- 100 ms --> - <set-property property="map-save-file" value="data/hostmap" /><!-- relative to context root, directory must exist! --> - </plug-in> - - </struts-config> \ No newline at end of file --- 98,110 ---- Index: web.xml =================================================================== RCS file: /cvsroot/junk/junk/WEB-INF/web.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** web.xml 18 Nov 2003 18:57:14 -0000 1.2 --- web.xml 23 Mar 2004 15:03:21 -0000 1.3 *************** *** 1 **** ! <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"> <web-app> <display-name>juNK Application</display-name> <!-- Standard Action Servlet Configuration (with debugging) --> <servlet> <servlet-name>action</servlet-name> <servlet-class>org.apache.struts.action.ActionServlet</servlet-class> <init-param> <param-name>config</param-name> <param-value>/WEB-INF/struts-config.xml</param-value> </init-param> <init-param> <param-name>debug</param-name> <param-value>2</param-value> </init-param> <init-param> <param-name>detail</param-name> <param-value>2</param-value> </init-param> <load-on-startup>2</load-on-startup> </servlet> <!-- 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> <!-- global error mapping --> <error-page> <exception-type>java.lang.OutOfMemoryError</exception-type> <location>/pages/Error.jsp</location> </error-page> <!-- Struts Tag Library Descriptors --> <taglib> <taglib-uri>/tags/struts-bean</taglib-uri> <taglib-location>/WEB-INF/struts-bean.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-html</taglib-uri> <taglib-location>/WEB-INF/struts-html.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-logic</taglib-uri> <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-nested</taglib-uri> <taglib-location>/WEB-INF/struts-nested.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-tiles</taglib-uri> <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location> </taglib> </web-app> \ No newline at end of file --- 1 ---- ! <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"> <web-app> <display-name>juNK Application</display-name> <!-- Standard Action Servlet Configuration (with debugging) --> <servlet> <servlet-name>action</servlet-name> <servlet-class>org.apache.struts.action.ActionServlet</servlet-class> <init-param> <param-name>config</param-name> <param-value>/WEB-INF/struts-config.xml, /WEB-INF/junk-config.xml</param-value> </init-param> <init-param> <param-name>debug</param-name> <param-value>2</param-value> </init-param> <init-param> <param-name>detail</param-name> <param-value>2</param-value> </init-param> <load-on-startup>2</load-on-startup> </servlet> <!-- 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> <!-- global error mapping --> <error-page> <exception-type>java.lang.OutOfMemoryError</exception-type> <location>/pages/Error.jsp</location> </error-page> <!-- Struts Tag Library Descriptors --> <taglib> <taglib-uri>/tags/struts-bean</taglib-uri> <taglib-location>/WEB-INF/struts-bean.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-html</taglib-uri> <taglib-location>/WEB-INF/struts-html.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-logic</taglib-uri> <taglib-location>/WEB-INF/struts-logic.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-nested</taglib-uri> <taglib-location>/WEB-INF/struts-nested.tld</taglib-location> </taglib> <taglib> <taglib-uri>/tags/struts-tiles</taglib-uri> <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location> </taglib> </web-app> \ No newline at end of file |