You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pe...@apache.org on 2006/09/17 20:58:55 UTC
svn commit: r447114 [1/3] - in /tomcat/connectors/trunk/jk/jkstatus: ./
example/ src/share/org/apache/jk/status/ test/ test/conf/
test/src/share/org/apache/jk/status/
Author: pero
Date: Sun Sep 17 11:58:54 2006
New Revision: 447114
URL: http://svn.apache.org/viewvc?view=rev&rev=447114
Log:
Correct line endings to unix /n
next checking set correct svn prop's
Modified:
tomcat/connectors/trunk/jk/jkstatus/build.xml
tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkServer.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatus.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusUpdateTask.java
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/jkstatus.tasks
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/mbeans-descriptors.xml
tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/package.html
tomcat/connectors/trunk/jk/jkstatus/test/build.xml
tomcat/connectors/trunk/jk/jkstatus/test/conf/log4j.xml
tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
Modified: tomcat/connectors/trunk/jk/jkstatus/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/build.xml?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/build.xml (original)
+++ tomcat/connectors/trunk/jk/jkstatus/build.xml Sun Sep 17 11:58:54 2006
@@ -1,142 +1,142 @@
-<project name="JkStatus" default="dist" basedir=".">
-
-
- <!-- ===================== Initialize Property Values =================== -->
-
- <property file="../../../build/build.properties" />
- <property file="../../../build/build.properties.default" />
-
- <!-- Build Defaults -->
- <property name="jtc.home" location="../.."/>
- <property name="catalina.build" location="../../../build/build"/>
- <property name="jk.build" value="${jtc.home}/jk/jkstatus/build"/>
- <property name="jk.dist" value="${jtc.home}/jk/jkstatus/dist"/>
-
- <!-- Construct Catalina classpath -->
- <path id="jtc.classpath">
- <pathelement location="${catalina.build}/server/lib/catalina.jar"/>
- <pathelement location="${catalina.build}/server/lib/catalina-ant.jar"/>
- <pathelement location="${catalina.build}/server/lib/tomcat-util.jar"/>
- <pathelement location="${commons-modeler.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="${ant.home}/lib/ant.jar"/>
- <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>
- </path>
-
- <!-- Source path -->
- <path id="javadoc.sourcepath">
- <pathelement location="src/share"/>
- </path>
-
-
- <!-- =================== BUILD: Set compile flags ======================= -->
- <target name="flags">
- <!-- JDK flags -->
- <available property="jdk.1.2.present" classname="java.util.HashMap" />
- <available property="jdk.1.3.present"
- classname="java.lang.reflect.Proxy" />
- <available property="jdk.1.4.present" classname="java.nio.Buffer" />
- </target>
-
-
- <!-- =================== BUILD: Set compile flags ======================= -->
- <target name="flags.display" depends="flags" unless="flags.hide">
-
- <echo message="--- Build environment for Catalina ---" />
-
- <echo message="If ${property_name} is displayed, then the property is not set)" />
-
- <echo message="--- Build options ---" />
- <echo message="full.dist=${full.dist}" />
- <echo message="build.sysclasspath=${build.sysclasspath}" />
- <echo message="compile.debug=${compile.debug}" />
- <echo message="compile.deprecation=${compile.deprecation}" />
- <echo message="compile.optimize=${compile.optimize}" />
-
- <echo message="--- Ant Flags ---" />
- <echo message="<style> task available (required)=${style.available}" />
-
- <echo message="--- JDK ---" />
- <echo message="jdk.1.2.present=${jdk.1.2.present}" />
- <echo message="jdk.1.3.present=${jdk.1.3.present}" />
- <echo message="jdk.1.4.present=${jdk.1.4.present}" />
-
- </target>
-
- <!-- =================== BUILD: Create Directories ====================== -->
- <target name="build-prepare">
- <mkdir dir="${catalina.build}"/>
- <mkdir dir="${catalina.build}/classes"/>
- <mkdir dir="${jk.dist}"/>
- <mkdir dir="${jk.build}"/>
- <mkdir dir="${jk.build}/classes"/>
- </target>
-
- <!-- ================ BUILD: Compile Catalina Components ================ -->
-
- <target name="build-jk-status" depends="build-prepare">
- <!-- Compile internal server components -->
- <javac srcdir="${basedir}/src/share" destdir="${jk.build}/classes"
- debug="${compile.debug}" deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- excludes="**/.svn/**"
- >
- <classpath refid="jtc.classpath" />
- </javac>
- <copy file="${basedir}/src/share/org/apache/jk/status/LocalStrings.properties"
- tofile="${jk.build}/classes/org/apache/jk/status/LocalStrings.properties"/>
- <copy file="${basedir}/src/share/org/apache/jk/status/mbeans-descriptors.xml"
- tofile="${jk.build}/classes/org/apache/jk/status/mbeans-descriptors.xml"/>
- <copy file="${basedir}/src/share/org/apache/jk/status/antlib.xml"
- tofile="${jk.build}/classes/org/apache/jk/status/antlib.xml"/>
- <copy file="${basedir}/src/share/org/apache/jk/status/jkstatus.tasks"
- tofile="${jk.build}/classes/org/apache/jk/status/jkstatus.tasks"/>
- </target>
-
-
- <!-- ================ BUILD: Create Catalina Javadocs =================== -->
- <target name="javadoc">
- <delete dir="${jk.build}/javadoc"/>
- <mkdir dir="${jk.build}/javadoc"/>
- <javadoc packagenames="org.apache.jk.status.*"
- classpathref="jtc.classpath"
- sourcepathref="javadoc.sourcepath"
- destdir="${jk.build}/javadoc"
- author="true"
- version="true"
- windowtitle="Jk Status Internal API Documentation"
- doctitle="Jk Status API"
- bottom="Copyright © 2000-2005 Apache Software Foundation. All Rights Reserved."
- />
- </target>
-
- <!-- ======================= BUILD: Clean Directory ===================== -->
- <target name="build-clean">
- <delete dir="${jk.build}"/>
- </target>
-
- <!-- ==================== BUILD: Rebuild Everything ===================== -->
-
-
- <!-- ================ DIST: Create Distribution ========================= -->
- <target name="dist" depends="build-jk-status">
-
- <jar destfile="${jk.dist}/tomcat-jkstatus-ant.jar"
- basedir="${jk.build}/classes">
- <include name="org/apache/jk/status/**" />
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </jar>
- </target>
-
- <target name="copy" depends="dist" >
- <copy file="${jk.dist}/tomcat-jkstatus-ant.jar" todir="${catalina.build}/server/lib" />
- <copy file="conf/jkstatus-tasks.xml" todir="${catalina.build}/bin" />
- </target>
-
- <!-- ======================== DIST: Clean Directory ===================== -->
-
- <!-- ====================== Convenient Synonyms ========================= -->
-
-</project>
+<project name="JkStatus" default="dist" basedir=".">
+
+
+ <!-- ===================== Initialize Property Values =================== -->
+
+ <property file="../../../build/build.properties" />
+ <property file="../../../build/build.properties.default" />
+
+ <!-- Build Defaults -->
+ <property name="jtc.home" location="../.."/>
+ <property name="catalina.build" location="../../../build/build"/>
+ <property name="jk.build" value="${jtc.home}/jk/jkstatus/build"/>
+ <property name="jk.dist" value="${jtc.home}/jk/jkstatus/dist"/>
+
+ <!-- Construct Catalina classpath -->
+ <path id="jtc.classpath">
+ <pathelement location="${catalina.build}/server/lib/catalina.jar"/>
+ <pathelement location="${catalina.build}/server/lib/catalina-ant.jar"/>
+ <pathelement location="${catalina.build}/server/lib/tomcat-util.jar"/>
+ <pathelement location="${commons-modeler.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${jmx.jar}"/>
+ <pathelement location="${ant.home}/lib/ant.jar"/>
+ <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>
+ </path>
+
+ <!-- Source path -->
+ <path id="javadoc.sourcepath">
+ <pathelement location="src/share"/>
+ </path>
+
+
+ <!-- =================== BUILD: Set compile flags ======================= -->
+ <target name="flags">
+ <!-- JDK flags -->
+ <available property="jdk.1.2.present" classname="java.util.HashMap" />
+ <available property="jdk.1.3.present"
+ classname="java.lang.reflect.Proxy" />
+ <available property="jdk.1.4.present" classname="java.nio.Buffer" />
+ </target>
+
+
+ <!-- =================== BUILD: Set compile flags ======================= -->
+ <target name="flags.display" depends="flags" unless="flags.hide">
+
+ <echo message="--- Build environment for Catalina ---" />
+
+ <echo message="If ${property_name} is displayed, then the property is not set)" />
+
+ <echo message="--- Build options ---" />
+ <echo message="full.dist=${full.dist}" />
+ <echo message="build.sysclasspath=${build.sysclasspath}" />
+ <echo message="compile.debug=${compile.debug}" />
+ <echo message="compile.deprecation=${compile.deprecation}" />
+ <echo message="compile.optimize=${compile.optimize}" />
+
+ <echo message="--- Ant Flags ---" />
+ <echo message="<style> task available (required)=${style.available}" />
+
+ <echo message="--- JDK ---" />
+ <echo message="jdk.1.2.present=${jdk.1.2.present}" />
+ <echo message="jdk.1.3.present=${jdk.1.3.present}" />
+ <echo message="jdk.1.4.present=${jdk.1.4.present}" />
+
+ </target>
+
+ <!-- =================== BUILD: Create Directories ====================== -->
+ <target name="build-prepare">
+ <mkdir dir="${catalina.build}"/>
+ <mkdir dir="${catalina.build}/classes"/>
+ <mkdir dir="${jk.dist}"/>
+ <mkdir dir="${jk.build}"/>
+ <mkdir dir="${jk.build}/classes"/>
+ </target>
+
+ <!-- ================ BUILD: Compile Catalina Components ================ -->
+
+ <target name="build-jk-status" depends="build-prepare">
+ <!-- Compile internal server components -->
+ <javac srcdir="${basedir}/src/share" destdir="${jk.build}/classes"
+ debug="${compile.debug}" deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/.svn/**"
+ >
+ <classpath refid="jtc.classpath" />
+ </javac>
+ <copy file="${basedir}/src/share/org/apache/jk/status/LocalStrings.properties"
+ tofile="${jk.build}/classes/org/apache/jk/status/LocalStrings.properties"/>
+ <copy file="${basedir}/src/share/org/apache/jk/status/mbeans-descriptors.xml"
+ tofile="${jk.build}/classes/org/apache/jk/status/mbeans-descriptors.xml"/>
+ <copy file="${basedir}/src/share/org/apache/jk/status/antlib.xml"
+ tofile="${jk.build}/classes/org/apache/jk/status/antlib.xml"/>
+ <copy file="${basedir}/src/share/org/apache/jk/status/jkstatus.tasks"
+ tofile="${jk.build}/classes/org/apache/jk/status/jkstatus.tasks"/>
+ </target>
+
+
+ <!-- ================ BUILD: Create Catalina Javadocs =================== -->
+ <target name="javadoc">
+ <delete dir="${jk.build}/javadoc"/>
+ <mkdir dir="${jk.build}/javadoc"/>
+ <javadoc packagenames="org.apache.jk.status.*"
+ classpathref="jtc.classpath"
+ sourcepathref="javadoc.sourcepath"
+ destdir="${jk.build}/javadoc"
+ author="true"
+ version="true"
+ windowtitle="Jk Status Internal API Documentation"
+ doctitle="Jk Status API"
+ bottom="Copyright © 2000-2005 Apache Software Foundation. All Rights Reserved."
+ />
+ </target>
+
+ <!-- ======================= BUILD: Clean Directory ===================== -->
+ <target name="build-clean">
+ <delete dir="${jk.build}"/>
+ </target>
+
+ <!-- ==================== BUILD: Rebuild Everything ===================== -->
+
+
+ <!-- ================ DIST: Create Distribution ========================= -->
+ <target name="dist" depends="build-jk-status">
+
+ <jar destfile="${jk.dist}/tomcat-jkstatus-ant.jar"
+ basedir="${jk.build}/classes">
+ <include name="org/apache/jk/status/**" />
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </jar>
+ </target>
+
+ <target name="copy" depends="dist" >
+ <copy file="${jk.dist}/tomcat-jkstatus-ant.jar" todir="${catalina.build}/server/lib" />
+ <copy file="conf/jkstatus-tasks.xml" todir="${catalina.build}/bin" />
+ </target>
+
+ <!-- ======================== DIST: Clean Directory ===================== -->
+
+ <!-- ====================== Convenient Synonyms ========================= -->
+
+</project>
Modified: tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml (original)
+++ tomcat/connectors/trunk/jk/jkstatus/example/jkstatus.xml Sun Sep 17 11:58:54 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- @author Peter Rossbach -->
<project name="status"
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancer.java Sun Sep 17 11:58:54 2006
@@ -1,161 +1,161 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jk.status;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Peter Rossbach
- * @version $Revision:$ $Date:$
- * @see org.apache.jk.status.JkStatusParser
- */
-public class JkBalancer implements Serializable {
-
- int id ;
- String name ;
- String type ;
- boolean sticky ;
- boolean stickyforce;
- int retries ;
- int recover ;
-
- List members = new ArrayList() ;
- List mappings = new ArrayList() ;
-
- /**
- * @return Returns the id.
- */
- public int getId() {
- return id;
- }
- /**
- * @param id The id to set.
- */
- public void setId(int id) {
- this.id = id;
- }
- /**
- * @return Returns the mappings.
- */
- public List getBalancerMappings() {
- return mappings;
- }
- /**
- * @param mappings The mappings to set.
- */
- public void setBalancerMappings(List mappings) {
- this.mappings = mappings;
- }
- public void addBalancerMapping(JkBalancerMapping mapping) {
- mappings.add(mapping);
- }
- public void removeBalancerMapping(JkBalancerMapping mapping) {
- mappings.remove(mapping);
- }
- /**
- * @return Returns the members.
- */
- public List getBalancerMembers() {
- return members;
- }
- /**
- * @param members The members to set.
- */
- public void setBalancerMembers(List members) {
- this.members = members;
- }
- public void addBalancerMember(JkBalancerMember member) {
- members.add(member);
- }
- public void removeBalancerMember(JkBalancerMember member) {
- members.remove(member);
- }
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @param name The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
- /**
- * @return Returns the recover.
- */
- public int getRecover() {
- return recover;
- }
- /**
- * @param recover The recover to set.
- */
- public void setRecover(int recover) {
- this.recover = recover;
- }
- /**
- * @return Returns the retries.
- */
- public int getRetries() {
- return retries;
- }
- /**
- * @param retries The retries to set.
- */
- public void setRetries(int retries) {
- this.retries = retries;
- }
- /**
- * @return Returns the sticky.
- */
- public boolean isSticky() {
- return sticky;
- }
- /**
- * @param sticky The sticky to set.
- */
- public void setSticky(boolean sticky) {
- this.sticky = sticky;
- }
- /**
- * @return Returns the stickyforce.
- */
- public boolean isStickyforce() {
- return stickyforce;
- }
- /**
- * @param stickyforce The stickyforce to set.
- */
- public void setStickyforce(boolean stickyforce) {
- this.stickyforce = stickyforce;
- }
- /**
- * @return Returns the type.
- */
- public String getType() {
- return type;
- }
- /**
- * @param type The type to set.
- */
- public void setType(String type) {
- this.type = type;
- }
-
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jk.status;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Peter Rossbach
+ * @version $Revision:$ $Date:$
+ * @see org.apache.jk.status.JkStatusParser
+ */
+public class JkBalancer implements Serializable {
+
+ int id ;
+ String name ;
+ String type ;
+ boolean sticky ;
+ boolean stickyforce;
+ int retries ;
+ int recover ;
+
+ List members = new ArrayList() ;
+ List mappings = new ArrayList() ;
+
+ /**
+ * @return Returns the id.
+ */
+ public int getId() {
+ return id;
+ }
+ /**
+ * @param id The id to set.
+ */
+ public void setId(int id) {
+ this.id = id;
+ }
+ /**
+ * @return Returns the mappings.
+ */
+ public List getBalancerMappings() {
+ return mappings;
+ }
+ /**
+ * @param mappings The mappings to set.
+ */
+ public void setBalancerMappings(List mappings) {
+ this.mappings = mappings;
+ }
+ public void addBalancerMapping(JkBalancerMapping mapping) {
+ mappings.add(mapping);
+ }
+ public void removeBalancerMapping(JkBalancerMapping mapping) {
+ mappings.remove(mapping);
+ }
+ /**
+ * @return Returns the members.
+ */
+ public List getBalancerMembers() {
+ return members;
+ }
+ /**
+ * @param members The members to set.
+ */
+ public void setBalancerMembers(List members) {
+ this.members = members;
+ }
+ public void addBalancerMember(JkBalancerMember member) {
+ members.add(member);
+ }
+ public void removeBalancerMember(JkBalancerMember member) {
+ members.remove(member);
+ }
+ /**
+ * @return Returns the name.
+ */
+ public String getName() {
+ return name;
+ }
+ /**
+ * @param name The name to set.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+ /**
+ * @return Returns the recover.
+ */
+ public int getRecover() {
+ return recover;
+ }
+ /**
+ * @param recover The recover to set.
+ */
+ public void setRecover(int recover) {
+ this.recover = recover;
+ }
+ /**
+ * @return Returns the retries.
+ */
+ public int getRetries() {
+ return retries;
+ }
+ /**
+ * @param retries The retries to set.
+ */
+ public void setRetries(int retries) {
+ this.retries = retries;
+ }
+ /**
+ * @return Returns the sticky.
+ */
+ public boolean isSticky() {
+ return sticky;
+ }
+ /**
+ * @param sticky The sticky to set.
+ */
+ public void setSticky(boolean sticky) {
+ this.sticky = sticky;
+ }
+ /**
+ * @return Returns the stickyforce.
+ */
+ public boolean isStickyforce() {
+ return stickyforce;
+ }
+ /**
+ * @param stickyforce The stickyforce to set.
+ */
+ public void setStickyforce(boolean stickyforce) {
+ this.stickyforce = stickyforce;
+ }
+ /**
+ * @return Returns the type.
+ */
+ public String getType() {
+ return type;
+ }
+ /**
+ * @param type The type to set.
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+}
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMapping.java Sun Sep 17 11:58:54 2006
@@ -1,66 +1,66 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jk.status;
-
-import java.io.Serializable;
-
-/**
- * @author Peter Rossbach
- * @version $Revision:$ $Date:$
- * @see org.apache.jk.status.JkStatusParser
- */
-public class JkBalancerMapping implements Serializable {
- String type ;
- String uri;
- String context ;
-
- /**
- * @return Returns the context.
- */
- public String getContext() {
- return context;
- }
- /**
- * @param context The context to set.
- */
- public void setContext(String context) {
- this.context = context;
- }
- /**
- * @return Returns the type.
- */
- public String getType() {
- return type;
- }
- /**
- * @param type The type to set.
- */
- public void setType(String type) {
- this.type = type;
- }
- /**
- * @return Returns the uri.
- */
- public String getUri() {
- return uri;
- }
- /**
- * @param uri The uri to set.
- */
- public void setUri(String uri) {
- this.uri = uri;
- }
- }
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jk.status;
+
+import java.io.Serializable;
+
+/**
+ * @author Peter Rossbach
+ * @version $Revision:$ $Date:$
+ * @see org.apache.jk.status.JkStatusParser
+ */
+public class JkBalancerMapping implements Serializable {
+ String type ;
+ String uri;
+ String context ;
+
+ /**
+ * @return Returns the context.
+ */
+ public String getContext() {
+ return context;
+ }
+ /**
+ * @param context The context to set.
+ */
+ public void setContext(String context) {
+ this.context = context;
+ }
+ /**
+ * @return Returns the type.
+ */
+ public String getType() {
+ return type;
+ }
+ /**
+ * @param type The type to set.
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+ /**
+ * @return Returns the uri.
+ */
+ public String getUri() {
+ return uri;
+ }
+ /**
+ * @param uri The uri to set.
+ */
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+ }
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkBalancerMember.java Sun Sep 17 11:58:54 2006
@@ -1,438 +1,438 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jk.status;
-
-import java.io.Serializable;
-
-/**
- * @author Peter Rossbach
- * @version $Revision:$ $Date:$
- * @see org.apache.jk.status.JkStatusParser
- */
-/**
- * @author peter
- *
- */
-public class JkBalancerMember implements Serializable {
-
- int id;
-
- String name;
-
- /* possible with > 1.2.16 */
- String jvm_route;
-
- String type;
-
- String host;
-
- int port;
-
- String address;
-
- /* deprecated with mod_jk 1.2.16*/
- String status;
-
- /* possible with > 1.2.16 */
- String activation;
-
- /* possible with > 1.2.16 */
- String state;
-
- int lbfactor;
-
- long lbvalue;
-
- /* possible with > 1.2.16 */
- long lbmult = -1 ;
-
- int elected;
-
- long readed;
-
- long transferred;
-
- long errors;
-
- long clienterrors = -1;
-
- int busy;
-
- /* possible with > 1.2.16 */
- int maxbusy = -1;
-
- String redirect;
-
- String domain;
-
- /* possible with > 1.2.16 */
- int distance = -1;
-
- /**
- * @return Returns the jvm_route.
- * @since mod_jk 1.2.19
- */
- public String getJvm_route() {
- return jvm_route;
- }
-
- /**
- * @param jvm_route The jvm_route to set.
- * @since mod_jk 1.2.19
- */
- public void setJvm_route(String jvm_route) {
- this.jvm_route = jvm_route;
- }
-
- /**
- * @return Returns the address.
- */
- public String getAddress() {
- return address;
- }
-
- /**
- * @param address
- * The address to set.
- */
- public void setAddress(String address) {
- this.address = address;
- }
-
- /**
- * @return Returns the busy.
- */
- public int getBusy() {
- return busy;
- }
-
- /**
- * @param busy
- * The busy to set.
- */
- public void setBusy(int busy) {
- this.busy = busy;
- }
-
-
- /**
- * @return Returns the maxbusy.
- * @since mod_jk 1.2.18
- */
- public int getMaxbusy() {
- return maxbusy;
- }
-
- /**
- * @param maxbusy The maxbusy to set.
- * @since mod_jk 1.2.18
- */
- public void setMaxbusy(int maxbusy) {
- this.maxbusy = maxbusy;
- }
-
- /**
- * @return Returns the elected.
- */
- public int getElected() {
- return elected;
- }
-
- /**
- * @param elected
- * The elected to set.
- */
- public void setElected(int elected) {
- this.elected = elected;
- }
-
- /**
- * @return Returns the clienterrors.
- * @since mod_jk 1.2.19
- */
- public long getClienterrors() {
- return clienterrors;
- }
-
- /**
- * @param clienterrors The clienterrors to set.
- * @since mod_jk 1.2.19
- */
- public void setClienterrors(long clienterrors) {
- this.clienterrors = clienterrors;
- }
-
- /**
- * @return Returns the errors.
- */
- public long getErrors() {
- return errors;
- }
-
- /**
- * @param errors
- * The errors to set.
- */
- public void setErrors(long errors) {
- this.errors = errors;
- }
-
- /**
- * @return Returns the host.
- */
- public String getHost() {
- return host;
- }
-
- /**
- * @param host
- * The host to set.
- */
- public void setHost(String host) {
- this.host = host;
- }
-
- /**
- * @return Returns the id.
- */
- public int getId() {
- return id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return Returns the lbfactor.
- */
- public int getLbfactor() {
- return lbfactor;
- }
-
- /**
- * @param lbfactor
- * The lbfactor to set.
- */
- public void setLbfactor(int lbfactor) {
- this.lbfactor = lbfactor;
- }
-
- /**
- * @return Returns the lbvalue.
- */
- public long getLbvalue() {
- return lbvalue;
- }
-
- /**
- * @param lbvalue
- * The lbvalue to set.
- */
- public void setLbvalue(long lbvalue) {
- this.lbvalue = lbvalue;
- }
-
- /**
- * @return Returns the lbmult.
- * @since mod_jk 1.2.19
- */
- public long getLbmult() {
- return lbmult;
- }
-
- /**
- * @param lbmult The lbmult to set.
- * @since mod_jk 1.2.19
- */
- public void setLbmult(long lbmult) {
- this.lbmult = lbmult;
- }
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name
- * The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
-
-
- /**
- * @return Returns the port.
- */
- public int getPort() {
- return port;
- }
-
- /**
- * @param port
- * The port to set.
- */
- public void setPort(int port) {
- this.port = port;
- }
-
- /**
- * @return Returns the readed.
- */
- public long getReaded() {
- return readed;
- }
-
- /**
- * @param readed
- * The readed to set.
- */
- public void setReaded(long readed) {
- this.readed = readed;
- }
-
- /**
- * @return Returns the status.
- * @deprecated since 1.2.16
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @param status
- * The status to set.
- * @deprecated since 1.2.16
- */
- public void setStatus(String status) {
- this.status = status;
- }
-
- /**
- * @return Returns the activation.
- * @since mod_jk 1.2.19
- */
- public String getActivation() {
- return activation;
- }
-
- /**
- * @param activation The activation to set.
- * @since mod_jk 1.2.19
- */
- public void setActivation(String activation) {
- this.activation = activation;
- }
-
- /**
- * @return Returns the state.
- * @since mod_jk 1.2.19
- */
- public String getState() {
- return state;
- }
-
- /**
- * @param state The state to set.
- * @since mod_jk 1.2.19
- */
- public void setState(String state) {
- this.state = state;
- }
-
- /**
- * @return Returns the transferred.
- */
- public long getTransferred() {
- return transferred;
- }
-
- /**
- * @param transferred
- * The transferred to set.
- */
- public void setTransferred(long transferred) {
- this.transferred = transferred;
- }
-
- /**
- * @return Returns the type.
- */
- public String getType() {
- return type;
- }
-
- /**
- * @param type
- * The type to set.
- */
- public void setType(String type) {
- this.type = type;
- }
-
-
- /**
- * @return Returns the domain.
- */
- public String getDomain() {
- return domain;
- }
- /**
- * @param domain The domain to set.
- */
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- /**
- * @return Returns the redirect.
- */
- public String getRedirect() {
- return redirect;
- }
- /**
- * @param redirect The redirect to set.
- */
- public void setRedirect(String redirect) {
- this.redirect = redirect;
- }
-
- /**
- * @return Returns the distance.
- * @since mod_jk 1.2.18
- */
- public int getDistance() {
- return distance;
- }
-
- /**
- * @param distance The distance to set.
- * @since mod_jk 1.2.18
- */
- public void setDistance(int distance) {
- this.distance = distance;
- }
-
-
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jk.status;
+
+import java.io.Serializable;
+
+/**
+ * @author Peter Rossbach
+ * @version $Revision:$ $Date:$
+ * @see org.apache.jk.status.JkStatusParser
+ */
+/**
+ * @author peter
+ *
+ */
+public class JkBalancerMember implements Serializable {
+
+ int id;
+
+ String name;
+
+ /* possible with > 1.2.16 */
+ String jvm_route;
+
+ String type;
+
+ String host;
+
+ int port;
+
+ String address;
+
+ /* deprecated with mod_jk 1.2.16*/
+ String status;
+
+ /* possible with > 1.2.16 */
+ String activation;
+
+ /* possible with > 1.2.16 */
+ String state;
+
+ int lbfactor;
+
+ long lbvalue;
+
+ /* possible with > 1.2.16 */
+ long lbmult = -1 ;
+
+ int elected;
+
+ long readed;
+
+ long transferred;
+
+ long errors;
+
+ long clienterrors = -1;
+
+ int busy;
+
+ /* possible with > 1.2.16 */
+ int maxbusy = -1;
+
+ String redirect;
+
+ String domain;
+
+ /* possible with > 1.2.16 */
+ int distance = -1;
+
+ /**
+ * @return Returns the jvm_route.
+ * @since mod_jk 1.2.19
+ */
+ public String getJvm_route() {
+ return jvm_route;
+ }
+
+ /**
+ * @param jvm_route The jvm_route to set.
+ * @since mod_jk 1.2.19
+ */
+ public void setJvm_route(String jvm_route) {
+ this.jvm_route = jvm_route;
+ }
+
+ /**
+ * @return Returns the address.
+ */
+ public String getAddress() {
+ return address;
+ }
+
+ /**
+ * @param address
+ * The address to set.
+ */
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ /**
+ * @return Returns the busy.
+ */
+ public int getBusy() {
+ return busy;
+ }
+
+ /**
+ * @param busy
+ * The busy to set.
+ */
+ public void setBusy(int busy) {
+ this.busy = busy;
+ }
+
+
+ /**
+ * @return Returns the maxbusy.
+ * @since mod_jk 1.2.18
+ */
+ public int getMaxbusy() {
+ return maxbusy;
+ }
+
+ /**
+ * @param maxbusy The maxbusy to set.
+ * @since mod_jk 1.2.18
+ */
+ public void setMaxbusy(int maxbusy) {
+ this.maxbusy = maxbusy;
+ }
+
+ /**
+ * @return Returns the elected.
+ */
+ public int getElected() {
+ return elected;
+ }
+
+ /**
+ * @param elected
+ * The elected to set.
+ */
+ public void setElected(int elected) {
+ this.elected = elected;
+ }
+
+ /**
+ * @return Returns the clienterrors.
+ * @since mod_jk 1.2.19
+ */
+ public long getClienterrors() {
+ return clienterrors;
+ }
+
+ /**
+ * @param clienterrors The clienterrors to set.
+ * @since mod_jk 1.2.19
+ */
+ public void setClienterrors(long clienterrors) {
+ this.clienterrors = clienterrors;
+ }
+
+ /**
+ * @return Returns the errors.
+ */
+ public long getErrors() {
+ return errors;
+ }
+
+ /**
+ * @param errors
+ * The errors to set.
+ */
+ public void setErrors(long errors) {
+ this.errors = errors;
+ }
+
+ /**
+ * @return Returns the host.
+ */
+ public String getHost() {
+ return host;
+ }
+
+ /**
+ * @param host
+ * The host to set.
+ */
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ /**
+ * @return Returns the id.
+ */
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * @param id
+ * The id to set.
+ */
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ /**
+ * @return Returns the lbfactor.
+ */
+ public int getLbfactor() {
+ return lbfactor;
+ }
+
+ /**
+ * @param lbfactor
+ * The lbfactor to set.
+ */
+ public void setLbfactor(int lbfactor) {
+ this.lbfactor = lbfactor;
+ }
+
+ /**
+ * @return Returns the lbvalue.
+ */
+ public long getLbvalue() {
+ return lbvalue;
+ }
+
+ /**
+ * @param lbvalue
+ * The lbvalue to set.
+ */
+ public void setLbvalue(long lbvalue) {
+ this.lbvalue = lbvalue;
+ }
+
+ /**
+ * @return Returns the lbmult.
+ * @since mod_jk 1.2.19
+ */
+ public long getLbmult() {
+ return lbmult;
+ }
+
+ /**
+ * @param lbmult The lbmult to set.
+ * @since mod_jk 1.2.19
+ */
+ public void setLbmult(long lbmult) {
+ this.lbmult = lbmult;
+ }
+
+ /**
+ * @return Returns the name.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name
+ * The name to set.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+
+ /**
+ * @return Returns the port.
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * @param port
+ * The port to set.
+ */
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ /**
+ * @return Returns the readed.
+ */
+ public long getReaded() {
+ return readed;
+ }
+
+ /**
+ * @param readed
+ * The readed to set.
+ */
+ public void setReaded(long readed) {
+ this.readed = readed;
+ }
+
+ /**
+ * @return Returns the status.
+ * @deprecated since 1.2.16
+ */
+ public String getStatus() {
+ return status;
+ }
+
+ /**
+ * @param status
+ * The status to set.
+ * @deprecated since 1.2.16
+ */
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ /**
+ * @return Returns the activation.
+ * @since mod_jk 1.2.19
+ */
+ public String getActivation() {
+ return activation;
+ }
+
+ /**
+ * @param activation The activation to set.
+ * @since mod_jk 1.2.19
+ */
+ public void setActivation(String activation) {
+ this.activation = activation;
+ }
+
+ /**
+ * @return Returns the state.
+ * @since mod_jk 1.2.19
+ */
+ public String getState() {
+ return state;
+ }
+
+ /**
+ * @param state The state to set.
+ * @since mod_jk 1.2.19
+ */
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ /**
+ * @return Returns the transferred.
+ */
+ public long getTransferred() {
+ return transferred;
+ }
+
+ /**
+ * @param transferred
+ * The transferred to set.
+ */
+ public void setTransferred(long transferred) {
+ this.transferred = transferred;
+ }
+
+ /**
+ * @return Returns the type.
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * @param type
+ * The type to set.
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+
+ /**
+ * @return Returns the domain.
+ */
+ public String getDomain() {
+ return domain;
+ }
+ /**
+ * @param domain The domain to set.
+ */
+ public void setDomain(String domain) {
+ this.domain = domain;
+ }
+
+ /**
+ * @return Returns the redirect.
+ */
+ public String getRedirect() {
+ return redirect;
+ }
+ /**
+ * @param redirect The redirect to set.
+ */
+ public void setRedirect(String redirect) {
+ this.redirect = redirect;
+ }
+
+ /**
+ * @return Returns the distance.
+ * @since mod_jk 1.2.18
+ */
+ public int getDistance() {
+ return distance;
+ }
+
+ /**
+ * @param distance The distance to set.
+ * @since mod_jk 1.2.18
+ */
+ public void setDistance(int distance) {
+ this.distance = distance;
+ }
+
+
+}
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkServer.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkServer.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkServer.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkServer.java Sun Sep 17 11:58:54 2006
@@ -1,79 +1,79 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jk.status;
-
-import java.io.Serializable;
-
-/**
- * @author Peter Rossbach
- * @version $Revision:$ $Date:$
- * @see org.apache.jk.status.JkStatusParser
- */
-public class JkServer implements Serializable {
- String name ;
- String port;
- String software;
- String version ;
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @param name The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
- /**
- * @return Returns the port.
- */
- public String getPort() {
- return port;
- }
- /**
- * @param port The port to set.
- */
- public void setPort(String port) {
- this.port = port;
- }
- /**
- * @return Returns the software.
- */
- public String getSoftware() {
- return software;
- }
- /**
- * @param software The software to set.
- */
- public void setSoftware(String software) {
- this.software = software;
- }
- /**
- * @return Returns the version.
- */
- public String getVersion() {
- return version;
- }
- /**
- * @param version The version to set.
- */
- public void setVersion(String version) {
- this.version = version;
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jk.status;
+
+import java.io.Serializable;
+
+/**
+ * @author Peter Rossbach
+ * @version $Revision:$ $Date:$
+ * @see org.apache.jk.status.JkStatusParser
+ */
+public class JkServer implements Serializable {
+ String name ;
+ String port;
+ String software;
+ String version ;
+
+ /**
+ * @return Returns the name.
+ */
+ public String getName() {
+ return name;
+ }
+ /**
+ * @param name The name to set.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+ /**
+ * @return Returns the port.
+ */
+ public String getPort() {
+ return port;
+ }
+ /**
+ * @param port The port to set.
+ */
+ public void setPort(String port) {
+ this.port = port;
+ }
+ /**
+ * @return Returns the software.
+ */
+ public String getSoftware() {
+ return software;
+ }
+ /**
+ * @param software The software to set.
+ */
+ public void setSoftware(String software) {
+ this.software = software;
+ }
+ /**
+ * @return Returns the version.
+ */
+ public String getVersion() {
+ return version;
+ }
+ /**
+ * @param version The version to set.
+ */
+ public void setVersion(String version) {
+ this.version = version;
+ }
+}
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatus.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatus.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatus.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatus.java Sun Sep 17 11:58:54 2006
@@ -1,63 +1,63 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jk.status;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Peter Rossbach
- * @version $Revision:$ $Date:$
- * @see org.apache.jk.status.JkStatusParser
- */
-public class JkStatus implements Serializable {
-
- JkServer server ;
- List balancers = new ArrayList() ;
-
- /**
- * @return Returns the balancers.
- */
- public List getBalancers() {
- return balancers;
- }
- /**
- * @param balancers The balancers to set.
- */
- public void setBalancers(List balancers) {
- this.balancers = balancers;
- }
-
- public void addBalancer(JkBalancer balancer) {
- balancers.add(balancer);
- }
-
- public void removeBalancer(JkBalancer balancer) {
- balancers.remove(balancer);
- }
-
- /**
- * @return Returns the server.
- */
- public JkServer getServer() {
- return server;
- }
- public void setServer(JkServer server) {
- this.server = server ;
- }
-
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jk.status;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Peter Rossbach
+ * @version $Revision:$ $Date:$
+ * @see org.apache.jk.status.JkStatusParser
+ */
+public class JkStatus implements Serializable {
+
+ JkServer server ;
+ List balancers = new ArrayList() ;
+
+ /**
+ * @return Returns the balancers.
+ */
+ public List getBalancers() {
+ return balancers;
+ }
+ /**
+ * @param balancers The balancers to set.
+ */
+ public void setBalancers(List balancers) {
+ this.balancers = balancers;
+ }
+
+ public void addBalancer(JkBalancer balancer) {
+ balancers.add(balancer);
+ }
+
+ public void removeBalancer(JkBalancer balancer) {
+ balancers.remove(balancer);
+ }
+
+ /**
+ * @return Returns the server.
+ */
+ public JkServer getServer() {
+ return server;
+ }
+ public void setServer(JkServer server) {
+ this.server = server ;
+ }
+
+}
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java Sun Sep 17 11:58:54 2006
@@ -1,121 +1,121 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jk.status;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tomcat.util.digester.Digester;
-
-/**
- * <code>
- *
- * <?xml version="1.0" encoding="UTF-8" ?>
- * <jk:status xmlns:jk="http://tomcat.apache.org">
- * <jk:server name="localhost" port="2010" software="Apache/2.0.58 (Unix) mod_jk/1.2.19-dev" version="1.2.19" />
- * <jk:balancers>
- * <jk:balancer id="0" name="loadbalancer" type="lb" sticky="True" stickyforce="False" retries="2" recover="60" >
- * <jk:member id="0" name="node01" type="ajp13" host="localhost" port="20012" address="127.0.0.1:20012" activation="ACT" state="N/A" distance="0" lbfactor="1" lbmult="1" lbvalue="0" elected="0" errors="0" transferred="0" readed="0" busy="0" maxbusy="0" jvm_route="node01" />
- * <jk:member id="1" name="node02" type="ajp13" host="localhost" port="20022" address="127.0.0.1:20022" activation="ACT" state="N/A" distance="0" lbfactor="1" lbmult="1" lbvalue="0" elected="0" errors="0" transferred="0" readed="0" busy="0" maxbusy="0" jvm_route="node02" />
- * <jk:map type="Wildchar" uri="/ClusterSession*" context="/ClusterSession*" />
- * <jk:map type="Wildchar" uri="/ClusterTest*" context="/ClusterTest*" />
- * <jk:map type="Wildchar" uri="/test*" context="/test*" />
- * </jk:balancer>
- * </jk:balancers>
- * </jk:status>
- *
- * </code>
- * @author Peter Rossbach
- * @version $Revision:$ $Date:$
- * @since 5.5.10
- */
-public class JkStatusParser {
- private static Log log = LogFactory.getLog(JkStatusParser.class);
-
- /**
- * The descriptive information about this implementation.
- */
- private static final String info = "org.apache.jk.status.JkStatusParser/1.1";
-
- /**
- * Return descriptive information about this implementation and the
- * corresponding version number, in the format
- * <code><description>/<version></code>.
- */
- public String getInfo() {
-
- return (info);
-
- }
-
- /**
- * The <code>Digester</code> instance used to parse registry descriptors.
- */
- public static Digester digester = createDigester();
-
- public static Digester getDigester() {
- return digester;
- }
-
- /**
- * Create and configure the Digester we will be using for setup mod_jk jk status page.
- */
- public static Digester createDigester() {
- long t1 = System.currentTimeMillis();
- // Initialize the digester
- Digester digester = new Digester();
- digester.setValidating(false);
- digester.setClassLoader(JkStatus.class.getClassLoader());
-
- // parse status
- digester.addObjectCreate("jk:status", "org.apache.jk.status.JkStatus",
- "className");
- digester.addSetProperties("jk:status");
-
- digester.addObjectCreate("jk:status/jk:server",
- "org.apache.jk.status.JkServer", "className");
- digester.addSetProperties("jk:status/jk:server");
- digester.addSetNext("jk:status/jk:server", "setServer",
- "org.apache.jk.status.JkServer");
-
- digester.addObjectCreate("jk:status/jk:balancers/jk:balancer",
- "org.apache.jk.status.JkBalancer", "className");
- digester.addSetProperties("jk:status/jk:balancers/jk:balancer");
- digester.addSetNext("jk:status/jk:balancers/jk:balancer",
- "addBalancer", "org.apache.jk.status.JkBalancer");
-
- digester.addObjectCreate(
- "jk:status/jk:balancers/jk:balancer/jk:member",
- "org.apache.jk.status.JkBalancerMember", "className");
- digester
- .addSetProperties("jk:status/jk:balancers/jk:balancer/jk:member");
- digester.addSetNext("jk:status/jk:balancers/jk:balancer/jk:member",
- "addBalancerMember", "org.apache.jk.status.JkBalancerMember");
-
- digester.addObjectCreate("jk:status/jk:balancers/jk:balancer/jk:map",
- "org.apache.jk.status.JkBalancerMapping", "className");
- digester.addSetProperties("jk:status/jk:balancers/jk:balancer/jk:map");
- digester.addSetNext("jk:status/jk:balancers/jk:balancer/jk:map",
- "addBalancerMapping", "org.apache.jk.status.JkBalancerMapping");
-
- long t2 = System.currentTimeMillis();
- if (log.isDebugEnabled())
- log.debug("Digester for apache mod_jk jkstatus page is created "
- + (t2 - t1));
- return (digester);
-
- }
-
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jk.status;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tomcat.util.digester.Digester;
+
+/**
+ * <code>
+ *
+ * <?xml version="1.0" encoding="UTF-8" ?>
+ * <jk:status xmlns:jk="http://tomcat.apache.org">
+ * <jk:server name="localhost" port="2010" software="Apache/2.0.58 (Unix) mod_jk/1.2.19-dev" version="1.2.19" />
+ * <jk:balancers>
+ * <jk:balancer id="0" name="loadbalancer" type="lb" sticky="True" stickyforce="False" retries="2" recover="60" >
+ * <jk:member id="0" name="node01" type="ajp13" host="localhost" port="20012" address="127.0.0.1:20012" activation="ACT" state="N/A" distance="0" lbfactor="1" lbmult="1" lbvalue="0" elected="0" errors="0" transferred="0" readed="0" busy="0" maxbusy="0" jvm_route="node01" />
+ * <jk:member id="1" name="node02" type="ajp13" host="localhost" port="20022" address="127.0.0.1:20022" activation="ACT" state="N/A" distance="0" lbfactor="1" lbmult="1" lbvalue="0" elected="0" errors="0" transferred="0" readed="0" busy="0" maxbusy="0" jvm_route="node02" />
+ * <jk:map type="Wildchar" uri="/ClusterSession*" context="/ClusterSession*" />
+ * <jk:map type="Wildchar" uri="/ClusterTest*" context="/ClusterTest*" />
+ * <jk:map type="Wildchar" uri="/test*" context="/test*" />
+ * </jk:balancer>
+ * </jk:balancers>
+ * </jk:status>
+ *
+ * </code>
+ * @author Peter Rossbach
+ * @version $Revision:$ $Date:$
+ * @since 5.5.10
+ */
+public class JkStatusParser {
+ private static Log log = LogFactory.getLog(JkStatusParser.class);
+
+ /**
+ * The descriptive information about this implementation.
+ */
+ private static final String info = "org.apache.jk.status.JkStatusParser/1.1";
+
+ /**
+ * Return descriptive information about this implementation and the
+ * corresponding version number, in the format
+ * <code><description>/<version></code>.
+ */
+ public String getInfo() {
+
+ return (info);
+
+ }
+
+ /**
+ * The <code>Digester</code> instance used to parse registry descriptors.
+ */
+ public static Digester digester = createDigester();
+
+ public static Digester getDigester() {
+ return digester;
+ }
+
+ /**
+ * Create and configure the Digester we will be using for setup mod_jk jk status page.
+ */
+ public static Digester createDigester() {
+ long t1 = System.currentTimeMillis();
+ // Initialize the digester
+ Digester digester = new Digester();
+ digester.setValidating(false);
+ digester.setClassLoader(JkStatus.class.getClassLoader());
+
+ // parse status
+ digester.addObjectCreate("jk:status", "org.apache.jk.status.JkStatus",
+ "className");
+ digester.addSetProperties("jk:status");
+
+ digester.addObjectCreate("jk:status/jk:server",
+ "org.apache.jk.status.JkServer", "className");
+ digester.addSetProperties("jk:status/jk:server");
+ digester.addSetNext("jk:status/jk:server", "setServer",
+ "org.apache.jk.status.JkServer");
+
+ digester.addObjectCreate("jk:status/jk:balancers/jk:balancer",
+ "org.apache.jk.status.JkBalancer", "className");
+ digester.addSetProperties("jk:status/jk:balancers/jk:balancer");
+ digester.addSetNext("jk:status/jk:balancers/jk:balancer",
+ "addBalancer", "org.apache.jk.status.JkBalancer");
+
+ digester.addObjectCreate(
+ "jk:status/jk:balancers/jk:balancer/jk:member",
+ "org.apache.jk.status.JkBalancerMember", "className");
+ digester
+ .addSetProperties("jk:status/jk:balancers/jk:balancer/jk:member");
+ digester.addSetNext("jk:status/jk:balancers/jk:balancer/jk:member",
+ "addBalancerMember", "org.apache.jk.status.JkBalancerMember");
+
+ digester.addObjectCreate("jk:status/jk:balancers/jk:balancer/jk:map",
+ "org.apache.jk.status.JkBalancerMapping", "className");
+ digester.addSetProperties("jk:status/jk:balancers/jk:balancer/jk:map");
+ digester.addSetNext("jk:status/jk:balancers/jk:balancer/jk:map",
+ "addBalancerMapping", "org.apache.jk.status.JkBalancerMapping");
+
+ long t2 = System.currentTimeMillis();
+ if (log.isDebugEnabled())
+ log.debug("Digester for apache mod_jk jkstatus page is created "
+ + (t2 - t1));
+ return (digester);
+
+ }
+
+}
Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusResetTask.java Sun Sep 17 11:58:54 2006
@@ -1,108 +1,108 @@
-/*
- * Copyright 2002,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jk.status;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import org.apache.catalina.ant.AbstractCatalinaTask;
-import org.apache.tools.ant.BuildException;
-
-/**
- * Ant task that implements the <code>/jkstatus?cmd=reset&w=loadbalancer</code> command, supported by the
- * mod_jk status (1.2.15) application.
- *
- * @author Peter Rossbach
- * @version $Revision: 1.3 $
- * @since 5.5.13
- */
-public class JkStatusResetTask extends AbstractCatalinaTask {
-
- private String workerLb;
-
- /**
- *
- */
- public JkStatusResetTask() {
- super();
- setUrl("http://localhost/jkstatus");
- }
-
- /**
- * @return Returns the workerLb.
- */
- public String getWorkerLb() {
- return workerLb;
- }
-
- /**
- * @param workerLb
- * The workerLb to set.
- */
- public void setWorkerLb(String workerLb) {
- this.workerLb = workerLb;
- }
-
- /**
- * Execute the requested operation.
- *
- * @exception BuildException
- * if an error occurs
- */
- public void execute() throws BuildException {
-
- super.execute();
- checkParameter();
- StringBuffer sb = createLink();
- execute(sb.toString(), null, null, -1);
-
- }
-
- /**
- * Create jkstatus reset link
- * <ul>
- * <li><b>load balance example:
- * </b>http://localhost/jkstatus?cmd=reset&w=loadbalancer&mime=txt</li>
- * </ul>
- *
- * @return create jkstatus link
- */
- private StringBuffer createLink() {
- // Building URL
- StringBuffer sb = new StringBuffer();
- try {
- sb.append("?cmd=reset");
- sb.append("&w=");
- sb.append(URLEncoder.encode(workerLb, getCharset()));
- sb.append("&mime=txt");
-
- } catch (UnsupportedEncodingException e) {
- throw new BuildException("Invalid 'charset' attribute: "
- + getCharset());
- }
- return sb;
- }
-
- /**
- * check correct lb and worker pararmeter
- */
- protected void checkParameter() {
- if (workerLb == null) {
- throw new BuildException("Must specify 'workerLb' attribute");
- }
- }
+/*
+ * Copyright 2002,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jk.status;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.apache.catalina.ant.AbstractCatalinaTask;
+import org.apache.tools.ant.BuildException;
+
+/**
+ * Ant task that implements the <code>/jkstatus?cmd=reset&w=loadbalancer</code> command, supported by the
+ * mod_jk status (1.2.15) application.
+ *
+ * @author Peter Rossbach
+ * @version $Revision: 1.3 $
+ * @since 5.5.13
+ */
+public class JkStatusResetTask extends AbstractCatalinaTask {
+
+ private String workerLb;
+
+ /**
+ *
+ */
+ public JkStatusResetTask() {
+ super();
+ setUrl("http://localhost/jkstatus");
+ }
+
+ /**
+ * @return Returns the workerLb.
+ */
+ public String getWorkerLb() {
+ return workerLb;
+ }
+
+ /**
+ * @param workerLb
+ * The workerLb to set.
+ */
+ public void setWorkerLb(String workerLb) {
+ this.workerLb = workerLb;
+ }
+
+ /**
+ * Execute the requested operation.
+ *
+ * @exception BuildException
+ * if an error occurs
+ */
+ public void execute() throws BuildException {
+
+ super.execute();
+ checkParameter();
+ StringBuffer sb = createLink();
+ execute(sb.toString(), null, null, -1);
+
+ }
+
+ /**
+ * Create jkstatus reset link
+ * <ul>
+ * <li><b>load balance example:
+ * </b>http://localhost/jkstatus?cmd=reset&w=loadbalancer&mime=txt</li>
+ * </ul>
+ *
+ * @return create jkstatus link
+ */
+ private StringBuffer createLink() {
+ // Building URL
+ StringBuffer sb = new StringBuffer();
+ try {
+ sb.append("?cmd=reset");
+ sb.append("&w=");
+ sb.append(URLEncoder.encode(workerLb, getCharset()));
+ sb.append("&mime=txt");
+
+ } catch (UnsupportedEncodingException e) {
+ throw new BuildException("Invalid 'charset' attribute: "
+ + getCharset());
+ }
+ return sb;
+ }
+
+ /**
+ * check correct lb and worker pararmeter
+ */
+ protected void checkParameter() {
+ if (workerLb == null) {
+ throw new BuildException("Must specify 'workerLb' attribute");
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org