[prev in list] [next in list] [prev in thread] [next in thread] 

List:       forrest-dev
Subject:    svn commit: r373404 - in
From:       thorsten () apache ! org
Date:       2006-01-30 0:21:41
Message-ID: 20060130002141.15539.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: thorsten
Date: Sun Jan 29 16:21:30 2006
New Revision: 373404

URL: http://svn.apache.org/viewcvs?rev=373404&view=rev
Log:
FOR-798 - removing unused code and dependency from the dispatcher to lm.

Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/contract-strip-xsl.xsl
 Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
  forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBean.java
  forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap


Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
                
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest \
.plugin.internal.dispatcher/internal.xmap?rev=373404&r1=373403&r2=373404&view=diff \
                ==============================================================================
                
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap \
                (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap \
Sun Jan 29 16:21:30 2006 @@ -102,6 +102,15 @@
       structurer
       prepares and transforms the requested contracts (themes) and populate them \
                with the content (businessHelper).
     -->
+    <map:pipeline>
+      <map:match pattern="resolve.contract.*.**">
+        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
+        <map:transform type="i18n">
+          <map:parameter name="locale" value="{request:locale}" />
+        </map:transform>
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
     <!-- You can group elements to a template and call it from any view. 
       <jx:import uri="cocoon://prepare.tiles.export-link"/>
     -->

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBean.java
                
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest \
.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBean.java?rev=373404&r1=373403&r2=373404&view=diff
 ==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBean.java \
                (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/ContractBean.java \
Sun Jan 29 16:21:30 2006 @@ -14,7 +14,7 @@
     /**
      * The resolver prefix
      */
-    public static final String CONTRACT_RESOLVE_PREFIX = "lm://resolve.contract";
+    public static final String CONTRACT_RESOLVE_PREFIX = \
"cocoon://resolve.contract";  
     /**
      * <code>forrest:contract</code> element is used to include extra content

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap
                
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap?rev=373404&r1=373403&r2=373404&view=diff
 ==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap \
                (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap \
Sun Jan 29 16:21:30 2006 @@ -37,27 +37,6 @@
     <map:serializers default="xml" />
   </map:components>
   <map:pipelines>
-    <map:pipeline>
-      <map:match pattern="resolve.contract.*.**">
-        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
-        <map:serialize />
-      </map:match>
-    </map:pipeline>
-    <!-- prepare the xsl:templates of the requested contract.
-      {1} format to deliver
-      {2} contract name  -->
-    <map:pipeline>
-      <map:match pattern="prepare.contract.*.**">
-        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
-        <map:transform src="{lm:contract-strip-xsl.xsl}">
-          <map:parameter name="format" value="{1}" />
-        </map:transform>
-        <map:transform type="i18n">
-          <map:parameter name="locale" value="{request:locale}" />
-        </map:transform>
-        <map:serialize />
-      </map:match>
-    </map:pipeline>
     <!-- ls.contracts 
       list the default contracts-->
     <map:pipeline>


[prev in list] [next in list] [prev in thread] [next in thread]