You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/08/16 15:44:29 UTC
svn commit: r566714 - in /cocoon/trunk: blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/ blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/ core/cocoon-expression-...

Author: gkossakowski
Date: Thu Aug 16 06:44:28 2007
New Revision: 566714

URL: http://svn.apache.org/viewvc?view=rev&rev=566714
Log:
COCOON-2112: Rename JXTGStringTemplateParser to LegacyStringTemplateParser so it better describes it's purpose.

Added:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/LegacyStringTemplateParser.java   (contents, props changed)
      - copied, changed from r566681, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTGStringTemplateParser.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml   (contents, props changed)
      - copied, changed from r566691, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXTGStringTemplateParser.xml
Removed:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTGStringTemplateParser.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXTGStringTemplateParser.xml
Modified:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/DefaultScriptManager.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/DefaultScriptManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/DefaultScriptManager.java?view=diff&rev=566714&r1=566713&r2=566714
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/DefaultScriptManager.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/DefaultScriptManager.java Thu Aug 16 06:44:28 2007
@@ -55,7 +55,7 @@
     private StringTemplateParser stringTemplateParser;
 
     public DefaultScriptManager() {
-        stringTemplateParserName = "jxtg";
+        stringTemplateParserName = "legacy";
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml?view=diff&rev=566714&r1=566713&r2=566714
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml Thu Aug 16 06:44:28 2007
@@ -28,7 +28,7 @@
   <import resource="classpath:META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/RhinoScope.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/AbstractStringTemplateParser.xml"/>
-  <import resource="classpath:META-INF/cocoon/spring/JXTGStringTemplateParser.xml"/>
+  <import resource="classpath:META-INF/cocoon/spring/LegacyStringTemplateParser.xml"/>
   
   <!-- Redefining this bean instead of importing because originally it is in "call" scope -->
   <bean name="org.apache.cocoon.objectmodel.ObjectModel" class="org.apache.cocoon.objectmodel.ObjectModelImpl">

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/LegacyStringTemplateParser.java (from r566681, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTGStringTemplateParser.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/LegacyStringTemplateParser.java?view=diff&rev=566714&p1=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTGStringTemplateParser.java&r1=566681&p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/LegacyStringTemplateParser.java&r2=566714
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/JXTGStringTemplateParser.java (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/LegacyStringTemplateParser.java Thu Aug 16 06:44:28 2007
@@ -23,7 +23,7 @@
 /**
  * @version $Id$
  */
-public class JXTGStringTemplateParser extends AbstractStringTemplateParser {
+public class LegacyStringTemplateParser extends AbstractStringTemplateParser {
 
     public final static String JXPATH = "jxpath";
     public final static String JEXL = "jexl";

Propchange: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/LegacyStringTemplateParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/expression/LegacyStringTemplateParser.java
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml (from r566691, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXTGStringTemplateParser.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml?view=diff&rev=566714&p1=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXTGStringTemplateParser.xml&r1=566691&p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml&r2=566714
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXTGStringTemplateParser.xml (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml Thu Aug 16 06:44:28 2007
@@ -20,8 +20,8 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
   
-  <bean name="org.apache.cocoon.el.parsing.StringTemplateParser/jxtg" 
-        class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"
+  <bean name="org.apache.cocoon.el.parsing.StringTemplateParser/legacy" 
+        class="org.apache.cocoon.template.expression.LegacyStringTemplateParser"
         parent="org.apache.cocoon.template.expression.AbstractStringTemplateParser"/>
 
 </beans>

Propchange: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/LegacyStringTemplateParser.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain