You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/03/30 02:55:28 UTC
svn commit: r389946 [1/5] - in /tomcat/tc6.0.x/trunk: ./
java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/connector/
java/org/apache/catalina/core/ java/org/apache/catalina/loader/
java/org/apache/catalina/mbeans/ java/org/apache/catalina/rea...
Author: remm
Date: Wed Mar 29 16:55:22 2006
New Revision: 389946
URL: http://svn.apache.org/viewcvs?rev=389946&view=rev
Log:
- Reduce the number of JARs.
- Is it me, or are the JARs magically smaller ? There must be something related to JDK 1.5.
- bootstrap.jar is really needed.
- Import modeler. I think there are some serious possibilities to enhance XML processing,
as everything (or almost everything, as I don't think the modeler does at the moment)
goes through digester.
- I suppose the webapps could be added now.
Added:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotification.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FieldInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/JndiJmx.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDynamicMBeanSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/package.html
Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/DefaultContextMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardHostMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ModJkMX.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java
tomcat/tc6.0.x/trunk/res/bootstrap.jar.manifest
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.properties.default?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Wed Mar 29 16:55:22 2006
@@ -18,11 +18,7 @@
#base.path=/usr/local
compile.source=1.5
-
-# ----- Servlet API v2.4 -----
-servlet-api.home=${base.path}/servlet-api-2.4
-servlet-api.lib=${servlet-api.home}/lib
-servlet-api.jar=${servlet-api.lib}/servlet-api.jar
+compile.target=1.5
# ----- Commons Logging, version 1.0.1 or later -----
commons-logging.home=${base.path}/commons-logging-1.0.4
@@ -30,12 +26,6 @@
commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
commons-logging.jar=${commons-logging.lib}/commons-logging.jar
commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz
-
-# ----- Commons Modeler, version 1.1 or later -----
-commons-modeler.home=${base.path}/commons-modeler-1.1
-commons-modeler.lib=${commons-modeler.home}
-commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
-commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/modeler-1.1.tar.gz
# ----- Eclipse JDT, version 3.1.2 or later -----
jdt.home=${base.path}/eclipse/plugins
Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.xml?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Mar 29 16:55:22 2006
@@ -35,27 +35,17 @@
<property name="compile.source" value="1.5"/>
<!-- JAR artifacts -->
+ <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
+
<property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
<property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
<property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
<property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
<property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/>
<property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/>
- <property name="naming-factory.jar" value="${tomcat.build}/lib/naming-factory.jar"/>
- <property name="naming-resources.jar" value="${tomcat.build}/lib/naming-resources.jar"/>
- <property name="servlets-cgi.jar" value="${tomcat.build}/lib/servlets-cgi.renametojar"/>
- <property name="servlets-default.jar" value="${tomcat.build}/lib/servlets-default.jar"/>
- <property name="servlets-invoker.jar" value="${tomcat.build}/lib/servlets-invoker.jar"/>
- <property name="servlets-ssi.jar" value="${tomcat.build}/lib/servlets-ssi.renametojar"/>
- <property name="servlets-webdav.jar" value="${tomcat.build}/lib/servlets-webdav.jar"/>
- <property name="tomcat-util.jar" value="${tomcat.build}/lib/tomcat-util.jar"/>
<property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/>
- <property name="tomcat-apr.jar" value="${tomcat.build}/lib/tomcat-apr.jar"/>
- <property name="tomcat-ajp.jar" value="${tomcat.build}/lib/tomcat-ajp.jar"/>
- <property name="tomcat-http.jar" value="${tomcat.build}/lib/tomcat-http.jar"/>
- <property name="jasper-compiler.jar" value="${tomcat.build}/lib/jasper-compiler.jar"/>
- <property name="jasper-runtime.jar" value="${tomcat.build}/lib/jasper-runtime.jar"/>
+ <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
<property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
<!-- Classpath -->
@@ -63,7 +53,6 @@
<pathelement location="${ant.jar}"/>
<pathelement location="${jdt.jar}"/>
<pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-modeler.jar}"/>
</path>
<!-- Just build Tomcat -->
@@ -77,6 +66,7 @@
<mkdir dir="${tomcat.build}/bin"/>
<mkdir dir="${tomcat.build}/conf"/>
<mkdir dir="${tomcat.build}/lib"/>
+ <mkdir dir="${tomcat.build}/webapps"/>
</target>
@@ -95,10 +85,12 @@
<exclude name="org/apache/naming/factory/SendMailFactory.java"/>
</javac>
<!-- Copy static resource files -->
- <copy todir="${tomcat.classes}">
+ <filter token="VERSION" value="${version}"/>
+ <copy todir="${tomcat.classes}" filtering="true">
<fileset dir="java">
<include name="**/*.properties"/>
<include name="**/*.dtd"/>
+ <include name="**/*.xsd"/>
</fileset>
</copy>
@@ -109,7 +101,7 @@
<target name="package" >
<!-- Servlet 2.5 Implementation JAR File -->
- <jar jarfile="${servlet-api.jar}" index="true">
+ <jar jarfile="${servlet-api.jar}">
<fileset dir="${tomcat.classes}">
<include name="javax/servlet/*" />
<include name="javax/servlet/http/*" />
@@ -121,7 +113,7 @@
</jar>
<!-- JSP 2.1 Implementation JAR File -->
- <jar jarfile="${jsp-api.jar}" index="true">
+ <jar jarfile="${jsp-api.jar}">
<fileset dir="${tomcat.classes}">
<include name="javax/servlet/jsp/**" />
<!-- Javadoc and i18n exclusions -->
@@ -131,7 +123,7 @@
</jar>
<!-- JSP 2.1 EL Implementation JAR File -->
- <jar jarfile="${el-api.jar}" index="true">
+ <jar jarfile="${el-api.jar}">
<fileset dir="${tomcat.classes}">
<include name="javax/el/**" />
<!-- Javadoc and i18n exclusions -->
@@ -140,10 +132,32 @@
</fileset>
</jar>
+ <!-- Bootstrap JAR File -->
+ <jar jarfile="${bootstrap.jar}"
+ manifest="res/bootstrap.jar.manifest">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/catalina/startup/Bootstrap.class" />
+ <include name="org/apache/catalina/startup/catalina.properties" />
+ <include name="org/apache/catalina/startup/CatalinaProperties.class" />
+ <include name="org/apache/catalina/startup/ClassLoaderFactory.class" />
+ <include name="org/apache/catalina/startup/Tool.class" />
+ <include name="org/apache/catalina/loader/StandardClassLoader*.class" />
+ <include name="org/apache/catalina/loader/Extension.class" />
+ <include name="org/apache/catalina/loader/Reloader.class" />
+ <include name="org/apache/catalina/security/SecurityClassLoad.class" />
+ <include name="org/apache/naming/JndiPermission.class" />
+ <include name="org/apache/tomcat/util/compat/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
<!-- Catalina Main JAR File -->
- <jar jarfile="${catalina.jar}" index="true" manifest="res/bootstrap.jar.manifest">
+ <jar jarfile="${catalina.jar}">
<fileset dir="${tomcat.classes}">
<include name="org/apache/catalina/**" />
+ <include name="org/apache/naming/**" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
@@ -151,14 +165,12 @@
<exclude name="org/apache/catalina/ant/**" />
<exclude name="org/apache/catalina/cluster/**" />
<exclude name="org/apache/catalina/launcher/**" />
- <exclude name="org/apache/catalina/servlets/**" />
<exclude name="org/apache/catalina/storeconfig/**" />
- <exclude name="org/apache/catalina/ssi/**" />
</fileset>
</jar>
<!-- Catalina Ant Tasks JAR File -->
- <jar jarfile="${catalina-ant.jar}" index="true">
+ <jar jarfile="${catalina-ant.jar}">
<fileset dir="${tomcat.classes}">
<include name="org/apache/catalina/ant/*" />
<include name="org/apache/catalina/util/Base64.class" />
@@ -169,7 +181,7 @@
</jar>
<!-- Catalina JMX Accessor Ant Tasks JAR File -->
- <jar jarfile="${catalina-ant-jmx.jar}" index="true">
+ <jar jarfile="${catalina-ant-jmx.jar}">
<fileset dir="${tomcat.classes}">
<include name="org/apache/catalina/ant/jmx/*" />
<!-- Javadoc and i18n exclusions -->
@@ -178,179 +190,31 @@
</fileset>
</jar>
- <!-- Naming - Factory JAR File -->
- <jar jarfile="${naming-factory.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/naming/**" />
- <exclude name="org/apache/naming/resources/**" />
- <exclude name="org/apache/naming/JndiPermission.class" />
- <exclude name="org/apache/naming/NameParserImpl.class" />
- <exclude name="org/apache/naming/NamingContextBindingsEnumeration.class" />
- <exclude name="org/apache/naming/NamingContextEnumeration.class" />
- <exclude name="org/apache/naming/NamingEntry.class" />
- <exclude name="org/apache/naming/StringManager.class" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Naming - Resources JAR File -->
- <jar jarfile="${naming-resources.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/naming/JndiPermission.class" />
- <include name="org/apache/naming/NameParserImpl.class" />
- <include name="org/apache/naming/NamingContextBindingsEnumeration.class" />
- <include name="org/apache/naming/NamingContextEnumeration.class" />
- <include name="org/apache/naming/NamingEntry.class" />
- <include name="org/apache/naming/StringManager.class" />
- <include name="org/apache/naming/resources/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Servlets - CGI Servlet -->
- <jar jarfile="${servlets-cgi.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/catalina/servlets/CGI*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Servlets - Default File-Serving Servlet -->
- <jar jarfile="${servlets-default.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/catalina/servlets/Default*" />
- <include name="org/apache/catalina/servlets/Constants.class" />
- <include name="org/apache/catalina/servlets/LocalStrings.properties" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Servlets - Invoker Servlet -->
- <jar jarfile="${servlets-invoker.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/catalina/servlets/Invoker*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Servlets - SSI Servlet -->
- <jar jarfile="${servlets-ssi.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/catalina/ssi/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Servlets - Webdav Servlet -->
- <jar jarfile="${servlets-webdav.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/catalina/servlets/Webdav*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
<!-- Protocol handlers - Coyote -->
- <jar jarfile="${tomcat-coyote.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/coyote/*" />
- <include name="org/apache/coyote/memory/*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Protocol handlers - APR -->
- <jar jarfile="${tomcat-apr.jar}" index="true">
+ <jar jarfile="${tomcat-coyote.jar}">
<fileset dir="${tomcat.classes}">
+ <include name="org/apache/coyote/**" />
<include name="org/apache/tomcat/jni/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Protocol handlers - HTTP -->
- <jar jarfile="${tomcat-http.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/coyote/http11/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Protocol handlers - AJP -->
- <jar jarfile="${tomcat-ajp.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/coyote/ajp/**" />
<include name="org/apache/jk/**" />
- <exclude name="org/apache/jk/ant/**" />
+ <include name="org/apache/tomcat/util/**" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</fileset>
</jar>
- <!-- Util JAR File -->
- <jar jarfile="${tomcat-util.jar}" index="true">
+ <!-- Jasper Implementation JAR File -->
+ <jar jarfile="${jasper.jar}">
<fileset dir="${tomcat.classes}">
- <include name="org/apache/tomcat/util/**" />
+ <include name="org/apache/jasper/**" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</fileset>
</jar>
- <!-- Jasper Compiler JAR File -->
- <jar jarfile="${jasper-compiler.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/jasper/compiler/**" />
- <include name="org/apache/jasper/xmlparser/**" />
- <include name="org/apache/jasper/servlet/**" />
- <include name="org/apache/jasper/tagplugins/**" />
- <exclude name="org/apache/jasper/Constants.class" />
- <exclude name="org/apache/jasper/JasperException.class" />
- <include name="org/apache/jasper/*.class" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Jasper Runtime JAR File -->
- <jar jarfile="${jasper-runtime.jar}" index="true">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/jasper/Constants.class" />
- <include name="org/apache/jasper/JasperException.class" />
- <include name="org/apache/jasper/compiler/Localizer.class" />
- <include name="org/apache/jasper/el/**" />
- <include name="org/apache/jasper/resources/**" />
- <include name="org/apache/jasper/runtime/**" />
- <include name="org/apache/jasper/security/**" />
- <include name="org/apache/jasper/util/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
<!-- Jasper EL Implementation JAR File -->
- <jar jarfile="${jasper-el.jar}" index="true">
+ <jar jarfile="${jasper-el.jar}">
<fileset dir="${tomcat.classes}">
<include name="org/apache/el/**" />
<!-- Javadoc and i18n exclusions -->
@@ -363,13 +227,20 @@
<target name="deploy" depends="build-only">
- <copy file="${commons-logging-api.jar}" todir="${tomcat.build}/lib" />
+ <copy file="${commons-logging-api.jar}" todir="${tomcat.build}/bin" />
<!-- Copy static resource files -->
<copy todir="${tomcat.build}/conf">
<fileset dir="conf">
<include name="*.xml"/>
<include name="*.properties"/>
+ </fileset>
+ </copy>
+
+ <!-- Temp: Copy webapps -->
+ <copy todir="${tomcat.build}/webapps">
+ <fileset dir="webapps">
+ <include name="ROOT/**"/>
</fileset>
</copy>
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Wed Mar 29 16:55:22 2006
@@ -174,7 +174,7 @@
try {
MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname);
String code = minfo.getClassName();
- if ("org.apache.commons.modeler.BaseModelMBean".equals(code)) {
+ if ("org.apache.tomcat.util.modeler.BaseModelMBean".equals(code)) {
code = (String) jmxServerConnection.getAttribute(oname,
"modelerType");
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Wed Mar 29 16:55:22 2006
@@ -36,11 +36,11 @@
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
import org.apache.coyote.Adapter;
import org.apache.coyote.ProtocolHandler;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.http.mapper.Mapper;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java Wed Mar 29 16:55:22 2006
@@ -28,9 +28,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.http.mapper.Mapper;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Mar 29 16:55:22 2006
@@ -54,8 +54,8 @@
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
import org.apache.naming.resources.ProxyDirContext;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java Wed Mar 29 16:55:22 2006
@@ -54,7 +54,6 @@
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
import org.apache.naming.ContextAccessController;
import org.apache.naming.ContextBindings;
import org.apache.naming.EjbRef;
@@ -63,6 +62,7 @@
import org.apache.naming.ResourceLinkRef;
import org.apache.naming.ResourceRef;
import org.apache.naming.TransactionRef;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Wed Mar 29 16:55:22 2006
@@ -90,7 +90,6 @@
import org.apache.catalina.util.URLEncoder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
import org.apache.naming.ContextBindings;
import org.apache.naming.resources.BaseDirContext;
import org.apache.naming.resources.DirContextURLStreamHandler;
@@ -98,6 +97,7 @@
import org.apache.naming.resources.ProxyDirContext;
import org.apache.naming.resources.WARDirContext;
import org.apache.tomcat.util.compat.JdkCompat;
+import org.apache.tomcat.util.modeler.Registry;
/**
* Standard implementation of the <b>Context</b> interface. Each
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Mar 29 16:55:22 2006
@@ -35,8 +35,8 @@
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
-import org.apache.commons.modeler.modules.MbeansSource;
+import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.modeler.modules.MbeansSource;
/**
* Standard implementation of the <b>Engine</b> interface. Each
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Wed Mar 29 16:55:22 2006
@@ -28,7 +28,7 @@
import org.apache.catalina.Valve;
import org.apache.catalina.startup.HostConfig;
import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java Wed Mar 29 16:55:22 2006
@@ -34,7 +34,7 @@
import org.apache.catalina.valves.ValveBase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardServer.java Wed Mar 29 16:55:22 2006
@@ -45,8 +45,8 @@
import org.apache.catalina.util.ServerInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.buf.StringCache;
+import org.apache.tomcat.util.modeler.Registry;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java Wed Mar 29 16:55:22 2006
@@ -36,7 +36,7 @@
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Mar 29 16:55:22 2006
@@ -57,7 +57,7 @@
import org.apache.catalina.util.InstanceSupport;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.log.SystemLogHandler;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.Registry;
/**
* Standard implementation of the <b>Wrapper</b> interface that represents
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed Mar 29 16:55:22 2006
@@ -57,10 +57,10 @@
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.modeler.Registry;
import org.apache.naming.resources.DirContextURLStreamHandler;
import org.apache.naming.resources.DirContextURLStreamHandlerFactory;
import org.apache.naming.resources.Resource;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java Wed Mar 29 16:55:22 2006
@@ -19,7 +19,8 @@
import javax.management.MBeanException;
import javax.management.RuntimeOperationsException;
-import org.apache.commons.modeler.BaseModelMBean;
+
+import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java Wed Mar 29 16:55:22 2006
@@ -27,7 +27,7 @@
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.commons.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java Wed Mar 29 16:55:22 2006
@@ -27,7 +27,7 @@
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.commons.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java Wed Mar 29 16:55:22 2006
@@ -27,7 +27,7 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.commons.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/DefaultContextMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/DefaultContextMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/DefaultContextMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/DefaultContextMBean.java Wed Mar 29 16:55:22 2006
@@ -28,10 +28,10 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.compat.JdkCompat;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java Wed Mar 29 16:55:22 2006
@@ -31,9 +31,9 @@
import org.apache.catalina.Role;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
-import org.apache.commons.modeler.Registry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GroupMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GroupMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/GroupMBean.java Wed Mar 29 16:55:22 2006
@@ -29,10 +29,10 @@
import org.apache.catalina.Group;
import org.apache.catalina.Role;
import org.apache.catalina.User;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.compat.JdkCompat;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Wed Mar 29 16:55:22 2006
@@ -52,8 +52,8 @@
import org.apache.catalina.valves.RemoteHostValve;
import org.apache.catalina.valves.RequestDumperValve;
import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Wed Mar 29 16:55:22 2006
@@ -48,9 +48,9 @@
import org.apache.catalina.valves.ValveBase;
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;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java Wed Mar 29 16:55:22 2006
@@ -28,10 +28,10 @@
import org.apache.catalina.Role;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.compat.JdkCompat;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java Wed Mar 29 16:55:22 2006
@@ -27,10 +27,10 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.compat.JdkCompat;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java Wed Mar 29 16:55:22 2006
@@ -21,9 +21,9 @@
import javax.management.MBeanServer;
import javax.management.RuntimeOperationsException;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardContextMBean.java Wed Mar 29 16:55:22 2006
@@ -28,10 +28,10 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.compat.JdkCompat;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardEngineMBean.java Wed Mar 29 16:55:22 2006
@@ -21,7 +21,7 @@
import javax.management.MBeanServer;
import javax.management.RuntimeOperationsException;
-import org.apache.commons.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardHostMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardHostMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardHostMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardHostMBean.java Wed Mar 29 16:55:22 2006
@@ -23,9 +23,9 @@
import org.apache.catalina.Valve;
import org.apache.catalina.core.StandardHost;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServerMBean.java Wed Mar 29 16:55:22 2006
@@ -24,7 +24,7 @@
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.core.StandardServer;
-import org.apache.commons.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/StandardServiceMBean.java Wed Mar 29 16:55:22 2006
@@ -21,7 +21,7 @@
import javax.management.MBeanServer;
import javax.management.RuntimeOperationsException;
-import org.apache.commons.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java Wed Mar 29 16:55:22 2006
@@ -29,10 +29,10 @@
import org.apache.catalina.Group;
import org.apache.catalina.Role;
import org.apache.catalina.User;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.compat.JdkCompat;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.Registry;
/**
* <p>A <strong>ModelMBean</strong> implementation for the
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Wed Mar 29 16:55:22 2006
@@ -52,7 +52,7 @@
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.Registry;
/**
* Simple implementation of <b>Realm</b> that reads an XML file to configure
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Wed Mar 29 16:55:22 2006
@@ -48,7 +48,7 @@
import org.apache.catalina.util.StringManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Mar 29 16:55:22 2006
@@ -41,8 +41,8 @@
import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.modeler.Registry;
import org.apache.tomcat.util.digester.Digester;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Wed Mar 29 16:55:22 2006
@@ -25,13 +25,13 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.coyote.ActionCode;
import org.apache.coyote.ActionHook;
import org.apache.coyote.Adapter;
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.net.AprEndpoint.Handler;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed Mar 29 16:55:22 2006
@@ -25,13 +25,13 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.coyote.ActionCode;
import org.apache.coyote.ActionHook;
import org.apache.coyote.Adapter;
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.net.AprEndpoint.Handler;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java Wed Mar 29 16:55:22 2006
@@ -20,8 +20,8 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.coyote.RequestInfo;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.threads.ThreadPool;
import org.apache.tomcat.util.threads.ThreadWithAttributes;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java Wed Mar 29 16:55:22 2006
@@ -45,7 +45,6 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.Msg;
import org.apache.jk.core.MsgContext;
@@ -54,6 +53,7 @@
import org.apache.coyote.Request;
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.threads.ThreadPool;
import org.apache.tomcat.util.threads.ThreadPoolRunnable;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java Wed Mar 29 16:55:22 2006
@@ -36,7 +36,6 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.Msg;
import org.apache.jk.core.MsgContext;
@@ -45,6 +44,7 @@
import org.apache.coyote.Request;
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.threads.ThreadPool;
import org.apache.tomcat.util.threads.ThreadPoolRunnable;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelUn.java Wed Mar 29 16:55:22 2006
@@ -22,7 +22,6 @@
import java.io.IOException;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.Msg;
import org.apache.jk.core.MsgContext;
@@ -31,6 +30,7 @@
import org.apache.coyote.Request;
import org.apache.coyote.RequestGroupInfo;
import org.apache.coyote.RequestInfo;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.threads.ThreadPool;
import org.apache.tomcat.util.threads.ThreadPoolRunnable;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JniHandler.java Wed Mar 29 16:55:22 2006
@@ -20,7 +20,6 @@
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.jk.apr.AprImpl;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.Msg;
@@ -29,6 +28,7 @@
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.C2BConverter;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.modeler.Registry;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ModJkMX.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ModJkMX.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ModJkMX.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ModJkMX.java Wed Mar 29 16:55:22 2006
@@ -33,11 +33,11 @@
import javax.management.ObjectName;
import org.apache.jk.core.JkHandler;
-import org.apache.commons.modeler.Registry;
-import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.ManagedBean;
-import org.apache.commons.modeler.AttributeInfo;
-import org.apache.commons.modeler.OperationInfo;
+import org.apache.tomcat.util.modeler.AttributeInfo;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+import org.apache.tomcat.util.modeler.ManagedBean;
+import org.apache.tomcat.util.modeler.OperationInfo;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/core/JkHandler.java Wed Mar 29 16:55:22 2006
@@ -25,7 +25,7 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
+import org.apache.tomcat.util.modeler.Registry;
/**
*
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java Wed Mar 29 16:55:22 2006
@@ -22,7 +22,6 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.coyote.Adapter;
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.Request;
@@ -41,6 +40,7 @@
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.SSLSupport;
/** Plugs Jk into Coyote. Must be named "type=JkHandler,name=container"
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java?rev=389946&r1=389945&r2=389946&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkMain.java Wed Mar 29 16:55:22 2006
@@ -31,10 +31,10 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.commons.modeler.Registry;
import org.apache.jk.core.JkHandler;
import org.apache.jk.core.WorkerEnv;
import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.modeler.Registry;
/** Main class used to startup and configure jk. It manages the conf/jk2.properties file
* and is the target of JMX proxy.
Added: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java?rev=389946&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java (added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java Wed Mar 29 16:55:22 2006
@@ -0,0 +1,269 @@
+/*
+ * 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.tomcat.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+
+/**
+ * Few simple utils to read DOM
+ *
+ * @author Costin Manolache
+ */
+public class DomUtil {
+ private static org.apache.commons.logging.Log log=
+ org.apache.commons.logging.LogFactory.getLog( DomUtil.class );
+
+ // -------------------- DOM utils --------------------
+
+ /** Get the trimed text content of a node or null if there is no text
+ */
+ public static String getContent(Node n ) {
+ if( n==null ) return null;
+ Node n1=DomUtil.getChild(n, Node.TEXT_NODE);
+
+ if( n1==null ) return null;
+
+ String s1=n1.getNodeValue();
+ return s1.trim();
+ }
+
+ /** Get the first element child.
+ * @param parent lookup direct childs
+ * @param name name of the element. If null return the first element.
+ */
+ public static Node getChild( Node parent, String name ) {
+ if( parent==null ) return null;
+ Node first=parent.getFirstChild();
+ if( first==null ) return null;
+
+ for (Node node = first; node != null;
+ node = node.getNextSibling()) {
+ //System.out.println("getNode: " + name + " " + node.getNodeName());
+ if( node.getNodeType()!=Node.ELEMENT_NODE)
+ continue;
+ if( name != null &&
+ name.equals( node.getNodeName() ) ) {
+ return node;
+ }
+ if( name == null ) {
+ return node;
+ }
+ }
+ return null;
+ }
+
+ public static String getAttribute(Node element, String attName ) {
+ NamedNodeMap attrs=element.getAttributes();
+ if( attrs==null ) return null;
+ Node attN=attrs.getNamedItem(attName);
+ if( attN==null ) return null;
+ return attN.getNodeValue();
+ }
+
+ public static void setAttribute(Node node, String attName, String val) {
+ NamedNodeMap attributes=node.getAttributes();
+ Node attNode=node.getOwnerDocument().createAttribute(attName);
+ attNode.setNodeValue( val );
+ attributes.setNamedItem(attNode);
+ }
+
+ public static void removeAttribute( Node node, String attName ) {
+ NamedNodeMap attributes=node.getAttributes();
+ attributes.removeNamedItem(attName);
+ }
+
+
+ /** Set or replace the text value
+ */
+ public static void setText(Node node, String val) {
+ Node chld=DomUtil.getChild(node, Node.TEXT_NODE);
+ if( chld == null ) {
+ Node textN=node.getOwnerDocument().createTextNode(val);
+ node.appendChild(textN);
+ return;
+ }
+ // change the value
+ chld.setNodeValue(val);
+ }
+
+ /** Find the first direct child with a given attribute.
+ * @param parent
+ * @param elemName name of the element, or null for any
+ * @param attName attribute we're looking for
+ * @param attVal attribute value or null if we just want any
+ */
+ public static Node findChildWithAtt(Node parent, String elemName,
+ String attName, String attVal) {
+
+ Node child=DomUtil.getChild(parent, Node.ELEMENT_NODE);
+ if( attVal== null ) {
+ while( child!= null &&
+ ( elemName==null || elemName.equals( child.getNodeName())) &&
+ DomUtil.getAttribute(child, attName) != null ) {
+ child=getNext(child, elemName, Node.ELEMENT_NODE );
+ }
+ } else {
+ while( child!= null &&
+ ( elemName==null || elemName.equals( child.getNodeName())) &&
+ ! attVal.equals( DomUtil.getAttribute(child, attName)) ) {
+ child=getNext(child, elemName, Node.ELEMENT_NODE );
+ }
+ }
+ return child;
+ }
+
+
+ /** Get the first child's content ( ie it's included TEXT node ).
+ */
+ public static String getChildContent( Node parent, String name ) {
+ Node first=parent.getFirstChild();
+ if( first==null ) return null;
+ for (Node node = first; node != null;
+ node = node.getNextSibling()) {
+ //System.out.println("getNode: " + name + " " + node.getNodeName());
+ if( name.equals( node.getNodeName() ) ) {
+ return getContent( node );
+ }
+ }
+ return null;
+ }
+
+ /** Get the first direct child with a given type
+ */
+ public static Node getChild( Node parent, int type ) {
+ Node n=parent.getFirstChild();
+ while( n!=null && type != n.getNodeType() ) {
+ n=n.getNextSibling();
+ }
+ if( n==null ) return null;
+ return n;
+ }
+
+ /** Get the next sibling with the same name and type
+ */
+ public static Node getNext( Node current ) {
+ String name=current.getNodeName();
+ int type=current.getNodeType();
+ return getNext( current, name, type);
+ }
+
+ /** Return the next sibling with a given name and type
+ */
+ public static Node getNext( Node current, String name, int type) {
+ Node first=current.getNextSibling();
+ if( first==null ) return null;
+
+ for (Node node = first; node != null;
+ node = node.getNextSibling()) {
+
+ if( type >= 0 && node.getNodeType() != type ) continue;
+ //System.out.println("getNode: " + name + " " + node.getNodeName());
+ if( name==null )
+ return node;
+ if( name.equals( node.getNodeName() ) ) {
+ return node;
+ }
+ }
+ return null;
+ }
+
+ public static class NullResolver implements EntityResolver {
+ public InputSource resolveEntity (String publicId,
+ String systemId)
+ throws SAXException, IOException
+ {
+ if( log.isTraceEnabled())
+ log.trace("ResolveEntity: " + publicId + " " + systemId);
+ return new InputSource(new StringReader(""));
+ }
+ }
+
+ public static void setAttributes( Object o, Node parent)
+ {
+ NamedNodeMap attrs=parent.getAttributes();
+ if( attrs==null ) return;
+
+ for (int i=0; i<attrs.getLength(); i++ ) {
+ Node n=attrs.item(i);
+ String name=n.getNodeName();
+ String value=n.getNodeValue();
+
+ if( log.isTraceEnabled() )
+ log.trace("Attribute " + parent.getNodeName() + " " +
+ name + "=" + value);
+ try {
+ IntrospectionUtils.setProperty(o, name, value);
+ } catch( Exception ex ) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ /** Read XML as DOM.
+ */
+ public static Document readXml(InputStream is)
+ throws SAXException, IOException, ParserConfigurationException
+ {
+ DocumentBuilderFactory dbf =
+ DocumentBuilderFactory.newInstance();
+
+ dbf.setValidating(false);
+ dbf.setIgnoringComments(false);
+ dbf.setIgnoringElementContentWhitespace(true);
+ //dbf.setCoalescing(true);
+ //dbf.setExpandEntityReferences(true);
+
+ DocumentBuilder db = null;
+ db = dbf.newDocumentBuilder();
+ db.setEntityResolver( new NullResolver() );
+
+ // db.setErrorHandler( new MyErrorHandler());
+
+ Document doc = db.parse(is);
+ return doc;
+ }
+
+ public static void writeXml( Node n, OutputStream os )
+ throws TransformerException
+ {
+ TransformerFactory tf=TransformerFactory.newInstance();
+ //identity
+ Transformer t=tf.newTransformer();
+ t.setOutputProperty(OutputKeys.INDENT, "yes");
+ t.transform(new DOMSource( n ), new StreamResult( os ));
+ }
+}
Added: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java?rev=389946&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java (added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java Wed Mar 29 16:55:22 2006
@@ -0,0 +1,317 @@
+/*
+ * 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.tomcat.util.modeler;
+
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import javax.management.Descriptor;
+import javax.management.modelmbean.ModelMBeanAttributeInfo;
+
+
+/**
+ * <p>Internal configuration information for an <code>Attribute</code>
+ * descriptor.</p>
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26 févr. 2005) $
+ */
+
+public class AttributeInfo extends FeatureInfo implements Serializable {
+ static final long serialVersionUID = -2511626862303972143L;
+
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The <code>ModelMBeanAttributeInfo</code> object that corresponds
+ * to this <code>AttributeInfo</code> instance.
+ */
+ protected transient ModelMBeanAttributeInfo info = null;
+ protected String displayName = null;
+ protected String getMethod = null;
+ protected String setMethod = null;
+
+ protected transient Method getMethodObj = null;
+ protected transient Method setMethodObj = null;
+
+ protected boolean readable = true;
+ protected boolean writeable = true;
+
+ protected boolean is = false;
+ protected String type = null;
+
+ protected String persist;
+ protected String defaultStringValue;
+ // ------------------------------------------------------------- Properties
+
+
+ /**
+ * Override the <code>description</code> property setter.
+ *
+ * @param description The new description
+ */
+ public void setDescription(String description) {
+ super.setDescription(description);
+ this.info = null;
+ }
+
+ /**
+ * Override the <code>name</code> property setter.
+ *
+ * @param name The new name
+ */
+ public void setName(String name) {
+ super.setName(name);
+ this.info = null;
+ }
+
+ /**
+ * The display name of this attribute.
+ */
+ public String getDisplayName() {
+ return (this.displayName);
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ /**
+ * The name of the property getter method, if non-standard.
+ */
+ public String getGetMethod() {
+ return (this.getMethod);
+ }
+
+ public void setGetMethod(String getMethod) {
+ this.getMethod = getMethod;
+ this.info = null;
+ }
+
+ public Method getGetMethodObj() {
+ return getMethodObj;
+ }
+
+ public void setGetMethodObj(Method getMethodObj) {
+ this.getMethodObj = getMethodObj;
+ }
+
+ public Method getSetMethodObj() {
+ return setMethodObj;
+ }
+
+ public void setSetMethodObj(Method setMethodObj) {
+ this.setMethodObj = setMethodObj;
+ }
+
+ /**
+ * Is this a boolean attribute with an "is" getter?
+ */
+ public boolean isIs() {
+ return (this.is);
+ }
+
+ public void setIs(boolean is) {
+ this.is = is;
+ this.info = null;
+ }
+
+
+ /**
+ * Is this attribute readable by management applications?
+ */
+ public boolean isReadable() {
+ return (this.readable);
+ }
+
+ public void setReadable(boolean readable) {
+ this.readable = readable;
+ this.info = null;
+ }
+
+
+ /**
+ * The name of the property setter method, if non-standard.
+ */
+ public String getSetMethod() {
+ return (this.setMethod);
+ }
+
+ public void setSetMethod(String setMethod) {
+ this.setMethod = setMethod;
+ this.info = null;
+ }
+
+
+ /**
+ * The fully qualified Java class name of this attribute.
+ */
+ public String getType() {
+ return (this.type);
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ this.info = null;
+ }
+
+
+ /**
+ * Is this attribute writeable by management applications?
+ */
+ public boolean isWriteable() {
+ return (this.writeable);
+ }
+
+ public void setWriteable(boolean writeable) {
+ this.writeable = writeable;
+ this.info = null;
+ }
+
+ /** Persistence policy.
+ * All persistent attributes should have this attribute set.
+ * Valid values:
+ * ???
+ */
+ public String getPersist() {
+ return persist;
+ }
+
+ public void setPersist(String persist) {
+ this.persist = persist;
+ }
+
+ /** Default value. If set, it can provide info to the user and
+ * it can be used by persistence mechanism to generate a more compact
+ * representation ( a value may not be saved if it's default )
+ */
+ public String getDefault() {
+ return defaultStringValue;
+ }
+
+ public void setDefault(String defaultStringValue) {
+ this.defaultStringValue = defaultStringValue;
+ }
+
+
+ // --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Create and return a <code>ModelMBeanAttributeInfo</code> object that
+ * corresponds to the attribute described by this instance.
+ */
+ public ModelMBeanAttributeInfo createAttributeInfo() {
+ // Return our cached information (if any)
+ if (info != null)
+ return (info);
+ if((getMethodObj != null) || (setMethodObj != null) ) {
+ try {
+ info=new ModelMBeanAttributeInfo(getName(), getDescription(),
+ getMethodObj, setMethodObj);
+ return info;
+ } catch( Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ // Create and return a new information object
+ info = new ModelMBeanAttributeInfo
+ (getName(), getType(), getDescription(),
+ isReadable(), isWriteable(), false);
+ Descriptor descriptor = info.getDescriptor();
+ if (getDisplayName() != null)
+ descriptor.setField("displayName", getDisplayName());
+ if (isReadable()) {
+ if (getGetMethod() != null)
+ descriptor.setField("getMethod", getGetMethod());
+ else
+ descriptor.setField("getMethod",
+ getMethodName(getName(), true, isIs()));
+ }
+ if (isWriteable()) {
+ if (getSetMethod() != null)
+ descriptor.setField("setMethod", getSetMethod());
+ else
+ descriptor.setField("setMethod",
+ getMethodName(getName(), false, false));
+ }
+ addFields(descriptor);
+ info.setDescriptor(descriptor);
+ return (info);
+
+ }
+
+
+ /**
+ * Return a string representation of this attribute descriptor.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("AttributeInfo[");
+ sb.append("name=");
+ sb.append(name);
+ sb.append(", description=");
+ sb.append(description);
+ if (!readable) {
+ sb.append(", readable=");
+ sb.append(readable);
+ }
+ sb.append(", type=");
+ sb.append(type);
+ if (!writeable) {
+ sb.append(", writeable=");
+ sb.append(writeable);
+ }
+ sb.append("]");
+ return (sb.toString());
+
+ }
+
+
+ // -------------------------------------------------------- Private Methods
+
+
+ /**
+ * Create and return the name of a default property getter or setter
+ * method, according to the specified values.
+ *
+ * @param name Name of the property itself
+ * @param getter Do we want a get method (versus a set method)?
+ * @param is If returning a getter, do we want the "is" form?
+ */
+ private String getMethodName(String name, boolean getter, boolean is) {
+
+ StringBuffer sb = new StringBuffer();
+ if (getter) {
+ if (is)
+ sb.append("is");
+ else
+ sb.append("get");
+ } else
+ sb.append("set");
+ sb.append(Character.toUpperCase(name.charAt(0)));
+ sb.append(name.substring(1));
+ return (sb.toString());
+
+ }
+
+
+}
Added: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java?rev=389946&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java (added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java Wed Mar 29 16:55:22 2006
@@ -0,0 +1,159 @@
+/*
+ * 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.tomcat.util.modeler;
+
+
+import java.util.HashSet;
+
+import javax.management.AttributeChangeNotification;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+
+
+/**
+ * <p>Implementation of <code>NotificationFilter</code> for attribute change
+ * notifications. This class is used by <code>BaseModelMBean</code> to
+ * construct attribute change notification event filters when a filter is not
+ * supplied by the application.</p>
+ *
+ * @author Craig R. McClanahan
+ * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26 févr. 2005) $
+ */
+
+public class BaseAttributeFilter implements NotificationFilter {
+
+
+ // ----------------------------------------------------------- Constructors
+
+
+ /**
+ * Construct a new filter that accepts only the specified attribute
+ * name.
+ *
+ * @param name Name of the attribute to be accepted by this filter, or
+ * <code>null</code> to accept all attribute names
+ */
+ public BaseAttributeFilter(String name) {
+
+ super();
+ if (name != null)
+ addAttribute(name);
+
+ }
+
+
+ // ----------------------------------------------------- Instance Variables
+
+
+ /**
+ * The set of attribute names that are accepted by this filter. If this
+ * list is empty, all attribute names are accepted.
+ */
+ private HashSet names = new HashSet();
+
+
+ // --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Add a new attribute name to the set of names accepted by this filter.
+ *
+ * @param name Name of the attribute to be accepted
+ */
+ public void addAttribute(String name) {
+
+ synchronized (names) {
+ names.add(name);
+ }
+
+ }
+
+
+ /**
+ * Clear all accepted names from this filter, so that it will accept
+ * all attribute names.
+ */
+ public void clear() {
+
+ synchronized (names) {
+ names.clear();
+ }
+
+ }
+
+
+ /**
+ * Return the set of names that are accepted by this filter. If this
+ * filter accepts all attribute names, a zero length array will be
+ * returned.
+ */
+ public String[] getNames() {
+
+ synchronized (names) {
+ return ((String[]) names.toArray(new String[names.size()]));
+ }
+
+ }
+
+
+ /**
+ * <p>Test whether notification enabled for this event.
+ * Return true if:</p>
+ * <ul>
+ * <li>This is an attribute change notification</li>
+ * <li>Either the set of accepted names is empty (implying that all
+ * attribute names are of interest) or the set of accepted names
+ * includes the name of the attribute in this notification</li>
+ * </ul>
+ */
+ public boolean isNotificationEnabled(Notification notification) {
+
+ if (notification == null)
+ return (false);
+ if (!(notification instanceof AttributeChangeNotification))
+ return (false);
+ AttributeChangeNotification acn =
+ (AttributeChangeNotification) notification;
+ if (!AttributeChangeNotification.ATTRIBUTE_CHANGE.equals(acn.getType()))
+ return (false);
+ synchronized (names) {
+ if (names.size() < 1)
+ return (true);
+ else
+ return (names.contains(acn.getAttributeName()));
+ }
+
+ }
+
+
+ /**
+ * Remove an attribute name from the set of names accepted by this
+ * filter.
+ *
+ * @param name Name of the attribute to be removed
+ */
+ public void removeAttribute(String name) {
+
+ synchronized (names) {
+ names.remove(name);
+ }
+
+ }
+
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org