remm 2002/07/25 05:01:22
Modified: . build.xml
catalina build.xml
catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Added: etc mx4j.license
Removed: catalina/src/share/org/apache/catalina/startup
CatalinaManager.java CatalinaManagerMBean.java
EmbeddedManager.java EmbeddedManagerMBean.java
Log:
- Fix a few basic problems with the scripts.
Revision Changes Path
1.2 +5 -11 jakarta-tomcat-catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 18 Jul 2002 16:47:24 -0000 1.1
+++ build.xml 25 Jul 2002 12:01:22 -0000 1.2
@@ -5,21 +5,15 @@
<!-- See "build.properties.sample" in the top level directory for all -->
<!-- property values you must customize for successful building!!! -->
- <property file="build.properties"/>
- <property file="${user.home}/build.properties"/>
+ <!--property file="build.properties"/>
+ <property file="${user.home}/build.properties"/-->
<!-- Build Defaults -->
- <property name="catalina.build" value="${basedir}/catalina/build"/>
- <property name="catalina.dist" value="${basedir}/dist"/>
- <property name="jasper.build" value="${jasper.home}/build"/>
- <property name="servlet.home" value="../jakarta-servletapi-4/dist"/>
- <property name="tomcat.build" value="${basedir}/build"/>
- <property name="tomcat.dist" value="${basedir}/dist"/>
- <property name="webapps.build" value="${basedir}/webapps/build"/>
- <property name="webapps.dist" value="${basedir}/webapps/dist"/>
-
+ <!--property name="catalina.build" value="${basedir}/catalina/build"/-->
<!-- Source dependencies -->
+ <property name="api.home"
+ value="${basedir}/../jakarta-servletapi-5"/>
<property name="jtc.home"
value="${basedir}/../jakarta-tomcat-connectors"/>
1.2 +7 -7 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 18 Jul 2002 16:47:30 -0000 1.1
+++ build.xml 25 Jul 2002 12:01:22 -0000 1.2
@@ -5,15 +5,14 @@
<!-- See "build.properties.sample" in the top level directory for all -->
<!-- property values you must customize for successful building!!! -->
- <property file="build.properties"/>
+ <!--property file="build.properties"/>
<property file="../build.properties"/>
- <property file="${user.home}/build.properties"/>
+ <property file="${user.home}/build.properties"/-->
<!-- Build Defaults -->
- <property name="build.compiler" value="classic"/>
- <property name="catalina.build" value="${basedir}/build"/>
- <property name="catalina.deploy" value="${basedir}/../build"/>
- <property name="catalina.dist" value="${basedir}/dist"/>
+ <property name="catalina.build" value="${catalina.home}/catalina/build"/>
+ <property name="catalina.deploy" value="${catalina.home}/build"/>
+ <property name="catalina.dist" value="${catalina.home}/dist"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="test.webapp" value="../webapps/build/examples"/>
@@ -28,6 +27,7 @@
<!-- Dependent JARs and files -->
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
+ <property name="servlet.jar" value="${api.home}/dist/lib/servlet.jar"/>
<property name="tomcat-util.jar"
value="${tomcat-util.home}/build/lib/tomcat-util.jar"/>
<property name="tomcat-coyote.jar"
@@ -688,7 +688,7 @@
</target>
<target name="copy-jmx.jar" if="copy.jmx.jar">
<copy todir="${catalina.build}/server/lib" file="${jmx.jar}"/>
- <copy todir="${catalina.build}/server/lib" file="../lib/mx4j.license"/>
+ <copy todir="${catalina.build}/server/lib" file="../etc/mx4j.license"/>
</target>
<target name="copy-jndi.jar" if="copy.jndi.jar">
<copy todir="${catalina.build}/common/lib" file="${jndi.jar}"/>
1.2 +5 -53
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MBeanUtils.java 18 Jul 2002 16:48:00 -0000 1.1
+++ MBeanUtils.java 25 Jul 2002 12:01:22 -0000 1.2
@@ -98,7 +98,6 @@
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.Valve;
-import org.apache.catalina.connector.http.HttpConnector;
import org.apache.catalina.core.StandardService;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
@@ -137,10 +136,6 @@
"CoyoteConnector" },
{ "org.apache.catalina.core.StandardDefaultContext",
"DefaultContext" },
- { "org.apache.catalina.connector.http10.HttpConnector",
- "Http10Connector" },
- { "org.apache.catalina.connector.http.HttpConnector",
- "Http11Connector" },
{ "org.apache.catalina.users.JDBCGroup",
"Group" },
{ "org.apache.catalina.users.JDBCRole",
@@ -808,50 +803,7 @@
throws MalformedObjectNameException {
ObjectName name = null;
- if (connector instanceof HttpConnector) {
- HttpConnector httpConnector = (HttpConnector) connector;
- Service service = httpConnector.getService();
- String serviceName = null;
- if (service != null)
- serviceName = service.getName();
- name = new ObjectName(domain + ":type=Connector" +
- ",service=" + serviceName +
- ",port=" + httpConnector.getPort() +
- ",address=" + httpConnector.getAddress());
- return (name);
- } else if (connector instanceof
org.apache.catalina.connector.http10.HttpConnector) {
- org.apache.catalina.connector.http10.HttpConnector httpConnector =
- (org.apache.catalina.connector.http10.HttpConnector) connector;
- Service service = httpConnector.getService();
- String serviceName = null;
- if (service != null)
- serviceName = service.getName();
- name = new ObjectName(domain + ":type=Connector" +
- ",service=" + serviceName+
- ",port=" + httpConnector.getPort() +
- ",address=" + httpConnector.getAddress());
- return (name);
- } else if ("org.apache.ajp.tomcat4.Ajp13Connector".equals
- (connector.getClass().getName())) {
- try {
- String address = (String)
- PropertyUtils.getSimpleProperty(connector, "address");
- Integer port = (Integer)
- PropertyUtils.getSimpleProperty(connector, "port");
- Service service = connector.getService();
- String serviceName = null;
- if (service != null)
- serviceName = service.getName();
- name = new ObjectName(domain + ":type=Connector" +
- ",service=" + serviceName +
- ",port=" + port +
- ",address=" + address);
- return (name);
- } catch (Exception e) {
- throw new MalformedObjectNameException
- ("Cannot create object name for " + connector+e);
- }
- } else if ("org.apache.coyote.tomcat4.CoyoteConnector".equals
+ if ("org.apache.coyote.tomcat4.CoyoteConnector".equals
(connector.getClass().getName())) {
try {
String address = (String)
1.1 jakarta-tomcat-catalina/etc/mx4j.license
Index: mx4j.license
===================================================================
/* ====================================================================
* The MX4J License, Version 1.0
*
* Copyright (c) 2001 MX4J. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* MX4J project (http://mx4j.sourceforge.net)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "MX4J" and "mx4j" must not be used to endorse or promote
* products derived from this software without prior written
* permission. For written permission, please contact
[EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "MX4J",
* nor may "MX4J" appear in their name, without prior written
* permission of Simone Bordet.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL CARLOS QUIROZ OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of MX4J. For more information on
* MX4J, please see
* <http://mx4j.sourceforge.net>.
*/
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
