Author: rjung Date: Sun Jan 13 17:32:42 2008 New Revision: 611693 URL: http://svn.apache.org/viewvc?rev=611693&view=rev Log: Update jkstatus ant task to 1.2.27 parameter names.
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java?rev=611693&r1=611692&r2=611693&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java (original) +++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateLoadbalancerTask.java Sun Jan 13 17:32:42 2008 @@ -216,7 +216,7 @@ /** * Create JkStatus worker update link * <ul> - * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=loadbalancer&lm=1&ll=1&lr=2<=60&ls=true&lf=false&lx=0 + * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=loadbalancer&vlm=1&vll=1&vlr=2&vlt=60&vls=true&vlf=false&vlx=0 * <br/> * * @@ -224,23 +224,23 @@ * <br/> * <ul> * <li><b>w:<b/> name loadbalancer</li> - * <li><b>lm:<b/> method (lb strategy)</li> - * <li><b>ll:<b/> lock</li> - * <li><b>lr:<b/> retries</li> - * <li><b>lt:<b/> recover wait timeout</li> - * <li><b>ls:<b/> sticky session</li> - * <li><b>lf:<b/> force sticky session</li> - * <li><b>lx:<b/> max reply timeouts</li> + * <li><b>vlm:<b/> method (lb strategy)</li> + * <li><b>vll:<b/> lock</li> + * <li><b>vlr:<b/> retries</li> + * <li><b>vlt:<b/> recover wait timeout</li> + * <li><b>vls:<b/> sticky session</li> + * <li><b>vlf:<b/> force sticky session</li> + * <li><b>vlx:<b/> max reply timeouts</li> * </ul> * <ul> - * <li>lm=0 or Requests</li> - * <li>lm=1 or Traffic</li> - * <li>lm=2 or Busyness</li> - * <li>lm=3 or Sessions</li> + * <li>vlm=0 or Requests</li> + * <li>vlm=1 or Traffic</li> + * <li>vlm=2 or Busyness</li> + * <li>vlm=3 or Sessions</li> * </ul> * <ul> - * <li>ll=0 or Optimistic</li> - * <li>ll=1 or Pessimistic</li> + * <li>vll=0 or Optimistic</li> + * <li>vll=1 or Pessimistic</li> * </ul> * * @return create jkstatus update worker link @@ -253,39 +253,39 @@ sb.append("&w="); sb.append(URLEncoder.encode(loadbalancer, getCharset())); if (stickySession != null) { - sb.append("&ls="); + sb.append("&vls="); sb.append(stickySession); } if (forceStickySession != null) { - sb.append("&lf="); + sb.append("&vlf="); sb.append(forceStickySession); } if (retries >= 0) { - sb.append("&lr="); + sb.append("&vlr="); sb.append(retries); } if (recoverWaitTime >= 0) { - sb.append("<="); + sb.append("&vlt="); sb.append(recoverWaitTime); } if (method == null && methodCode >= 0 && methodCode < 4) { - sb.append("&lm="); + sb.append("&vlm="); sb.append(methodCode); } if (method != null) { - sb.append("&lm="); + sb.append("&vlm="); sb.append(method); } if (lock == null && lockCode >= 0 && lockCode < 2) { - sb.append("&ll="); + sb.append("&vll="); sb.append(lockCode); } if (lock != null) { - sb.append("&ll="); + sb.append("&vll="); sb.append(lock); } if (maxReplyTimeouts >= 0) { - sb.append("&lx="); + sb.append("&vlx="); sb.append(maxReplyTimeouts); } Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java?rev=611693&r1=611692&r2=611693&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java (original) +++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java Sun Jan 13 17:32:42 2008 @@ -356,14 +356,14 @@ * Create JkStatus link * <ul> * <li><b>load balance example: - * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=lb&lf=false&ls=true</li> + * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=lb&vlf=false&vls=true</li> * <li><b>worker example: - * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=node1&wn=node01&l=lb&wf=1&wa=2&wx=0 + * </b>http://localhost/jkstatus?cmd=update&mime=txt&w=lb&sw=node1&vwn=node01&vwf=1&vwa=2&vwx=0 * <br/> * <ul> - * <li>wa=0 active</li> - * <li>wa=1 disabled</li> - * <li>wa=2 stopped</li> + * <li>vwa=0 active</li> + * <li>vwa=1 disabled</li> + * <li>vwa=2 stopped</li> * </ul> * </li> * </ul> @@ -372,23 +372,23 @@ * <br/> * <ul> * <li><b>w:<b/> name lb worker</li> - * <li><b>lr:<b/> Number of Retries</li> - * <li><b>lt:<b/> recover wait time</li> - * <li><b>lf:<b/> Force Sticky Session</li> - * <li><b>ls:<b/> Sticky session</li> + * <li><b>vlr:<b/> Number of Retries</li> + * <li><b>vlt:<b/> recover wait time</li> + * <li><b>vlf:<b/> Force Sticky Session</li> + * <li><b>vls:<b/> Sticky session</li> * </ul> * * <br/>Tcp worker parameter: * <br/> * <ul> - * <li><b>w:<b/> name tcp worker node</li> - * <li><b>l:<b/> name loadbalancer</li> - * <li><b>wf:<b/> load factor</li> - * <li><b>wn:<b/> jvm route</li> - * <li><b>wx:<b/> distance</li> - * <li><b>wa:<b/> activation state</li> - * <li><b>wr:<b/> redirect route</li> - * <li><b>wd:<b/> cluster domain</li> + * <li><b>w:<b/> name worker</li> + * <li><b>sw:<b/> name lb sub worker</li> + * <li><b>vwf:<b/> load factor</li> + * <li><b>vwn:<b/> jvm route</li> + * <li><b>vwx:<b/> distance</li> + * <li><b>vwa:<b/> activation state</li> + * <li><b>vwr:<b/> redirect route</li> + * <li><b>vwd:<b/> cluster domain</li> * <li><b>ws:<b/> stopped deprecated 1.2.16</li> * <li><b>wd:<b/> disabled deprecated 1.2.16</li> * </ul> @@ -401,63 +401,64 @@ try { sb.append("?cmd=update&mime=txt"); sb.append("&w="); - sb.append(URLEncoder.encode(worker, getCharset())); if (isLBMode) { - //http://localhost/jkstatus?cmd=update&mime=txt&w=lb&lf=false&ls=true + sb.append(URLEncoder.encode(worker, getCharset())); + //http://localhost/jkstatus?cmd=update&mime=txt&w=lb&vlf=false&vls=true if ((lbRetries != null)) { // > 0 - sb.append("&lr="); + sb.append("&vlr="); sb.append(lbRetries); } if ((lbRecovertime != null)) { // > 59 - sb.append("<="); + sb.append("&vlt="); sb.append(lbRecovertime); } if ((lbStickySession != null)) { - sb.append("&ls="); + sb.append("&vls="); sb.append(lbStickySession); } if ((lbForceSession != null)) { - sb.append("&lf="); + sb.append("&vlf="); sb.append(lbForceSession); } } else { - //http://localhost/status?cmd=update&mime=txt&w=node1&l=lb&wf=1&wd=false&ws=false + //http://localhost/status?cmd=update&mime=txt&sw=node1&w=lb&vwf=1&wd=false&ws=false if (workerLb != null) { // must be configured - sb.append("&l="); sb.append(URLEncoder.encode(workerLb, getCharset())); } + sb.append("&sw="); + sb.append(URLEncoder.encode(worker, getCharset())); if (workerLoadFactor != null) { // >= 1 - sb.append("&wf="); + sb.append("&vwf="); sb.append(workerLoadFactor); } if (workerJvmRoute != null) { - sb.append("&wn="); + sb.append("&vwn="); sb.append(URLEncoder.encode(workerJvmRoute, getCharset())); } if (workerDisabled != null) { - sb.append("&wd="); + sb.append("&vwd="); sb.append(workerDisabled); } if (workerStopped != null) { - sb.append("&ws="); + sb.append("&vws="); sb.append(workerStopped); } if (workerActivation >= 0 && workerActivation < 3) { - sb.append("&wa="); + sb.append("&vwa="); sb.append(workerActivation); } if (workerDistance >= 0) { - sb.append("&wx="); + sb.append("&vwx="); sb.append(workerDistance); } if (workerRedirect != null) { // other worker conrecte lb's - sb.append("&wr="); + sb.append("&vwr="); sb.append(URLEncoder.encode(workerRedirect, getCharset())); } if (workerClusterDomain != null) { - sb.append("&wc="); + sb.append("&vwc="); sb.append(URLEncoder.encode(workerClusterDomain, getCharset())); } @@ -525,4 +526,4 @@ "Only 'lb' and 'worker' supported as workerType attribute"); } } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]