You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/02/22 23:59:45 UTC
svn commit: r379958 [3/3] - in /tomcat/container/branches/tc4.1.x: ./
webapps/admin/WEB-INF/ webapps/admin/WEB-INF/classes/org/apache/webapp/admin/
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/
webapps/admin/WEB-INF/classes/org/apach...
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java Wed Feb 22 14:59:15 2006
@@ -66,7 +66,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java Wed Feb 22 14:59:15 2006
@@ -78,7 +78,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java Wed Feb 22 14:59:15 2006
@@ -88,7 +88,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java Wed Feb 22 14:59:15 2006
@@ -79,7 +79,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java Wed Feb 22 14:59:15 2006
@@ -19,7 +19,7 @@
import java.lang.IllegalArgumentException;
import javax.servlet.http.HttpServletRequest;
import org.apache.regexp.RE;
-import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMapping;
@@ -159,7 +159,7 @@
if ((allow == null) || (allow.length() < 1)) {
if ((deny == null) || (deny.length() < 1)) {
errors.add("allow",
- new ActionError("error.allow.deny.required"));
+ new ActionMessage("error.allow.deny.required"));
}
}
}
@@ -167,14 +167,14 @@
try {
allows = ValveUtil.precalculate(allow);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
try {
denies = ValveUtil.precalculate(deny);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
@@ -188,12 +188,12 @@
if (denies[i].match(ip)) {
if (allows.length < 1) {
errors.add("deny",
- new ActionError("error.denyIP"));
+ new ActionMessage("error.denyIP"));
}
for (int j = 0; j < allows.length; j++) {
if (!allows[j].match(ip)) {
errors.add("deny",
- new ActionError("error.denyIP"));
+ new ActionMessage("error.denyIP"));
}
}
}
@@ -209,7 +209,7 @@
}
}
if (!allowMatch) {
- errors.add("allow", new ActionError("error.allowIP"));
+ errors.add("allow", new ActionMessage("error.allowIP"));
}
return errors;
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java Wed Feb 22 14:59:15 2006
@@ -20,7 +20,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.regexp.RE;
-import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMapping;
@@ -160,7 +160,7 @@
if ((allow == null) || (allow.length() < 1)) {
if ((deny == null) || (deny.length() < 1)) {
errors.add("allow",
- new ActionError("error.allow.deny.required"));
+ new ActionMessage("error.allow.deny.required"));
}
}
}
@@ -168,14 +168,14 @@
try {
allows = ValveUtil.precalculate(allow);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
try {
denies = ValveUtil.precalculate(deny);
} catch (IllegalArgumentException e) {
- errors.add("allow", new ActionError("error.syntax"));
+ errors.add("allow", new ActionMessage("error.syntax"));
return errors;
}
@@ -192,23 +192,23 @@
if (denies[i].match(host)) {
if (allows.length < 1) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
for (int j = 0; j < allows.length; j++) {
if (!allows[j].match(host)) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
}
} else if (denies[i].match(ip)) {
if (allows.length < 1) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
for (int j = 0; j < allows.length; j++) {
if (!allows[j].match(ip)) {
errors.add("deny",
- new ActionError("error.denyHost"));
+ new ActionMessage("error.denyHost"));
}
}
}
@@ -227,7 +227,7 @@
}
if (!allowMatch) {
- errors.add("allow", new ActionError("error.allowHost"));
+ errors.add("allow", new ActionMessage("error.allowHost"));
}
return errors;
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java Wed Feb 22 14:59:15 2006
@@ -75,7 +75,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java Wed Feb 22 14:59:15 2006
@@ -75,7 +75,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java Wed Feb 22 14:59:15 2006
@@ -75,7 +75,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java Wed Feb 22 14:59:15 2006
@@ -65,7 +65,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java Wed Feb 22 14:59:15 2006
@@ -75,7 +75,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java Wed Feb 22 14:59:15 2006
@@ -112,7 +112,7 @@
if (mBServer.isRegistered(oname)) {
ActionErrors errors = new ActionErrors();
errors.add("valveName",
- new ActionError("error.valveName.exists"));
+ new ActionMessage("error.valveName.exists"));
String message =
resources.getMessage("error.valveName.exists", sb.toString());
response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/struts-config.xml?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/struts-config.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/struts-config.xml Wed Feb 22 14:59:15 2006
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd">
-
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://struts.apache.org/dtds/struts-config_1_2.dtd">
<struts-config>
-
<!-- ========== Data Source Configuration =============================== -->
@@ -1047,5 +1045,10 @@
</action-mappings>
+
+ <!-- ========== Controller Configuration ================================ -->
+ <controller locale="true" nocache="true"/>
+
+ <message-resources parameter="org.apache.webapp.admin.ApplicationResources"/>
</struts-config>
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/web.xml?rev=379958&r1=379957&r2=379958&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/web.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/WEB-INF/web.xml Wed Feb 22 14:59:15 2006
@@ -43,30 +43,12 @@
org.apache.webapp.admin.ApplicationServlet
</servlet-class>
<init-param>
- <param-name>application</param-name>
- <param-value>
- org.apache.webapp.admin.ApplicationResources
- </param-value>
- </init-param>
- <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>0</param-value>
- </init-param>
- <init-param>
<param-name>detail</param-name>
<param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>locale</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>nocache</param-name>
- <param-value>true</param-value>
</init-param>
<init-param>
<param-name>validate</param-name>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org