svn commit: r1378560 - /maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
Author: olamy
Date: Wed Aug 29 13:56:32 2012
New Revision: 1378560
URL: http://svn.apache.org/viewvc?rev=1378560view=rev
Log:
log checkout/update url used
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?rev=1378560r1=1378559r2=1378560view=diff
==
---
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
Wed Aug 29 13:56:32 2012
@@ -52,19 +52,22 @@ public abstract class AbstractScmPublish
/**
* Location of the inventory file.
*/
-@Parameter( property = scmpublish.inventoryFile,
defaultValue=${project.build.directory}/scmpublish-inventory.js )
+@Parameter( property = scmpublish.inventoryFile,
+ defaultValue =
${project.build.directory}/scmpublish-inventory.js )
protected File inventoryFile;
/**
* Location of the scm publication tree.
*/
-@Parameter( property = scmpublish.pubScmUrl, defaultValue =
${project.distributionManagement.site.url}, required = true )
+@Parameter( property = scmpublish.pubScmUrl, defaultValue =
${project.distributionManagement.site.url},
+ required = true )
protected String pubScmUrl;
/**
* Location where the scm check-out is done.
*/
-@Parameter( property = scmpublish.checkoutDirectory,
defaultValue=${project.build.directory}/scmpublish-checkout )
+@Parameter( property = scmpublish.checkoutDirectory,
+ defaultValue = ${project.build.directory}/scmpublish-checkout
)
protected File checkoutDirectory;
/**
@@ -230,7 +233,7 @@ public abstract class AbstractScmPublish
protected void checkoutExisting()
throws MojoExecutionException
{
-logInfo( ( tryUpdate ? Updating : Checking ) + out the pub tree
... );
+logInfo( %s out the pub tree from %s ..., ( tryUpdate ? Updating
: Checking ), pubScmUrl );
if ( checkoutDirectory.exists() !tryUpdate )
{
svn commit: r1378645 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: snicoll Date: Wed Aug 29 17:04:08 2012 New Revision: 1378645 URL: http://svn.apache.org/viewvc?rev=1378645view=rev Log: [maven-release-plugin] prepare release maven-ear-plugin-2.8 Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1378645r1=1378644r2=1378645view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Aug 29 17:04:08 2012 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-ear-plugin/artifactId - version2.8-SNAPSHOT/version + version2.8/version packagingmaven-plugin/packaging nameMaven EAR Plugin/name @@ -41,11 +41,11 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin//connection + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.8/connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.8 /developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin//url + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-ear-plugin-2.8/url /scm issueManagement systemJIRA/system
svn commit: r1378646 - /maven/plugins/tags/maven-ear-plugin-2.8/
Author: snicoll Date: Wed Aug 29 17:04:17 2012 New Revision: 1378646 URL: http://svn.apache.org/viewvc?rev=1378646view=rev Log: [maven-release-plugin] copy for tag maven-ear-plugin-2.8 Added: maven/plugins/tags/maven-ear-plugin-2.8/ - copied from r1378645, maven/plugins/trunk/maven-ear-plugin/
svn commit: r1378647 - /maven/plugins/trunk/maven-ear-plugin/pom.xml
Author: snicoll Date: Wed Aug 29 17:04:21 2012 New Revision: 1378647 URL: http://svn.apache.org/viewvc?rev=1378647view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1378647r1=1378646r2=1378647view=diff == --- maven/plugins/trunk/maven-ear-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Aug 29 17:04:21 2012 @@ -30,7 +30,7 @@ under the License. /parent artifactIdmaven-ear-plugin/artifactId - version2.8/version + version2.9-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven EAR Plugin/name @@ -41,11 +41,11 @@ under the License. /prerequisites scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.8/connection + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin//connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-ear-plugin-2.8 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ear-plugin/ /developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-ear-plugin-2.8/url + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin//url /scm issueManagement systemJIRA/system
svn commit: r1378652 - /maven/plugins/trunk/maven-install-plugin/pom.xml
Author: olamy Date: Wed Aug 29 17:12:37 2012 New Revision: 1378652 URL: http://svn.apache.org/viewvc?rev=1378652view=rev Log: use last p-u 3.0.5 version Modified: maven/plugins/trunk/maven-install-plugin/pom.xml Modified: maven/plugins/trunk/maven-install-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=1378652r1=1378651r2=1378652view=diff == --- maven/plugins/trunk/maven-install-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-install-plugin/pom.xml Wed Aug 29 17:12:37 2012 @@ -100,7 +100,7 @@ under the License. dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId - version2.0.5/version + version3.0.5/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r1378655 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/io/ test/java/org/apache/maven/shared/utils/io/
Author: struberg
Date: Wed Aug 29 17:29:58 2012
New Revision: 1378655
URL: http://svn.apache.org/viewvc?rev=1378655view=rev
Log:
MSHARED-238 introduce ScanConductor and adopt scandir
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java
(with props)
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java?rev=1378655r1=1378654r2=1378655view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
Wed Aug 29 17:29:58 2012
@@ -105,6 +105,8 @@ import java.util.Vector;
* /pre
* This will scan a directory called test for .class files, but excludes all
* files in all proper subdirectories of a directory called modules
+ * p
+ * This class must not be used from multiple Threads concurrently!
*
* @author Arnout J. Kuiper
* a href=mailto:ajkui...@wxs.nl;ajkui...@wxs.nl/a
@@ -232,6 +234,17 @@ public class DirectoryScanner
protected boolean everythingIncluded = true;
/**
+ * A {@link ScanConductor} an control the scanning process.
+ */
+protected ScanConductor scanConductor = null;
+
+/**
+ * The last ScanAction. We need to store this in the instance
+ * as the scan() method doesn't return
+ */
+private ScanConductor.ScanAction scanAction = null;
+
+/**
* Sole constructor.
*/
public DirectoryScanner()
@@ -491,6 +504,11 @@ public class DirectoryScanner
}
}
+public void setScanConductor( ScanConductor scanConductor )
+{
+this.scanConductor = scanConductor;
+}
+
/**
* Returns whether or not the scanner has included all the files or
* directories it has come across so far.
@@ -548,6 +566,7 @@ public class DirectoryScanner
dirsNotIncluded = new Vector();
dirsExcluded = new Vector();
dirsDeselected = new Vector();
+scanAction = ScanConductor.ScanAction.CONTINUE;
if ( isIncluded( ) )
{
@@ -555,6 +574,19 @@ public class DirectoryScanner
{
if ( isSelected( , basedir ) )
{
+if ( scanConductor != null )
+{
+scanAction = scanConductor.visitDirectory( , basedir
);
+
+if ( ScanConductor.ScanAction.ABORT.equals( scanAction
) ||
+ ScanConductor.ScanAction.ABORT_DIRECTORY.equals(
scanAction ) ||
+ ScanConductor.ScanAction.NO_RECURSE.equals(
scanAction ) )
+{
+return;
+}
+}
+
+
dirsIncluded.addElement( );
}
else
@@ -715,11 +747,31 @@ public class DirectoryScanner
{
if ( isSelected( name, file ) )
{
-dirsIncluded.addElement( name );
-if ( fast )
+if ( scanConductor != null )
{
-scandir( file, name + File.separator, fast );
+scanAction = scanConductor.visitDirectory(
name, file );
+
+if ( ScanConductor.ScanAction.ABORT.equals(
scanAction ) ||
+
ScanConductor.ScanAction.ABORT_DIRECTORY.equals( scanAction ) )
+{
+return;
+}
+}
+
+if ( !ScanConductor.ScanAction.NO_RECURSE.equals(
scanAction ) )
+{
+dirsIncluded.addElement( name );
+if ( fast )
+{
+scandir( file, name + File.separator, fast
);
+
+if (
ScanConductor.ScanAction.ABORT.equals( scanAction ) )
+{
+return;
+}
+
svn commit: r1378679 - in /maven/shared/trunk/maven-verifier: ./ src/main/java/org/apache/maven/it/ src/main/java/org/apache/maven/it/util/ src/main/java/org/apache/maven/it/util/cli/
Author: struberg
Date: Wed Aug 29 18:48:09 2012
New Revision: 1378679
URL: http://svn.apache.org/viewvc?rev=1378679view=rev
Log:
MSHARED-236 use m-shared-utils instead own classes
We just moved those utility classes over to maven-shared-utils
and applied some bugfixes.
Removed:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/Os.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java
Modified:
maven/shared/trunk/maven-verifier/pom.xml
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
Modified: maven/shared/trunk/maven-verifier/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/pom.xml?rev=1378679r1=1378678r2=1378679view=diff
==
--- maven/shared/trunk/maven-verifier/pom.xml (original)
+++ maven/shared/trunk/maven-verifier/pom.xml Wed Aug 29 18:48:09 2012
@@ -45,6 +45,12 @@
dependencies
dependency
+ groupIdorg.apache.maven.shared/groupId
+ artifactIdmaven-shared-utils/artifactId
+ version0.1-SNAPSHOT/version
+/dependency
+
+dependency
groupIdjunit/groupId
artifactIdjunit/artifactId
version3.8.2/version
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1378679r1=1378678r2=1378679view=diff
==
---
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
(original)
+++
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Wed Aug 29 18:48:09 2012
@@ -20,14 +20,14 @@ package org.apache.maven.it;
*/
import junit.framework.Assert;
-import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.it.util.IOUtil;
-import org.apache.maven.it.util.StringUtils;
import org.apache.maven.it.util.cli.CommandLineException;
import org.apache.maven.it.util.cli.CommandLineUtils;
import org.apache.maven.it.util.cli.Commandline;
import org.apache.maven.it.util.cli.StreamConsumer;
import org.apache.maven.it.util.cli.WriterStreamConsumer;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java?rev=1378679r1=1378678r2=1378679view=diff
==
---
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
(original)
+++
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java
Wed Aug 29 18:48:09 2012
@@ -19,6 +19,9 @@ package org.apache.maven.it.util;
* under the License.
*/
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -93,7 +96,7 @@ public class ResourceExtractor {
} else {
FileOutputStream fos = new FileOutputStream(destFile);
try {
-IOUtil.copy(z.getInputStream(ze), fos);
+IOUtil.copy( z.getInputStream( ze ), fos );
} finally {
IOUtil.close(fos);
}
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java?rev=1378679r1=1378678r2=1378679view=diff
==
---
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java
(original)
+++
svn commit: r1378680 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/CollectionUtils.java test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java
Author: struberg
Date: Wed Aug 29 18:49:23 2012
New Revision: 1378680
URL: http://svn.apache.org/viewvc?rev=1378680view=rev
Log:
MSHARED-236 move CollectionUtils + test over from sandbox-pu
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java
Copied:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java
(from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.javap1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.javar1=1378653r2=1378680rev=1378680view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java
Wed Aug 29 18:49:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java
(from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java?p2=maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.javap1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.javar1=1378653r2=1378680rev=1378680view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java
Wed Aug 29 18:49:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,20 +26,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.maven.tck.FixPlexusBugs;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multiset;
public class CollectionUtilsTest
extends Assert
{
-@Rule
-public FixPlexusBugs fixPlexusBugs = new FixPlexusBugs();
@SuppressWarnings( rawtypes )
@Test
@@ -130,14 +123,14 @@ public class CollectionUtilsTest
c2.add( 33.3 );
c2.add( jabberwock );
-MultisetString correct = HashMultiset.create();
+ListString correct = new ArrayListString();
correct.add( blue );
correct.add( blue );
correct.add( porpoise );
@SuppressWarnings( unchecked )
CollectionString res = CollectionUtils.intersection( c1, c2 );
-MultisetString actual = HashMultiset.create();
+ListString actual = new ArrayListString();
actual.addAll( res );
assertEquals( correct, actual );
}
@@ -173,7 +166,7 @@ public class CollectionUtilsTest
c2.add( 33.3 );
c2.add( jabberwock );
-MultisetString correct = HashMultiset.create();
+ListString correct = new ArrayListString();
correct.addAll( c1 );
for ( String s : c2 )
{
@@ -182,7 +175,7 @@ public class CollectionUtilsTest
@SuppressWarnings( unchecked )
CollectionString res = CollectionUtils.subtract( c1, c2 );
-MultisetString act = HashMultiset.create();
+ListString act = new ArrayListString();
act.addAll( res );
assertEquals( correct, act );
@@ -236,7 +229,7 @@ public
svn commit: r1378684 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/ test/java/org/apache/maven/shared/utils/ test/java/org/apache/maven/shared/utils/exceptio
Author: struberg
Date: Wed Aug 29 19:08:11 2012
New Revision: 1378684
URL: http://svn.apache.org/viewvc?rev=1378684view=rev
Log:
MSHARED-236 move Expand and ExceptionUtils from sandbox-pu to proper
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Expand.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExceptionUtilsTest.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExceptionUtilsTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/ExpandTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/exceptionutils/
- copied from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/exceptionutils/
maven/shared/trunk/maven-shared-utils/src/test/resources/expand/
- copied from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/resources/expand/
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestException.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/exceptionutils/TestExceptionWithDetail.java
Copied:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java
(from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.javap1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.javar1=1378653r2=1378684rev=1378684view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/ExceptionUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/ExceptionUtils.java
Wed Aug 29 19:08:11 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
(from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Expand.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.javap1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Expand.javar1=1378653r2=1378684rev=1378684view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/Expand.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Expand.java
Wed Aug 29 19:08:11 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@ package org.codehaus.plexus.util;
* under the License.
*/
+import org.apache.maven.shared.utils.io.FileUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -226,7 +228,7 @@ public class Expand
{
if ( targetFile.isDirectory() )
{
-org.apache.commons.io.FileUtils.deleteDirectory( targetFile );
+FileUtils.deleteDirectory( targetFile );
}
else
{
Copied:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/ExceptionUtilsTest.java
(from r1378653,
svn commit: r1378688 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/ test/java/org/apache/maven/shared/utils/
Author: struberg
Date: Wed Aug 29 19:18:45 2012
New Revision: 1378688
URL: http://svn.apache.org/viewvc?rev=1378688view=rev
Log:
MSHARED-236 move PathTool and PropertyUtils from sandbox to proper
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PathTool.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PropertyUtilsTest.java
- copied, changed from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PropertyUtilsTest.java
Copied:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
(from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PathTool.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.javap1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PathTool.javar1=1378653r2=1378688rev=1378688view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PathTool.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PathTool.java
Wed Aug 29 19:18:45 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
(from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PropertyUtils.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.javap1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PropertyUtils.javar1=1378653r2=1378688rev=1378688view=diff
==
---
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
Wed Aug 29 19:18:45 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,8 @@ package org.codehaus.plexus.util;
* under the License.
*/
-import org.apache.commons.io.IOUtils;
+
+import org.apache.maven.shared.utils.io.IOUtil;
import java.io.FileInputStream;
import java.io.IOException;
@@ -84,9 +85,9 @@ public class PropertyUtils
}
finally
{
-IOUtils.closeQuietly( is );
+IOUtil.close( is );
}
return null;
}
-}
\ No newline at end of file
+}
Copied:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java
(from r1378653,
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.java)
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.java?p2=maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/PathToolTest.javap1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/PathToolTest.javar1=1378653r2=1378688rev=1378688view=diff
==
---
svn commit: r1378692 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/io/ main/java/org/apache/maven/shared/utils/reflection/ test/java/org/apache/maven/shared/
Author: struberg Date: Wed Aug 29 19:40:44 2012 New Revision: 1378692 URL: http://svn.apache.org/viewvc?rev=1378692view=rev Log: MSHARED-236 move Reflector from sandbox to proper also fix a few license headers and improve unit test helpers Added: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/ - copied from r1378653, maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/reflection/ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ - copied from r1378653, maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/reflection/ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/testhelpers/ExceptionHelper.java (with props) Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java?rev=1378692r1=1378691r2=1378692view=diff == --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/ScanConductor.java Wed Aug 29 19:40:44 2012 @@ -1,5 +1,25 @@ package org.apache.maven.shared.utils.io; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + + import java.io.File; /** Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java?rev=1378692r1=1378653r2=1378692view=diff == --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/Reflector.java Wed Aug 29 19:40:44 2012 @@ -1,4 +1,4 @@ -package org.codehaus.plexus.util.reflection; +package org.apache.maven.shared.utils.reflection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -667,4 +667,4 @@ public final class Reflector return methodMap; } -} \ No newline at end of file +} Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java?rev=1378692r1=1378653r2=1378692view=diff == --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/reflection/ReflectorException.java Wed Aug 29 19:40:44 2012 @@ -1,4 +1,4 @@ -package org.codehaus.plexus.util.reflection; +package org.apache.maven.shared.utils.reflection; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -71,4 +71,4 @@ public class
svn commit: r1378696 - in /maven/shared/trunk: maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/ maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/ maven-verif
Author: struberg Date: Wed Aug 29 20:08:27 2012 New Revision: 1378696 URL: http://svn.apache.org/viewvc?rev=1378696view=rev Log: MSHARED-236 move cli utils from verifier to shared-utils Added: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/ - copied from r1378656, maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamPumper.java - copied, changed from r1378679, maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java Removed: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineException.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/CommandLineUtils.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/Commandline.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/DefaultConsumer.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/EnhancedStringTokenizer.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamConsumer.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamFeeder.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/WriterStreamConsumer.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/shell/ Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/DefaultConsumer.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/EnhancedStringTokenizer.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamConsumer.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/StreamFeeder.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/WriterStreamConsumer.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/BourneShell.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CmdShell.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/CommandShell.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java?rev=1378696r1=1378656r2=1378696view=diff == --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineException.java Wed Aug 29 20:08:27 2012 @@ -1,4 +1,4 @@ -package org.apache.maven.it.util.cli; +package org.apache.maven.shared.utils.cli; /* * The MIT License Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1378696r1=1378656r2=1378696view=diff == --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java Wed Aug 29 20:08:27 2012 @@ -1,4 +1,4 @@ -package org.apache.maven.it.util.cli; +package org.apache.maven.shared.utils.cli; /* * The MIT License Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java URL:
svn commit: r1378697 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
Author: jdcasey
Date: Wed Aug 29 20:11:09 2012
New Revision: 1378697
URL: http://svn.apache.org/viewvc?rev=1378697view=rev
Log:
Fixing inappropriate translation of Vector.copyInto() - List.addAll() (should
have been replaced with a different formulation based on List.toArray(..) )
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java?rev=1378697r1=1378696r2=1378697view=diff
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
Wed Aug 29 20:11:09 2012
@@ -22,7 +22,6 @@ package org.apache.maven.shared.utils.io
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -550,11 +549,9 @@ public class DirectoryScanner
return;
}
-final String[] excl = new String[dirsExcluded.size()];
-dirsExcluded.addAll( Arrays.asList( excl ) );
+final String[] excl = dirsExcluded.toArray( new String[] {} );
-final String[] notIncl = new String[dirsNotIncluded.size()];
-dirsNotIncluded.addAll( Arrays.asList( notIncl ) );
+final String[] notIncl = dirsNotIncluded.toArray( new String[] {} );
for ( int i = 0; i excl.length; i++ )
{
@@ -648,8 +645,7 @@ public class DirectoryScanner
noLinks.add( newfile );
}
}
-newfiles = new String[noLinks.size()];
-noLinks.addAll( Arrays.asList( newfiles ) );
+newfiles = noLinks.toArray( new String[] {} );
}
for ( final String newfile : newfiles )
@@ -880,8 +876,7 @@ public class DirectoryScanner
*/
public String[] getIncludedFiles()
{
-final String[] files = new String[filesIncluded.size()];
-filesIncluded.addAll( Arrays.asList( files ) );
+final String[] files = filesIncluded.toArray( new String[] {} );
return files;
}
@@ -895,8 +890,7 @@ public class DirectoryScanner
public String[] getNotIncludedFiles()
{
slowScan();
-final String[] files = new String[filesNotIncluded.size()];
-filesNotIncluded.addAll( Arrays.asList( files ) );
+final String[] files = filesNotIncluded.toArray( new String[] {} );
return files;
}
@@ -912,8 +906,7 @@ public class DirectoryScanner
public String[] getExcludedFiles()
{
slowScan();
-final String[] files = new String[filesExcluded.size()];
-filesExcluded.addAll( Arrays.asList( files ) );
+final String[] files = filesExcluded.toArray( new String[] {} );
return files;
}
@@ -932,8 +925,7 @@ public class DirectoryScanner
public String[] getDeselectedFiles()
{
slowScan();
-final String[] files = new String[filesDeselected.size()];
-filesDeselected.addAll( Arrays.asList( files ) );
+final String[] files = filesDeselected.toArray( new String[] {} );
return files;
}
@@ -946,8 +938,7 @@ public class DirectoryScanner
*/
public String[] getIncludedDirectories()
{
-final String[] directories = new String[dirsIncluded.size()];
-dirsIncluded.addAll( Arrays.asList( directories ) );
+final String[] directories = dirsIncluded.toArray( new String[] {} );
return directories;
}
@@ -961,8 +952,7 @@ public class DirectoryScanner
public String[] getNotIncludedDirectories()
{
slowScan();
-final String[] directories = new String[dirsNotIncluded.size()];
-dirsNotIncluded.addAll( Arrays.asList( directories ) );
+final String[] directories = dirsNotIncluded.toArray( new String[] {}
);
return directories;
}
@@ -978,8 +968,7 @@ public class DirectoryScanner
public String[] getExcludedDirectories()
{
slowScan();
-final String[] directories = new String[dirsExcluded.size()];
-dirsExcluded.addAll( Arrays.asList( directories ) );
+final String[] directories = dirsExcluded.toArray( new String[] {} );
return directories;
}
@@ -998,8 +987,7 @@ public class DirectoryScanner
public String[] getDeselectedDirectories()
{
slowScan();
-final String[] directories = new String[dirsDeselected.size()];
-dirsDeselected.addAll( Arrays.asList( directories ) );
+final String[] directories = dirsDeselected.toArray(
svn commit: r1378709 - /maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
Author: hboutemy
Date: Wed Aug 29 20:36:19 2012
New Revision: 1378709
URL: http://svn.apache.org/viewvc?rev=1378709view=rev
Log:
fixed typo
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?rev=1378709r1=1378708r2=1378709view=diff
==
---
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
Wed Aug 29 20:36:19 2012
@@ -233,7 +233,7 @@ public abstract class AbstractScmPublish
protected void checkoutExisting()
throws MojoExecutionException
{
-logInfo( %s out the pub tree from %s ..., ( tryUpdate ? Updating
: Checking ), pubScmUrl );
+logInfo( %s the pub tree from %s ..., ( tryUpdate ? Updating :
Checking out ), pubScmUrl );
if ( checkoutDirectory.exists() !tryUpdate )
{
svn commit: r1378719 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Author: hboutemy
Date: Wed Aug 29 20:51:22 2012
New Revision: 1378719
URL: http://svn.apache.org/viewvc?rev=1378719view=rev
Log:
renamed method to better match what is done
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=1378719r1=1378718r2=1378719view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Wed Aug 29 20:51:22 2012
@@ -49,13 +49,14 @@ import java.util.Map;
public final class HgUtils
{
-private HgUtils() {
+private HgUtils()
+{
}
/**
* Map between command and its valid exit codes
*/
-private static final MapString,ListInteger EXIT_CODE_MAP = new
HashMapString,ListInteger();
+private static final MapString, ListInteger EXIT_CODE_MAP = new
HashMapString, ListInteger();
/**
* Default exit codes for entries not in exitCodeMap
@@ -89,7 +90,7 @@ public final class HgUtils
Commandline cmd = buildCmd( workingDir, cmdAndArgs );
if ( logger.isInfoEnabled() )
{
-logger.info( EXECUTING: + HgUtils.cryptPassword( cmd ) );
+logger.info( EXECUTING: + hidePassword( cmd ) );
}
//Execute command
@@ -324,11 +325,11 @@ public final class HgUtils
return false;
}
-public static String cryptPassword( Commandline cl )
+public static String hidePassword( Commandline cl )
{
String clString = cl.toString();
-int pos = clString.indexOf( @ );
+int pos = clString.indexOf( '@' );
if ( pos 0 )
{
svn commit: r1378722 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Author: hboutemy
Date: Wed Aug 29 20:54:53 2012
New Revision: 1378722
URL: http://svn.apache.org/viewvc?rev=1378722view=rev
Log:
use Java 5 for loop construct
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=1378722r1=1378721r2=1378722view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Wed Aug 29 20:54:53 2012
@@ -36,7 +36,6 @@ import org.codehaus.plexus.util.cli.Comm
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -110,9 +109,9 @@ public final class HgUtils
{
HgConfig config = new HgConfig( workingDir );
providerMsg =
-\nEXECUTION FAILED + \n Execution of cmd : +
cmdAndArgs[0] + failed with exit code: +
-exitCode + . + \n Working directory was: + \n
+ workingDir.getAbsolutePath() +
-config.toString( workingDir ) + \n;
+\nEXECUTION FAILED + \n Execution of cmd : +
cmdAndArgs[0] + failed with exit code:
++ exitCode + . + \n Working directory was: + \n
+ workingDir.getAbsolutePath()
++ config.toString( workingDir ) + \n;
if ( logger.isErrorEnabled() )
{
logger.error( providerMsg );
@@ -124,8 +123,8 @@ public final class HgUtils
catch ( ScmException se )
{
String msg =
-EXECUTION FAILED + \n Execution failed before invoking the
Hg command. Last exception: + \n +
-se.getMessage();
+EXECUTION FAILED + \n Execution failed before invoking the
Hg command. Last exception: + \n
++ se.getMessage();
//Add nested cause if any
if ( se.getCause() != null )
@@ -197,12 +196,11 @@ public final class HgUtils
// Add files as additional parameter into the array
int i = 0;
-for ( IteratorFile iterator = filesList.iterator();
iterator.hasNext(); i++ )
+for ( File scmFile : filesList )
{
-File scmFile = iterator.next();
String file = scmFile.getPath().replace( '\\', File.separatorChar
);
cmd[i + cmdAndArgs.length] = file;
-
+i++;
}
return cmd;
@@ -310,14 +308,13 @@ public final class HgUtils
ListHgChangeSet changes = outConsumer.getChanges();
if ( outResult.isSuccess() )
{
-for ( int i = 0; i changes.size(); i++ )
+for ( HgChangeSet set : changes )
{
-HgChangeSet set = changes.get( i );
if ( set.getBranch() != null )
{
-logger.warn( A different branch than +
workingbranchName +
- was found in outgoing changes, branch name was +
set.getBranch() +
-. Only local branch named + workingbranchName +
will be pushed. );
+logger.warn( A different branch than + workingbranchName
++ was found in outgoing changes, branch name was +
set.getBranch()
++ . Only local branch named + workingbranchName +
will be pushed. );
return true;
}
}
svn commit: r1378723 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Author: hboutemy
Date: Wed Aug 29 20:57:26 2012
New Revision: 1378723
URL: http://svn.apache.org/viewvc?rev=1378723view=rev
Log:
renamed method even better to better match what is done: thank you Robert :)
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java?rev=1378723r1=1378722r2=1378723view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
Wed Aug 29 20:57:26 2012
@@ -89,7 +89,7 @@ public final class HgUtils
Commandline cmd = buildCmd( workingDir, cmdAndArgs );
if ( logger.isInfoEnabled() )
{
-logger.info( EXECUTING: + hidePassword( cmd ) );
+logger.info( EXECUTING: + maskPassword( cmd ) );
}
//Execute command
@@ -322,7 +322,7 @@ public final class HgUtils
return false;
}
-public static String hidePassword( Commandline cl )
+public static String maskPassword( Commandline cl )
{
String clString = cl.toString();
svn commit: r1378726 - /maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java
Author: hboutemy Date: Wed Aug 29 21:05:09 2012 New Revision: 1378726 URL: http://svn.apache.org/viewvc?rev=1378726view=rev Log: forgot one modified file Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java?rev=1378726r1=1378725r2=1378726view=diff == --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java Wed Aug 29 21:05:09 2012 @@ -45,7 +45,7 @@ public class HgUtilsTest null, https://username:passw...@example.com/foobar; } ); -Commandline cmd = new Commandline( HgUtils.cryptPassword( cmdHttps ) ); +Commandline cmd = new Commandline( HgUtils.maskPassword( cmdHttps ) ); assertEquals( https://username:*@example.com/foobar;, cmd.getArguments()[3] ); } }
svn commit: r1378737 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
Author: jdcasey
Date: Wed Aug 29 21:17:13 2012
New Revision: 1378737
URL: http://svn.apache.org/viewvc?rev=1378737view=rev
Log:
Adding Arg.java
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
(with props)
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java?rev=1378737view=auto
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
Wed Aug 29 21:17:13 2012
@@ -0,0 +1,33 @@
+package org.apache.maven.shared.utils.cli;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import java.io.File;
+
+public interface Arg
+{
+void setValue( String value );
+
+void setLine( String line );
+
+void setFile( File value );
+
+String[] getParts();
+}
Propchange:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Arg.java
--
svn:eol-style = native
svn commit: r1378744 - in /maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish: ScmPublishPublishMojo.java ScmPublishPublishScmMojo.java
Author: hboutemy
Date: Wed Aug 29 21:25:54 2012
New Revision: 1378744
URL: http://svn.apache.org/viewvc?rev=1378744view=rev
Log:
improved messages
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java?rev=1378744r1=1378743r2=1378744view=diff
==
---
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
Wed Aug 29 21:25:54 2012
@@ -327,11 +327,11 @@ public class ScmPublishPublishMojo
try
{
ScmFileSet fileSet = new ScmFileSet( checkoutDirectory,
relativized );
-getLog().debug( scm add directory: + relativized );
+getLog().debug( scm add directory: + relativized );
AddScmResult addDirResult = scmProvider.add( scmRepository,
fileSet, Adding directory );
if ( !addDirResult.isSuccess() )
{
-getLog().debug( Error adding directory + relativized +
+ addDirResult.getCommandOutput() );
+getLog().debug( Error adding directory + relativized +
: + addDirResult.getCommandOutput() );
}
}
catch ( ScmException e )
@@ -344,7 +344,7 @@ public class ScmPublishPublishMojo
addedList.removeAll( dirsToAdd );
ScmFileSet addedFileSet = new ScmFileSet( checkoutDirectory, addedList
);
-getLog().debug( scm add files: + addedList );
+getLog().debug( scm add files: + addedList );
try
{
CommandParameters commandParameters = new CommandParameters();
Modified:
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1378744r1=1378743r2=1378744view=diff
==
---
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
(original)
+++
maven/sandbox/trunk/plugins/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java
Wed Aug 29 21:25:54 2012
@@ -105,7 +105,7 @@ public class ScmPublishPublishScmMojo
{
if ( ignoreDeleteMatchPatterns != null
ignoreDeleteMatchPatterns.matches( name, true ) )
{
-getLog().debug( name + match one of the patterns ' +
pathsAsList + ' do not add to deleted files );
+getLog().debug( name + match one of the patterns ' +
pathsAsList + ': do not add to deleted files );
continue;
}
File file = new File( checkout, name );
@@ -220,9 +220,14 @@ public class ScmPublishPublishScmMojo
siteOutputEncoding = utf-8;
}
+if ( !content.exists() )
+{
+throw new MojoExecutionException( Configured content directory
does not exist: + content );
+}
+
if ( !content.canRead() )
{
-throw new MojoExecutionException( can't read content directory:
+ content );
+throw new MojoExecutionException( Can't read content directory:
+ content );
}
checkoutExisting();
@@ -234,7 +239,7 @@ public class ScmPublishPublishScmMojo
}
catch ( IOException ioe )
{
-throw new MojoExecutionException( could not copy content to scm
checkout, ioe );
+throw new MojoExecutionException( Could not copy content to scm
checkout, ioe );
}
logInfo( Publish files: %d addition(s), %d update(s), %d delete(s),
added.size(), updated.size(),
svn commit: r1378755 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
Author: struberg
Date: Wed Aug 29 22:08:47 2012
New Revision: 1378755
URL: http://svn.apache.org/viewvc?rev=1378755view=rev
Log:
MSHARED-236 import code written by olamy and (c) ASF
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
(with props)
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java?rev=1378755view=auto
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
Wed Aug 29 22:08:47 2012
@@ -0,0 +1,49 @@
+package org.apache.maven.shared.utils.cli;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ *
+ * @author a href=mailto:ol...@apache.org;olamy/a
+ * @since 1.5.9
+ * @version $Id$
+ */
+public class CommandLineTimeOutException
+extends CommandLineException
+{
+
+/**
+ * @param message
+ */
+public CommandLineTimeOutException( String message )
+{
+super( message );
+}
+
+/**
+ * @param message
+ * @param cause
+ */
+public CommandLineTimeOutException( String message, Throwable cause )
+{
+super( message, cause );
+}
+
+}
Propchange:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineTimeOutException.java
--
svn:eol-style = native
svn commit: r1378758 - in /maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell: ./ BourneShellTest.java
Author: jdcasey
Date: Wed Aug 29 22:25:08 2012
New Revision: 1378758
URL: http://svn.apache.org/viewvc?rev=1378758view=rev
Log:
adding test for BourneShell
Added:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
(with props)
Added:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java?rev=1378758view=auto
==
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
Wed Aug 29 22:25:08 2012
@@ -0,0 +1,197 @@
+package org.apache.maven.shared.utils.cli.shell;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to you 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.
+ */
+
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
+import java.util.Arrays;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+public class BourneShellTest
+extends TestCase
+{
+
+protected Shell newShell()
+{
+return new BourneShell();
+}
+
+public void testQuoteWorkingDirectoryAndExecutable()
+{
+Shell sh = newShell();
+
+sh.setWorkingDirectory( /usr/local/bin );
+sh.setExecutable( chmod );
+
+String executable = StringUtils.join( sh.getShellCommandLine( new
String[]{} ).iterator(), );
+
+assertEquals( /bin/sh -c cd /usr/local/bin chmod, executable );
+}
+
+public void testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes()
+{
+Shell sh = newShell();
+
+sh.setWorkingDirectory( /usr/local/'something else' );
+sh.setExecutable( chmod );
+
+String executable = StringUtils.join( sh.getShellCommandLine( new
String[]{} ).iterator(), );
+
+assertEquals( /bin/sh -c cd \/usr/local/\'something else\'\
chmod, executable );
+}
+
+public void
testQuoteWorkingDirectoryAndExecutable_WDPathWithSingleQuotes_BackslashFileSep()
+{
+Shell sh = newShell();
+
+sh.setWorkingDirectory( \\usr\\local\\'something else' );
+sh.setExecutable( chmod );
+
+String executable = StringUtils.join( sh.getShellCommandLine( new
String[]{} ).iterator(), );
+
+assertEquals( /bin/sh -c cd \\\usr\\local\\\'something else\'\
chmod, executable );
+}
+
+public void testPreserveSingleQuotesOnArgument()
+{
+Shell sh = newShell();
+
+sh.setWorkingDirectory( /usr/bin );
+sh.setExecutable( chmod );
+
+String[] args = { \'some arg with spaces\' };
+
+List shellCommandLine = sh.getShellCommandLine( args );
+
+String cli = StringUtils.join( shellCommandLine.iterator(), );
+System.out.println( cli );
+assertTrue( cli.endsWith( args[0] ) );
+}
+
+public void testAddSingleQuotesOnArgumentWithSpaces()
+{
+Shell sh = newShell();
+
+sh.setWorkingDirectory( /usr/bin );
+sh.setExecutable( chmod );
+
+String[] args = { some arg with spaces };
+
+List shellCommandLine = sh.getShellCommandLine( args );
+
+String cli = StringUtils.join( shellCommandLine.iterator(), );
+System.out.println( cli );
+assertTrue( cli.endsWith( \' + args[0] + \' ) );
+}
+
+public void testArgumentsWithsemicolon()
+{
+
+System.out.println( semi colon tests );
+
+Shell sh = newShell();
+
+sh.setWorkingDirectory( /usr/bin );
+sh.setExecutable( chmod );
+
+String[] args = { ;someargwithunix$chars };
+
+List shellCommandLine = sh.getShellCommandLine( args );
+
+String cli = StringUtils.join( shellCommandLine.iterator(), );
+System.out.println( cli );
+assertTrue( cli.endsWith( \' + args[0] + \' ) );
+
+
svn commit: r1378760 - /maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java
Author: jdcasey Date: Wed Aug 29 22:28:25 2012 New Revision: 1378760 URL: http://svn.apache.org/viewvc?rev=1378760view=rev Log: fixing imports Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java?rev=1378760r1=1378759r2=1378760view=diff == --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/shell/BourneShellTest.java Wed Aug 29 22:28:25 2012 @@ -15,8 +15,8 @@ package org.apache.maven.shared.utils.cl * the License. */ -import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.util.cli.Commandline; +import org.apache.maven.shared.utils.StringUtils; +import org.apache.maven.shared.utils.cli.Commandline; import java.util.Arrays; import java.util.List;
svn commit: r1378765 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/io/ test/java/org/apache/maven/shared/utils/io/ test/resources/directorywalker/ test/resou
Author: struberg
Date: Wed Aug 29 23:05:58 2012
New Revision: 1378765
URL: http://svn.apache.org/viewvc?rev=1378765view=rev
Log:
MSHARED-236 import ALv2 (c) ASF DirectoryWalker
I rewrote parts which had no clear license header (WalkCollector).
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/WalkCollector.java
(with props)
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryWalkerTest.java
(with props)
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/directory1/
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/directory1/file1.txt
(with props)
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/directory2/
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/directory2/directory21/
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/directory2/directory21/file21.txt
(with props)
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/directory2/file2.txt
(with props)
maven/shared/trunk/maven-shared-utils/src/test/resources/directorywalker/file.txt
(with props)
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java?rev=1378765view=auto
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java
Wed Aug 29 23:05:58 2012
@@ -0,0 +1,48 @@
+package org.apache.maven.shared.utils.io;
+
+/*
+ * Copyright 2001-2006 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.
+ */
+
+import java.io.File;
+
+/**
+ * DirectoryWalkListener
+ * @version $Id$
+ */
+public interface DirectoryWalkListener
+{
+/**
+ * The directory walking has begun.
+ *
+ * @param basedir the basedir that walk started in.
+ */
+void directoryWalkStarting( File basedir );
+
+/**
+ * The included entry that was encountered.
+ *
+ * @param percentage rough percentage of the walk completed. (inaccurate)
+ * @param file the file that was included.
+ */
+void directoryWalkStep( int percentage, File file );
+
+/**
+ * The directory walking has finished.
+ */
+void directoryWalkFinished();
+
+void debug( String message );
+}
Propchange:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalkListener.java
--
svn:eol-style = native
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java?rev=1378765view=auto
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryWalker.java
Wed Aug 29 23:05:58 2012
@@ -0,0 +1,443 @@
+package org.apache.maven.shared.utils.io;
+
+/*
+ * Copyright 2001-2006 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
svn commit: r1378767 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/introspection/ main/resources/META-INF/ test/java/org/apache/maven/shared/utils/introspect
Author: struberg
Date: Wed Aug 29 23:24:31 2012
New Revision: 1378767
URL: http://svn.apache.org/viewvc?rev=1378767view=rev
Log:
MSHARED-236 add ALv2 (c) ASF ReflectionValueExtractor
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
(with props)
maven/shared/trunk/maven-shared-utils/src/main/resources/META-INF/
maven/shared/trunk/maven-shared-utils/src/main/resources/META-INF/NOTICE
(with props)
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
(with props)
Added:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java?rev=1378767view=auto
==
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
(added)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
Wed Aug 29 23:24:31 2012
@@ -0,0 +1,519 @@
+package org.apache.maven.shared.utils.introspection;
+
+/*
+ * Copyright 2001-2005 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.
+ */
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * A cache of introspection information for a specific class instance.
+ * Keys {@link java.lang.reflect.Method} objects by a concatenation of the
+ * method name and the names of classes that make up the parameters.
+ *
+ * @author a href=mailto:jvan...@apache.org;Jason van Zyl/a
+ * @author a href=mailto:b...@werken.com;Bob McWhirter/a
+ * @author a href=mailto:szege...@freemail.hu;Attila Szegedi/a
+ * @author a href=mailto:ge...@optonline.net;Geir Magnusson Jr./a
+ * @version $Id$
+ */
+public class ClassMap
+{
+private static final class CacheMiss
+{
+}
+
+private static final CacheMiss CACHE_MISS = new CacheMiss();
+private static final Object OBJECT = new Object();
+
+/**
+ * Class passed into the constructor used to as
+ * the basis for the Method map.
+ */
+
+private final Class clazz;
+
+/**
+ * Cache of Methods, or CACHE_MISS, keyed by method
+ * name and actual arguments used to find it.
+ */
+private Map methodCache = new Hashtable();
+
+private MethodMap methodMap = new MethodMap();
+
+/**
+ * Standard constructor
+ */
+public ClassMap( Class clazz )
+{
+this.clazz = clazz;
+populateMethodCache();
+}
+
+/**
+ * @return the class object whose methods are cached by this map.
+ */
+Class getCachedClass()
+{
+return clazz;
+}
+
+/**
+ * Find a Method using the methodKey
+ * provided.
+ * p/
+ * Look in the methodMap for an entry. If found,
+ * it'll either be a CACHE_MISS, in which case we
+ * simply give up, or it'll be a Method, in which
+ * case, we return it.
+ * p/
+ * If nothing is found, then we must actually go
+ * and introspect the method from the MethodMap.
+ */
+public Method findMethod( String name, Object[] params )
+throws MethodMap.AmbiguousException
+{
+String methodKey = makeMethodKey( name, params );
+Object cacheEntry = methodCache.get( methodKey );
+
+if ( cacheEntry == CACHE_MISS )
+{
+return null;
+}
+
+if ( cacheEntry == null )
+{
+try
+{
+cacheEntry = methodMap.find( name,
+ params );
+}
+catch ( MethodMap.AmbiguousException ae )
+{
+/*
