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 test_args.jelly testFile.jelly testFindVariable.jelly
Date Wed, 25 Feb 2004 04:38:17 GMT
dion        2004/02/24 20:38:17

  Modified:    jelly/src/test/org/apache/commons/jelly test_args.jelly
                        testFile.jelly testFindVariable.jelly
  Log:
  *** keyword substitution change ***
  
  Revision  Changes    Path
  1.5       +15 -0     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- test_args.jelly	16 Jan 2003 23:36:12 -0000	1.4
  +++ test_args.jelly	25 Feb 2004 04:38:17 -0000	1.5
  @@ -1,4 +1,19 @@
   <?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.
  +-->
   
   <!-- displays the current command line arguments -->
   
  
  
  
  1.3       +42 -26    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testFile.jelly	29 Jul 2002 18:14:20 -0000	1.2
  +++ testFile.jelly	25 Feb 2004 04:38:17 -0000	1.3
  @@ -1,26 +1,42 @@
  -<?xml version="1.0"?>
  -<jelly xmlns="jelly:core">
  -
  -<forEach var="i" begin="1" end="10">
  -  <file name="target/test_${i}.xml">
  -  	<test id="${id}">
  -  	  a test
  -  	</test>
  -  </file>
  -</forEach>
  -
  -<!-- now lets test some different formatting -->
  -
  -<file name="target/test_normal.xml">
  -  <include uri="dummy.xml"/>
  -</file>
  -
  -<file name="target/test_pretty.xml" prettyPrint="true" omitXmlDeclaration="true">
  -  <include uri="dummy.xml"/>
  -</file>
  -
  -<file name="target/test_iso.xml" encoding="ISO-8859-1">
  -  <include uri="dummy.xml"/>
  -</file>
  - 
  -</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.
  +-->
  +
  +<jelly xmlns="jelly:core">
  +
  +<forEach var="i" begin="1" end="10">
  +  <file name="target/test_${i}.xml">
  +  	<test id="${id}">
  +  	  a test
  +  	</test>
  +  </file>
  +</forEach>
  +
  +<!-- now lets test some different formatting -->
  +
  +<file name="target/test_normal.xml">
  +  <include uri="dummy.xml"/>
  +</file>
  +
  +<file name="target/test_pretty.xml" prettyPrint="true" omitXmlDeclaration="true">
  +  <include uri="dummy.xml"/>
  +</file>
  +
  +<file name="target/test_iso.xml" encoding="ISO-8859-1">
  +  <include uri="dummy.xml"/>
  +</file>
  + 
  +</jelly>
  
  
  
  1.3       +15 -0     jakarta-commons/jelly/src/test/org/apache/commons/jelly/testFindVariable.jelly
  
  Index: testFindVariable.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/testFindVariable.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testFindVariable.jelly	3 Jun 2002 05:14:29 -0000	1.2
  +++ testFindVariable.jelly	25 Feb 2004 04:38:17 -0000	1.3
  @@ -1,4 +1,19 @@
   <?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">
     <j:if test='${context.findVariable("foo") != "bar"}'>
         <fail>The value of foo in a parent scope does not equal to 'bar'</fail>
  
  
  

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