Author: costin
Date: Wed Nov 23 22:21:32 2005
New Revision: 348672
URL: http://svn.apache.org/viewcvs?rev=348672&view=rev
Log:
Few fixes and adjustments
Modified:
tomcat/sandbox/.classpath
tomcat/sandbox/build.xml
tomcat/sandbox/java/org/apache/tomcat/util/net/AcceptorEndpoint.java
Modified: tomcat/sandbox/.classpath
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/.classpath?rev=348672&r1=348671&r2=348672&view=diff
==============================================================================
--- tomcat/sandbox/.classpath (original)
+++ tomcat/sandbox/.classpath Wed Nov 23 22:21:32 2005
@@ -8,5 +8,5 @@
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/junit3.8.1/junit.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/servlet-api-2.4/lib/servlet-api.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/commons-modeler-1.1/commons-modeler.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="classes"/>
</classpath>
Modified: tomcat/sandbox/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/build.xml?rev=348672&r1=348671&r2=348672&view=diff
==============================================================================
--- tomcat/sandbox/build.xml (original)
+++ tomcat/sandbox/build.xml Wed Nov 23 22:21:32 2005
@@ -11,6 +11,8 @@
<property name="tc55xbase" location=".." />
<!-- Source dependencies -->
+ <property name="target.vm" value="1.4"/>
+ <property name="source.vm" value="1.4"/>
<property name="api.home" value="${tc55xbase}/servletapi"/>
<property name="container.home" value="${tc55xbase}/container"/>
<property name="jasper.home" value="${tc55xbase}/jasper"/>
@@ -113,7 +115,7 @@
<target name="compile-connectors">
<mkdir dir="${connectors.home}/bin" />
- <javac destdir="${connectors.home}/bin"
+ <javac destdir="${connectors.home}/bin" source="${source.vm}"
target="${target.vm}"
deprecation="false" debug="false" >
<classpath refid="runtime-deps" />
<src path="${connectors.home}/coyote/src/java" />
@@ -126,6 +128,7 @@
<exclude name="org/apache/coyote/tomcat3/**"/>
<exclude name="org/apache/coyote/tomcat4/**"/>
<exclude name="org/apache/tomcat/util/net/puretls/**"/>
+ <exclude
name="org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java"/>
</javac>
<copy todir="${connectors.home}/bin" >
<fileset dir="${connectors.home}/util/java" includes="**/*.properties
**/*.xml"/>
@@ -139,7 +142,7 @@
<target name="compile-sandbox">
<mkdir dir="${sandbox.home}/bin" />
- <javac destdir="${sandbox.home}/bin"
+ <javac destdir="${sandbox.home}/classes" source="${source.vm}"
target="${target.vm}"
deprecation="false" debug="false" >
<src path="${sandbox.home}/java" />
<classpath>
@@ -147,22 +150,24 @@
<pathelement location="${connectors.home}/bin"/>
</classpath>
</javac>
- <copy todir="${sandbox.home}/bin" >
+ <copy todir="${sandbox.home}/classes" >
<fileset dir="${sandbox.home}/java" includes="**/*.properties **/*.xml"/>
</copy>
</target>
<target name="compile-container">
<mkdir dir="${container.home}/bin" />
- <javac destdir="${container.home}/bin"
+ <javac destdir="${container.home}/bin" source="${source.vm}"
target="${target.vm}"
deprecation="false" debug="false" >
<src path="${container.home}/catalina/src/share" />
+ <!--
<src path="${container.home}/modules/cluster/src/share" />
<src path="${container.home}/modules/storeconfig/src/share" />
<src path="${container.home}/webapps/admin/WEB-INF/classes" />
<src path="${container.home}/webapps/balancer/WEB-INF/classes" />
<src path="${container.home}/webapps/host-manager/WEB-INF/classes" />
<src path="${container.home}/webapps/manager/WEB-INF/classes" />
+ -->
<src path="${container.home}/webapps/jmxremote/WEB-INF/src" />
<src path="${container.home}/webapps/docs/appdev/sample/src" />
<classpath>
@@ -179,7 +184,7 @@
<target name="compile-jasper">
<mkdir dir="${jasper.home}/bin" />
- <javac destdir="${jasper.home}/bin"
+ <javac destdir="${jasper.home}/bin" source="${source.vm}"
target="${target.vm}"
deprecation="false" debug="false" >
<src path="${jasper.home}/src/share" />
<classpath>
@@ -195,7 +200,7 @@
<target name="clean-compile">
<delete dir="${container.home}/bin" includes="**"/>
<delete dir="${sandbox.home}/bin" includes="**"/>
- <delete dir="${connector.home}/bin" includes="**"/>
+ <delete dir="${connectors.home}/bin" includes="**"/>
<delete dir="${jasper.home}/bin" includes="**"/>
</target>
@@ -208,9 +213,23 @@
<exclude name="org/apache/tomcat/util/buf/**"/>
</fileset>
<fileset dir="${sandbox.home}/bin" >
+ <exclude name="org/apache/tomcat/util/net/Leader**"/>
+ <exclude name="org/apache/tomcat/util/net/Master**"/>
+ <exclude name="org/apache/tomcat/util/net/SSL**"/>
+ <exclude name="org/apache/tomcat/util/net/jsse/**"/>
+ <exclude name="org/apache/tomcat/util/net/ServerSocketFactory**"/>
+ <exclude name="org/apache/tomcat/util/net/Default**"/>
</fileset>
<fileset dir="${connectors.home}/bin" >
<exclude name="org/apache/tomcat/util/buf/**"/>
+ <exclude name="org/apache/tomcat/util/net/jsse/**"/>
+ <exclude name="org/apache/tomcat/util/threads/Expirer**"/>
+ <exclude name="org/apache/tomcat/util/threads/Reaper**"/>
+ <exclude name="org/apache/tomcat/util/threads/ThreadPoolListener.*"/>
+ <exclude name="org/apache/tomcat/util/threads/ThreadPool.*"/>
+ <exclude name="org/apache/tomcat/util/threads/Control**"/>
+ <exclude name="org/apache/tomcat/util/threads/Monitor**"/>
+ <exclude name="org/apache/tomcat/util/net/**"/>
</fileset>
<zipfileset src="${base.path}/servlet-api-2.4/lib/servlet-api.jar" >
<exclude name="META-INF/**" />
@@ -284,27 +303,51 @@
This is only the http connector, for testing/experimental purposes.
-->
- <target name="tomcat-http11" depends="compile">
+ <target name="tomcat-http11"
+ depends="compile-connectors,compile-sandbox,tomcat-http11.jar">
+ </target>
+
+ <target name="tomcat-http11.jar">
<mkdir dir="runtime"/>
<jar jarfile="runtime/tomcat-http11.jar"
manifest="resources/coyote-http11.MF">
+ <fileset dir="${sandbox.home}/classes" >
+ <include name="org/**" />
+ <exclude name="org/apache/coyote/http11/Http11Protocol**"/>
+ <exclude name="org/apache/coyote/http11/Http11AprProcessor**"/>
+ <exclude name="org/apache/coyote/http11/Http11AprProtocol**"/>
+ <exclude name="org/apache/coyote/http11/InternalAprInputBuffer**"/>
+ <exclude name="org/apache/coyote/http11/InternalAprOutputBuffer**"/>
+ <exclude name="org/apache/tomcat/util/net/Leader**"/>
+ <exclude name="org/apache/tomcat/util/net/Master**"/>
+ <exclude name="org/apache/tomcat/util/net/SSL**"/>
+ <exclude name="org/apache/tomcat/util/net/jsse/**"/>
+ <exclude name="org/apache/tomcat/util/net/ServerSocketFactory**"/>
+ <exclude name="org/apache/tomcat/util/net/Default**"/>
+ </fileset>
+
<fileset dir="${connectors.home}/bin" >
+ <include name="org/apache/tomcat/util/**"/>
+ <include name="org/apache/tomcat/jni/**"/>
+ <include name="org/apache/tomcat/*"/>
+ <include name="org/apache/coyote/**"/>
+ <exclude name="org/apache/coyote/memory/**"/>
+ <exclude name="org/apache/coyote/http11/*"/>
+ <include name="org/apache/coyote/http11/filters/*"/>
<exclude name="org/apache/tomcat/util/buf/**"/>
+ <exclude name="org/apache/tomcat/util/IntrospectionUtils**"/>
+ <exclude name="org/apache/tomcat/util/digester/**"/>
+ <exclude name="org/apache/tomcat/util/compat/**"/>
+ <exclude name="org/apache/tomcat/util/jmx/**"/>
+ <exclude name="org/apache/tomcat/util/net/**"/>
+ <exclude name="org/apache/tomcat/util/log/**"/>
+ <exclude name="org/apache/tomcat/util/threads/Expirer**"/>
+ <exclude name="org/apache/tomcat/util/threads/Reaper**"/>
+ <exclude name="org/apache/tomcat/util/threads/ThreadPoolListener.*"/>
+ <exclude name="org/apache/tomcat/util/threads/ThreadPool.*"/>
+ <exclude name="org/apache/tomcat/util/threads/Control**"/>
+ <exclude name="org/apache/tomcat/util/threads/Monitor**"/>
</fileset>
- <fileset dir="${sandbox.home}/bin" >
- </fileset>
- <exclude name="org/apache/coyote/http11/Http11Protocol**"/>
- <exclude name="org/apache/coyote/http11/Http11AprProcessor**"/>
- <exclude name="org/apache/coyote/http11/Http11AprProtocol**"/>
- <exclude name="org/apache/coyote/http11/InternalAprInputBuffer**"/>
- <exclude name="org/apache/coyote/http11/InternalAprOutputBuffer**"/>
- <exclude name="org/apache/tomcat/util/digester/**"/>
- <exclude name="org/apache/tomcat/util/compat/**"/>
- <exclude name="org/apache/tomcat/util/jmx/**"/>
- <exclude name="org/apache/tomcat/util/log/**"/>
- <exclude name="org/apache/tomcat/util/IntrospectionUtils**"/>
- <exclude name="org/apache/coyote/tomcat3/**"/>
- <exclude name="org/apache/coyote/tomcat4/**"/>
- <exclude name="org/apache/coyote/memory/**"/>
+
</jar>
</target>
Modified: tomcat/sandbox/java/org/apache/tomcat/util/net/AcceptorEndpoint.java
URL:
http://svn.apache.org/viewcvs/tomcat/sandbox/java/org/apache/tomcat/util/net/AcceptorEndpoint.java?rev=348672&r1=348671&r2=348672&view=diff
==============================================================================
--- tomcat/sandbox/java/org/apache/tomcat/util/net/AcceptorEndpoint.java
(original)
+++ tomcat/sandbox/java/org/apache/tomcat/util/net/AcceptorEndpoint.java Wed
Nov 23 22:21:32 2005
@@ -121,6 +121,10 @@
}
}
+ public void run() {
+ // nothing
+ }
+
public void workerDone(Runnable workerThread) {
curThreads--;
}
@@ -132,7 +136,9 @@
void newAcceptor() {
acceptors++;
Thread t=new ThreadWithAttributes( this, new AcceptorThread());
- t.setPriority(threadPriority);
+ if( threadPriority > 0 ) {
+ t.setPriority(threadPriority);
+ }
t.setDaemon(daemon);
threadStart( t );
t.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
