svn commit: r720105 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src: main/java/org/apache/maven/archiva/web/startup/Banner.java test/java/org/apache/maven/archiva/web/startup/BannerTest.java

[jdumay]

Author: jdumay
Date: Sun Nov 23 19:16:29 2008
New Revision: 720105

URL: http://svn.apache.org/viewvc?rev=720105&view=rev
Log:
MRM-1020 - Fix the crazy alpaca on Windows. Submitted by Martin Cooper


Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java?rev=720105&r1=720104&r2=720105&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/Banner.java
 Sun Nov 23 19:16:29 2008
@@ -32,8 +32,13 @@
  */
 public class Banner
 {
+    private static final String eol = System.getProperty("line.separator");
+
     public static String encode( String raw )
     {
+        // Canonicalize line ends to make them easier to process
+        raw = raw.replace("\r\n", "\n").replace("\r", "\n");
+
         StringBuffer encoded = new StringBuffer();
         int rawlen = raw.length();
 
@@ -124,7 +129,7 @@
                 }
                 else if ( nc == 'n' )
                 {
-                    decoded.append( '\n' );
+                    decoded.append( eol );
                     i++;
                 }
                 else if ( Character.isDigit( nc ) )
@@ -206,7 +211,7 @@
     public static String getBanner( String version )
     {
         String encodedBanner = "$26 $34_$n$15 /$._$7 /$34 $.$n$14 /`/@),$4 |  
Ba" +
-                " orunys bs nyy bs gur nycnpn'f  |$n$14 |  (~'  __| gbvyvat 
njnl ba " +
+                " orunys bs nyy bs gur nycnpnf   |$n$14 |  (~'  __| gbvyvat 
njnl ba " +
                 "gur Ncnpur Nepuvin |$n$6 _,--.$3_/  |$4 $.$5  cebwrpg grnz, V 
jbhyq y" +
                 "vxr gb$3 |$n$4 ,' ,$5 ($3 |$5 $.$5     jrypbzr lbh gb 
Nepuvin$6 |$" +
                 "n$4 |  ($6 $.  /$6 |  $32#  |$n$5 $.  )$._/  ,_/$7 |$36 |$n$5 
/ /$3 " +
@@ -219,6 +224,6 @@
     public static void display()
     {
         String banner = getBanner( ArchivaVersion.determineVersion() );
-       LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 
25 ) + "\n" + banner );
+       LoggerFactory.getLogger( Banner.class ).info( StringUtils.repeat( "_", 
25 ) + eol + banner );
     }
 }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java?rev=720105&r1=720104&r2=720105&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/startup/BannerTest.java
 Sun Nov 23 19:16:29 2008
@@ -36,6 +36,8 @@
 public class BannerTest
     extends TestCase
 {
+    private static final String eol = System.getProperty("line.separator");
+
     private void assertEncodeDecode( String encoded, String decoded )
     {
         assertEquals( "Encoding: ", encoded, Banner.encode( decoded ) );
@@ -45,7 +47,7 @@
     public void testEncodeDecode()
     {
         assertEncodeDecode( "[$10 ]", "[          ]" );
-        assertEncodeDecode( "$$$5_$n$5_", "$_____\n_____" );
+        assertEncodeDecode( "$$$5_$n$5_", "$_____"+eol+"_____" );
         assertEncodeDecode( "$${Refgjuvyr}", "${Erstwhile}" );
     }
 
@@ -54,8 +56,8 @@
         assertEquals( "[ 1.0 ]", Banner.injectVersion( "[#####]", "1.0" ) );
         assertEquals( ".\\  1.0-SNAPSHOT  \\._____", Banner.injectVersion( 
".\\################\\._____",
                                                                            
"1.0-SNAPSHOT" ) );
-        assertEquals( "Archiva:\n ( 1.0-alpha-1  )", Banner
-            .injectVersion( "Archiva:\n (##############)", "1.0-alpha-1" ) );
+        assertEquals( "Archiva:\"+eol+\" ( 1.0-alpha-1  )", Banner
+            .injectVersion( "Archiva:\"+eol+\" (##############)", 
"1.0-alpha-1" ) );
     }
 
     public void testGetBanner()