[plexus-classworlds2] 01/02: Merge tag 'upstream/2.5.1'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-classworlds2.

commit 3a4a8b14f00f86188db5105510f2f5ff4a022112
Merge: 09be1d6 a4bdf22
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 23 10:55:57 2013 +0200

    Merge tag 'upstream/2.5.1'
    
    Upstream version 2.5.1

 .gitignore                                         |    3 +
 LICENSE-2.0.txt                                    |  202 ++++++++++++++++++++
 pom.xml                                            |   68 +++++--
 .../plexus/classworlds/event/ListenerAspect.aj     |    6 +-
 .../java/org/codehaus/classworlds/ClassRealm.java  |    2 -
 .../codehaus/classworlds/ClassRealmAdapter.java    |    1 -
 .../classworlds/ClassRealmReverseAdapter.java      |    1 -
 .../java/org/codehaus/classworlds/ClassWorld.java  |    1 -
 .../codehaus/classworlds/ClassWorldAdapter.java    |    1 -
 .../codehaus/classworlds/ClassWorldException.java  |    2 -
 .../classworlds/ClassWorldReverseAdapter.java      |    1 -
 .../classworlds/ConfigurationException.java        |    2 -
 .../org/codehaus/classworlds/Configurator.java     |    1 -
 .../codehaus/classworlds/ConfiguratorAdapter.java  |    1 -
 .../classworlds/DuplicateRealmException.java       |    2 -
 .../java/org/codehaus/classworlds/Launcher.java    |    1 -
 .../codehaus/classworlds/NoSuchRealmException.java |    2 -
 .../codehaus/plexus/classworlds/ClassWorld.java    |   63 +++---
 .../plexus/classworlds/ClassWorldException.java    |    4 +-
 .../org/codehaus/plexus/classworlds/UrlUtils.java  |   10 +-
 .../launcher/ConfigurationException.java           |    5 +-
 .../classworlds/launcher/ConfigurationHandler.java |   43 ++++-
 .../classworlds/launcher/ConfigurationParser.java  |   19 +-
 .../plexus/classworlds/launcher/Configurator.java  |   32 ++--
 .../plexus/classworlds/launcher/Launcher.java      |   16 +-
 .../plexus/classworlds/realm/ClassRealm.java       |  186 ++++++++++--------
 .../classworlds/realm/DuplicateRealmException.java |    4 +-
 .../codehaus/plexus/classworlds/realm/Entry.java   |    6 +-
 .../classworlds/realm/NoSuchRealmException.java    |    4 +-
 .../classworlds/strategy/AbstractStrategy.java     |    7 +-
 .../classworlds/strategy/OsgiBundleStrategy.java   |   12 +-
 .../classworlds/strategy/ParentFirstStrategy.java  |   12 +-
 .../classworlds/strategy/SelfFirstStrategy.java    |   12 +-
 .../plexus/classworlds/strategy/Strategy.java      |    5 +-
 .../classworlds/strategy/StrategyFactory.java      |    1 -
 src/site/site.xml                                  |   15 +-
 .../org/codehaus/plexus/classworlds/ClassView.java |   12 +-
 .../plexus/classworlds/ClassWorldTest.java         |   10 +-
 .../org/codehaus/plexus/classworlds/TestUtil.java  |    1 -
 .../classworlds/launcher/ConfiguratorTest.java     |    6 +-
 .../plexus/classworlds/launcher/LauncherTest.java  |    2 +-
 .../classworlds/realm/ClassRealmImplTest.java      |   34 ++--
 .../classworlds/realm/DefaultClassRealmTest.java   |   85 +++++++-
 .../plexus/classworlds/realm/EntryTest.java        |    1 -
 .../plexus/classworlds/strategy/StrategyTest.java  |   12 +-
 src/test/test-data/deadlock.jar                    |  Bin 0 -> 1576 bytes
 src/test/test-data/valid.conf                      |    2 +-
 47 files changed, 638 insertions(+), 280 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git