Author: kenney
Date: Tue Apr 11 05:16:30 2006
New Revision: 393197
URL: http://svn.apache.org/viewcvs?rev=393197&view=rev
Log:
PR: MJAR-21.
Committed on behalf of Jerome Lacoste.
Changes from the original patch: Two methods changed
from package protected to private. Since this is API breaking,
I undid them.
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java?rev=393197&r1=393196&r2=393197&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
Tue Apr 11 05:16:30 2006
@@ -367,9 +367,9 @@
* @param arguments
* @param key the argument name.
* @param value the argument value to be added.
- * @see #addArgIfNotEmpty(java.util.List,String,String,boolean)
+ * @see #addArgIfNotEmpty(java.util.List,String,Object,boolean)
*/
- private void addArgIfNotEmpty( List arguments, String key, String value )
+ private void addArgIfNotEmpty( List arguments, String key, Object value )
{
addArgIfNotEmpty( arguments, key, value, false );
}
@@ -385,13 +385,13 @@
* @param value the argument value to be added.
* @param repeatKey repeat or not the key in the command line
*/
- private void addArgIfNotEmpty( List arguments, String key, String value,
boolean repeatKey )
+ private void addArgIfNotEmpty( List arguments, String key, Object value,
boolean repeatKey )
{
- if ( !StringUtils.isEmpty( value ) )
+ if ( value != null && !StringUtils.isEmpty( value.toString() ) )
{
arguments.add( key );
- StringTokenizer token = new StringTokenizer( value, "," );
+ StringTokenizer token = new StringTokenizer( value.toString(), ","
);
while ( token.hasMoreTokens() )
{
String current = token.nextToken().trim();
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java?rev=393197&r1=393196&r2=393197&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
Tue Apr 11 05:16:30 2006
@@ -142,7 +142,7 @@
try
{
int result = executeCommandLine( commandLine, null, outConsumer,
errConsumer );
-
+
if ( result != 0 )
{
throw new MojoExecutionException("Result of " + commandLine
@@ -156,18 +156,6 @@
catch ( CommandLineException e )
{
throw new MojoExecutionException( "command execution failed", e );
- }
- }
-
- private void createParentDirIfNecessary(final String file) {
- if ( file != null)
- {
- final File fileDir = new File( file ).getParentFile();
-
- if ( fileDir != null) { // not a relative path
- boolean mkdirs = fileDir.mkdirs();
- getLog().debug("mdkirs: " + mkdirs + " " + fileDir);
- }
}
}