You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/05/13 10:33:15 UTC
cvs commit: jakarta-tomcat-catalina/webapps/admin/valve requestDumperValve.jsp
amyroh 2003/05/13 01:33:15
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
AddValveAction.java EditValveAction.java
RequestDumperValveForm.java
SaveRequestDumperValveAction.java
SaveSingleSignOnValveAction.java
webapps/admin/valve requestDumperValve.jsp
Log:
Disallow more than one SingleSignOn valve per service. Also, add debug attribute for RequestDumperValve.
Revision Changes Path
1.14 +1 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ApplicationResources_en.properties 13 May 2003 00:10:52 -0000 1.13
+++ ApplicationResources_en.properties 13 May 2003 08:33:14 -0000 1.14
@@ -185,6 +185,7 @@
error.suffix.required=<li>Suffix cannot be empty.</li>
error.valveName.bad=Invalid valve name {0}
error.vavlveName.exists=<li>Valve already exists</li>
+error.singleSignOn.exists=<li>SingleSignOn Valve already exists</li>
user.fullName=Full Name
user.groups=Member in Groups
user.newUser=Create New User Properties
1.13 +1 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApplicationResources_es.properties 13 May 2003 00:10:52 -0000 1.12
+++ ApplicationResources_es.properties 13 May 2003 08:33:14 -0000 1.13
@@ -184,6 +184,7 @@
error.suffix.required=<li>El sufijo no puede estar vacio.</li>
error.valveName.bad=Invalido valve nombre {0}
error.vavlveName.exists=<li>Valve ya existe</li>
+error.singleSignOn.exists=<li>SingleSignOn Valve ya existe</li>
user.fullName=Nombre Completo
user.groups=Miembro en los Grupos
user.newUser=Cree Las Nuevas Caracteristicas Del Utilizador
1.6 +6 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
Index: AddValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddValveAction.java 24 Apr 2003 07:56:34 -0000 1.5
+++ AddValveAction.java 13 May 2003 08:33:14 -0000 1.6
@@ -231,6 +231,8 @@
String valveType = "RequestDumperValve";
valveFm.setNodeLabel("Valve (" + valveType + ")");
valveFm.setValveType(valveType);
+ valveFm.setDebugLvl("0");
+ valveFm.setDebugLvlVals(Lists.getDebugLevels());
valveFm.setValveTypeVals(types);
}
1.3 +21 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
Index: EditValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EditValveAction.java 22 Nov 2002 22:24:56 -0000 1.2
+++ EditValveAction.java 13 May 2003 08:33:14 -0000 1.3
@@ -282,6 +282,23 @@
sb.append(")");
valveFm.setNodeLabel(sb.toString());
valveFm.setValveType(valveType);
+ valveFm.setDebugLvlVals(Lists.getDebugLevels());
+ String attribute = null;
+ try {
+
+ // Copy scalar properties
+ attribute = "debug";
+ valveFm.setDebugLvl
+ (((Integer) mBServer.getAttribute(vname, attribute)).toString());
+ } catch (Throwable t) {
+ getServlet().log
+ (resources.getMessage(locale, "users.error.attribute.get",
+ attribute), t);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "users.error.attribute.get",
+ attribute));
+ }
}
private void setUpSingleSignOnValve(ObjectName vname,
1.2 +55 -7 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java
Index: RequestDumperValveForm.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestDumperValveForm.java 18 Jul 2002 16:48:28 -0000 1.1
+++ RequestDumperValveForm.java 13 May 2003 08:33:14 -0000 1.2
@@ -76,11 +76,57 @@
*/
public final class RequestDumperValveForm extends ValveForm {
-
+
// ----------------------------------------------------- Instance Variables
+ /**
+ * The text for the debug level.
+ */
+ private String debugLvl = "0";
+
+ /**
+ * Set of valid values for debug level.
+ */
+ private List debugLvlVals = null;
+
// ------------------------------------------------------------- Properties
-
+
+ /**
+ * Return the debugVals.
+ */
+ public List getDebugLvlVals() {
+
+ return this.debugLvlVals;
+
+ }
+
+ /**
+ * Set the debugVals.
+ */
+ public void setDebugLvlVals(List debugLvlVals) {
+
+ this.debugLvlVals = debugLvlVals;
+
+ }
+
+ /**
+ * Return the Debug Level Text.
+ */
+ public String getDebugLvl() {
+
+ return this.debugLvl;
+
+ }
+
+ /**
+ * Set the Debug Level Text.
+ */
+ public void setDebugLvl(String debugLvl) {
+
+ this.debugLvl = debugLvl;
+
+ }
+
// --------------------------------------------------------- Public Methods
/**
@@ -90,10 +136,12 @@
* @param request The servlet request we are processing
*/
public void reset(ActionMapping mapping, HttpServletRequest request) {
-
+
super.reset(mapping, request);
+ this.debugLvl = "0";
}
+
/**
* Render this object as a String.
1.5 +30 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
Index: SaveRequestDumperValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveRequestDumperValveAction.java 24 Apr 2003 07:56:34 -0000 1.4
+++ SaveRequestDumperValveAction.java 13 May 2003 08:33:14 -0000 1.5
@@ -162,8 +162,33 @@
}
// Perform attribute updates as requested
- // No attributes to be updated.
+ String attribute = null;
+ try {
+ ObjectName voname = new ObjectName(vObjectName);
+
+ attribute = "debug";
+ int debug = 0;
+ try {
+ debug = Integer.parseInt(vform.getDebugLvl());
+ } catch (Throwable t) {
+ debug = 0;
+ }
+ mBServer.setAttribute(voname,
+ new Attribute("debug", new Integer(debug)));
+
+ } catch (Exception e) {
+
+ getServlet().log
+ (resources.getMessage(locale, "users.error.attribute.set",
+ attribute), e);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "users.error.attribute.set",
+ attribute));
+ return (null);
+ }
+
// Forward to the success reporting page
session.removeAttribute(mapping.getAttribute());
return (mapping.findForward("Save Successful"));
1.5 +32 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
Index: SaveSingleSignOnValveAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveSingleSignOnValveAction.java 24 Apr 2003 07:56:34 -0000 1.4
+++ SaveSingleSignOnValveAction.java 13 May 2003 08:33:14 -0000 1.5
@@ -155,8 +155,34 @@
// Perform a "Create Valve" transaction (if requested)
if ("Create".equals(adminAction)) {
-
- vObjectName = ValveUtil.createValve(parent, valveType,
+
+ try {
+ // Ensure that only one single sign on valve exists
+ ObjectName pname = new ObjectName(parent);
+ ObjectName oname =
+ new ObjectName(pname.getDomain() +
+ ":type=Valve,name=SingleSignOn");
+
+ if (mBServer.isRegistered(oname)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("singleSignOnValve",
+ new ActionError("error.singleSignOn.exists"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
+ } catch (Exception e) {
+ getServlet().log
+ (resources.getMessage(locale, "users.error.invoke",
+ adminAction), e);
+ response.sendError
+ (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ resources.getMessage(locale, "users.error.invoke",
+ adminAction));
+ return (null);
+
+ }
+
+ vObjectName = ValveUtil.createValve(parent, valveType,
response, request, mapping,
(ApplicationServlet) getServlet());
1.4 +11 -0 jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp
Index: requestDumperValve.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/valve/requestDumperValve.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- requestDumperValve.jsp 23 Jan 2003 00:07:10 -0000 1.3
+++ requestDumperValve.jsp 13 May 2003 08:33:14 -0000 1.4
@@ -92,6 +92,17 @@
</controls:data>
</controls:row>
+ <controls:row labelStyle="table-label-text" dataStyle="table-normal-text" styleId="debugLvlVals">
+ <controls:label><bean:message key="server.debuglevel"/>:</controls:label>
+ <controls:data>
+ <html:select property="debugLvl" styleId="debugLvlVals">
+ <bean:define id="debugLvlVals" name="requestDumperValveForm" property="debugLvlVals"/>
+ <html:options collection="debugLvlVals" property="value"
+ labelProperty="label"/>
+ </html:select>
+ </controls:data>
+ </controls:row>
+
</controls:table>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org