You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by ni...@apache.org on 2004/06/21 17:49:55 UTC
svn commit: rev 21544 - in forrest/trunk/src/core: context targets
Author: nicolaken
Date: Mon Jun 21 08:49:54 2004
New Revision: 21544
Modified:
forrest/trunk/src/core/context/sitemap.xmap
forrest/trunk/src/core/targets/context.xml
Log:
Upgrade the skinconf directly in Cocoon rather than in the Ant task.
Modified: forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- forrest/trunk/src/core/context/sitemap.xmap (original)
+++ forrest/trunk/src/core/context/sitemap.xmap Mon Jun 21 08:49:54 2004
@@ -226,6 +226,7 @@
<map:pipeline internal-only="false">
<map:match pattern="skinconf.xml">
<map:generate src="{project:skinconf}" />
+ <map:transform src="{forrest:stylesheets}/upgrade-skinconf.xsl"/>
<map:select type="exists">
<map:when test="{project:skins-dir}{forrest:skin}/skinconf.xsl">
<map:transform src="{project:skins-dir}{forrest:skin}/skinconf.xsl"/>
Modified: forrest/trunk/src/core/targets/context.xml
==============================================================================
--- forrest/trunk/src/core/targets/context.xml (original)
+++ forrest/trunk/src/core/targets/context.xml Mon Jun 21 08:49:54 2004
@@ -67,7 +67,7 @@
param: location to make temporary context-dir ${project.webapp}
=============================================================== -->
<target name="project-context" depends="examine-proj, ensure-content,
- validate, init, bare-context, copy-sitemap, copy-conf, upgrade-skinconf, copy-status"/>
+ validate, init, bare-context, copy-sitemap, copy-conf, copy-status"/>
<target name="copy-conf" if="conf.present">
<copy toDir="${project.webapp}/WEB-INF" filtering="false"
@@ -99,14 +99,6 @@
</fileset>
<mapper type="glob" from="*-${version}.xmap" to="*.xmap"/>
</copy>
- </target>
-
- <target name="upgrade-skinconf" if="skinconf.present">
- <!-- FIXME: hardcode values here -->
- <xslt in="${skinconf}" out="${project.webapp}/skinconf.xml"
- style="${forrest.home}/context/resources/stylesheets/upgrade-skinconf.xsl">
- <xmlcatalog refid="fcatalog"/>
- </xslt>
</target>
<target name="copy-status" if="status.present">