You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2008/04/23 17:49:11 UTC
svn commit: r650916 - in /maven/sandbox/trunk/shared/maven-runtime/src:
main/java/org/apache/maven/shared/runtime/
test/java/org/apache/maven/shared/runtime/
Author: markh
Date: Wed Apr 23 08:49:08 2008
New Revision: 650916
URL: http://svn.apache.org/viewvc?rev=650916&view=rev
Log:
Formatted source
Modified:
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassUtils.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtils.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtilsTest.java
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassUtils.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassUtils.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassUtils.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/ClassUtils.java Wed Apr 23 08:49:08 2008
@@ -33,14 +33,14 @@
final class ClassUtils
{
// constructors -----------------------------------------------------------
-
+
private ClassUtils()
{
// private constructor for utility class
}
// public methods ---------------------------------------------------------
-
+
/**
* Gets a URL to the specified class's default package. For example, if the class <code>foo.Bar</code> is
* supplied, then a URL to the directory above <code>foo</code> is returned.
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/DefaultMavenRuntime.java Wed Apr 23 08:49:08 2008
@@ -34,7 +34,7 @@
public class DefaultMavenRuntime implements MavenRuntime
{
// MavenRuntime methods ---------------------------------------------------
-
+
/**
* {@inheritDoc}
*/
@@ -58,7 +58,7 @@
return visitor.getProjects();
}
-
+
/**
* {@inheritDoc}
*/
@@ -94,7 +94,7 @@
return visitor.getSortedProjects();
}
-
+
// private methods --------------------------------------------------------
/**
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenProjectProperties.java Wed Apr 23 08:49:08 2008
@@ -158,8 +158,8 @@
&& version.equals( info.getVersion() );
}
- /*
- * @see java.lang.Object#toString()
+ /**
+ * {@inheritDoc}
*/
public String toString()
{
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntime.java Wed Apr 23 08:49:08 2008
@@ -50,7 +50,7 @@
* if an error occurred introspecting the Maven runtime environment
*/
MavenProjectProperties getProjectProperties( Class klass ) throws MavenRuntimeException;
-
+
/**
* Obtains a list of simple properties for each Maven project running within the specified class loader.
*
@@ -62,7 +62,7 @@
* if an error occurred introspecting the Maven runtime environment
*/
List getProjectsProperties( ClassLoader classLoader ) throws MavenRuntimeException;
-
+
/**
* Gets the specified class's Maven project.
*
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtils.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtils.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtils.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtils.java Wed Apr 23 08:49:08 2008
@@ -41,7 +41,7 @@
public final class MavenRuntimeVisitorUtils
{
// constants --------------------------------------------------------------
-
+
/**
* The path to Maven's metadata directory.
*/
@@ -57,17 +57,17 @@
* The path elements of a Maven project XML file, where <code>null</code> is a wildcard.
*/
private static final String[] XML_PATH_TOKENS = new String[] { "META-INF", "maven", null, null, "pom.xml" };
-
+
/**
* The path element index of a Maven project properties/XML file that contains the project group id.
*/
private static final int GROUP_ID_TOKEN_INDEX = 2;
-
+
/**
* The path element index of a Maven project properties/XML file that contains the project artifact id.
*/
private static final int ARTIFACT_ID_TOKEN_INDEX = 3;
-
+
// constructors -----------------------------------------------------------
/**
@@ -104,7 +104,7 @@
throw new MavenRuntimeException( "Cannot obtain Maven metadata from class loader: " + classLoader,
exception );
}
-
+
Set visitedProjectProperties = new HashSet();
Set visitedProjectXML = new HashSet();
@@ -115,7 +115,7 @@
acceptURL( url, visitor, visitedProjectProperties, visitedProjectXML );
}
}
-
+
/**
* Invokes the specified visitor on the specified class's Maven project.
*
@@ -141,9 +141,9 @@
throw new MavenRuntimeException( "Cannot obtain URL for class: " + klass.getName(), exception );
}
}
-
+
// private methods --------------------------------------------------------
-
+
/**
* Invokes the specified visitor on all Maven projects found within the specified Maven metadata URL.
*
@@ -196,16 +196,16 @@
Set visitedProjectXML ) throws MavenRuntimeException
{
JarInputStream in = null;
-
+
try
{
URLConnection connection = url.openConnection();
connection.setUseCaches( false );
-
+
in = new JarInputStream( connection.getInputStream() );
JarEntry entry;
-
+
while ( ( entry = in.getNextJarEntry() ) != null )
{
acceptJarEntry( url, entry, visitor, visitedProjectProperties, visitedProjectXML );
@@ -220,7 +220,7 @@
IOUtil.close( in );
}
}
-
+
/**
* Invokes the specified visitor on the specified Jar entry if it corresponds to a Maven project XML or properties
* file.
@@ -246,27 +246,27 @@
try
{
- URL url = new URL("jar:" + jarURL + "!/" + entry.getName());
-
+ URL url = new URL( "jar:" + jarURL + "!/" + entry.getName() );
+
if ( isProjectPropertiesPath( name ) )
{
- String projectId = getProjectId(name);
-
+ String projectId = getProjectId( name );
+
if ( !visitedProjectProperties.contains( projectId ) )
{
visitor.visitProjectProperties( url );
-
+
visitedProjectProperties.add( projectId );
}
}
else if ( isProjectXMLPath( name ) )
{
- String projectId = getProjectId(name);
-
+ String projectId = getProjectId( name );
+
if ( !visitedProjectXML.contains( projectId ) )
{
visitor.visitProjectXML( url );
-
+
visitedProjectXML.add( projectId );
}
}
@@ -276,7 +276,7 @@
throw new MavenRuntimeException( "Cannot read jar entry", exception );
}
}
-
+
/**
* Gets the underlying Jar file URL for the specified Jar entry URL.
*
@@ -304,7 +304,7 @@
return new URL( path );
}
-
+
/**
* Gets a unique project identifier for the specified Maven project properties/XML file.
*
@@ -315,10 +315,10 @@
private static String getProjectId( String path )
{
String[] tokens = path.split( "/" );
-
+
String groupId = tokens[GROUP_ID_TOKEN_INDEX];
String artifactId = tokens[ARTIFACT_ID_TOKEN_INDEX];
-
+
return groupId + ":" + artifactId;
}
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java Wed Apr 23 08:49:08 2008
@@ -120,12 +120,12 @@
Properties properties = new Properties();
InputStream in = null;
-
+
try
{
URLConnection connection = url.openConnection();
connection.setUseCaches( false );
-
+
in = connection.getInputStream();
properties.load( in );
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java Wed Apr 23 08:49:08 2008
@@ -135,14 +135,14 @@
MavenXpp3Reader reader = new MavenXpp3Reader();
InputStream in = null;
-
+
try
{
URLConnection connection = url.openConnection();
connection.setUseCaches( false );
-
+
in = connection.getInputStream();
-
+
Model model = reader.read( ReaderFactory.newXmlReader( in ) );
return new MavenProject( model );
Modified: maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java Wed Apr 23 08:49:08 2008
@@ -249,7 +249,7 @@
"org.apache.maven.shared.runtime.tests:testMultipleJars3:1.0"
}, properties );
}
-
+
public void testGetProjectsPropertiesWithMultipleVersions()
throws TestToolsException, MavenRuntimeException, IOException
{
@@ -583,7 +583,7 @@
assertMavenProjects( "org.apache.maven.shared.runtime.tests:testSingleJar:2.0", projects );
}
-
+
// getSortedProjects tests ------------------------------------------------
public void testGetSortedProjectsWithSingleJar()
@@ -790,12 +790,12 @@
return new DelegatingClassLoader( urls, parent, childDelegation );
}
-
+
private void close( URLClassLoader classLoader ) throws IOException
{
IOException[] exceptions = ClassLoaderUtil.releaseLoader( classLoader, new Vector() );
-
- if (exceptions.length > 0)
+
+ if ( exceptions.length > 0 )
{
throw exceptions[0];
}
@@ -832,7 +832,7 @@
assertEquals( "Artifact id", artifactId, properties.getArtifactId() );
assertEquals( "Version", version, properties.getVersion() );
}
-
+
private void assertMavenProjects( String id, List projects )
{
assertMavenProjects( new String[] { id }, projects );
@@ -858,7 +858,7 @@
private void assertMavenProject( String groupId, String artifactId, String version, MavenProject project )
{
assertNotNull( "Project is null", project );
-
+
assertEquals( "Group id", groupId, project.getGroupId() );
assertEquals( "Artifact id", artifactId, project.getArtifactId() );
assertEquals( "Version", version, project.getVersion() );
Modified: maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtilsTest.java?rev=650916&r1=650915&r2=650916&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtilsTest.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/test/java/org/apache/maven/shared/runtime/MavenRuntimeVisitorUtilsTest.java Wed Apr 23 08:49:08 2008
@@ -39,13 +39,13 @@
public class MavenRuntimeVisitorUtilsTest extends TestCase
{
// fields -----------------------------------------------------------------
-
+
private IMocksControl mockVisitorControl;
-
+
private MavenRuntimeVisitor mockVisitor;
-
+
// TestCase methods -------------------------------------------------------
-
+
/**
* {@inheritDoc}
*/
@@ -53,10 +53,10 @@
{
mockVisitorControl = EasyMock.createStrictControl();
mockVisitor = (MavenRuntimeVisitor) mockVisitorControl.createMock( MavenRuntimeVisitor.class );
-
+
mockVisitorControl.replay();
}
-
+
/**
* {@inheritDoc}
*/
@@ -64,38 +64,38 @@
{
mockVisitorControl.verify();
}
-
+
// tests ------------------------------------------------------------------
-
+
public void testWithEmptyJar() throws IOException, MavenRuntimeException
{
accept( createTempFile( "file", ".jar" ) );
}
-
+
public void testWithUnknownFileExtension() throws IOException, MavenRuntimeException
{
accept( createTempFile( "file", ".unknown" ) );
}
-
+
// private methods -------------------------------------------------------
-
+
private URL createTempFile( String prefix, String suffix ) throws IOException
{
File file = File.createTempFile( prefix, suffix );
file.deleteOnExit();
-
+
return file.toURI().toURL();
}
-
+
private void accept( URL url ) throws MavenRuntimeException
{
- accept( new URL[] {url} );
+ accept( new URL[] { url } );
}
-
+
private void accept( URL[] urls ) throws MavenRuntimeException
{
- ClassLoader classLoader = new URLClassLoader(urls, null);
-
+ ClassLoader classLoader = new URLClassLoader( urls, null );
+
MavenRuntimeVisitorUtils.accept( classLoader, mockVisitor );
}
}