Author: dennisl
Date: Thu Feb 3 22:44:09 2011
New Revision: 1067016
URL: http://svn.apache.org/viewvc?rev=1067016&view=rev
Log:
[MASSEMBLY-255] Typo in error message
Submitted by: Benjamin Bentmann
Reviewed by: Dennis Lundberg
o Make "windows" valid synonym for CRLF line endings
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=1067016&r1=1067015&r2=1067016&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
Thu Feb 3 22:44:09 2011
@@ -45,6 +45,7 @@ public final class AssemblyFileUtils
public static final String LINE_ENDING_KEEP = "keep";
public static final String LINE_ENDING_DOS = "dos";
+ public static final String LINE_ENDING_WINDOWS = "windows";
public static final String LINE_ENDING_UNIX = "unix";
public static final String LINE_ENDING_CRLF = "crlf";
public static final String LINE_ENDING_LF = "lf";
@@ -182,7 +183,7 @@ public final class AssemblyFileUtils
{
value = null;
}
- else if ( LINE_ENDING_DOS.equals( lineEnding ) ||
LINE_ENDING_CRLF.equals( lineEnding ) )
+ else if ( LINE_ENDING_DOS.equals( lineEnding ) ||
LINE_ENDING_WINDOWS.equals( lineEnding ) || LINE_ENDING_CRLF.equals( lineEnding
) )
{
value = "\r\n";
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=1067016&r1=1067015&r2=1067016&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Thu
Feb 3 22:44:09 2011
@@ -365,10 +365,11 @@
Valid values:
<ul>
<li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings</li>
- <li><b>"lf"</b> - Use a single line-feed line endings</li>
- <li><b>"dos"</b> - Use DOS-style line endings</li>
- <li><b>"crlf"</b> - Use Carraige-return, line-feed line
endings</li>
+ <li><b>"unix"</b> - Use Unix-style line endings (i.e. "\n")</li>
+ <li><b>"lf"</b> - Use a single line-feed line endings (i.e.
"\n")</li>
+ <li><b>"dos"</b> - Use DOS-/Windows-style line endings (i.e.
"\r\n")</li>
+ <li><b>"windows"</b> - Use DOS-/Windows-style line endings (i.e.
"\r\n")</li>
+ <li><b>"crlf"</b> - Use carriage-return, line-feed line endings
(i.e. "\r\n")</li>
</ul>
]]>
</description>
@@ -451,10 +452,11 @@
Valid values are:
<ul>
<li><b>"keep"</b> - Preserve all line endings</li>
- <li><b>"unix"</b> - Use Unix-style line endings</li>
- <li><b>"lf"</b> - Use a single line-feed line endings</li>
- <li><b>"dos"</b> - Use DOS-style line endings</li>
- <li><b>"crlf"</b> - Use Carraige-return, line-feed line
endings</li>
+ <li><b>"unix"</b> - Use Unix-style line endings (i.e. "\n")</li>
+ <li><b>"lf"</b> - Use a single line-feed line endings (i.e.
"\n")</li>
+ <li><b>"dos"</b> - Use DOS-/Windows-style line endings (i.e.
"\r\n")</li>
+ <li><b>"windows"</b> - Use DOS-/Windows-style line endings (i.e.
"\r\n")</li>
+ <li><b>"crlf"</b> - Use carriage-return, line-feed line endings
(i.e. "\r\n")</li>
</ul>
]]>
</description>
