remm 2004/06/27 16:56:23
Modified: . build.xml
catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java StandardServer.java
StandardWrapperValve.java
catalina build.xml
modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
webapps/admin build.xml
catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
webapps/balancer/WEB-INF/classes/org/apache/webapp/balancer
RulesParser.java
util/java/org/apache/tomcat/util/http/mapper Mapper.java
webapps/balancer build.xml
catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
- Remove all direct dependencies on beanutils.
Revision Changes Path
1.190 +0 -2 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- build.xml 23 Jun 2004 08:25:04 -0000 1.189
+++ build.xml 27 Jun 2004 23:56:22 -0000 1.190
@@ -439,8 +439,6 @@
<target name="build" depends="init"
description="Builds all components">
- <copy file="${commons-digester.jar}" todir="${tomcat.build}/server/lib"/>
- <copy file="${commons-collections.jar}" todir="${tomcat.build}/common/lib"/>
<antcall target="build-tomcatutil"/>
<antcall target="build-tomcatcoyote"/>
1.39 +3 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ApplicationDispatcher.java 25 Jun 2004 23:56:25 -0000 1.38
+++ ApplicationDispatcher.java 27 Jun 2004 23:56:22 -0000 1.39
@@ -46,9 +46,9 @@
import org.apache.catalina.connector.ResponseFacade;
import org.apache.catalina.util.InstanceSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tomcat.util.IntrospectionUtils;
/**
@@ -715,18 +715,12 @@
// Extra aggressive rootCause finding
do {
try {
- rootCauseCheck = (Throwable)PropertyUtils.getProperty
+ rootCauseCheck = (Throwable)IntrospectionUtils.getProperty
(rootCause, "rootCause");
if (rootCauseCheck!=null)
rootCause = rootCauseCheck;
} catch (ClassCastException ex) {
- rootCauseCheck = null;
- } catch (IllegalAccessException ex) {
- rootCauseCheck = null;
- } catch (NoSuchMethodException ex) {
- rootCauseCheck = null;
- } catch (java.lang.reflect.InvocationTargetException ex) {
rootCauseCheck = null;
}
} while (rootCauseCheck != null);
1.33 +6 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
Index: StandardServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- StandardServer.java 23 Jun 2004 16:59:41 -0000 1.32
+++ StandardServer.java 27 Jun 2004 23:56:22 -0000 1.33
@@ -19,6 +19,7 @@
import java.beans.IndexedPropertyDescriptor;
+import java.beans.Introspector;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyDescriptor;
@@ -73,11 +74,11 @@
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.Registry;
import org.apache.coyote.ProtocolHandler;
+import org.apache.tomcat.util.IntrospectionUtils;
@@ -1007,7 +1008,7 @@
// Acquire the list of properties for this bean
PropertyDescriptor descriptors[] =
- PropertyUtils.getPropertyDescriptors(bean);
+ Introspector.getBeanInfo(bean.getClass()).getPropertyDescriptors();
if (descriptors == null) {
descriptors = new PropertyDescriptor[0];
}
@@ -1024,10 +1025,10 @@
continue; // Must be a read-write primitive or String
}
Object value =
- PropertyUtils.getSimpleProperty(bean,
+ IntrospectionUtils.getProperty(bean,
descriptors[i].getName());
Object value2 =
- PropertyUtils.getSimpleProperty(bean2,
+ IntrospectionUtils.getProperty(bean2,
descriptors[i].getName());
if (value == null) {
continue; // Null values are not persisted
1.30 +3 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StandardWrapperValve.java 23 Jun 2004 16:59:41 -0000 1.29
+++ StandardWrapperValve.java 27 Jun 2004 23:56:22 -0000 1.30
@@ -35,9 +35,9 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.log.SystemLogHandler;
@@ -255,18 +255,12 @@
// Extra aggressive rootCause finding
do {
try {
- rootCauseCheck = (Throwable)PropertyUtils.getProperty
+ rootCauseCheck = (Throwable)IntrospectionUtils.getProperty
(rootCause, "rootCause");
if (rootCauseCheck!=null)
rootCause = rootCauseCheck;
} catch (ClassCastException ex) {
- rootCauseCheck = null;
- } catch (IllegalAccessException ex) {
- rootCauseCheck = null;
- } catch (NoSuchMethodException ex) {
- rootCauseCheck = null;
- } catch (java.lang.reflect.InvocationTargetException ex) {
rootCauseCheck = null;
}
} while (rootCauseCheck != null);
1.62 +0 -4 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- build.xml 16 Jun 2004 18:04:38 -0000 1.61
+++ build.xml 27 Jun 2004 23:56:22 -0000 1.62
@@ -559,10 +559,6 @@
file="src/temp/README.txt"/>
<!-- Catalina Server Libraries -->
- <copy todir="${catalina.build}/server/lib"
- file="${commons-beanutils.jar}"/>
- <copy todir="${catalina.build}/server/lib"
- file="${commons-digester.jar}"/>
<copy todir="${catalina.build}/server/lib" file="${regexp.jar}"/>
</target>
1.43 +4 -8
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Index: SimpleTcpCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- SimpleTcpCluster.java 23 Jun 2004 13:51:37 -0000 1.42
+++ SimpleTcpCluster.java 27 Jun 2004 23:56:22 -0000 1.43
@@ -42,8 +42,8 @@
import org.apache.catalina.cluster.session.ReplicationStream;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.beanutils.MethodUtils;
import org.apache.commons.logging.Log;
+import org.apache.tomcat.util.IntrospectionUtils;
/**
* A <b>Cluster</b> implementation using simple multicast.
* Responsible for setting
@@ -378,7 +378,7 @@
(sm.getString("cluster.alreadyStarted"));
log.info("Cluster is about to start");
try {
- MethodUtils.invokeMethod(getContainer(), "addValve", valve);
+ IntrospectionUtils.callMethod1(getContainer(), "addValve", valve, null,
null);
clusterReceiver.setIsSenderSynchronized(clusterSender.getIsSenderSynchronized());
clusterReceiver.setCatalinaCluster(this);
clusterReceiver.start();
@@ -390,11 +390,7 @@
try {
if ( clusterDeployer != null ) {
clusterDeployer.setCluster(this);
- Object deployer = MethodUtils.invokeMethod(
- getContainer(),
- "getDeployer",
- new Object[0],
- new Class[0]);
+ Object deployer =
IntrospectionUtils.getProperty(getContainer(), "deployer");
clusterDeployer.setDeployer( (org.apache.catalina.Deployer)
deployer);
clusterDeployer.start();
1.10 +2 -0 jakarta-tomcat-catalina/webapps/admin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 4 Apr 2004 10:27:33 -0000 1.9
+++ build.xml 27 Jun 2004 23:56:23 -0000 1.10
@@ -185,6 +185,8 @@
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static"
depends="flags,flags.display,build-prepare,copy-struts.jar">
+ <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib"
file="${commons-beanutils.jar}"/>
+ <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib"
file="${commons-digester.jar}"/>
<copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
<exclude name="build.*"/>
1.21 +3 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ErrorReportValve.java 24 Jun 2004 16:20:20 -0000 1.20
+++ ErrorReportValve.java 27 Jun 2004 23:56:23 -0000 1.21
@@ -33,7 +33,7 @@
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.compat.JdkCompat;
/**
@@ -262,15 +262,9 @@
sb.append("</pre></p>");
// In case root cause is somehow heavily nested
try {
- rootCause = (Throwable)PropertyUtils.getProperty
+ rootCause = (Throwable)IntrospectionUtils.getProperty
(rootCause, "rootCause");
} catch (ClassCastException e) {
- rootCause = null;
- } catch (IllegalAccessException e) {
- rootCause = null;
- } catch (NoSuchMethodException e) {
- rootCause = null;
- } catch (java.lang.reflect.InvocationTargetException e) {
rootCause = null;
}
}
1.4 +2 -2
jakarta-tomcat-catalina/webapps/balancer/WEB-INF/classes/org/apache/webapp/balancer/RulesParser.java
Index: RulesParser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/balancer/WEB-INF/classes/org/apache/webapp/balancer/RulesParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RulesParser.java 27 Feb 2004 14:59:06 -0000 1.3
+++ RulesParser.java 27 Jun 2004 23:56:23 -0000 1.4
@@ -15,7 +15,7 @@
*/
package org.apache.webapp.balancer;
-import org.apache.commons.digester.Digester;
+import org.apache.tomcat.util.digester.Digester;
import java.io.InputStream;
@@ -78,7 +78,7 @@
digester.addSetProperties(rules + rule);
// Add rule to chain
- digester.addSetNext(rules + rule, "addRule");
+ digester.addSetNext(rules + rule, "addRule",
"org.apache.webapp.balancer.Rule");
return digester;
}
1.40 +3 -0
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Mapper.java 19 Jun 2004 04:25:14 -0000 1.39
+++ Mapper.java 27 Jun 2004 23:56:23 -0000 1.40
@@ -1279,6 +1279,8 @@
// -------------------------------------------------------- Testing Methods
+ // FIXME: Externalize this
+ /*
public static void main(String args[]) {
try {
@@ -1383,6 +1385,7 @@
}
}
+ */
}
1.3 +1 -3 jakarta-tomcat-catalina/webapps/balancer/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/balancer/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 20 Nov 2003 18:41:52 -0000 1.2
+++ build.xml 27 Jun 2004 23:56:23 -0000 1.3
@@ -29,9 +29,7 @@
<!-- Compilation classpath -->
<path id="balancer.classpath">
<!-- Required by Digester -->
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${catalina.deploy}/classes"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${commons-logging-api.jar}" />
</path>
1.27 +4 -4
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- MBeanUtils.java 23 Jun 2004 13:51:38 -0000 1.26
+++ MBeanUtils.java 27 Jun 2004 23:56:23 -0000 1.27
@@ -52,11 +52,11 @@
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.IntrospectionUtils;
/**
@@ -789,9 +789,9 @@
if (connector.getClass().getName().indexOf("CoyoteConnector") >= 0 ) {
try {
String address = (String)
- PropertyUtils.getSimpleProperty(connector, "address");
+ IntrospectionUtils.getProperty(connector, "address");
Integer port = (Integer)
- PropertyUtils.getSimpleProperty(connector, "port");
+ IntrospectionUtils.getProperty(connector, "port");
Service service = connector.getService();
String serviceName = null;
if (service != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
