[Yanel-commits] rev 42495 - public/yanel/trunk/src/build/targets/webapp

michi at wyona.com michi at wyona.com
Wed Apr 22 15:37:20 CEST 2009


Author: michi
Date: 2009-04-22 15:37:19 +0200 (Wed, 22 Apr 2009)
New Revision: 42495

Modified:
   public/yanel/trunk/src/build/targets/webapp/webapp.xml
Log:
check for local resource types has become obsolete when building webapp because it is done beforehand

Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-04-22 13:17:35 UTC (rev 42494)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-04-22 13:37:19 UTC (rev 42495)
@@ -81,10 +81,6 @@
 
     <copy file="${yanel.source.home}/conf/realms.xml" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
 
-    <condition property="local.resource-types.config.exists">
-      <available file="${local.config.home}/local.resource-types.xml" type="file"/>
-    </condition>
-    <antcall target="generate-resource-types-registry"/>
 
     <condition property="local.yanel.config.exists">
       <available file="${local.config.home}/local.yanel.xml" type="file"/>
@@ -96,9 +92,10 @@
     <copy file="${local.config.home}/local.log4j.properties" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" overwrite="true" failonerror="false"/>
     <copy file="${local.config.home}/local.realms.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/realms.xml" overwrite="true" failonerror="false"/>
     <antcall target="patch-with-local-yanel-config"/>
-    <antcall target="patch-with-local-resource-types-registry"/>
 
+    <copy file="${classes.dir}/resource-types.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="true"/>
 
+
     <!-- Patch properties ... -->
 
     <!-- DEPRECATED -->
@@ -210,14 +207,6 @@
     </exec>
   </target>
 
-  <target name="generate-resource-types-registry" unless="local.resource-types.config.exists">
-    <copy file="${yanel.source.home}/conf/resource-types.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="false"/>
-  </target>
-
-  <target name="patch-with-local-resource-types-registry" if="local.resource-types.config.exists">
-    <copy file="${local.config.home}/local.resource-types.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="true"/>
-  </target>
-
   <target name="generate-yanel-properties" unless="local.yanel.config.exists">
     <xslt in="${yanel.source.home}/conf/yanel.xml" out="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/yanel.xml" style="yanel2properties.xsl" force="false">
       <param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>



More information about the Yanel-commits mailing list