You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by be...@apache.org on 2008/04/15 09:17:55 UTC
svn commit: r648137 - /james/server/trunk/spring-deployment/build.xml
Author: berndf
Date: Tue Apr 15 00:17:53 2008
New Revision: 648137
URL: http://svn.apache.org/viewvc?rev=648137&view=rev
Log:
remove previous build file changes (inline xml), see r648134 [JAMES-834]
Modified:
james/server/trunk/spring-deployment/build.xml
Modified: james/server/trunk/spring-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/build.xml?rev=648137&r1=648136&r2=648137&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/build.xml (original)
+++ james/server/trunk/spring-deployment/build.xml Tue Apr 15 00:17:53 2008
@@ -348,29 +348,7 @@
<replace file="${spring-deployment.target.bin.dir}/run.bat" token=":" value=";" />
</target>
- <target name="eliminate-entity-references-in-james-config" depends="package-aquire-config-files" >
-
- <!-- inline the content of the XML entities files into james-config.xml -->
- <property name="listserverConfigEmptyContent" value=" this is content for the comment " />
- <loadfile property="listserverConfigContent" srcfile="${basedir}/src/main/config/james/james-listmanager.xml" />
- <replace file="${spring-deployment.target.config.dir}/james-config.xml" token="&listserverConfig;" value="${listserverConfigEmptyContent}" />
-
- <property name="listserverStoresEmptyContent" value=" this is content for the comment " />
- <loadfile property="listserverStoresContent" srcfile="${basedir}/src/main/config/james/james-liststores.xml" />
- <replace file="${spring-deployment.target.config.dir}/james-config.xml" token="&listserverStores;" value="${listserverStoresEmptyContent}" />
-
- <loadfile property="fetchmailConfigContent" srcfile="${basedir}/src/main/config/james/james-fetchmail.xml" />
- <replace file="${spring-deployment.target.config.dir}/james-config.xml" token="&fetchmailConfig;" value="${fetchmailConfigContent}" />
-
- <loadfile property="jmsConfigContent" srcfile="${basedir}/src/main/config/james/james-jms.xml" />
- <replace file="${spring-deployment.target.config.dir}/james-config.xml" token="&jmsConfig;" value="${jmsConfigContent}" />
-
- <loadfile property="smtphandlerchainConfigContent" srcfile="${basedir}/src/main/config/james/james-smtphandlerchain.xml" />
- <replace file="${spring-deployment.target.config.dir}/james-config.xml" token="&smtphandlerchainConfig;" value="${smtphandlerchainConfigContent}" />
-
- </target>
-
- <target name="dist-war" description="build a war file distribution" depends="eliminate-entity-references-in-james-config" >
+ <target name="dist-war" description="build a war file distribution" >
<war destfile="${spring-deployment.dist.dir}/${name}-spring-deployment-${version}.war"
webxml="src/main/config/warfile/WEB-INF/web.xml" >
<fileset dir="${spring-deployment.target.dir}" ><include name="NOTICE.txt" /></fileset>
@@ -384,9 +362,13 @@
<include name="james-assembly.xml" />
</zipfileset>
<zipfileset dir="${spring-deployment.target.config.dir}" prefix="WEB-INF/classes" >
+ <include name="james-config.xml" />
+ </zipfileset>
+ <zipfileset dir="${spring-deployment.target.config.dir}" prefix="WEB-INF/conf" >
<exclude name="log4j.properties" />
<exclude name="spring-beans.xml" />
<exclude name="james-assembly.xml" />
+ <exclude name="james-config.xml" />
</zipfileset>
</war>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org