From 7b8fada7531a50b679150f14233c48c8ab4a4b51 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 16 Dec 2009 08:41:17 +0000
Subject: [PATCH] Integrated r2044-r2046: Removed dependency on BSF and
 Rhino/js by using javax.scripting as the manager for merge-webxml.

git-svn-id: https://svn.libreccm.org/ccm/trunk@315 8810af33-2d31-482b-a856-94f89814c4df
---
 tools-ng/common/xsl/build-template.xsl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index 425d2c1aa..4c8090ea0 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -1220,11 +1220,20 @@
         <property name="customWebXML" value="${{file}}"/>
         <property name="originalWebXML" value="${{this.deploy.dir}}/WEB-INF/web.xml"/>
         <property name="mergedWebXML" value="${{customWebXML}}.merged"/>
-        <script language="javascript">
+        <!-- manager property javax avoids dependency on bsf which introduced a lot 
+             of cross-OS problems                                                  -->
+        <script language="javascript" manager="javax">
             <classpath>
                 <fileset dir="tools-ng/webxml/lib" includes="*.jar"/>
             </classpath>
             importClass(java.lang.System);
+            <!-- Fixed Bug in combination with version ant-apache-bsf tasks 
+                 1.7.1/bsf-2.4.0. by prefixing non Java API packages with "Packages" cf: 
+                 http://wiki.apache.org/ant/AntOddities#Using_your_own_classes_inside_.3Cscript.3E. 
+
+                 Need for bsf removed now by introducing manager="javax" above so this 
+                 fix (introduced in r2016) may be removed (Dec. 2009 r2045)
+            -->
             importClass(Packages.com.liferay.portal.tools.WebXMLBuilder);
             importClass(Packages.com.liferay.portal.kernel.util.FileUtil);
             importClass(Packages.com.liferay.portal.util.FileImpl);