Author: dkulp Date: Fri Apr 6 16:44:10 2012 New Revision: 1310469 URL: http://svn.apache.org/viewvc?rev=1310469&view=rev Log: Merged revisions 1310384 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1310384 | dkulp | 2012-04-06 11:08:35 -0400 (Fri, 06 Apr 2012) | 9 lines Merged revisions 1310336 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1310336 | dkulp | 2012-04-06 10:19:36 -0400 (Fri, 06 Apr 2012) | 2 lines Minor updates to WHICH_JARS ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/distribution/src/main/release/lib/WHICH_JARS Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/lib/WHICH_JARS URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/lib/WHICH_JARS?rev=1310469&r1=1310468&r2=1310469&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/lib/WHICH_JARS (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/lib/WHICH_JARS Fri Apr 6 16:44:10 2012 @@ -76,6 +76,7 @@ For WS-Security support: - serializer.jar - wss4j.jar - xmlsec.jar +- ehcache-core.jar For SAML support in WS-Security - joda-time.jar @@ -95,6 +96,7 @@ For JAX-RS support: - axiom* (Needed for Abdera) - jsr311-api.jar - jettison.jar (Needed for JSON services only) +- oauth*.jar (Needed for OAuth support) For JMS transport - geronimo-jms.jar (Or the Sun equivalent)
