forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r232565 - in /forrest/trunk: plugins/build.xml whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
Date Sun, 14 Aug 2005 01:16:51 GMT
Author: rgardler
Date: Sat Aug 13 18:16:42 2005
New Revision: 232565

URL: http://svn.apache.org/viewcvs?rev=232565&view=rev
Log:
allow plugins to expose forrest:contracts, plugin contracts are overridden by project contracts
but override default contracts

Modified:
    forrest/trunk/plugins/build.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap

Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?rev=232565&r1=232564&r2=232565&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Sat Aug 13 18:16:42 2005
@@ -129,6 +129,7 @@
     <copy toDir="${forrest.plugins.localDeploy.dir}/${plugin-name}">
       <fileset dir="${forrest.plugins.dir}/${plugin-name}">
         <exclude name="lib/**"/>
+        <exclude name="templates/**"/>
         <exclude name="build/**"/>
       </fileset>
     </copy>
@@ -165,6 +166,15 @@
       <then>
         <copy toDir="${forrest.plugins.localDeploy.dir}/lib" failonerror="false">
           <fileset dir="lib"/>
+        </copy>
+       </then>
+     </if>
+
+    <if>
+      <available file="templates"/>
+      <then>
+        <copy toDir="${forrest.plugins.localDeploy.dir}/templates" failonerror="false">
+          <fileset dir="templates"/>
         </copy>
        </then>
      </if>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap?rev=232565&r1=232564&r2=232565&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
Sat Aug 13 18:16:42 2005
@@ -104,6 +104,9 @@
       <map:when test="{project:resources}/templates/{1}.ft">
         <map:generate src="{project:resources}/templates/{1}.ft"/>
       </map:when>
+      <map:when test="{forrest:plugins}/templates/{1}.ft">
+        <map:generate src="{forrest:plugins}/templates/{1}.ft"/>
+      </map:when>
       <map:when test="resources/templates/{1}.ft">
         <map:generate src="resources/templates/{1}.ft"/>
       </map:when>



Mime
View raw message