You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/10/27 06:02:30 UTC
svn commit: r328783 - in /beehive/trunk/netui: ant/ external/tomcat/5.0.x/
external/tomcat/5x/ src/tomcat-common/ src/tomcat-common/5.0.x/
src/tomcat-common/5.0.x/org/ src/tomcat-common/5x/ src/tomcat-server/
src/tomcat-server/5.0.x/ src/tomcat-server/...
Author: rich
Date: Wed Oct 26 21:02:15 2005
New Revision: 328783
URL: http://svn.apache.org/viewcvs?rev=328783&view=rev
Log:
Changes to allow Abdessattar's Tomcat 5.5.x patch side-by-side with 5.0.x support. Eventually both of these will be moved to a separate location in the tree, where they can be released independently from the rest of the code.
tests: bvt in netui, drt in netui/test/webapps/tomcat (WinXP)
BB: same (linux)
Added:
beehive/trunk/netui/external/tomcat/5.0.x/
- copied from r326609, beehive/trunk/netui/external/tomcat/5x/
beehive/trunk/netui/external/tomcat/5.0.x/catalina.jar
- copied unchanged from r328676, beehive/trunk/netui/external/tomcat/5x/catalina.jar
beehive/trunk/netui/external/tomcat/5.0.x/tomcat-coyote.jar
- copied unchanged from r328676, beehive/trunk/netui/external/tomcat/5x/tomcat-coyote.jar
beehive/trunk/netui/src/tomcat-common/5.0.x/
- copied from r326609, beehive/trunk/netui/src/tomcat-common/5x/
beehive/trunk/netui/src/tomcat-common/5.0.x/build.xml
- copied, changed from r328676, beehive/trunk/netui/src/tomcat-common/5x/build.xml
beehive/trunk/netui/src/tomcat-common/5.0.x/org/
- copied from r328676, beehive/trunk/netui/src/tomcat-common/5x/org/
beehive/trunk/netui/src/tomcat-server/5.0.x/
- copied from r326609, beehive/trunk/netui/src/tomcat-server/5x/
beehive/trunk/netui/src/tomcat-server/5.0.x/build.xml
- copied, changed from r328676, beehive/trunk/netui/src/tomcat-server/5x/build.xml
beehive/trunk/netui/src/tomcat-server/5.0.x/org/
- copied from r328676, beehive/trunk/netui/src/tomcat-server/5x/org/
beehive/trunk/netui/src/tomcat-webapp/5.0.x/
- copied from r326609, beehive/trunk/netui/src/tomcat-webapp/5x/
beehive/trunk/netui/src/tomcat-webapp/5.0.x/META-INF/
- copied from r328676, beehive/trunk/netui/src/tomcat-webapp/5x/META-INF/
beehive/trunk/netui/src/tomcat-webapp/5.0.x/build.xml
- copied, changed from r328676, beehive/trunk/netui/src/tomcat-webapp/5x/build.xml
beehive/trunk/netui/src/tomcat-webapp/5.0.x/org/
- copied from r328676, beehive/trunk/netui/src/tomcat-webapp/5x/org/
beehive/trunk/netui/test/webapps/tomcat/README.txt (with props)
beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/META-INF/
beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/META-INF/context.xml (with props)
Removed:
beehive/trunk/netui/external/tomcat/5x/
beehive/trunk/netui/src/tomcat-common/5x/
beehive/trunk/netui/src/tomcat-server/5x/
beehive/trunk/netui/src/tomcat-webapp/5x/
beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/error.jsp
Modified:
beehive/trunk/netui/ant/netui.properties
beehive/trunk/netui/src/tomcat-common/build.xml
beehive/trunk/netui/src/tomcat-server/build.xml
beehive/trunk/netui/src/tomcat-webapp/build.xml
beehive/trunk/netui/test/webapps/tomcat/build.xml
beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml
Modified: beehive/trunk/netui/ant/netui.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/ant/netui.properties?rev=328783&r1=328782&r2=328783&view=diff
==============================================================================
--- beehive/trunk/netui/ant/netui.properties (original)
+++ beehive/trunk/netui/ant/netui.properties Wed Oct 26 21:02:15 2005
@@ -36,10 +36,10 @@
jsf-api.jar=${myfaces.dir}/myfaces-jsf-api.jar
#
-# Tomcat properties. These JARs are used to compile the Tomcat 5x ServletContextAdapter.
+# Tomcat properties. These JARs are used to compile the Tomcat 5.0.x ServletContextAdapter.
#
-catalina.5x.jar=${tomcat.lib.dir}/5x/catalina.jar
-coyote.5x.jar=${tomcat.lib.dir}/5x/tomcat-coyote.jar
+catalina.5.0.x.jar=${tomcat.lib.dir}/5.0.x/catalina.jar
+coyote.5.0.x.jar=${tomcat.lib.dir}/5.0.x/tomcat-coyote.jar
#
# XDoclet properties. These JARs are used by the Page Flow XDoclet compiler (compiler-xdoclet module)
@@ -58,9 +58,9 @@
compiler.jar.name=beehive-netui-compiler.jar
compiler-xdoclet.jar.name=beehive-netui-compiler-xdoclet.jar
-netui-tomcat-common.5x.jar.name=beehive-netui-tomcat-common-5x.jar
-netui-tomcat-server.5x.jar.name=beehive-netui-tomcat-server-5x.jar
-netui-tomcat-webapp.5x.jar.name=beehive-netui-tomcat-webapp-5x.jar
+netui-tomcat-common.5.0.x.jar.name=beehive-netui-tomcat-common-5.0.x.jar
+netui-tomcat-server.5.0.x.jar.name=beehive-netui-tomcat-server-5.0.x.jar
+netui-tomcat-webapp.5.0.x.jar.name=beehive-netui-tomcat-webapp-5.0.x.jar
# NetUI TLD Names
netui-tags-simple.tld.name=beehive-netui-tags-simple.tld
Copied: beehive/trunk/netui/src/tomcat-common/5.0.x/build.xml (from r328676, beehive/trunk/netui/src/tomcat-common/5x/build.xml)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-common/5.0.x/build.xml?p2=beehive/trunk/netui/src/tomcat-common/5.0.x/build.xml&p1=beehive/trunk/netui/src/tomcat-common/5x/build.xml&r1=328676&r2=328783&rev=328783&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-common/5x/build.xml (original)
+++ beehive/trunk/netui/src/tomcat-common/5.0.x/build.xml Wed Oct 26 21:02:15 2005
@@ -4,7 +4,7 @@
<import file="../../../netui-imports.xml"/>
- <property name="module.dir" location="${src.dir}/${module.name}/5x"/>
+ <property name="module.dir" location="${src.dir}/${module.name}/5.0.x"/>
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
</path>
@@ -30,12 +30,12 @@
<fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
- <jar jarfile="${build.lib.dir}/${netui-tomcat-common.5x.jar.name}" basedir="${classes.dir}/${module.name}"/>
+ <jar jarfile="${build.lib.dir}/${netui-tomcat-common.5.0.x.jar.name}" basedir="${classes.dir}/${module.name}"/>
</target>
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
- <delete dir="${build.lib.dir}/${netui-tomcat-common.5x.jar.name}"/>
+ <delete dir="${build.lib.dir}/${netui-tomcat-common.5.0.x.jar.name}"/>
</target>
</project>
Modified: beehive/trunk/netui/src/tomcat-common/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-common/build.xml?rev=328783&r1=328782&r2=328783&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-common/build.xml (original)
+++ beehive/trunk/netui/src/tomcat-common/build.xml Wed Oct 26 21:02:15 2005
@@ -8,13 +8,13 @@
<property name="module.dir" location="${src.dir}/${module.name}"/>
<target name="build">
- <ant antfile="build.xml" target="build" dir="${module.dir}/5x" inheritAll="false">
+ <ant antfile="build.xml" target="build" dir="${module.dir}/5.0.x" inheritAll="false">
<property name="module.name" value="${module.name}"/>
</ant>
</target>
<target name="clean">
- <ant antfile="build.xml" target="clean" dir="${module.dir}/5x" inheritAll="false">
+ <ant antfile="build.xml" target="clean" dir="${module.dir}/5.0.x" inheritAll="false">
<property name="module.name" value="${module.name}"/>
</ant>
</target>
Copied: beehive/trunk/netui/src/tomcat-server/5.0.x/build.xml (from r328676, beehive/trunk/netui/src/tomcat-server/5x/build.xml)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-server/5.0.x/build.xml?p2=beehive/trunk/netui/src/tomcat-server/5.0.x/build.xml&p1=beehive/trunk/netui/src/tomcat-server/5x/build.xml&r1=328676&r2=328783&rev=328783&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-server/5x/build.xml (original)
+++ beehive/trunk/netui/src/tomcat-server/5.0.x/build.xml Wed Oct 26 21:02:15 2005
@@ -4,14 +4,14 @@
<import file="../../../netui-imports.xml"/>
- <property name="module.dir" location="${src.dir}/${module.name}/5x"/>
+ <property name="module.dir" location="${src.dir}/${module.name}/5.0.x"/>
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
<path refid="log4j.dependency.path"/>
<path refid="commons-logging.dependency.path"/>
- <pathelement location="${build.lib.dir}/beehive-netui-tomcat-common-5x.jar"/>
- <pathelement location="${catalina.5x.jar}"/>
- <pathelement location="${coyote.5x.jar}"/>
+ <pathelement location="${build.lib.dir}/beehive-netui-tomcat-common-5.0.x.jar"/>
+ <pathelement location="${catalina.5.0.x.jar}"/>
+ <pathelement location="${coyote.5.0.x.jar}"/>
</path>
<target name="build">
@@ -36,12 +36,12 @@
<fileset dir="${module.dir}" includes="**/mbeans-descriptors.xml"/>
</copy>
- <jar jarfile="${build.lib.dir}/${netui-tomcat-server.5x.jar.name}" basedir="${classes.dir}/${module.name}"/>
+ <jar jarfile="${build.lib.dir}/${netui-tomcat-server.5.0.x.jar.name}" basedir="${classes.dir}/${module.name}"/>
</target>
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
- <delete dir="${build.lib.dir}/${netui-tomcat-server.5x.jar.name}"/>
+ <delete dir="${build.lib.dir}/${netui-tomcat-server.5.0.x.jar.name}"/>
</target>
</project>
Modified: beehive/trunk/netui/src/tomcat-server/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-server/build.xml?rev=328783&r1=328782&r2=328783&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-server/build.xml (original)
+++ beehive/trunk/netui/src/tomcat-server/build.xml Wed Oct 26 21:02:15 2005
@@ -8,13 +8,13 @@
<property name="module.dir" location="${src.dir}/${module.name}"/>
<target name="build">
- <ant antfile="build.xml" target="build" dir="${module.dir}/5x" inheritAll="false">
+ <ant antfile="build.xml" target="build" dir="${module.dir}/5.0.x" inheritAll="false">
<property name="module.name" value="${module.name}"/>
</ant>
</target>
<target name="clean">
- <ant antfile="build.xml" target="clean" dir="${module.dir}/5x" inheritAll="false">
+ <ant antfile="build.xml" target="clean" dir="${module.dir}/5.0.x" inheritAll="false">
<property name="module.name" value="${module.name}"/>
</ant>
</target>
Copied: beehive/trunk/netui/src/tomcat-webapp/5.0.x/build.xml (from r328676, beehive/trunk/netui/src/tomcat-webapp/5x/build.xml)
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-webapp/5.0.x/build.xml?p2=beehive/trunk/netui/src/tomcat-webapp/5.0.x/build.xml&p1=beehive/trunk/netui/src/tomcat-webapp/5x/build.xml&r1=328676&r2=328783&rev=328783&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/5x/build.xml (original)
+++ beehive/trunk/netui/src/tomcat-webapp/5.0.x/build.xml Wed Oct 26 21:02:15 2005
@@ -4,10 +4,10 @@
<import file="../../../netui-imports.xml"/>
- <property name="module.dir" location="${src.dir}/${module.name}/5x"/>
+ <property name="module.dir" location="${src.dir}/${module.name}/5.0.x"/>
<path id="module.classpath">
<path refid="servlet.dependency.path"/>
- <pathelement path="${build.lib.dir}/beehive-netui-tomcat-common-5x.jar"/>
+ <pathelement path="${build.lib.dir}/beehive-netui-tomcat-common-5.0.x.jar"/>
<pathelement path="${classes.dir}/scoping"/>
<pathelement path="${classes.dir}/util"/>
<pathelement path="${classes.dir}/pageflow"/>
@@ -35,12 +35,12 @@
<fileset dir="${module.dir}" includes="META-INF/**"/>
</copy>
- <jar jarfile="${build.lib.dir}/${netui-tomcat-webapp.5x.jar.name}" basedir="${classes.dir}/${module.name}"/>
+ <jar jarfile="${build.lib.dir}/${netui-tomcat-webapp.5.0.x.jar.name}" basedir="${classes.dir}/${module.name}"/>
</target>
<target name="clean">
<delete dir="${classes.dir}/${module.name}"/>
- <delete dir="${build.lib.dir}/${netui-tomcat-webapp.5x.jar.name}"/>
+ <delete dir="${build.lib.dir}/${netui-tomcat-webapp.5.0.x.jar.name}"/>
</target>
</project>
Modified: beehive/trunk/netui/src/tomcat-webapp/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tomcat-webapp/build.xml?rev=328783&r1=328782&r2=328783&view=diff
==============================================================================
--- beehive/trunk/netui/src/tomcat-webapp/build.xml (original)
+++ beehive/trunk/netui/src/tomcat-webapp/build.xml Wed Oct 26 21:02:15 2005
@@ -8,13 +8,13 @@
<property name="module.dir" location="${src.dir}/${module.name}"/>
<target name="build">
- <ant antfile="build.xml" target="build" dir="${module.dir}/5x" inheritAll="false">
+ <ant antfile="build.xml" target="build" dir="${module.dir}/5.0.x" inheritAll="false">
<property name="module.name" value="${module.name}"/>
</ant>
</target>
<target name="clean">
- <ant antfile="build.xml" target="clean" dir="${module.dir}/5x" inheritAll="false">
+ <ant antfile="build.xml" target="clean" dir="${module.dir}/5.0.x" inheritAll="false">
<property name="module.name" value="${module.name}"/>
</ant>
</target>
Added: beehive/trunk/netui/test/webapps/tomcat/README.txt
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/tomcat/README.txt?rev=328783&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/tomcat/README.txt (added)
+++ beehive/trunk/netui/test/webapps/tomcat/README.txt Wed Oct 26 21:02:15 2005
@@ -0,0 +1,25 @@
+To run the Tomcat DRTs (where VERSION is 5.0.x, 5.5.x, etc.):
+ - Install beehive-netui-tomcat-server-VERSION.jar to server/lib in a Tomcat installation.
+ - Install beehive-netui-tomcat-common-VERSION.jar to common/lib in the Tomcat installation.
+ - Edit conf/server.xml in the Tomcat installation:
+ 1) Change the ServerLifecycleListener entry so that it uses the NetUI descriptors:
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
+ debug="0"
+ descriptors="/org/apache/beehive/netui/tomcat/mbeans-descriptors.xml" />
+
+ 2) If you are using Tomcat 5.0.x, add the following <Context> entry in the <Host> element:
+
+ <Context path="/tomcatWeb"
+ docBase="<path to the tomcatWeb directory"
+ debug="0"
+ reloadable="true"
+ crossContext="true">
+ <Valve className="org.apache.beehive.netui.tomcat.PageflowValve" debug="0" />
+ </Context>
+
+ In Tomcat 5.5.x and above, this is picked up from META-INF/context.xml in the webapp.
+
+ - Run 'ant build.VERSION'.
+ - Start Tomcat.
+ - Run 'ant deploy'.
+ - Run 'ant drt.running'.
Propchange: beehive/trunk/netui/test/webapps/tomcat/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/tomcat/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/tomcat/build.xml?rev=328783&r1=328782&r2=328783&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/tomcat/build.xml (original)
+++ beehive/trunk/netui/test/webapps/tomcat/build.xml Wed Oct 26 21:02:15 2005
@@ -18,7 +18,12 @@
<!-- Targets for building a webapp -->
<!-- -->
<!-- ================================================================ -->
- <target name="build" description="Build webapp">
+ <target name="build.tomcat5.0.x">
+ <property name="tomcat.webapp.jar" value="${netui-tomcat-webapp.5.0.x.jar.name}"/>
+ <antcall target="build.internal"/>
+ </target>
+
+ <target name="build.internal">
<echo message="--------------------------------------------------"/>
<echo message="| NetUI tomcatWeb DRT webapp build starting |"/>
<echo message="--------------------------------------------------"/>
@@ -40,11 +45,17 @@
<property name="webinf.dir" value="${webapp.dir}/WEB-INF"/>
- <!-- copy the tomcat webapp integration library -->
+ <!-- deploy the tomcat webapp integration library -->
<copy todir="${webinf.dir}/lib" overwrite="true" failonerror="true">
<fileset dir="${build.lib.dir}">
- <include name="${netui-tomcat-webapp.5x.jar.name}"/>
+ <include name="${tomcat.webapp.jar}"/>
</fileset>
+ </copy>
+
+ <!-- deploy XMLBeans which isn't included in the default webapp template -->
+ <copy todir="${webapp.dir}/WEB-INF/lib">
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
</copy>
<build-webapp webappDir="${webapp.dir}"/>
Added: beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/META-INF/context.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/META-INF/context.xml?rev=328783&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/META-INF/context.xml (added)
+++ beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/META-INF/context.xml Wed Oct 26 21:02:15 2005
@@ -0,0 +1,4 @@
+<Context path="/tomcatWeb" debug="0" reloadable="true" crossContext="true">
+ <Valve className="org.apache.beehive.netui.tomcat.PageflowValve" debug="0" />
+</Context>
+
Propchange: beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/META-INF/context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml?rev=328783&r1=328782&r2=328783&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml (original)
+++ beehive/trunk/netui/test/webapps/tomcat/tomcatWeb/WEB-INF/web.xml Wed Oct 26 21:02:15 2005
@@ -98,11 +98,6 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
- <error-page>
- <error-code>500</error-code>
- <location>/error.jsp</location>
- </error-page>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>Secure PageFlow - all</web-resource-name>