LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
master
pb 2009-12-16 08:41:17 +00:00
parent eb111dd6db
commit 7b8fada753
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools-ng/common/xsl/build-template.xsl
View File

@ -1220,11 +1220,20 @@
<property name="customWebXML" value="${{file}}"/> <property name="customWebXML" value="${{file}}"/>
<property name="originalWebXML" value="${{this.deploy.dir}}/WEB-INF/web.xml"/> <property name="originalWebXML" value="${{this.deploy.dir}}/WEB-INF/web.xml"/>
<property name="mergedWebXML" value="${{customWebXML}}.merged"/> <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> <classpath>
<fileset dir="tools-ng/webxml/lib" includes="*.jar"/> <fileset dir="tools-ng/webxml/lib" includes="*.jar"/>
</classpath> </classpath>
importClass(java.lang.System); 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.tools.WebXMLBuilder);
importClass(Packages.com.liferay.portal.kernel.util.FileUtil); importClass(Packages.com.liferay.portal.kernel.util.FileUtil);
importClass(Packages.com.liferay.portal.util.FileImpl); importClass(Packages.com.liferay.portal.util.FileImpl);