Author: krosenvold
Date: Wed Oct 10 19:05:26 2012
New Revision: 1396740
URL: http://svn.apache.org/viewvc?rev=1396740&view=rev
Log:
o Minor fixes
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
maven/shared/trunk/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=1396740&r1=1396739&r2=1396740&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
Wed Oct 10 19:05:26 2012
@@ -26,8 +26,8 @@ import org.codehaus.plexus.logging.Abstr
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.codehaus.plexus.util.PathTool;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.apache.maven.shared.utils.PathTool;
+import org.apache.maven.shared.utils.ReaderFactory;
import org.codehaus.plexus.util.Scanner;
import org.apache.maven.shared.utils.StringUtils;
import org.sonatype.plexus.build.incremental.BuildContext;
Modified:
maven/shared/trunk/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java?rev=1396740&r1=1396739&r2=1396740&view=diff
==============================================================================
---
maven/shared/trunk/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
(original)
+++
maven/shared/trunk/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
Wed Oct 10 19:05:26 2012
@@ -33,7 +33,7 @@ import org.apache.maven.project.Duplicat
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectSorter;
import org.apache.maven.shared.utils.io.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.apache.maven.shared.utils.ReaderFactory;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified:
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java?rev=1396740&r1=1396739&r2=1396740&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
(original)
+++
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
Wed Oct 10 19:05:26 2012
@@ -29,7 +29,7 @@ import java.io.StringWriter;
import java.io.Writer;
import org.apache.maven.shared.utils.io.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.apache.maven.shared.utils.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
public final class TestUtils
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java?rev=1396740&r1=1396739&r2=1396740&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/PropertyUtils.java
Wed Oct 10 19:05:26 2012
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.util.Properties;
import org.apache.maven.shared.utils.io.IOUtil;
-class PropertyUtils
+public class PropertyUtils
{
public PropertyUtils()
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java?rev=1396740&r1=1396739&r2=1396740&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
Wed Oct 10 19:05:26 2012
@@ -94,7 +94,7 @@ public final class SelectorUtils
* @return whether or not a given path matches the start of a given
* pattern up to the first "**".
*/
- private static boolean matchPatternStart( String pattern, String str,
boolean isCaseSensitive )
+ public static boolean matchPatternStart( String pattern, String str,
boolean isCaseSensitive )
{
if ( isRegexPrefixedPattern( pattern ) )
{
@@ -381,7 +381,7 @@ public final class SelectorUtils
* @return <code>true</code> if the string matches against the pattern,
* or <code>false</code> otherwise.
*/
- private static boolean match( String pattern, String str, boolean
isCaseSensitive )
+ public static boolean match( String pattern, String str, boolean
isCaseSensitive )
{
char[] patArr = pattern.toCharArray();
char[] strArr = str.toCharArray();
