[Yanel-commits] rev 24426 - in public/yanel/trunk/src/build: .
targets
michi at wyona.com
michi at wyona.com
Mon May 14 11:37:28 CEST 2007
Author: michi
Date: 2007-05-14 11:37:27 +0200 (Mon, 14 May 2007)
New Revision: 24426
Removed:
public/yanel/trunk/src/build/resource2resourcetypereg.xsl
Modified:
public/yanel/trunk/src/build/build.xml
public/yanel/trunk/src/build/targets/build-binary-snapshot.xml
Log:
patching of resource.xml fixed
Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml 2007-05-14 09:30:40 UTC (rev 24425)
+++ public/yanel/trunk/src/build/build.xml 2007-05-14 09:37:27 UTC (rev 24426)
@@ -874,11 +874,11 @@
</target>
<target name="generate-resource-types-registry" unless="local.resource-types.config.exists">
- <xslt in="${yanel.home.dir}/conf/resource-types.xml" out="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" style="resource2resourcetypereg.xsl" force="false"/>
+ <copy file="${yanel.home.dir}/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">
- <xslt in="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" out="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" style="resource2resourcetypereg.xsl" force="true"/>
+ <copy file="${yanel.home.dir}/${local.config.dir}/local.resource-types.xml" tofile="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="true"/>
</target>
<target name="test" description="Run tests">
Deleted: public/yanel/trunk/src/build/resource2resourcetypereg.xsl
===================================================================
--- public/yanel/trunk/src/build/resource2resourcetypereg.xsl 2007-05-14 09:30:40 UTC (rev 24425)
+++ public/yanel/trunk/src/build/resource2resourcetypereg.xsl 2007-05-14 09:37:27 UTC (rev 24426)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:yanel="http://www.wyona.org/yanel/1.0"
- xmlns="http://www.wyona.org/yanel/1.0"
- >
-
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:template match="/">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match="@src">
- <xsl:attribute name="src"><xsl:value-of select="."/>resource.xml</xsl:attribute>
- </xsl:template>
-
- <xsl:template match="@*|node()" priority="-1">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
Modified: public/yanel/trunk/src/build/targets/build-binary-snapshot.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2007-05-14 09:30:40 UTC (rev 24425)
+++ public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2007-05-14 09:37:27 UTC (rev 24426)
@@ -70,10 +70,8 @@
<replacetoken>@REALMS_DIR@</replacetoken>
</replace>
-<!--
- <copy file="${yanel.home.dir}/conf/resource-types.xml" todir="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
--->
- <xslt in="${yanel.home.dir}/conf/resource-types.xml" out="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/resource-types.xml" style="resource2resourcetypereg.xsl" force="true"/>
+ <copy file="${yanel.home.dir}/conf/resource-types.xml" tofile="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/resource-types.xml" overwrite="true"/>
+
<replace file="${snapshot.dir}/${target.servlet.context.prefix}/WEB-INF/classes/resource-types.xml" value="../../resources">
<replacetoken>../src/resources</replacetoken>
</replace>
More information about the Yanel-commits
mailing list