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/src/test/org/apache/commons/jelly/benchmark sample.jelly benchmark.jelly
Date Wed, 08 Sep 2004 05:41:32 GMT
dion        2004/09/07 22:41:32

  Modified:    jelly/src/test/org/apache/commons/jelly/test/xml
                        nsFilterTest.jelly producesOutput.jelly
                        invalidScript1.jelly nonexistentTags1.jelly
                        validScript1.jelly
               jelly/src/test/org/apache/commons/jelly/core
                        testBreakTag.jelly testUseBeanTag.jelly
                        testInvokeTag.jelly testFileTag.jelly
                        testChooseTag.jelly testInvokeStaticTag.jelly
               jelly/src/test/org/apache/commons/jelly test_args.jelly
                        testFile.jelly testStatic.jelly
               jelly/src/test/org/apache/commons/jelly/benchmark
                        sample.jelly benchmark.jelly
  Log:
  detab
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/nsFilterTest.jelly
  
  Index: nsFilterTest.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/nsFilterTest.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- nsFilterTest.jelly	25 Feb 2004 05:14:48 -0000	1.2
  +++ nsFilterTest.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -15,7 +15,7 @@
     limitations under the License.
   -->
   <j:jelly 
  -	xmlns:j="jelly:core">
  +    xmlns:j="jelly:core">
     
     <set var="foo" value="bar"/>
     
  
  
  
  1.3       +1 -1      jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/producesOutput.jelly
  
  Index: producesOutput.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/producesOutput.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- producesOutput.jelly	25 Feb 2004 05:14:48 -0000	1.2
  +++ producesOutput.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -26,7 +26,7 @@
     limitations under the License.
   -->
   <j:jelly 
  -	xmlns:j="jelly:core">
  +    xmlns:j="jelly:core">
           
     <ignoreThisOutput/>
     
  
  
  
  1.3       +1 -1      jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/invalidScript1.jelly
  
  Index: invalidScript1.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/invalidScript1.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- invalidScript1.jelly	25 Feb 2004 05:14:48 -0000	1.2
  +++ invalidScript1.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -26,7 +26,7 @@
     limitations under the License.
   -->
   <j:jelly 
  -	xmlns:j="jelly:core">
  +    xmlns:j="jelly:core">
     
     <j:set var="foo" value="bar"/>
     
  
  
  
  1.3       +1 -1      jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/nonexistentTags1.jelly
  
  Index: nonexistentTags1.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/nonexistentTags1.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- nonexistentTags1.jelly	25 Feb 2004 05:14:48 -0000	1.2
  +++ nonexistentTags1.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -15,7 +15,7 @@
     limitations under the License.
   -->
   <j:jelly 
  -	xmlns:j="jelly:core" xmlns:x="jelly:xml">
  +    xmlns:j="jelly:core" xmlns:x="jelly:xml">
     
     <j:set var="foo" value="bar"/>
     
  
  
  
  1.3       +1 -1      jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/validScript1.jelly
  
  Index: validScript1.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/xml/validScript1.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- validScript1.jelly	25 Feb 2004 05:14:48 -0000	1.2
  +++ validScript1.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -26,7 +26,7 @@
     limitations under the License.
   -->
   <j:jelly 
  -	xmlns:j="jelly:core">
  +    xmlns:j="jelly:core">
     
     <j:set var="foo" value="bar"/>
     
  
  
  
  1.2       +26 -26    jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testBreakTag.jelly
  
  Index: testBreakTag.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testBreakTag.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testBreakTag.jelly	12 Aug 2004 04:58:04 -0000	1.1
  +++ testBreakTag.jelly	8 Sep 2004 05:41:32 -0000	1.2
  @@ -16,31 +16,31 @@
   
   <j:jelly xmlns:j="jelly:core">
   
  -	<j:set var="simpleResult" value=""/>
  -	<j:forEach var="counter" begin="1" end="10">
  -	   <j:set var="simpleResult" value="${simpleResult}${counter}"/>
  -	   <j:if test="${counter==5}">
  -	      <j:break/>
  -	   </j:if>
  -	</j:forEach>
  -	  
  -	<j:set var="conditionalResult" value=""/>
  -	<j:forEach var="counter" begin="1" end="10">
  -	   <j:set var="conditionalResult" value="${conditionalResult}${counter}"/>
  -	   <j:break test="${counter==5}"/>
  -	</j:forEach>  
  -	
  -	<j:set var="varBreaksResult" value=""/>
  -	<j:forEach var="counter" begin="1" end="10">
  -	   <j:set var="varBreaksResult" value="${varBreaksResult}${counter}"/>
  -	   <j:break var="varBroken" test="${counter==5}"/>
  -	</j:forEach>  
  +    <j:set var="simpleResult" value=""/>
  +    <j:forEach var="counter" begin="1" end="10">
  +       <j:set var="simpleResult" value="${simpleResult}${counter}"/>
  +       <j:if test="${counter==5}">
  +          <j:break/>
  +       </j:if>
  +    </j:forEach>
  +      
  +    <j:set var="conditionalResult" value=""/>
  +    <j:forEach var="counter" begin="1" end="10">
  +       <j:set var="conditionalResult" value="${conditionalResult}${counter}"/>
  +       <j:break test="${counter==5}"/>
  +    </j:forEach>  
  +    
  +    <j:set var="varBreaksResult" value=""/>
  +    <j:forEach var="counter" begin="1" end="10">
  +       <j:set var="varBreaksResult" value="${varBreaksResult}${counter}"/>
  +       <j:break var="varBroken" test="${counter==5}"/>
  +    </j:forEach>  
   
  -	<j:set var="varNoBreaksResult" value=""/>
  -	<j:forEach var="counter" begin="1" end="10">
  -	   <j:set var="varNoBreaksResult" value="${varNoBreaksResult}${counter}"/>
  -	   <j:break var="varNotBroken" test="${counter==11}"/>
  -	</j:forEach>  
  -	
  -	
  +    <j:set var="varNoBreaksResult" value=""/>
  +    <j:forEach var="counter" begin="1" end="10">
  +       <j:set var="varNoBreaksResult" value="${varNoBreaksResult}${counter}"/>
  +       <j:break var="varNotBroken" test="${counter==11}"/>
  +    </j:forEach>  
  +    
  +    
   </j:jelly>
  
  
  
  1.5       +17 -17    jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testUseBeanTag.jelly
  
  Index: testUseBeanTag.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testUseBeanTag.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testUseBeanTag.jelly	31 Aug 2004 04:27:04 -0000	1.4
  +++ testUseBeanTag.jelly	8 Sep 2004 05:41:32 -0000	1.5
  @@ -15,15 +15,15 @@
   -->
   
   <j:jelly xmlns:j="jelly:core"
  -	xmlns:jx="jelly:org.apache.commons.jelly.core.extension.CoreExtensionTagLibrary">
  -	
  +    xmlns:jx="jelly:org.apache.commons.jelly.core.extension.CoreExtensionTagLibrary">
  +    
       <j:if test="${test.simple}">
           <j:useBean var="foo" 
             class="org.apache.commons.jelly.core.Customer"
             name="testing"
             city="sydney"/>
       </j:if>
  -	
  +    
       <j:if test="${test.extension}">
           <jx:useBeanX var="foo" 
             class="org.apache.commons.jelly.core.Customer"
  @@ -32,21 +32,21 @@
       </j:if>
       
       <j:if test="${test.badProperty}">
  -		<j:catch var="ex">
  -        	<jx:useBean var="foo" 
  -			  class="org.apache.commons.jelly.core.Customer"
  -			  name="testing"
  -			  city="sydney"
  -			  foo="bar"/>
  -		</j:catch>
  +        <j:catch var="ex">
  +            <jx:useBean var="foo" 
  +              class="org.apache.commons.jelly.core.Customer"
  +              name="testing"
  +              city="sydney"
  +              foo="bar"/>
  +        </j:catch>
       </j:if>
  -	
  -	<j:if test="${test.badPropertyIgnored}">
  -		<jx:useBeanXP var="foo" 
  -			class="org.apache.commons.jelly.core.Customer"
  -			name="testing"
  -			city="sydney"
  -			foo="bar"/> 
  +    
  +    <j:if test="${test.badPropertyIgnored}">
  +        <jx:useBeanXP var="foo" 
  +            class="org.apache.commons.jelly.core.Customer"
  +            name="testing"
  +            city="sydney"
  +            foo="bar"/> 
       </j:if>
       
   </j:jelly>
  
  
  
  1.5       +6 -6      jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testInvokeTag.jelly
  
  Index: testInvokeTag.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testInvokeTag.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testInvokeTag.jelly	12 Aug 2004 04:25:42 -0000	1.4
  +++ testInvokeTag.jelly	8 Sep 2004 05:41:32 -0000	1.5
  @@ -64,18 +64,18 @@
           <j:set var="exceptionMessage" value="method threw an exception"/>
           <j:new var="exceptionBean" className="org.apache.commons.jelly.core.ExceptionBean"/>
           <j:catch var="jellyException">
  -	        <j:invoke on="${exceptionBean}" method="instanceMethod" exceptionVar="exceptionThrown">
  -	        	<j:arg value="${exceptionMessage}"/>
  -	        </j:invoke>
  +            <j:invoke on="${exceptionBean}" method="instanceMethod" exceptionVar="exceptionThrown">
  +                <j:arg value="${exceptionMessage}"/>
  +            </j:invoke>
           </j:catch>
       </j:if>
       <j:if test="${test.invokeThatDoesNotHandleException}">
           <j:set var="exceptionMessage" value="method threw an exception"/>
           <j:new var="exceptionBean" className="org.apache.commons.jelly.core.ExceptionBean"/>
           <j:catch var="jellyException">
  -	        <j:invoke on="${exceptionBean}" method="instanceMethod">
  -	        	<j:arg value="${exceptionMessage}"/>
  -	        </j:invoke>
  +            <j:invoke on="${exceptionBean}" method="instanceMethod">
  +                <j:arg value="${exceptionMessage}"/>
  +            </j:invoke>
           </j:catch>
       </j:if>
   
  
  
  
  1.5       +1 -1      jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testFileTag.jelly
  
  Index: testFileTag.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testFileTag.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testFileTag.jelly	2 Sep 2004 04:07:17 -0000	1.4
  +++ testFileTag.jelly	8 Sep 2004 05:41:32 -0000	1.5
  @@ -15,7 +15,7 @@
   -->
   
   <j:jelly xmlns:j="jelly:core">
  -	<j:file var="testFileTag" outputMode="html" escapeText="false">
  +    <j:file var="testFileTag" outputMode="html" escapeText="false">
         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
         </html>
       </j:file>
  
  
  
  1.3       +5 -5      jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testChooseTag.jelly
  
  Index: testChooseTag.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testChooseTag.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testChooseTag.jelly	25 Feb 2004 05:09:57 -0000	1.2
  +++ testChooseTag.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -15,27 +15,27 @@
   -->
   
   <j:jelly xmlns:j="jelly:core">
  -	<j:set var="result.true">
  -	  <j:choose>
  +    <j:set var="result.true">
  +      <j:choose>
           <j:when test="${1 == 1}">
             A
           </j:when>
           <j:otherwise>
             B
           </j:otherwise>
  -		C        
  +        C        
         </j:choose>
       </j:set>
       
       <j:set var="result.false">
  -	  <j:choose>
  +      <j:choose>
           <j:when test="${0 == 1}">
             A
           </j:when>
           <j:otherwise>
             B
           </j:otherwise>
  -		C        
  +        C        
         </j:choose>
       </j:set>
       
  
  
  
  1.5       +6 -6      jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testInvokeStaticTag.jelly
  
  Index: testInvokeStaticTag.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/testInvokeStaticTag.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testInvokeStaticTag.jelly	12 Aug 2004 04:36:25 -0000	1.4
  +++ testInvokeStaticTag.jelly	8 Sep 2004 05:41:32 -0000	1.5
  @@ -39,17 +39,17 @@
       <j:if test="${test.invokeThatThrowsException}">
           <j:set var="exceptionMessage" value="method threw an exception"/>
           <j:catch var="jellyException">
  -	        <j:invokeStatic className="org.apache.commons.jelly.core.ExceptionBean" method="staticMethod"
