Commit 24fbb0f7 authored by Quality Assurance's avatar Quality Assurance Committed by qa

Fixed jasper2 issue

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5875 b35dd754-fafc-0310-a699-88a17e54d16e
parent c24c744d
...@@ -425,23 +425,18 @@ ...@@ -425,23 +425,18 @@
</target> </target>
<target name="-jspc-impl" unless="no.jspc"> <target name="-jspc-impl" unless="no.jspc">
<java classname="org.apache.jasper.JspC" fork="true">
<!-- Have to use Tomcat 5's JspC task, not the default Ant one --> <classpath>
<taskdef classname="org.apache.jasper.JspC" name="jasper2" loaderref="jasperA">
<classpath id="jspc.classpath">
<pathelement location="${java.home}/../lib/tools.jar"/> <pathelement location="${java.home}/../lib/tools.jar"/>
<pathelement path="${compile.dir}"/> <pathelement path="${compile.dir}"/>
<path refid="jspc.dependencies"/> <path refid="jspc.dependencies"/>
</classpath> </classpath>
</taskdef> <arg line="-compile" />
<arg line="-uriroot \jive\scm\wildfire\work\jspc\java" />
<!-- JSP to JAVA --> <arg line="-d \Jive\scm\wildfire\work\jspc\java" />
<jasper2 <arg line="-p org.jivesoftware.wildfire.admin" />
validateXml="false" <arg line="-webinc ${jspc.dest.dir}/web.partial.xml" />
uriroot="${web.dir}" </java>
outputDir="${jspc.java.dest.dir}"
package="org.jivesoftware.wildfire.admin"
webXmlFragment="${jspc.dest.dir}/web.partial.xml"/>
<!-- Compile java source --> <!-- Compile java source -->
<javac <javac
...@@ -723,7 +718,7 @@ ...@@ -723,7 +718,7 @@
</target> </target>
<!-- dist.bin =============================================================================== --> <!-- dist.bin =============================================================================== -->
<target name="dist.bin" depends="wildfire,javadoc" description="Creates a binary distribution package"> <target name="dist.bin" depends="plugins,javadoc" description="Creates a binary distribution package">
<!-- ie: wildfire --> <!-- ie: wildfire -->
<property name="release.name" value="${dist.prefix}"/> <property name="release.name" value="${dist.prefix}"/>
<!-- ie: wildfire_2_1_2 --> <!-- ie: wildfire_2_1_2 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment