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 [3/3] - in /tomcat/connectors/trunk/jk/jkstatus: ./
example/ src/share/org/apache/jk/status/ test/ test/conf/
test/src/share/org/apache/jk/status/
Modified: tomcat/connectors/trunk/jk/jkstatus/test/conf/log4j.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/test/conf/log4j.xml?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/test/conf/log4j.xml (original)
+++ tomcat/connectors/trunk/jk/jkstatus/test/conf/log4j.xml Sun Sep 17 11:58:54 2006
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-<!-- $Id:$ -->
-<!--
-| For more configuration infromation and examples see the Jakarta Log4j
-| owebsite: http://jakarta.apache.org/log4j
--->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-<!-- ============================== -->
-<!-- Append messages to the console -->
-<!-- ==============================-->
-
-<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-<param name="Target" value="System.out"/>
-<layout class="org.apache.log4j.PatternLayout">
-<!--The default pattern: Date Priority [Category] Message\n-->
-<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-</layout>
-</appender>
-
-
-<category name="org.apache.jk.status"
- additivity="false">
- <priority value="info" />
- <appender-ref ref="CONSOLE" />
-</category>
-
-<category name="org.apache.catalina"
- additivity="false">
- <priority value="info" />
- <appender-ref ref="CONSOLE" />
-</category>
-<category name="org.apache.tomcat"
- additivity="false">
- <priority value="error" />
- <appender-ref ref="CONSOLE" />
-</category>
-<category name="org.apache.naming"
- additivity="false">
- <priority value="info" />
- <appender-ref ref="CONSOLE" />
-</category>
-<category name="org.apache.commons"
- additivity="false">
- <priority value="info" />
- <appender-ref ref="CONSOLE" />
-</category>
-
-<!-- Setup the Root c -->
-<root>
-<appender-ref ref="CONSOLE"/>
-</root>
-</log4j:configuration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+<!-- $Id:$ -->
+<!--
+| For more configuration infromation and examples see the Jakarta Log4j
+| owebsite: http://jakarta.apache.org/log4j
+-->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+<!-- ============================== -->
+<!-- Append messages to the console -->
+<!-- ==============================-->
+
+<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+<param name="Target" value="System.out"/>
+<layout class="org.apache.log4j.PatternLayout">
+<!--The default pattern: Date Priority [Category] Message\n-->
+<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+</layout>
+</appender>
+
+
+<category name="org.apache.jk.status"
+ additivity="false">
+ <priority value="info" />
+ <appender-ref ref="CONSOLE" />
+</category>
+
+<category name="org.apache.catalina"
+ additivity="false">
+ <priority value="info" />
+ <appender-ref ref="CONSOLE" />
+</category>
+<category name="org.apache.tomcat"
+ additivity="false">
+ <priority value="error" />
+ <appender-ref ref="CONSOLE" />
+</category>
+<category name="org.apache.naming"
+ additivity="false">
+ <priority value="info" />
+ <appender-ref ref="CONSOLE" />
+</category>
+<category name="org.apache.commons"
+ additivity="false">
+ <priority value="info" />
+ <appender-ref ref="CONSOLE" />
+</category>
+
+<!-- Setup the Root c -->
+<root>
+<appender-ref ref="CONSOLE"/>
+</root>
+</log4j:configuration>
+
Modified: tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java?view=diff&rev=447114&r1=447113&r2=447114
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java Sun Sep 17 11:58:54 2006
@@ -1,62 +1,62 @@
-/*
- * Copyright 1999-2004, 2006 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.IOException;
-import java.io.StringReader;
-
-import junit.framework.TestCase;
-
-import org.apache.tomcat.util.digester.Digester;
-import org.xml.sax.SAXException;
-
-/**
- * @author Peter Rossbach
- *
- */
-public class JkStatusParserTest extends TestCase {
-
- public void testDigester() throws IOException, SAXException {
- Digester digester = JkStatusParser.createDigester();
- String example = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
- + "<jk:status xmlns:jk=\"http://tomcat.apache.org\">"
- + "<jk:server name=\"localhost\" port=\"80\" software=\"Apache/2.0.58 (Unix) mod_jk/1.2.19\" 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=\"node1\" type=\"ajp13\" host=\"localhost\" port=\"9012\" address=\"127.0.0.1:9012\" 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=\"node1\" />"
- + "<jk:member id=\"0\" name=\"node2\" type=\"ajp13\" host=\"localhost\" port=\"9022\" address=\"127.0.0.1:9022\" 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=\"node2\" />"
- + "<jk:map type=\"Wildchar\" uri=\"/ClusterTest/*\" context=\"/ClusterTest/*\" />"
- + "<jk:map type=\"Exact\" uri=\"/ClusterTest\" context=\"/ClusterTest\" />"
- + "<jk:map type=\"Wildchar\" uri=\"/myapps/*\" context=\"/myapps/*\" />"
- + "<jk:map type=\"Exact\" uri=\"/myapps\" context=\"/myapps\" />"
- + "</jk:balancer>"
- + "</jk:balancers>"
- + "</jk:status>" ;
-
- StringReader reader = new StringReader(example);
- JkStatus status = (JkStatus) digester
- .parse(reader);
- assertNotNull(status);
- assertNotNull(status.getServer());
- assertEquals(1,status.getBalancers().size());
- JkBalancer balancer = (JkBalancer)status.getBalancers().get(0);
- assertEquals(2,balancer.getBalancerMembers().size());
- assertEquals("node1",((JkBalancerMember)balancer.getBalancerMembers().get(0)).getName());
- assertEquals("node2",((JkBalancerMember)balancer.getBalancerMembers().get(1)).getName());
- assertEquals(4,balancer.getBalancerMappings().size());
- }
-
+/*
+ * Copyright 1999-2004, 2006 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.IOException;
+import java.io.StringReader;
+
+import junit.framework.TestCase;
+
+import org.apache.tomcat.util.digester.Digester;
+import org.xml.sax.SAXException;
+
+/**
+ * @author Peter Rossbach
+ *
+ */
+public class JkStatusParserTest extends TestCase {
+
+ public void testDigester() throws IOException, SAXException {
+ Digester digester = JkStatusParser.createDigester();
+ String example = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
+ + "<jk:status xmlns:jk=\"http://tomcat.apache.org\">"
+ + "<jk:server name=\"localhost\" port=\"80\" software=\"Apache/2.0.58 (Unix) mod_jk/1.2.19\" 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=\"node1\" type=\"ajp13\" host=\"localhost\" port=\"9012\" address=\"127.0.0.1:9012\" 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=\"node1\" />"
+ + "<jk:member id=\"0\" name=\"node2\" type=\"ajp13\" host=\"localhost\" port=\"9022\" address=\"127.0.0.1:9022\" 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=\"node2\" />"
+ + "<jk:map type=\"Wildchar\" uri=\"/ClusterTest/*\" context=\"/ClusterTest/*\" />"
+ + "<jk:map type=\"Exact\" uri=\"/ClusterTest\" context=\"/ClusterTest\" />"
+ + "<jk:map type=\"Wildchar\" uri=\"/myapps/*\" context=\"/myapps/*\" />"
+ + "<jk:map type=\"Exact\" uri=\"/myapps\" context=\"/myapps\" />"
+ + "</jk:balancer>"
+ + "</jk:balancers>"
+ + "</jk:status>" ;
+
+ StringReader reader = new StringReader(example);
+ JkStatus status = (JkStatus) digester
+ .parse(reader);
+ assertNotNull(status);
+ assertNotNull(status.getServer());
+ assertEquals(1,status.getBalancers().size());
+ JkBalancer balancer = (JkBalancer)status.getBalancers().get(0);
+ assertEquals(2,balancer.getBalancerMembers().size());
+ assertEquals("node1",((JkBalancerMember)balancer.getBalancerMembers().get(0)).getName());
+ assertEquals("node2",((JkBalancerMember)balancer.getBalancerMembers().get(1)).getName());
+ assertEquals(4,balancer.getBalancerMappings().size());
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org