Revision 41079
trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/plugins/PluginClassLoader.java | ||
---|---|---|
397 | 397 |
// |
398 | 398 |
// Primero buscamos en el directorio del plugin. |
399 | 399 |
try { |
400 |
logger.debug("Search resource {} in {}", res, this.baseDir.toString());
|
|
400 |
logger.debug("Plugin {}. Searching resource '{}'", res, this.getPluginName());
|
|
401 | 401 |
List<String> resource = new ArrayList<String>(); |
402 | 402 |
StringTokenizer st = new StringTokenizer(res, "\\/"); |
403 | 403 |
while (st.hasMoreTokens()) { |
... | ... | |
409 | 409 |
return ret; |
410 | 410 |
} |
411 | 411 |
} catch (Exception e) { |
412 |
logger.info("Error getting resource {} in {}'", new Object[] {res,this.baseDir.toString()}, e);
|
|
412 |
logger.warn("Plugin {}. Error getting resource '{}'.", new Object[] {this.getPluginName(),res}, e);
|
|
413 | 413 |
} |
414 | 414 |
|
415 | 415 |
// |
416 | 416 |
// Luego en los plugins de los que depende |
417 |
logger.debug("Searching in depends pluginLoaders");
|
|
417 |
logger.debug("Plugin {}. Searching in depends pluginLoaders", this.getPluginName());
|
|
418 | 418 |
for (int i = 0; i < this.pluginLoaders.length; i++) { |
419 | 419 |
PluginClassLoader pluginClassLoader = pluginLoaders[i]; |
420 | 420 |
if (pluginClassLoader != null) { |
421 | 421 |
try { |
422 | 422 |
ret = pluginClassLoader.getResource(res); |
423 | 423 |
if (ret != null) { |
424 |
logger.info("Found resource in plugin '"+pluginClassLoader.getPluginName()+"' ("+res+")."); |
|
424 |
logger.trace("Plugin {}. Found resource '{}' in plugin '{}'.", |
|
425 |
new Object[] { |
|
426 |
this.getPluginName(),pluginClassLoader.getPluginName(),res |
|
427 |
}); |
|
425 | 428 |
return ret; |
426 | 429 |
} |
427 | 430 |
} catch (Exception e) { |
... | ... | |
435 | 438 |
try { |
436 | 439 |
ret = super.getResource(res); |
437 | 440 |
} catch (Exception e) { |
438 |
logger.info("Error getting resource {} in {}'", new Object[] {res,this.baseDir.toString()}, e);
|
|
441 |
logger.warn("Plugin {}. Error getting resource '{}' in parent classloader'", new Object[] {this.getPluginName(),res}, e);
|
|
439 | 442 |
} |
440 | 443 |
|
441 | 444 |
|
442 | 445 |
if( ret == null ) { |
443 |
logger.info("Error getting resource {} in {}'", new Object[] {res,this.baseDir.toString()});
|
|
446 |
logger.debug("Plugin {}. Resource '{}' not found.", new Object[] {this.getPluginName(),res});
|
|
444 | 447 |
} |
445 | 448 |
return ret; |
446 | 449 |
} |
... | ... | |
484 | 487 |
* @return An String containing the plugin's name. |
485 | 488 |
*/ |
486 | 489 |
public String getPluginName() { |
487 |
String ret = baseDir.getAbsolutePath().substring(baseDir.getAbsolutePath() |
|
488 |
.lastIndexOf(File.separatorChar) + |
|
489 |
1); |
|
490 |
|
|
491 |
return ret; |
|
490 |
return baseDir.getName(); |
|
492 | 491 |
} |
493 | 492 |
|
494 | 493 |
/* |
Also available in: Unified diff