svn commit: r628782 - in /forrest/trunk/whiteboard/plugins: org.apache.forrest.plugin.input.XDoc/ org.apache.forrest.plugin.input.XDoc/src/documentation/content/xdocs/ org.apache.forrest.plugin.input.XDoc/src/documentation/resources/themes/ org.apache....

[th...@apache.org]

Author: thorsten
Date: Mon Feb 18 07:31:50 2008
New Revision: 628782

URL: http://svn.apache.org/viewvc?rev=628782&view=rev
Log:
Moving contracts to the xhtml2 plugin. Fixing build errors for both plugins and set the default to dispatcher.

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/content/xdocs/favicon.ico
      - copied unchanged from r628638, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/favicon.ico
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/
      - copied from r628711, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/resources/themes/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/
      - copied from r628781, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/resources/themes/pelt/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.header.panel.xml   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/xdocs/favicon.ico
      - copied unchanged from r628638, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/favicon.ico
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/resources/themes/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/common/
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/content/xdocs/site.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.content.panel.xml

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties?rev=628782&r1=628781&r2=628782&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/forrest.properties Mon Feb 18 07:31:50 2008
@@ -23,4 +23,4 @@
 # FIXME: FOR-785
 forrest.validate.skinconf=false
 
-project.required.plugins=org.apache.forrest.plugin.internal.xhtml2,org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule,org.apache.forrest.plugin.input.XDoc,org.apache.forrest.plugin.input.projectInfo
+project.required.plugins=org.apache.forrest.plugin.internal.xhtml2,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule,org.apache.forrest.plugin.input.XDoc,org.apache.forrest.plugin.input.projectInfo

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/content/xdocs/site.xml?rev=628782&r1=628781&r2=628782&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.XDoc/src/documentation/content/xdocs/site.xml Mon Feb 18 07:31:50 2008
@@ -32,8 +32,9 @@
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.input.XDoc"/>
     <forrestPlugins label="Plugins Index" href="site:forrest/plugins" description="Index of Forrest Plugins"/>
-    <changes label="Changes" href="changes.html" description="History of Changes" />
-    <todo label="Todo" href="todo.html" description="Todo List" />
+    <!--FIXME: The projectInfo plugin does not produce yet xhtml2.-->
+    <!--<changes label="Changes" href="changes.html" description="History of Changes" />
+    <todo label="Todo" href="todo.html" description="Todo List" />-->
   </about>
 <!--
   The href must be wholesite.html/pdf  You can change the labels and node names

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/forrest.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/forrest.properties?rev=628782&r1=628781&r2=628782&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/forrest.properties Mon Feb 18 07:31:50 2008
@@ -20,7 +20,7 @@
 # Copy properties from there as needed.
 ##############
 
-project.required.plugins=org.apache.forrest.plugin.internal.xhtml2,org.apache.forrest.plugin.input.projectInfo
+project.required.plugins=org.apache.forrest.plugin.internal.xhtml2,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.internal.dispatcher,org.apache.forrest.themes.core,org.apache.forrest.plugin.output.inputModule
 
 # FIXME: FOR-785
 forrest.validate.skinconf=false

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/locationmap.xml?rev=628782&r1=628781&r2=628782&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/locationmap.xml Mon Feb 18 07:31:50 2008
@@ -43,4 +43,24 @@
       </select>
     </match>
   </locator>
+  <locator>
+    <match pattern="resolvePluginContract.*.**">
+      <select type="exists">
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.xhtml2/resources/themes/{properties:dispatcher.theme}/{1}/{2}.ft" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.xhtml2/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.ft" />
+      </select>
+    </match>
+    <match pattern="resolvePluginThemes.*.**">
+      <select type="exists">
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.xhtml2/resources/themes/{properties:dispatcher.theme}/{1}/{2}.{1}" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.xhtml2/resources/themes/{properties:dispatcher.fallback.theme}/{1}/{2}.{1}" />
+      </select>
+    </match>
+    <match pattern="resolvePluginPanels.**">
+      <select type="exists">
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.xhtml2/resources/themes/{properties:dispatcher.theme}/panels/{1}.panel.xml" />
+        <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.xhtml2/resources/themes/{properties:dispatcher.fallback.theme}/panels/{1}.panel.xml" />
+      </select>
+    </match>
+  </locator>
 </locationmap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.content.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.content.panel.xml?rev=628782&r1=628781&r2=628782&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.content.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.content.panel.xml Mon Feb 18 07:31:50 2008
@@ -18,9 +18,14 @@
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="content">
-    <forrest:hook name="export-link">
+    
+    <!--FIXME: Commenting the pdf contract
+      since it does not support xhtml2 yet.
+      It is to say the pdf plugin does not 
+      support xhmtl2-->
+    <!--<forrest:hook name="export-link">
       <forrest:contract name="content-pdf-link"/>
-    </forrest:hook>
+    </forrest:hook>-->
     
     <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
     <forrest:hook class="trail">

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.header.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.header.panel.xml?rev=628782&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.header.panel.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.header.panel.xml Mon Feb 18 07:31:50 2008
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <forrest:contract name="branding-breadcrumbs">
+    <forrest:property name="branding-breadcrumbs">
+      <trail>
+        <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
+      </trail>
+    </forrest:property>
+  </forrest:contract>
+  <forrest:hook name="header">
+    <forrest:contract name="branding-tagline">
+      <forrest:property name="branding-tagline-name">new seed</forrest:property>
+      <forrest:property name="branding-tagline-tagline">powered by the
+        dispatcher</forrest:property>
+    </forrest:contract>
+    <forrest:hook class="logo">
+      <forrest:contract name="branding-logo">
+        <forrest:property name="branding-logo-name">Apache Forrest
+          Logo</forrest:property>
+        <forrest:property name="branding-logo-description">Apache
+          Forrest</forrest:property>
+        <forrest:property name="branding-logo-url">
+          http://forrest.apache.org/</forrest:property>
+        <forrest:property name="branding-logo-logo">
+          images/project-logo.gif</forrest:property>
+      </forrest:contract>
+    </forrest:hook>
+    <forrest:hook class="logo">
+      <forrest:contract name="branding-logo">
+        <forrest:property name="branding-logo-name">plugin logo</forrest:property>
+        <forrest:property name="branding-logo-description">
+          org.apache.forrest.plugin.internal.dispatcher plugin for Apache
+          Forrest</forrest:property>
+        <forrest:property name="branding-logo-url">
+          http://forrest.apache.org/pluginDocs/</forrest:property>
+        <forrest:property name="branding-logo-logo">
+          images/project.png</forrest:property>
+      </forrest:contract>
+    </forrest:hook>
+    <jx:import uri="cocoon://prepare.panels.pelt-html.nav-main"/>
+  </forrest:hook>
+</forrest:template>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/resources/themes/pelt/panels/pelt-html.header.panel.xml
------------------------------------------------------------------------------
    svn:eol-style = native