commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl suite.jelly
Date Thu, 28 Oct 2004 19:18:30 GMT
dion        2004/10/28 12:18:30

  Modified:    jelly/jelly-tags/jsl project.xml
               jelly/jelly-tags/jsl/xdocs changes.xml
               jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl
                        ApplyTemplatesTag.java
               jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl
                        suite.jelly
  Log:
  Apply fix for Jelly-109. Mode attribute was not functioning.
  
  Revision  Changes    Path
  1.27      +2 -2      jakarta-commons/jelly/jelly-tags/jsl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jsl/project.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- project.xml	11 Sep 2004 14:23:54 -0000	1.26
  +++ project.xml	28 Oct 2004 19:18:30 -0000	1.27
  @@ -18,7 +18,7 @@
     <extend>${basedir}/../tag-project.xml</extend>
     <id>commons-jelly-tags-jsl</id>
     <name>commons-jelly-tags-jsl</name>
  -  <currentVersion>1.0</currentVersion>
  +  <currentVersion>1.1-SNAPSHOT</currentVersion>
   
     <package>org.apache.commons.jelly.tags.jsl</package>
   
  @@ -106,7 +106,7 @@
   
       <dependency>
         <id>commons-cli</id>
  -      <version>SNAPSHOT</version>
  +      <version>1.0</version>
       </dependency>
           
       <!-- END for running demos -->
  
  
  
  1.3       +3 -0      jakarta-commons/jelly/jelly-tags/jsl/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jsl/xdocs/changes.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- changes.xml	11 Sep 2004 14:23:54 -0000	1.2
  +++ changes.xml	28 Oct 2004 19:18:30 -0000	1.3
  @@ -24,6 +24,9 @@
       <author email="dion@apache.org">dIon Gillard</author>
     </properties>
     <body>
  +    <release version="1.1-SNAPSHOT" date="in CVS">
  +      <action dev="dion" type="fix" issue="JELLY-109" due-to="Maarten Coene">jsl:applyTemplates
mode attribute not functioning.</action>
  +    </release>
       <release version="1.0" date="2004-09-11">
         <action dev="dion" type="add">Initial Release</action>
       </release>
  
  
  
  1.11      +2 -2      jakarta-commons/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java
  
  Index: ApplyTemplatesTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jsl/src/java/org/apache/commons/jelly/tags/jsl/ApplyTemplatesTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ApplyTemplatesTag.java	9 Sep 2004 12:14:11 -0000	1.10
  +++ ApplyTemplatesTag.java	28 Oct 2004 19:18:30 -0000	1.11
  @@ -64,10 +64,10 @@
           // for some reason, these DOM4J methods only throw Exception
           try {
               if ( select != null ) {
  -                stylesheet.applyTemplates( source, select );
  +                stylesheet.applyTemplates( source, select, mode );
               }
               else {
  -                stylesheet.applyTemplates( source );
  +                stylesheet.applyTemplates( source, mode );
               }
           }
           catch (Exception e) {
  
  
  
  1.14      +20 -0     jakarta-commons/jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly
  
  Index: suite.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- suite.jelly	8 Sep 2004 05:25:12 -0000	1.13
  +++ suite.jelly	28 Oct 2004 19:18:30 -0000	1.14
  @@ -227,4 +227,24 @@
       <test:assertEquals expected="El1SomeText" actual="${contextText}" />
     </test:case>  
     
  +  <test:case name="testModeBug" xmlns="dummy">
  +    <x:parse var="testDoc">
  +      <menu>
  +        <item />
  +        <item />
  +      </menu>
  +    </x:parse>
  +    
  +    <jsl:stylesheet var="modeStyleSheet">
  +      <jsl:template match="menu"><jsl:applyTemplates mode="bbb"/></jsl:template>
  +	  <jsl:template match="item">No mode</jsl:template>
  +	  <jsl:template match="item" trim="false" mode="bbb">BBB</jsl:template>
  +    </jsl:stylesheet>
  +    
  +    <j:set var="modeText"><jsl:style stylesheet="${modeStyleSheet}" select="$testDoc"/></j:set>
  +
  +    <m:echo>text is '${modeText}'</m:echo>
  +    
  +    <test:assertEquals expected="BBBBBB" actual="${modeText}" />
  +  </test:case>
   </test:suite>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message