forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r215900 - in /forrest/trunk: main/forrest.build.xml main/webapp/WEB-INF/xconf/forrest-core.xconf main/webapp/default-forrest.properties whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
Date Mon, 11 Jul 2005 23:48:07 GMT
Author: thorsten
Date: Mon Jul 11 16:48:05 2005
New Revision: 215900

URL: http://svn.apache.org/viewcvs?rev=215900&view=rev
Log:
Activated project specific naming for the fallback view. In forrest.properties we can now
add project.view-defaultView and rename default.fv to the way we want.

Modified:
    forrest/trunk/main/forrest.build.xml
    forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
    forrest/trunk/main/webapp/default-forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/forrest.build.xml?rev=215900&r1=215899&r2=215900&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Mon Jul 11 16:48:05 2005
@@ -44,9 +44,6 @@
   <property name="forrest.core"               location="${forrest.home}/main"/>
   <property name="forrest.core.webapp"        location="${forrest.core}/webapp"/>
   
-  
-  
-
   <import file="targets/validate.xml"/>
   <import file="targets/webapp.xml"/>
   <import file="targets/site.xml"/>
@@ -98,11 +95,16 @@
     <property file="${project.home}/forrest.properties" />
     <property file="${user.home}/forrest.properties" />
     <property file="${forrest.core.webapp}/default-forrest.properties" />
-
+    
     <!-- people should use forrest.properties to override following defaults  -->
     <property name="build.plugins-dir"     value="build/plugins"/>
     <property name="forrest.skins-dir"     location="${forrest.core.webapp}/skins"/>
     <property name="forrest.plugins-dir"   location="${forrest.home}/${build.plugins-dir}"/>
+    <!-- views -->
+    <property name="project.view-defaultView" value="default.fv"/>
+    <echo>Views:
+      project.view-defaultView: ${project.view-defaultView}
+      </echo>
     <!-- If the user wants to build i18n in diferent locations this is one way to implemented
it--> 
     <if>
         <equals arg1="${project.i18n}" arg2="true"/>

Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=215900&r1=215899&r2=215900&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Mon Jul 11 16:48:05 2005
@@ -135,6 +135,7 @@
 
     <component-instance name="project" class="org.apache.forrest.conf.ForrestConfModule">
       <values>
+        <defaultView>@project.view-defaultView@</defaultView>
         <skin>@project.skin@</skin>
         <sitemap>@project.home@/@project.sitemap@</sitemap>
         <status>@project.home@/@project.status@</status>

Modified: forrest/trunk/main/webapp/default-forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/default-forrest.properties?rev=215900&r1=215899&r2=215900&view=diff
==============================================================================
--- forrest/trunk/main/webapp/default-forrest.properties (original)
+++ forrest/trunk/main/webapp/default-forrest.properties Mon Jul 11 16:48:05 2005
@@ -23,6 +23,9 @@
 # Project name (used to name .war file)
 project.name=my-project
 
+#views
+project.view-defaultView=default.fv
+
 # Specifies name of Forrest skin to use
 project.skin=pelt
 #project.skin=tigris

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap?rev=215900&r1=215899&r2=215900&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
Mon Jul 11 16:48:05 2005
@@ -104,6 +104,7 @@
       <map:generate src="cocoon:/viewLocationmap.xml"/>
       <map:transform src="resources/stylesheets/viewLocationmap2path.xsl"/>
       <map:transform src="resources/stylesheets/includes-viewLocationmap.xsl">
+        <map:parameter value="{project:defaultView}" name="defaultView"/>
         <map:parameter value="{1}" name="path"/>
         <map:parameter value="{project:content.xdocs}" name="root"/>
         <map:parameter value="resources/views/default.fv" name="viewFallback"/>
@@ -149,7 +150,7 @@
         <!--Which output format?-->
         <map:parameter name="format" value="{1}"/>
       </map:transform>
-      <map:transform type="xinclude"/> 
+      <map:transform type="xinclude"/>
      	<map:serialize type="xml"/>
     </map:match>
     <!--FIXME



Mime
View raw message