[Aplaws-commit] r897 - in trunk: ccm-auth-http/web/WEB-INF ccm-core/web/WEB-INF ccm-formbuilder-pdf/web/WEB-INF ccm-forum/web/WEB-INF ccm-ldn-aplaws/bundles/camden/cfg ccm-ldn-aplaws/bundles/complete/cfg ccm-ldn-aplaws/web/WEB-INF ccm-ldn-atoz/web/WEB-INF ccm-ldn-rss/web/WEB-INF ccm-ldn-search/web/WEB-INF ccm-ldn-shortcuts/web/WEB-INF ccm-ldn-subsite/web/WEB-INF ccm-ldn-terms/web/WEB-INF ccm-ldn-theme/web/WEB-INF ccm-simplesurvey/web/WEB-INF tools/tools/server/tomcat/conf

[<ap...@vh...>]

Author: apevec
Date: 2005-09-22 05:07:25 +0200 (Thu, 22 Sep 2005)
New Revision: 897

Modified:
   trunk/ccm-auth-http/web/WEB-INF/web.xml
   trunk/ccm-core/web/WEB-INF/web.xml-default
   trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml
   trunk/ccm-forum/web/WEB-INF/web.xml
   trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml
   trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
   trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
   trunk/ccm-ldn-atoz/web/WEB-INF/web.xml
   trunk/ccm-ldn-rss/web/WEB-INF/web.xml
   trunk/ccm-ldn-search/web/WEB-INF/web.xml
   trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml
   trunk/ccm-ldn-subsite/web/WEB-INF/web.xml
   trunk/ccm-ldn-terms/web/WEB-INF/web.xml
   trunk/ccm-ldn-theme/web/WEB-INF/web.xml
   trunk/ccm-simplesurvey/web/WEB-INF/web.xml
   trunk/tools/tools/server/tomcat/conf/server-default.xml.in
   trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
Log:
SF patch [ 1205024 ] Patch for apache-tomcat connector in server.xml (AJP13)
SF patch [ 1221316 ] Aplaws with Tomcat 5 (taglibs in web.xml)


Modified: trunk/ccm-auth-http/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-auth-http/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-auth-http/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-core/web/WEB-INF/web.xml-default
===================================================================
--- trunk/ccm-core/web/WEB-INF/web.xml-default	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-core/web/WEB-INF/web.xml-default	2005-09-22 03:07:25 UTC (rev 897)
@@ -181,4 +181,16 @@
     <exception-type>java.lang.Error</exception-type>
     <location>/error/general.jsp</location>
   </error-page>
+
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-formbuilder-pdf/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -23,4 +23,15 @@
     <url-pattern>/Converter/</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-forum/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-forum/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-forum/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -23,4 +23,15 @@
     <url-pattern>/main/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-aplaws/bundles/camden/cfg/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -318,4 +318,15 @@
     <location>/error/404.jsp</location>
   </error-page>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-aplaws/bundles/complete/cfg/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -314,4 +314,15 @@
     <location>/error/general.jsp</location>
   </error-page>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
===================================================================
--- trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws	2005-09-22 03:07:25 UTC (rev 897)
@@ -293,4 +293,15 @@
     <location>/error/general.jsp</location>
   </error-page>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-atoz/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-atoz/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-atoz/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -28,4 +28,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-rss/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-rss/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-rss/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -32,4 +32,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-search/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-search/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-search/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -46,4 +46,16 @@
     <servlet-name>AxisServlet</servlet-name>
     <url-pattern>/services/*</url-pattern>
   </servlet-mapping>
+
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-shortcuts/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-subsite/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-subsite/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-subsite/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-terms/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-terms/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-terms/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -28,4 +28,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-ldn-theme/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-ldn-theme/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-ldn-theme/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -42,4 +42,15 @@
     <url-pattern>/theme-files/download/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/ccm-simplesurvey/web/WEB-INF/web.xml
===================================================================
--- trunk/ccm-simplesurvey/web/WEB-INF/web.xml	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/ccm-simplesurvey/web/WEB-INF/web.xml	2005-09-22 03:07:25 UTC (rev 897)
@@ -27,4 +27,15 @@
     <url-pattern>/files/*</url-pattern>
   </servlet-mapping>
 
+  <!-- TAGLIBS -->
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>

Modified: trunk/tools/tools/server/tomcat/conf/server-default.xml.in
===================================================================
--- trunk/tools/tools/server/tomcat/conf/server-default.xml.in	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/tools/tools/server/tomcat/conf/server-default.xml.in	2005-09-22 03:07:25 UTC (rev 897)
@@ -1,13 +1,23 @@
 <Server port="::shutdown-port::" shutdown="SHUTDOWN" debug="0">
   <!--
      - http-port => ::http-port::
+     - ajp-port => ::ajp-port::
      - shutdown-port => ::shutdown-port::
     -->
   <Service name="Tomcat-Standalone">
+
     <Connector className="org.apache.catalina.connector.http.HttpConnector"
       port="::http-port::" minProcessors="10" maxProcessors="20"
       enableLookups="true" redirectPort="8443"
       acceptCount="10" debug="0" connectionTimeout="60000"/>
+
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+      port="::ajp-port::" minProcessors="5" maxProcessors="75"
+      enableLookups="true" redirectPort="8443"
+      acceptCount="10" debug="0" connectionTimeout="0"
+      useURIValidationHack="false"
+      protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+
     <Engine name="Standalone::http-port::" defaultHost="localhost" debug="0">
       <Logger className="org.apache.catalina.logger.FileLogger"
         prefix="catalina." suffix=".log" directory="::log-dir::"

Modified: trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
===================================================================
--- trunk/tools/tools/server/tomcat/conf/server-devel.xml.in	2005-09-22 03:04:44 UTC (rev 896)
+++ trunk/tools/tools/server/tomcat/conf/server-devel.xml.in	2005-09-22 03:07:25 UTC (rev 897)
@@ -1,13 +1,23 @@
 <Server port="::shutdown-port::" shutdown="SHUTDOWN" debug="9">
   <!--
      - http-port => ::http-port::
+     - ajp-port => ::ajp-port::
      - shutdown-port => ::shutdown-port::
     -->
   <Service name="Tomcat-Standalone">
+
     <Connector className="org.apache.catalina.connector.http.HttpConnector"
       port="::http-port::" minProcessors="5" maxProcessors="20"
       enableLookups="true" redirectPort="8443"
       acceptCount="10" debug="9" connectionTimeout="60000"/>
+
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+      port="::ajp-port::" minProcessors="5" maxProcessors="75"
+      enableLookups="true" redirectPort="8443"
+      acceptCount="10" debug="9" connectionTimeout="0"
+      useURIValidationHack="false"
+      protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+
     <Engine name="Standalone::http-port::" defaultHost="localhost" debug="9">
       <Logger className="org.apache.catalina.logger.FileLogger"
         prefix="catalina." suffix=".log" directory="::log-dir::"