Hi Mladen, since this has already been out in the wild for a few month, I'd prefer to add the old one to the deprecation list in jk_util.c and in the docs and to have the get function fall back to the original one, if the new attribute is empty (like for disable/stop -> activation).
Regards, Rainer [EMAIL PROTECTED] schrieb: > Author: mturk > Date: Sun Nov 26 01:50:34 2006 > New Revision: 479321 > > URL: http://svn.apache.org/viewvc?view=rev&rev=479321 > Log: > Add simpler name for jvmRoute. Right now we use > jvm_rute. Allow having just route to be consistent > with domain and redirect params. > > Modified: > tomcat/connectors/trunk/jk/native/common/jk_util.c > > Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c > URL: > http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=479321&r1=479320&r2=479321 > ============================================================================== > --- tomcat/connectors/trunk/jk/native/common/jk_util.c (original) > +++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Nov 26 01:50:34 > 2006 > @@ -66,6 +66,7 @@ > #define STICKY_SESSION ("sticky_session") > #define STICKY_SESSION_FORCE ("sticky_session_force") > #define JVM_ROUTE_OF_WORKER ("jvm_route") > +#define ROUTE_OF_WORKER ("route") > #define DOMAIN_OF_WORKER ("domain") > #define REDIRECT_OF_WORKER ("redirect") > #define MOUNT_OF_WORKER ("mount") > @@ -152,6 +153,7 @@ > STICKY_SESSION, > STICKY_SESSION_FORCE, > JVM_ROUTE_OF_WORKER, > + ROUTE_OF_WORKER, > DOMAIN_OF_WORKER, > REDIRECT_OF_WORKER, > METHOD_OF_WORKER, > @@ -481,12 +483,18 @@ > > const char *jk_get_worker_jvm_route(jk_map_t *m, const char *wname, const > char *def) > { > + const char *rv; > char buf[1024]; > if (!m || !wname) { > return NULL; > } > - MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER); > - return jk_map_get_string(m, buf, def); > + MAKE_WORKER_PARAM(ROUTE_OF_WORKER); > + rv = jk_map_get_string(m, buf, def); > + if (!rv) { > + MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER); > + rv = jk_map_get_string(m, buf, def); > + } > + return rv; > } > > const char *jk_get_worker_domain(jk_map_t *m, const char *wname, const char > *def) > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
