Author: markh
Date: Wed May 21 06:55:15 2008
New Revision: 658687
URL: http://svn.apache.org/viewvc?rev=658687&view=rev
Log:
Removed need to close classloader in tests now that test projects are only
built once
Modified:
maven/shared/trunk/maven-runtime/pom.xml
maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
Modified: maven/shared/trunk/maven-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-runtime/pom.xml?rev=658687&r1=658686&r2=658687&view=diff
==============================================================================
--- maven/shared/trunk/maven-runtime/pom.xml (original)
+++ maven/shared/trunk/maven-runtime/pom.xml Wed May 21 06:55:15 2008
@@ -95,13 +95,6 @@
<version>2.2</version>
<scope>test</scope>
</dependency>
- <!-- only required for com.sun.appserv.ClassLoaderUtil -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>6.1.7</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<reporting>
<plugins>
Modified:
maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java?rev=658687&r1=658686&r2=658687&view=diff
==============================================================================
---
maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
(original)
+++
maven/shared/trunk/maven-runtime/src/test/java/org/apache/maven/shared/runtime/DefaultMavenRuntimeTest.java
Wed May 21 06:55:15 2008
@@ -28,7 +28,6 @@
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-import java.util.Vector;
import org.apache.commons.io.filefilter.SuffixFileFilter;
import org.apache.maven.project.MavenProject;
@@ -37,8 +36,6 @@
import org.apache.maven.shared.test.plugin.TestToolsException;
import org.codehaus.plexus.PlexusTestCase;
-import com.sun.appserv.ClassLoaderUtil;
-
/**
* Tests [EMAIL PROTECTED] DefaultMavenRuntime}.
*
@@ -96,8 +93,6 @@
MavenProjectProperties properties = mavenRuntime.getProjectProperties(
klass );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -112,8 +107,6 @@
MavenProjectProperties properties = mavenRuntime.getProjectProperties(
klass );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -128,8 +121,6 @@
MavenProjectProperties properties = mavenRuntime.getProjectProperties(
klass );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -145,8 +136,6 @@
MavenProjectProperties properties = mavenRuntime.getProjectProperties(
klass );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -162,8 +151,6 @@
MavenProjectProperties properties = mavenRuntime.getProjectProperties(
klass );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", properties );
}
@@ -180,9 +167,6 @@
MavenProjectProperties properties = mavenRuntime.getProjectProperties(
klass );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -199,9 +183,6 @@
MavenProjectProperties properties = mavenRuntime.getProjectProperties(
klass );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", properties );
}
@@ -216,8 +197,6 @@
List<MavenProjectProperties> properties =
mavenRuntime.getProjectsProperties( classLoader );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -232,8 +211,6 @@
List<MavenProjectProperties> properties =
mavenRuntime.getProjectsProperties( classLoader );
- close( classLoader );
-
assertMavenProjectProperties( new String[] {
"org.apache.maven.shared.runtime.tests:testMultipleJars1:1.0",
"org.apache.maven.shared.runtime.tests:testMultipleJars2:1.0",
@@ -251,8 +228,6 @@
List<MavenProjectProperties> properties =
mavenRuntime.getProjectsProperties( classLoader );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -266,8 +241,6 @@
List<MavenProjectProperties> properties =
mavenRuntime.getProjectsProperties( classLoader );
- close( classLoader );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", properties );
}
@@ -282,9 +255,6 @@
List<MavenProjectProperties> properties =
mavenRuntime.getProjectsProperties( classLoader2 );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", properties );
}
@@ -299,9 +269,6 @@
List<MavenProjectProperties> properties =
mavenRuntime.getProjectsProperties( classLoader2 );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjectProperties(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", properties );
}
@@ -318,8 +285,6 @@
MavenProject project = mavenRuntime.getProject( klass );
- close( classLoader );
-
assertMavenProject(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", project );
}
@@ -334,8 +299,6 @@
MavenProject project = mavenRuntime.getProject( klass );
- close( classLoader );
-
assertMavenProject(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", project );
}
@@ -350,8 +313,6 @@
MavenProject project = mavenRuntime.getProject( klass );
- close( classLoader );
-
assertMavenProject(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", project );
}
@@ -367,8 +328,6 @@
MavenProject project = mavenRuntime.getProject( klass );
- close( classLoader );
-
assertMavenProject(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", project );
}
@@ -384,8 +343,6 @@
MavenProject project = mavenRuntime.getProject( klass );
- close( classLoader );
-
assertMavenProject(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", project );
}
@@ -402,9 +359,6 @@
MavenProject project = mavenRuntime.getProject( klass );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProject(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", project );
}
@@ -421,9 +375,6 @@
MavenProject project = mavenRuntime.getProject( klass );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProject(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", project );
}
@@ -438,8 +389,6 @@
List<MavenProject> projects = mavenRuntime.getProjects( classLoader );
- close( classLoader );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", projects );
}
@@ -454,8 +403,6 @@
List<MavenProject> projects = mavenRuntime.getProjects( classLoader );
- close( classLoader );
-
assertMavenProjects( new String[] {
"org.apache.maven.shared.runtime.tests:testMultipleJars1:1.0",
"org.apache.maven.shared.runtime.tests:testMultipleJars2:1.0",
@@ -473,8 +420,6 @@
List<MavenProject> projects = mavenRuntime.getProjects( classLoader );
- close( classLoader );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", projects );
}
@@ -488,8 +433,6 @@
List<MavenProject> projects = mavenRuntime.getProjects( classLoader );
- close( classLoader );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", projects );
}
@@ -504,9 +447,6 @@
List<MavenProject> projects = mavenRuntime.getProjects( classLoader2 );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", projects );
}
@@ -521,9 +461,6 @@
List<MavenProject> projects = mavenRuntime.getProjects( classLoader2 );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", projects );
}
@@ -538,8 +475,6 @@
List<MavenProject> projects = mavenRuntime.getSortedProjects(
classLoader );
- close( classLoader );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", projects );
}
@@ -554,8 +489,6 @@
List<MavenProject> projects = mavenRuntime.getSortedProjects(
classLoader );
- close( classLoader );
-
assertMavenProjects( new String[] {
"org.apache.maven.shared.runtime.tests:testMultipleJars1:1.0",
"org.apache.maven.shared.runtime.tests:testMultipleJars2:1.0",
@@ -574,8 +507,6 @@
List<MavenProject> projects = mavenRuntime.getSortedProjects(
classLoader );
- close( classLoader );
-
assertMavenProjects( new String[] {
"org.apache.maven.shared.runtime.tests:testDependentJars3:1.0",
"org.apache.maven.shared.runtime.tests:testDependentJars1:1.0",
@@ -593,8 +524,6 @@
List<MavenProject> projects = mavenRuntime.getSortedProjects(
classLoader );
- close( classLoader );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", projects );
}
@@ -608,8 +537,6 @@
List<MavenProject> projects = mavenRuntime.getSortedProjects(
classLoader );
- close( classLoader );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", projects );
}
@@ -624,9 +551,6 @@
List<MavenProject> projects = mavenRuntime.getSortedProjects(
classLoader2 );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:1.0", projects );
}
@@ -641,9 +565,6 @@
List<MavenProject> projects = mavenRuntime.getSortedProjects(
classLoader2 );
- close( classLoader1 );
- close( classLoader2 );
-
assertMavenProjects(
"org.apache.maven.shared.runtime.tests:testSingleJar:2.0", projects );
}
@@ -716,16 +637,6 @@
return new DelegatingClassLoader( urls, parent, childDelegation );
}
- private void close( URLClassLoader classLoader ) throws IOException
- {
- IOException[] exceptions = ClassLoaderUtil.releaseLoader( classLoader,
new Vector<String>() );
-
- if ( exceptions.length > 0 )
- {
- throw exceptions[0];
- }
- }
-
private void assertMavenProjectProperties( String id,
List<MavenProjectProperties> propertiesList )
{
assertMavenProjectProperties( new String[] { id }, propertiesList );
