Return-Path: 
 <svn-return-8125-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 83623 invoked from network); 15 Oct 2008 12:37:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Oct 2008 12:37:41 -0000
Received: (qmail 55069 invoked by uid 500); 15 Oct 2008 12:37:43 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 55024 invoked by uid 500); 15 Oct 2008 12:37:42 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 55015 invoked by uid 99); 15 Oct 2008 12:37:42 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Oct 2008 05:37:42 -0700
X-ASF-Spam-Status: No, hits=-1998.5 required=10.0
	tests=ALL_TRUSTED,WEIRD_PORT
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Oct 2008 12:36:43 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0D9DE23888A3; Wed, 15 Oct 2008 05:36:51 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r704891 -
 /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/
Date: Wed, 15 Oct 2008 12:36:50 -0000
To: svn@forrest.apache.org
From: thorsten@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081015123651.0D9DE23888A3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: thorsten
Date: Wed Oct 15 05:36:49 2008
New Revision: 704891

URL: http://svn.apache.org/viewvc?rev=704891&view=rev
Log:
FOR-1118 removing level of properties matching

Modified:
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
    forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-css-links.contract.xml Wed Oct 15 05:36:49 2008
@@ -83,8 +83,8 @@
       xmlns:forrest="http://apache.org/forrest/templates/1.0">
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:param name="branding-css-links-input"/>
-      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
-      <xsl:variable name="theme" select="$defaultVariables/*/*[@name='theme']/@value"/>
+      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+      <xsl:variable name="theme" select="$defaultVariables/*[@name='theme']/@value"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml Wed Oct 15 05:36:49 2008
@@ -57,7 +57,7 @@
       <xsl:param name="branding-logo-over"/>
       <xsl:param name="branding-logo-width"/>
       <xsl:param name="branding-logo-height"/>
-      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml Wed Oct 15 05:36:49 2008
@@ -38,7 +38,7 @@
 <!-- If you need default variables: -->
 <!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
 <!-- then extract the variable like: -->
-<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*/*[@name='skin-img-dir']/@value"/>-->
+<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>-->
 <!-- more information which variables are available can be found at http://localhost:8888/**.props
      which connects to the org.apache.forrest.plugin.output.inputModule plugin.
      A custom generator contacts the forrest properties input module to get all aviable key/values and
@@ -67,7 +67,7 @@
 <!-- copy n paste -->
 <!--
       <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:variable name="skin-img-dir" select="$defaultVariables/*/*[@name='skin-img-dir']/@value"/>
+      <xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part/>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml?rev=704891&r1=704890&r2=704891&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml Wed Oct 15 05:36:49 2008
@@ -42,7 +42,7 @@
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:param name="siteinfo-meta-icon"/>
-      <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">