exceptionVar="exceptionThrown">
  -	        	<j:arg value="${exceptionMessage}"/>
  -	        </j:invokeStatic>
  +            <j:invokeStatic className="org.apache.commons.jelly.core.ExceptionBean"
method="staticMethod" exceptionVar="exceptionThrown">
  +                <j:arg value="${exceptionMessage}"/>
  +            </j:invokeStatic>
           </j:catch>
       </j:if>
       <j:if test="${test.invokeThatDoesNotHandleException}">
           <j:set var="exceptionMessage" value="method threw an exception"/>
           <j:catch var="jellyException">
  -	        <j:invokeStatic className="org.apache.commons.jelly.core.ExceptionBean" method="staticMethod">
  -	        	<j:arg value="${exceptionMessage}"/>
  -	        </j:invokeStatic>
  +            <j:invokeStatic className="org.apache.commons.jelly.core.ExceptionBean"
method="staticMethod">
  +                <j:arg value="${exceptionMessage}"/>
  +            </j:invokeStatic>
           </j:catch>
       </j:if>
       
  
  
  
  1.6       +2 -2      jakarta-commons/jelly/src/test/org/apache/commons/jelly/test_args.jelly
  
  Index: test_args.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/test_args.jelly,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- test_args.jelly	25 Feb 2004 04:38:17 -0000	1.5
  +++ test_args.jelly	8 Sep 2004 05:41:32 -0000	1.6
  @@ -20,8 +20,8 @@
   <j:jelly xmlns:j="jelly:core">
   
     <j:forEach var="arg" items="${args}">
  -  	<!-- use the <whitespace> tag to have careful control over whitespace -->
  -  	<j:whitespace><j:expr value="${arg}"/> </j:whitespace>
  +      <!-- use the <whitespace> tag to have careful control over whitespace -->
  +      <j:whitespace><j:expr value="${arg}"/> </j:whitespace>
     </j:forEach>
     
   </j:jelly>
  
  
  
  1.4       +3 -3      jakarta-commons/jelly/src/test/org/apache/commons/jelly/testFile.jelly
  
  Index: testFile.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/testFile.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testFile.jelly	25 Feb 2004 04:38:17 -0000	1.3
  +++ testFile.jelly	8 Sep 2004 05:41:32 -0000	1.4
  @@ -19,9 +19,9 @@
   
   <forEach var="i" begin="1" end="10">
     <file name="target/test_${i}.xml">
  -  	<test id="${id}">
  -  	  a test
  -  	</test>
  +      <test id="${id}">
  +        a test
  +      </test>
     </file>
   </forEach>
   
  
  
  
  1.3       +5 -5      jakarta-commons/jelly/src/test/org/apache/commons/jelly/testStatic.jelly
  
  Index: testStatic.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/testStatic.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testStatic.jelly	25 Feb 2004 04:57:16 -0000	1.2
  +++ testStatic.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -16,11 +16,11 @@
   -->
   <j:jelly trim="false" xmlns:j="jelly:core">
     <x:foo xmlns:x="http://www.acme.com/foo">
  -  	<a cheese="cheddar"/>
  -	<y:bar xmlns:y="something">
  -	  <x:topping y:type="ham"/>
  -	</y:bar>
  -  </x:foo>				  		
  +      <a cheese="cheddar"/>
  +    <y:bar xmlns:y="something">
  +      <x:topping y:type="ham"/>
  +    </y:bar>
  +  </x:foo>                          
   </j:jelly>
   
   
  
  
  
  1.3       +13 -13    jakarta-commons/jelly/src/test/org/apache/commons/jelly/benchmark/sample.jelly
  
  Index: sample.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/benchmark/sample.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sample.jelly	25 Feb 2004 05:06:11 -0000	1.2
  +++ sample.jelly	8 Sep 2004 05:41:32 -0000	1.3
  @@ -19,20 +19,20 @@
   
   <j:jelly xmlns:j="jelly:core">
   
  -	<j:if test="${1==2}">	
  -		<static>
  -			<some id="12">
  -				<dummy x="${dummy.whatever}">
  -					this is some static XML
  -				</dummy>
  -				<dummy x="${dummy.whatever}">
  -					some ${e}
  -				</dummy>
  -			</some>
  -		</static>
  -	</j:if>		
  +    <j:if test="${1==2}">    
  +        <static>
  +            <some id="12">
  +                <dummy x="${dummy.whatever}">
  +                    this is some static XML
  +                </dummy>
  +                <dummy x="${dummy.whatever}">
  +                    some ${e}
  +                </dummy>
  +            </some>
  +        </static>
  +    </j:if>        
   
     <j:forEach var="i" begin="1" end="100">
  -  	<j:set var="dummy" value="${i}"/>
  +      <j:set var="dummy" value="${i}"/>
     </j:forEach>
   </j:jelly>
  
  
  
  1.5       +2 -2      jakarta-commons/jelly/src/test/org/apache/commons/jelly/benchmark/benchmark.jelly
  
  Index: benchmark.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/benchmark/benchmark.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- benchmark.jelly	25 Feb 2004 05:06:11 -0000	1.4
  +++ benchmark.jelly	8 Sep 2004 05:41:32 -0000	1.5
  @@ -21,9 +21,9 @@
   
     <j:useBean var="start" class="java.util.Date" />
     Started at: ${start}
  -	
  +    
     <j:forEach begin="1" end="1000">
  -  	<j:include uri="sample.jelly"/>
  +      <j:include uri="sample.jelly"/>
     </j:forEach>
     
     <j:useBean var="end" class="java.util.Date" />
  
  
  

---------------------------------------------------------------------
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