[Yanel-commits] rev 39514 - public/yanel/trunk/src/build/targets/webapp

[michi at wyona.com]

Author: michi
Date: 2008-10-24 16:14:14 +0200 (Fri, 24 Oct 2008)
New Revision: 39514

Modified:
   public/yanel/trunk/src/build/targets/webapp/cluster.xml
Log:
endorsed libs commented

Modified: public/yanel/trunk/src/build/targets/webapp/cluster.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/cluster.xml	2008-10-24 14:13:46 UTC (rev 39513)
+++ public/yanel/trunk/src/build/targets/webapp/cluster.xml	2008-10-24 14:14:14 UTC (rev 39514)
@@ -20,12 +20,8 @@
 
     <antcall target="patch-tomcat-cluster-node-1-ssl-port"/>
 
+<!-- NOTE: Java 1.5 doesn't seem to need these endorsed libs (http://tomcat.apache.org/tomcat-5.5-doc/class-loader-howto.html) -->
 <!--
-    <antcall target="remove-ambiguous-libs-from-tomcat-cluster-node">
-      <param name="tomcat-cluster-node-home-dir" value="${tomcat1.home.dir}/"/>
-    </antcall>
--->
-    
     <condition property="endorsed-xerces-at-node1-does-not-exist-yet">
       <not>
         <available file="${tomcat1.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar"/>
@@ -46,26 +42,10 @@
       </not>
     </condition>
     <antcall target="ask-to-copy-endorsed-xalan-to-node1"/>
+-->
     
   </target>
 
-<!--
-  <target name="remove-ambiguous-libs-from-tomcat-cluster-node">
-    <echo>INFO: Remove ambiguous libs from Tomcat cluster node: ${tomcat-cluster-node-home-dir}</echo>
-
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/commons-lang-2.1.jar"/>
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/xalan-2.6.0.jar"/>
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/xercesImpl-2.8.1.jar"/>
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/icu4j-2.6.1.jar"/>
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/jaxen-1.1-beta-10.jar"/>
-
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-cmdl.xml"/>
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-core.xml"/>
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-impl.xml"/>
-    <delete file="${tomcat-cluster-node-home-dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-webapp.xml"/>
-  </target>
--->
-  
   <target name="patch-tomcat-cluster-node-1-ssl-port" if="property-tomcat1-ssl-port-is-set">
     <echo>SSL port for tomcat is set</echo>
     <xslt in="${tomcat1.home.dir}/webapps/${servlet.context.prefix}/WEB-INF/web.xml"
@@ -104,6 +84,7 @@
 
     <antcall target="patch-tomcat-cluster-node-2-ssl-port"/>
 
+<!--
     <condition property="endorsed-xerces-at-node2-does-not-exist-yet">
       <not>
         <available file="${tomcat2.home.dir}/common/endorsed/${xerces.impl.artifactId}-${xerces.impl.version}.jar"/>
@@ -124,6 +105,7 @@
       </not>
     </condition>
     <antcall target="ask-to-copy-endorsed-xalan-to-node2"/>
+-->
   </target>
 
   <target name="ask-to-copy-endorsed-xerces-to-node1" if="endorsed-xerces-at-node1-does-not-exist-yet">