diff -uNr mx/build/build.xml mx-patched/build/build.xml
--- mx/build/build.xml	2004-04-05 07:09:12.000000000 -0400
+++ mx-patched/build/build.xml	2004-07-08 19:05:32.000000000 -0400
@@ -205,11 +205,6 @@
       <antcall target="jython-present"/>
 
       <!-- Jetty flag -->
-      <condition property="jetty.present">
-         <and>
-            <available classname="org.mortbay.jetty.Server" classpathref="lib.classpath"/>
-         </and>
-      </condition>
       <antcall target="jetty-present"/>
    </target>
 
@@ -293,7 +288,6 @@
          <exclude name="mx4j/tools/mail/**" unless="javamail.present"/>
          <exclude name="mx4j/tools/jython/**" unless="jython.present"/>
          <exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
-         <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
          <exclude name="mx4j/tools/remote/soap/web/jetty/**" unless="jetty.present"/>
          <exclude name="mx4j/tools/heartbeat/**" if="releasing"/>
          <exclude name="mx4j/tools/connector/**" if="releasing"/>
@@ -370,7 +364,6 @@
          <exclude name="test/mx4j/tools/connector/**" if="releasing"/>
          <exclude name="test/mx4j/tools/adaptor/rmi/**" if="releasing"/>
          <exclude name="test/mx4j/tools/adaptor/interceptor/**" if="releasing"/>
-         <exclude name="test/**/*SecurityManager*" unless="jdk14.present"/>
          <classpath refid="classpath"/>
       </javac>
 
@@ -390,7 +383,6 @@
       <javac srcdir="${examples.src.dir}" destdir="${examples.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
          <classpath refid="classpath"/>
          <exclude name="mx4j/examples/tools/xdoclet/**"/>
-         <exclude name="mx4j/examples/remote/rmi/ssl/**" unless="jdk14.present"/>
       </javac>
 
       <rmic base="${examples.classes.dir}"
@@ -442,45 +434,7 @@
       </javadoc>
    </target>
 
-   <target name="docs" description="Builds the MX4J documentation">
-      <unzip src="${docbook.dtd.zip.file}" dest="${docs.src.dir}/docbook"/>
-      <unzip src="${docbook.xsl.zip.file}" dest="${docs.src.dir}/docbookx"/>
-      <mkdir dir="${dist.docs.dir}"/>
-
-      <style processor="trax"
-         basedir="${docs.src.dir}"
-         destdir="${dist.docs.dir}"
-         force="yes"
-         style="${docs.src.dir}/xsl/mx4j-chunk.xsl"
-         includes="${root.document.name}"
-         classpathref="lib.classpath"
-         />
-
-      <delete dir="${docs.src.dir}/docbook" quiet="true"/>
-      <delete dir="${docs.src.dir}/docbookx" quiet="true"/>
-
-      <!-- Bug in Ant forces this move, since destdir of the style task does not work -->
-      <move todir="${dist.docs.dir}">
-         <fileset dir="${basedir}/build">
-            <include name="*.html"/>
-         </fileset>
-      </move>
-
-      <copy todir="${dist.docs.dir}">
-         <fileset dir="${docs.src.dir}">
-            <include name="*.css"/>
-         </fileset>
-      </copy>
-
-      <mkdir dir="${dist.docs.dir}/images"/>
-      <copy todir="${dist.docs.dir}/images">
-         <fileset dir="${docs.src.dir}/images">
-            <include name="*.png"/>
-            <include name="*.gif"/>
-            <include name="*.jpg"/>
-         </fileset>
-      </copy>
-   </target>
+   <target name="docs" description="Builds the MX4J documentation" />
 
    <target name="main" depends="tests, compile.examples"/>
 
@@ -552,50 +506,7 @@
 
    </target>
 
-   <target name="tests" description="Prepares the environment for the tests" depends="flags, compile.tests">
-      <mkdir dir="${dist.test.dir}"/>
-
-      <copy todir="${dist.test.dir}">
-         <fileset dir="${lib.dir}">
-            <include name="junit.jar"/>
-            <include name="xmlunit.jar"/>
-            <include name="xml-apis.jar"/>
-            <include name="xercesImpl.jar"/>
-            <include name="xalan.jar"/>
-            <include name="commons-logging.jar"/>
-            <include name="log4j.jar"/>
-            <include name="bcel.jar"/>
-            <include name="axis.jar"/>
-            <include name="jaxrpc.jar"/>
-            <include name="saaj.jar"/>
-            <include name="wsdl4j.jar"/>
-            <include name="commons-discovery.jar"/>
-            <include name="org.mortbay.jetty.jar"/>
-            <!-- Also jars downloaded apart -->
-            <include name="servlet.jar"/>
-            <include name="jython.jar"/>
-            <include name="jsse.jar"/>
-            <include name="jcert.jar"/>
-            <include name="jnet.jar"/>
-            <include name="jaas.jar"/>
-            <include name="jmxri.jar"/>
-            <include name="jmxremote.jar"/>
-            <include name="jmxremote_optional.jar"/>
-         </fileset>
-         <fileset dir="${dist.lib.dir}">
-            <include name="*.jar"/>
-            <include name="*.war"/>
-            <exclude name="${name}.jar"/>
-            <exclude name="${name}-remote.jar"/>
-         </fileset>
-         <fileset dir="${etc.dir}">
-            <include name="log4j.xml"/>
-            <include name="key.store"/>
-            <include name="trust.store"/>
-         </fileset>
-      </copy>
-
-   </target>
+   <target name="tests" description="Prepares the environment for the tests" depends="flags" />
 
    <target name="singletest" description="Executes the test class defined by the system property 'testname'" depends="tests">
       <junit printsummary="withOutAndErr" fork="yes" dir="${basedir}">
@@ -635,7 +546,6 @@
                <exclude name="test/mx4j/remote/**" unless="jaas.present"/>
                <exclude name="test/mx4j/tools/remote/**" unless="jaas.present"/>
                <exclude name="test/mx4j/tools/jython/**" unless="jython.present"/>
-               <exclude name="test/**/*SecurityManager*" unless="jdk14.present"/>
             </fileset>
          </batchtest>
          <classpath>
diff -uNr mx/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java mx-patched/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java
--- mx/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java	2004-04-05 07:09:10.000000000 -0400
+++ mx-patched/src/tools/mx4j/tools/remote/soap/SOAPConnectorServer.java	2004-07-08 18:46:04.000000000 -0400
@@ -21,7 +21,6 @@
 import mx4j.tools.remote.AbstractJMXConnectorServer;
 import mx4j.tools.remote.soap.web.axis.SimpleAxisWebContainer;
 import mx4j.tools.remote.soap.web.WebContainer;
-import mx4j.tools.remote.soap.web.jetty.JettyWebContainer;
 
 /**
  * @author <a href="mailto:biorn_steedom@users.sourceforge.net">Simone Bordet</a>
@@ -94,8 +93,6 @@
       {
          // Create and start an embedded web container
          String webContainerClassName = environment == null ? null : (String)environment.get(EMBEDDED_WEB_CONTAINER_CLASS);
-         // Not present, by default use Jetty
-         if (webContainerClassName == null || webContainerClassName.length() == 0) webContainerClassName = JettyWebContainer.class.getName();
          webContainer = createWebContainer(webContainerClassName, environment);
          // Jetty not present, use AXIS
          if (webContainer == null) webContainer = createWebContainer(SimpleAxisWebContainer.class.getName(), environment);