shuber 2004/09/29 15:43:55 CEST
Modified files:
. plugin.jelly
Log:
Move up shared library deletion because Jasper loads the libraries in the
classloader and then we can't delete them anymore. This restricts the classes that may
be use in <useBean> statements.
Revision Changes Path
1.6 +12 -7 maven-jahiawar-plugin/plugin.jelly
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/plugin.jelly.diff?r1=1.5&r2=1.6&f=h
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/repository/maven-jahiawar-plugin/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 22 Sep 2004 12:28:28 -0000 1.5
+++ plugin.jelly 29 Sep 2004 13:43:55 -0000 1.6
@@ -7,7 +7,9 @@
xmlns:util="jelly:util">
<define:taglib uri="jasper">
+ <define:classpath var="jasperClassLoader" url="${maven.dependency.classpath}" />
<define:jellybean
+ classLoader="${jasperClassLoader}"
name="JspC"
className="org.apache.jasper.JspC"
method="execute"
@@ -15,6 +17,14 @@
</define:taglib>
<postGoal name="war:webapp">
+
+ <j:set var="useSharedLibs" value="${maven.jahiawar.usesharedlibs}"/>
+ <j:if test="${useSharedLibs == 'true'}">
+ <delete deleteonexit="true">
+ <fileset dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib"
includes="${maven.jahiawar.usesharedlibs.list}" />
+ </delete>
+ </j:if>
+
<j:set var="precompileJsp" value="${maven.jahiawar.precompile.jsp}"/>
<j:if test="${precompileJsp == 'true'}">
<attainGoal name="jahia:precompile-jsp" />
@@ -30,14 +40,8 @@
</copy>
</j:if>
- <j:set var="useSharedLibs" value="${maven.jahiawar.usesharedlibs}"/>
- <j:if test="${useSharedLibs == 'true'}">
- <delete>
- <fileset dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib"
includes="${maven.jahiawar.usesharedlibs.list}" />
- </delete>
- </j:if>
- <delete>
+ <delete deleteonexit="true">
<fileset dir="${maven.build.dir}/${pom.artifactId}"
includes="${maven.jahiawar.excludes}" />
</delete>
@@ -78,6 +82,7 @@
verbose="2" />
<echo>Compiling generated JSP Java source...</echo>
<ant:javac
+ fork="true"
srcdir="${jspOutDir}"
destdir="${jspClassesOutDir}"
debug="${maven.compile.debug}"
