Author: jvanzyl
Date: Tue Dec 12 06:12:24 2006
New Revision: 486153
URL: http://svn.apache.org/viewvc?view=rev&rev=486153
Log:
o applying brian's patch which makes this IT work with the new/old classworlds
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/Enhance.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/Enhance.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/Enhance.java?view=diff&rev=486153&r1=486152&r2=486153
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/Enhance.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0094/mojo/src/main/java/org/codehaus/mojo/kodo/Enhance.java
Tue Dec 12 06:12:24 2006
@@ -132,38 +132,45 @@
{
ClassLoader sysClassLoader =
Thread.currentThread().getContextClassLoader();
URL[] urls = null;
- Field field;
- try
+
+ if ( sysClassLoader instanceof URLClassLoader )
{
-
- field = sysClassLoader.getClass().getDeclaredField( "realm" );
- field.setAccessible( true );
- ClassRealm realm = (ClassRealm) field.get( sysClassLoader );
-
- urls = realm.getConstituents();
- }
- catch ( SecurityException e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch ( NoSuchFieldException e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ urls = ( (URLClassLoader) sysClassLoader ).getURLs();
}
- catch ( IllegalArgumentException e )
+ else
{
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch ( IllegalAccessException e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ Field field;
+ try
+ {
- //URL[] urls = ( (URLClassLoader) sysClassLoader ).getURLs();
+ field = sysClassLoader.getClass().getDeclaredField( "realm" );
+ field.setAccessible( true );
+ ClassRealm realm = (ClassRealm) field.get( sysClassLoader );
+
+ urls = realm.getConstituents();
+ }
+ catch ( SecurityException e )
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch ( NoSuchFieldException e )
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch ( IllegalArgumentException e )
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch ( IllegalAccessException e )
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
this.getLog().info( "Initial Classpath:" );
for ( int i = 0; i < urls.length; i++ )
{
