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/html/src/test/org/apache/commons/jelly/html suite.jelly example.jelly example2.jelly radioToPDA.jelly
Date Wed, 08 Sep 2004 05:17:15 GMT
dion        2004/09/07 22:17:15

  Modified:    jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html
                        suite.jelly example.jelly example2.jelly
                        radioToPDA.jelly
  Log:
  detab
  
  Revision  Changes    Path
  1.5       +6 -6      jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/suite.jelly
  
  Index: suite.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/suite.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- suite.jelly	25 Feb 2004 23:47:35 -0000	1.4
  +++ suite.jelly	8 Sep 2004 05:17:14 -0000	1.5
  @@ -53,7 +53,7 @@
         <html>
           <head>
             <title>Jelly - Jelly : Java and XML based processing engine</title>
  -		  <meta name="author" value="James Strachan"/>
  +          <meta name="author" value="James Strachan"/>
             <meta name="email" value="jstrachan@apache.org" />
           </head>
           <body>
  @@ -69,13 +69,13 @@
     </test:case>
   
     <test:case name="testInlineFromVar">
  -  	
  -  	<!-- this will turn the HTML markup from XML events into text -->
  +      
  +      <!-- this will turn the HTML markup from XML events into text -->
       <j:set var="html" encode="false">
         <html>
           <head>
             <title>Jelly - Jelly : Java and XML based processing engine</title>
  -				  <meta name="author" value="James Strachan"/>
  +                  <meta name="author" value="James Strachan"/>
             <meta name="email" value="jstrachan@apache.org" />
           </head>
           <body>
  @@ -83,7 +83,7 @@
         </html>
       </j:set>
   
  -		<!-- parse the text as markup -->
  +        <!-- parse the text as markup -->
       <html:parse var="doc" text="${html}"/>
   
       <test:assert xpath="$doc/html/head/title"/>
  @@ -91,7 +91,7 @@
       <j:set var="title"><x:expr select="$doc/html/head/title" /></j:set>
       
       <test:assertEquals 
  -    	expected="Jelly - Jelly : Java and XML based processing engine"
  +        expected="Jelly - Jelly : Java and XML based processing engine"
         actual="${title}" />
     </test:case>
   
  
  
  
  1.4       +1 -1      jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/example.jelly
  
  Index: example.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/example.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- example.jelly	25 Feb 2004 23:47:35 -0000	1.3
  +++ example.jelly	8 Sep 2004 05:17:14 -0000	1.4
  @@ -23,7 +23,7 @@
     <x:expr select="$doc/html/head/title"/>
   
     <j:whitespace>
  -  	
  +      
     The XML of the document is
     
     <x:copyOf select="$doc"/>
  
  
  
  1.3       +1 -1      jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/example2.jelly
  
  Index: example2.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/example2.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- example2.jelly	25 Feb 2004 23:47:35 -0000	1.2
  +++ example2.jelly	8 Sep 2004 05:17:14 -0000	1.3
  @@ -19,7 +19,7 @@
     <html:parse var="doc" html="textScript.txt"/>
   
     <j:whitespace>
  -  	
  +      
     The XML of the document is
     
     <x:copyOf select="$doc"/>
  
  
  
  1.7       +45 -45    jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/radioToPDA.jelly
  
  Index: radioToPDA.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/radioToPDA.jelly,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- radioToPDA.jelly	25 Feb 2004 23:47:35 -0000	1.6
  +++ radioToPDA.jelly	8 Sep 2004 05:17:14 -0000	1.7
  @@ -15,56 +15,56 @@
     limitations under the License.
   -->
   <j:jelly 
  -	xmlns:j="jelly:core" 
  -	xmlns:x="jelly:xml" 
  -	xmlns:html="jelly:html" 
  -	xmlns:log="jelly:log" 
  -	xmlns:jsl="jelly:jsl">
  +    xmlns:j="jelly:core" 
  +    xmlns:x="jelly:xml" 
  +    xmlns:html="jelly:html" 
  +    xmlns:log="jelly:log" 
  +    xmlns:jsl="jelly:jsl">
   
  -	<!-- 
  -		|| This script parsers the current news using Radio Userland's news aggregator
  -		|| and then outputs it in a simple HTML format that can be read easily on a PDA
  -		-->
  +    <!-- 
  +        || This script parsers the current news using Radio Userland's news aggregator
  +        || and then outputs it in a simple HTML format that can be read easily on a PDA
  +        -->
   
     <html:parse var="doc" html="http://127.0.0.1:5335/system/pages/news"/>
   
  -	<j:if test="${empty(outputFile)}">
  -		<j:set var="outputFile" value="target/radio.html"/>			
  -	</j:if>
  -	
  -	<log:info>About to generate file ${outputFile}</log:info>
  -	
  -	<j:file name="${outputFile}" outputMode="html" encoding="ISO-8859-1">
  -		<jsl:stylesheet select="$doc">
  -			<jsl:template match="/">
  -				<jsl:applyTemplates/>
  -			</jsl:template>
  -		
  -			<!-- strip out these elements-->
  -			<jsl:template match="form|table|td|center">
  -				<jsl:applyTemplates select="child::node()"/>
  -			</jsl:template>
  -				
  -			<jsl:template match="tr">
  -				<br />
  -				<div>
  -					<jsl:applyTemplates select="child::node()"/>
  -				</div>
  -			</jsl:template>
  -				
  -			<jsl:template match="script|img|input"/>
  -		
  -			<!-- pass through all other elements -->
  -			<jsl:template match="*" trim="false">
  -				<jsl:copy>
  -					<jsl:applyTemplates/>
  -				</jsl:copy>
  -			</jsl:template>
  +    <j:if test="${empty(outputFile)}">
  +        <j:set var="outputFile" value="target/radio.html"/>            
  +    </j:if>
  +    
  +    <log:info>About to generate file ${outputFile}</log:info>
  +    
  +    <j:file name="${outputFile}" outputMode="html" encoding="ISO-8859-1">
  +        <jsl:stylesheet select="$doc">
  +            <jsl:template match="/">
  +                <jsl:applyTemplates/>
  +            </jsl:template>
  +        
  +            <!-- strip out these elements-->
  +            <jsl:template match="form|table|td|center">
  +                <jsl:applyTemplates select="child::node()"/>
  +            </jsl:template>
  +                
  +            <jsl:template match="tr">
  +                <br />
  +                <div>
  +                    <jsl:applyTemplates select="child::node()"/>
  +                </div>
  +            </jsl:template>
  +                
  +            <jsl:template match="script|img|input"/>
  +        
  +            <!-- pass through all other elements -->
  +            <jsl:template match="*" trim="false">
  +                <jsl:copy>
  +                    <jsl:applyTemplates/>
  +                </jsl:copy>
  +            </jsl:template>
   
  -			<jsl:template match="@*"/>
  -		</jsl:stylesheet>
  -	</j:file> 
  -	
  +            <jsl:template match="@*"/>
  +        </jsl:stylesheet>
  +    </j:file> 
  +    
   </j:jelly>
   
   
  
  
  

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