commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From felip...@apache.org
Subject svn commit: r391465 - in /jakarta/commons/proper/jelly/trunk/jelly-tags/util: src/java/org/apache/commons/jelly/tags/util/ src/test/org/apache/commons/jelly/tags/util/ xdocs/
Date Wed, 05 Apr 2006 01:53:47 GMT
Author: felipeal
Date: Tue Apr  4 18:53:43 2006
New Revision: 391465

URL: http://svn.apache.org/viewcvs?rev=391465&view=rev
Log:
JELLY-203: fixed wrong package for test case classes
JELLY-205: fixed <util:loadText>, which was adding a new line to files that doe\s not
ends with one (and also added test cases)

Added:
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText6.txt
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt
Modified:
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly
    jakarta/commons/proper/jelly/trunk/jelly-tags/util/xdocs/changes.xml

Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java?rev=391465&r1=391464&r2=391465&view=diff
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
Tue Apr  4 18:53:43 2006
@@ -15,10 +15,8 @@
  */
 package org.apache.commons.jelly.tags.util;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.FileInputStream;
@@ -179,19 +177,17 @@
     protected String loadText(Reader reader) throws IOException {
         StringBuffer buffer = new StringBuffer();
 
-        // @todo its probably more efficient to use a fixed char[] buffer instead
         try {
-            BufferedReader bufferedReader = new BufferedReader(reader);
-            while (true) {
-                String line = bufferedReader.readLine();
-                if (line == null) {
-                    break;
-                }
-                else {
-                    buffer.append(line);
-                    buffer.append('\n');
-                }
-            }
+            char[] charBuffer = new char[ 4096 ];
+            int read;
+            
+            do {
+            	read = reader.read( charBuffer );
+            	if ( read > 0 ) {
+            		buffer.append( charBuffer, 0, read );
+            	}
+            } while ( read > 0);
+            
             return buffer.toString();
         }
         finally {

Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java?rev=391465&r1=391464&r2=391465&view=diff
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/Customer.java
Tue Apr  4 18:53:43 2006
@@ -13,11 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.jelly.util;
+package org.apache.commons.jelly.tags.util;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * A sample bean that we can construct via Jelly tags

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt?rev=391465&view=auto
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt
(added)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText1.txt
Tue Apr  4 18:53:43 2006
@@ -0,0 +1 @@
+12345

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt?rev=391465&view=auto
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt
(added)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText2.txt
Tue Apr  4 18:53:43 2006
@@ -0,0 +1 @@
+12345
\ No newline at end of file

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt?rev=391465&view=auto
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt
(added)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText3.txt
Tue Apr  4 18:53:43 2006
@@ -0,0 +1,2 @@
+12345
+6789

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt?rev=391465&view=auto
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt
(added)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText4.txt
Tue Apr  4 18:53:43 2006
@@ -0,0 +1,2 @@
+12345
+6789
\ No newline at end of file

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt?rev=391465&view=auto
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt
(added)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText5.txt
Tue Apr  4 18:53:43 2006
@@ -0,0 +1 @@
+

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText6.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText6.txt?rev=391465&view=auto
==============================================================================
    (empty)

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt?rev=391465&view=auto
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt
(added)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText7.txt
Tue Apr  4 18:53:43 2006
@@ -0,0 +1,1000 @@
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789

Added: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt?rev=391465&view=auto
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt
(added)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/loadText8.txt
Tue Apr  4 18:53:43 2006
@@ -0,0 +1,1000 @@
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
+123456789
\ No newline at end of file

Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly?rev=391465&r1=391464&r2=391465&view=diff
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/src/test/org/apache/commons/jelly/tags/util/suite.jelly
Tue Apr  4 18:53:43 2006
@@ -191,9 +191,9 @@
   <test:case name="testSortBean">
     <j:new var="testCollection" className="java.util.ArrayList"/>
 
-    <j:useBean var="cust1" class="org.apache.commons.jelly.util.Customer" city="Sydney"
location="Australia" name="Fred Nerk"/>
-    <j:useBean var="cust2" class="org.apache.commons.jelly.util.Customer" city="Melbourne"
location="Australia" name="Joe Nerk"/>
-    <j:useBean var="cust3" class="org.apache.commons.jelly.util.Customer" city="San Francisco"
location="U.S.A." name="Colette Cool"/>
+    <j:useBean var="cust1" class="org.apache.commons.jelly.tags.util.Customer" city="Sydney"
location="Australia" name="Fred Nerk"/>
+    <j:useBean var="cust2" class="org.apache.commons.jelly.tags.util.Customer" city="Melbourne"
location="Australia" name="Joe Nerk"/>
+    <j:useBean var="cust3" class="org.apache.commons.jelly.tags.util.Customer" city="San
Francisco" location="U.S.A." name="Colette Cool"/>
     <j:mute>
     	${testCollection.add(cust1)}
     	${testCollection.add(cust2)}
@@ -214,5 +214,47 @@
   
   </test:case>
 
+  <test:case name="testLoadTextTag">
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText1.txt"

+        var="oneLineNewLine" />
+      <test:assertEquals expected="6" actual="${oneLineNewLine.length().toString()}">
+      Wrong size of loaded text (one line with newline)!
+      </test:assertEquals>
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText2.txt"

+        var="oneLineNoNewLine" />
+      <test:assertEquals expected="5" actual="${oneLineNoNewLine.length().toString()}">
+      Wrong size of loaded text (one line without newline)!
+      </test:assertEquals>
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText3.txt"

+        var="twoLinesNewLine" />
+      <test:assertEquals expected="11" actual="${twoLinesNewLine.length().toString()}">
+      Wrong size of loaded text (two lines with newline)!
+      </test:assertEquals>
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText4.txt"

+        var="twoLinesNoNewLine" />
+      <test:assertEquals expected="10" actual="${twoLinesNoNewLine.length().toString()}">
+      Wrong size of loaded text (two lines without newline)!
+      </test:assertEquals>
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText5.txt"

+        var="emptyNewLine" />
+      <test:assertEquals expected="1" actual="${emptyNewLine.length().toString()}">
+      Wrong size of loaded text (empty line with newline)!
+      </test:assertEquals>
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText6.txt"

+        var="emptyNoNewLine" />
+      <test:assertEquals expected="0" actual="${emptyNoNewLine.length().toString()}">
+      Wrong size of loaded text (empty lines without newline)!
+      </test:assertEquals>
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText7.txt"

+        var="bigFileNewLine" />
+      <test:assertEquals expected="10000" actual="${bigFileNewLine.length().toString()}">
+      Wrong size of loaded text (big file with newline)!
+      </test:assertEquals>
+      <util:loadText file="${basedir}/src/test/org/apache/commons/jelly/tags/util/loadText8.txt"

+        var="bigFileNoNewLine" />
+      <test:assertEquals expected="9999" actual="${bigFileNoNewLine.length().toString()}">
+      Wrong size of loaded text (big file without newline)!
+      </test:assertEquals>
+  </test:case>
     
 </test:suite>

Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/util/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/util/xdocs/changes.xml?rev=391465&r1=391464&r2=391465&view=diff
==============================================================================
--- jakarta/commons/proper/jelly/trunk/jelly-tags/util/xdocs/changes.xml (original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/util/xdocs/changes.xml Tue Apr  4 18:53:43
2006
@@ -24,6 +24,10 @@
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.1.2-SNAPSHOT" date="on CVS">
+      <action dev="dion" type="fix" dev="felipeal" issue="JELLY-203">Fixed test case
packages</action>
+      <action dev="dion" type="fix" dev="felipeal" issue="JELLY-205">loadText tag was
adding a new line to files that does not ends with one</action>
+    </release>
     <release version="1.1.1" date="2005-01-01">
       <action dev="dion" type="fix" due-to="Stefan Bodewig">Handle null encoding in
loadText tag</action>
     </release>



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