forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r704529 - in /forrest/branches/dispatcher_rewrite/plugins: org.apache.forrest.plugin.internal.dispatcher/ org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/ org.apache.forrest.plugin.internal.dispatcher/theme...
Date Tue, 14 Oct 2008 13:13:34 GMT
Author: thorsten
Date: Tue Oct 14 06:13:33 2008
New Revision: 704529

URL: http://svn.apache.org/viewvc?rev=704529&view=rev
Log:
FOR-1118
Moving all contracts/structurer into the dispatcher plugin. This will remove the dependency
on the themer plugin. 
Removing the plugin completly since documentation was outdated and already contained in the
dispatcher.

Added:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/
      - copied from r700365, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.structurer.xml
      - copied unchanged from r704527, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/coat.structurer.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/
      - copied from r704527, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common/
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.structurer.xml
      - copied unchanged from r704527, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/common.structurer.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven/
      - copied from r704527, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven/
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.structurer.xml
      - copied unchanged from r704527, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/maven.structurer.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt/
      - copied from r704527, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt/
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt.structurer.xml
      - copied unchanged from r704527, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/themes/pelt.structurer.xml
Removed:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.fv
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.fv
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/maven.fv
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/pelt.fv
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.themes.core/
Modified:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml?rev=704529&r1=704528&r2=704529&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
Tue Oct 14 06:13:33 2008
@@ -22,7 +22,6 @@
   <property name="dispatcher.fallback.theme-ext" value=".structurer.xml"/>
   <property name="dispatcher.contract-ext" value=".contract.xml"/>
   <property name="dispatcher.panel-ext" value=".panel.xml"/>
-  <property name="dispatcher.themer" value="org.apache.forrest.themes.core"/>
   <property name="dispatcher.home" value="org.apache.forrest.plugin.internal.dispatcher"/>
   <property name="dispatcher.caching" value="on" />
 <!--SVG example for project/group logo-->

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=704529&r1=704528&r2=704529&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
Tue Oct 14 06:13:33 2008
@@ -135,12 +135,6 @@
       <location src="{lm:resources.home}structurer" />
     </match>
     <!--+
-        | contracts (e.g. html) that can be used in the project. 
-        +-->
-    <match pattern="themer.contracts.dir">
-      <location src="{lm:dispatcher.themer}/themes" />
-    </match>
-    <!--+
         | Base location for plugins
         +-->
     <match pattern="plugins.home">
@@ -156,7 +150,7 @@
         | Base location of the builded themer plugin
         +-->
     <match pattern="dispatcher.themer">
-      <location src="{lm:plugins.home}/{properties:dispatcher.themer}" />
+      <location src="{lm:dispatcher.home}/themer" />
     </match>
     <!--+
         | Configuration of general location
@@ -299,9 +293,6 @@
 <!-- forrest-application-based theme -->
         <location 
                     src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}"
/>
-        <location 
-                    src="{lm:plugins.home}/org.apache.forrest.themes.core/themes/common/{1}/{2}{properties:dispatcher.contract-ext}"

-                    />
 <!--  forrest-application-based default fallback -->
         <location 
                     src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}"

@@ -330,9 +321,6 @@
                     src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/images/{1}.{2}"

                     />
         <location 
-                    src="{lm:plugins.home}/org.apache.forrest.themes.core/themes/common/images/{1}.{2}"

-                    />
-        <location 
                     src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/images/{1}.{2}"

                     />
       </select>
@@ -421,10 +409,15 @@
     <match pattern="contract-strip-xsl.xsl">
       <select type="exists">
         <location 
-                    src="{lm:dispatcher.home}/resources/stylesheets/contract-strip-xsl.xsl"

+                    src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl"

                     />
       </select>
     </match>
+    <match pattern="transform.book.menu">
+      <select type="exists">
+        <location src="{forrest:forrest.context}/skins/common/xslt/html/book-to-menu.xsl"
/>
+      </select>
+    </match>
     <match pattern="hooks-to-**.xsl">
       <select type="exists">
         <location 
@@ -472,11 +465,5 @@
             src="{lm:dispatcher.home}/resources/stylesheets/helper/variable.helper.xsl" 
             />
     </match>
-<!-- Id generation -->
-    <match pattern="generateId.xsl">
-      <location 
-            src="{lm:dispatcher.home}/resources/stylesheets/helper/generateId.xsl" 
-            />
-    </match>
   </locator>
 </locationmap>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml?rev=704529&r1=704528&r2=704529&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml
(original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/int/index.xml
Tue Oct 14 06:13:33 2008
@@ -44,7 +44,6 @@
   <property name="dispatcher.fallback.theme" value="common"/>
   <property name="dispatcher.theme-ext" value=".fv"/>
   <property name="dispatcher.fallback.theme-ext" value=".fv"/>
-  <property name="dispatcher.themer" value="org.apache.forrest.themes.core"/>
   <property name="dispatcher.home" value="org.apache.forrest.plugin.internal.dispatcher"/>]]>
       </source>
       <section>



Mime
View raw message