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/ant/src/test/org/apache/commons/jelly/ant example_tasks.jelly jellyunit.jelly
Date Wed, 08 Sep 2004 05:11:35 GMT
dion        2004/09/07 22:11:35

  Modified:    jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant
                        example_tasks.jelly jellyunit.jelly
  Log:
  *** keyword substitution change ***
  
  Revision  Changes    Path
  1.6       +39 -39    jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly
  
  Index: example_tasks.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/example_tasks.jelly,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- example_tasks.jelly	25 Feb 2004 05:32:00 -0000	1.5
  +++ example_tasks.jelly	8 Sep 2004 05:11:34 -0000	1.6
  @@ -1,39 +1,39 @@
  -<?xml version="1.0"?>
  -<!--
  -  Copyright 2002,2004 The Apache Software Foundation.
  -  
  -  Licensed under the Apache License, Version 2.0 (the "License");
  -  you may not use this file except in compliance with the License.
  -  You may obtain a copy of the License at
  -  
  -       http://www.apache.org/licenses/LICENSE-2.0
  -  
  -  Unless required by applicable law or agreed to in writing, software
  -  distributed under the License is distributed on an "AS IS" BASIS,
  -  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -  See the License for the specific language governing permissions and
  -  limitations under the License.
  --->
  -<j:jelly xmlns:j="jelly:core" xmlns="jelly:ant">
  -  Lets start by calling the echo task
  -    
  -  <!-- this example attempts to invoke some Ant tasks -->
  -  <echo message="Invoking the echo task from inside Jelly; the Maven repository is ${lib.repo}"/>
         
  -
  -  <echo>
  -  	Maven home is ${maven.home}
  -  </echo>
  -
  -  classpath: ${project.getReference('test.classpath')}
  -
  -  <!-- lets try invoke a program -->
  -  <java classname="org.apache.commons.jelly.Jelly" fork="yes">
  -    <classpath refid="test.classpath"/>
  -    <arg value="src/test/org/apache/commons/jelly/show_args.jelly"/> 
  -    <arg value="one"/> 
  -    <arg value="two"/> 
  -    <arg value="three"/> 
  -  </java>
  -
  -  We should be back to the Jelly script again now...    
  -</j:jelly>
  +<?xml version="1.0"?>
  +<!--
  +  Copyright 2002,2004 The Apache Software Foundation.
  +  
  +  Licensed under the Apache License, Version 2.0 (the "License");
  +  you may not use this file except in compliance with the License.
  +  You may obtain a copy of the License at
  +  
  +       http://www.apache.org/licenses/LICENSE-2.0
  +  
  +  Unless required by applicable law or agreed to in writing, software
  +  distributed under the License is distributed on an "AS IS" BASIS,
  +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +  See the License for the specific language governing permissions and
  +  limitations under the License.
  +-->
  +<j:jelly xmlns:j="jelly:core" xmlns="jelly:ant">
  +  Lets start by calling the echo task
  +    
  +  <!-- this example attempts to invoke some Ant tasks -->
  +  <echo message="Invoking the echo task from inside Jelly; the Maven repository is ${lib.repo}"/>
         
  +
  +  <echo>
  +      Maven home is ${maven.home}
  +  </echo>
  +
  +  classpath: ${project.getReference('test.classpath')}
  +
  +  <!-- lets try invoke a program -->
  +  <java classname="org.apache.commons.jelly.Jelly" fork="yes">
  +    <classpath refid="test.classpath"/>
  +    <arg value="src/test/org/apache/commons/jelly/show_args.jelly"/> 
  +    <arg value="one"/> 
  +    <arg value="two"/> 
  +    <arg value="three"/> 
  +  </java>
  +
  +  We should be back to the Jelly script again now...    
  +</j:jelly>
  
  
  
  1.3       +42 -42    jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly
  
  Index: jellyunit.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ant/src/test/org/apache/commons/jelly/ant/jellyunit.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jellyunit.jelly	25 Feb 2004 05:32:00 -0000	1.2
  +++ jellyunit.jelly	8 Sep 2004 05:11:35 -0000	1.3
  @@ -1,43 +1,43 @@
  -<?xml version="1.0"?>
  -<!--
  -  Copyright 2002,2004 The Apache Software Foundation.
  -  
  -  Licensed under the Apache License, Version 2.0 (the "License");
  -  you may not use this file except in compliance with the License.
  -  You may obtain a copy of the License at
  -  
  -       http://www.apache.org/licenses/LICENSE-2.0
  -  
  -  Unless required by applicable law or agreed to in writing, software
  -  distributed under the License is distributed on an "AS IS" BASIS,
  -  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  -  See the License for the specific language governing permissions and
  -  limitations under the License.
  --->
  -<j:jelly xmlns:j="jelly:core" xmlns:test="jelly:junit" xmlns:ant="jelly:ant">
  -
  -  <ant:fileScanner var="scanner">
  -    <ant:fileset dir="src/test" includes="**/suite.jelly"/>
  -  </ant:fileScanner>
  -
  -	<j:if test="${empty outputfile}">
  -			<j:set var="outputfile" value="target/jellyunit.xml"/>
  -  </j:if>
  -  
  -  <ant:echo>Running all JellyUnit tests and generating file ${outputfile}</ant:echo>
  -  	
  -	<j:file name="${outputfile}">
  -		<tests>
  -		  <j:forEach var="file" items="${scanner.iterator()}">
  -	
  -		  	<j:set var="uri" value="${file.toURL().toString()}"/>
  -		  	
  -		  	<suite uri="${uri}">
  -		  		<j:include uri="${uri}"/>
  -					<test:run/>  	
  -				</suite>	
  -						
  -		  </j:forEach>
  -		</tests>
  -	</j:file>		
  +<?xml version="1.0"?>
  +<!--
  +  Copyright 2002,2004 The Apache Software Foundation.
  +  
  +  Licensed under the Apache License, Version 2.0 (the "License");
  +  you may not use this file except in compliance with the License.
  +  You may obtain a copy of the License at
  +  
  +       http://www.apache.org/licenses/LICENSE-2.0
  +  
  +  Unless required by applicable law or agreed to in writing, software
  +  distributed under the License is distributed on an "AS IS" BASIS,
  +  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +  See the License for the specific language governing permissions and
  +  limitations under the License.
  +-->
  +<j:jelly xmlns:j="jelly:core" xmlns:test="jelly:junit" xmlns:ant="jelly:ant">
  +
  +  <ant:fileScanner var="scanner">
  +    <ant:fileset dir="src/test" includes="**/suite.jelly"/>
  +  </ant:fileScanner>
  +
  +    <j:if test="${empty outputfile}">
  +            <j:set var="outputfile" value="target/jellyunit.xml"/>
  +  </j:if>
  +  
  +  <ant:echo>Running all JellyUnit tests and generating file ${outputfile}</ant:echo>
  +      
  +    <j:file name="${outputfile}">
  +        <tests>
  +          <j:forEach var="file" items="${scanner.iterator()}">
  +    
  +              <j:set var="uri" value="${file.toURL().toString()}"/>
  +              
  +              <suite uri="${uri}">
  +                  <j:include uri="${uri}"/>
  +                    <test:run/>      
  +                </suite>    
  +                        
  +          </j:forEach>
  +        </tests>
  +    </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