Author: dkulp Date: Tue Mar 20 18:37:50 2012 New Revision: 1303080 URL: http://svn.apache.org/viewvc?rev=1303080&view=rev Log: Blocking revisions 1296195,1297038,1300233,1300240,1300271,1300272,1300332,1300535,1300542,1301040,1301213,1301440,1301549,1301627,1302578,1302579,1302937,1302938,1303012,1303013,1303014 via svn from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1296195 | sergeyb | 2012-03-02 08:24:04 -0500 (Fri, 02 Mar 2012) | 9 lines Merged revisions 1296183 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1296183 | sergeyb | 2012-03-02 12:58:48 +0000 (Fri, 02 Mar 2012) | 1 line [CXF-4142] Checking contextual properties for non-root parts ........ ........ ........ r1297038 | coheigea | 2012-03-05 07:53:19 -0500 (Mon, 05 Mar 2012) | 1 line [CXF-4160] - Support signing a SAML token using the requested signature and canonicalization algorithm ........ ........ r1300233 | sergeyb | 2012-03-13 12:46:44 -0400 (Tue, 13 Mar 2012) | 1 line Unblocking r1236902 and r1298470 ........ ........ r1300240 | sergeyb | 2012-03-13 13:09:49 -0400 (Tue, 13 Mar 2012) | 9 lines Merged revisions 1236902 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1236902 | sergeyb | 2012-01-27 21:49:40 +0000 (Fri, 27 Jan 2012) | 1 line Moving the cors code to the new rs/security/cors module ........ ........ ........ r1300271 | dkulp | 2012-03-13 14:26:04 -0400 (Tue, 13 Mar 2012) | 17 lines Recording revisions 1299691,1300261 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1299691 | coheigea | 2012-03-12 10:47:51 -0400 (Mon, 12 Mar 2012) | 2 lines Setting a max TTL on the EhCacheReplayCache ........ ........ r1300261 | dkulp | 2012-03-13 14:04:05 -0400 (Tue, 13 Mar 2012) | 3 lines Use some reflection magic to allow code compiled with Jetty 7.5 to work with Jetty 7.6 ........ ........ ........ r1300272 | dkulp | 2012-03-13 14:26:05 -0400 (Tue, 13 Mar 2012) | 28 lines Blocking revisions 1298565,1299524,1299782,1300092 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1298565 | dkulp | 2012-03-08 15:40:02 -0500 (Thu, 08 Mar 2012) | 2 lines Add a whiteboard feature to allow feature.xml to work with Karaf 2.2.5 ........ ........ r1299524 | dkulp | 2012-03-11 22:20:16 -0400 (Sun, 11 Mar 2012) | 2 lines Enhance SAAJ usage to better work with other SAAJ implementations ........ ........ r1299782 | dkulp | 2012-03-12 14:51:28 -0400 (Mon, 12 Mar 2012) | 2 lines More updates for working with different SAAJ implementations ........ ........ r1300092 | coheigea | 2012-03-13 08:25:13 -0400 (Tue, 13 Mar 2012) | 2 lines [CXF-4158] - Added support for renewing SecurityContextTokens ........ ........ ........ r1300332 | dkulp | 2012-03-13 16:16:52 -0400 (Tue, 13 Mar 2012) | 1 line Fix parent version number ........ ........ r1300535 | sergeyb | 2012-03-14 09:16:09 -0400 (Wed, 14 Mar 2012) | 21 lines Merged revisions 1299900,1300084,1300509,1300523 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1299900 | sergeyb | 2012-03-12 22:10:07 +0000 (Mon, 12 Mar 2012) | 1 line [CXF-4167] Making sure some of the cors properties can be customized if they are not set on the annotation ........ r1300084 | sergeyb | 2012-03-13 11:51:51 +0000 (Tue, 13 Mar 2012) | 1 line [CXF-4167] Also removing a couple of redundant annotation properties ........ r1300509 | sergeyb | 2012-03-14 11:23:58 +0000 (Wed, 14 Mar 2012) | 1 line [CXF-4167] restoring allowAllOrigins for a moment ........ r1300523 | sergeyb | 2012-03-14 12:33:09 +0000 (Wed, 14 Mar 2012) | 1 line [CXF-4167] Fixing the test and moving the localPreflight property into its own annotation ........ ........ ........ r1300542 | dkulp | 2012-03-14 09:43:23 -0400 (Wed, 14 Mar 2012) | 9 lines Merged revisions 1300541 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1300541 | dkulp | 2012-03-14 09:40:10 -0400 (Wed, 14 Mar 2012) | 1 line Widen the range of Jetty versions that can be used with CXF ........ ........ ........ r1301040 | coheigea | 2012-03-15 11:20:32 -0400 (Thu, 15 Mar 2012) | 7 lines Some updates relating to caching security tokens in the STS Conflicts: services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SCTRenewer.java services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/SCTValidator.java ........ ........ r1301213 | dkulp | 2012-03-15 17:32:09 -0400 (Thu, 15 Mar 2012) | 58 lines Blocking revisions 1300594,1300630,1300662,1300673,1300691,1300714,1301005,1301131,1301154,1301158 via svn from https://svn.apache.org/repos/asf/cxf/trunk ........ r1300594 | dkulp | 2012-03-14 11:37:19 -0400 (Wed, 14 Mar 2012) | 1 line pom was obviously copied from http's pom, but osgi info not updated ........ ........ r1300630 | dkulp | 2012-03-14 12:42:27 -0400 (Wed, 14 Mar 2012) | 1 line Bunch of OSGi manifest and feature updates ........ ........ r1300662 | dkulp | 2012-03-14 13:46:05 -0400 (Wed, 14 Mar 2012) | 2 lines Update versions for various things we use, particularly OSGi bundles to use the new bundles that have sources attachable. ........ ........ r1300673 | dkulp | 2012-03-14 14:19:46 -0400 (Wed, 14 Mar 2012) | 1 line Fix java 5 compile ........ ........ r1300691 | dkulp | 2012-03-14 15:24:32 -0400 (Wed, 14 Mar 2012) | 1 line More osgi updates ........ ........ r1300714 | dkulp | 2012-03-14 16:39:20 -0400 (Wed, 14 Mar 2012) | 1 line Back out a version of the jaxb bundle due to a bug that affects Camel ........ ........ r1301005 | dkulp | 2012-03-15 10:35:22 -0400 (Thu, 15 Mar 2012) | 1 line Fix typo in sts feature ........ ........ r1301131 | dkulp | 2012-03-15 14:33:13 -0400 (Thu, 15 Mar 2012) | 3 lines Update the HTTPTransportActivator stuff to not have to sync on ALL the matchers, just on each one individually. Also, apply the regex stuff first, then the specific address based and name based last. ........ ........ r1301154 | dkulp | 2012-03-15 15:07:46 -0400 (Thu, 15 Mar 2012) | 1 line Fix java5 compile ........ ........ r1301158 | dkulp | 2012-03-15 15:21:16 -0400 (Thu, 15 Mar 2012) | 2 lines Cleanup some deps in hopes that jenkins will generate the same Import-Packages that I get locally ........ ........ ........ r1301440 | coheigea | 2012-03-16 07:33:48 -0400 (Fri, 16 Mar 2012) | 10 lines [CXF-4062][CXF-4173] - Enabling custom claim parser / Support for ClaimValue element of federation claims dialect added - Patch(es) applied, thanks! I made a few minor modifications Conflicts: services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java services/sts/sts-core/src/test/java/org/apache/cxf/sts/request/RequestParserUnitTest.java ........ ........ r1301549 | ningjiang | 2012-03-16 10:38:18 -0400 (Fri, 16 Mar 2012) | 9 lines Merged revisions 1301539 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1301539 | ningjiang | 2012-03-16 22:18:01 +0800 (Fri, 16 Mar 2012) | 1 line CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J or JCL driver ........ ........ ........ r1301627 | ningjiang | 2012-03-16 12:17:11 -0400 (Fri, 16 Mar 2012) | 1 line CXF-4180 revert the patch which has some side effects ........ ........ r1302578 | dkulp | 2012-03-19 14:09:57 -0400 (Mon, 19 Mar 2012) | 4 lines Recording revisions 1298913,1301018,1301434 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ ........ r1302579 | dkulp | 2012-03-19 14:09:59 -0400 (Mon, 19 Mar 2012) | 67 lines Blocking revisions 1300579,1301484,1301510,1301539,1301550,1301708,1301710,1301711,1301714 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1300579 | coheigea | 2012-03-14 11:01:37 -0400 (Wed, 14 Mar 2012) | 4 lines [CXF-4157] - Support batch processing via RequestSecurityTokenCollection. - Removed old RequestCollectionOperation from the STS Provider - Issue/Renew/Validate/Cancel operations now support processing collections ........ ........ r1301484 | dkulp | 2012-03-16 09:16:19 -0400 (Fri, 16 Mar 2012) | 3 lines Set the prereq for building to Maven 3.0. Should not affect those using CXF. ........ ........ r1301510 | dkulp | 2012-03-16 09:44:01 -0400 (Fri, 16 Mar 2012) | 3 lines Rename the priority field to "order" to make it clearer and easier to explain ........ ........ r1301539 | ningjiang | 2012-03-16 10:18:01 -0400 (Fri, 16 Mar 2012) | 2 lines CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J or JCL driver ........ ........ r1301550 | ningjiang | 2012-03-16 10:38:47 -0400 (Fri, 16 Mar 2012) | 2 lines CXF-4180 Fixed the CS error of my last commit ........ ........ r1301708 | dkulp | 2012-03-16 15:12:02 -0400 (Fri, 16 Mar 2012) | 2 lines Initial work to get jetty stuff configured from config:admin ........ ........ r1301710 | dkulp | 2012-03-16 15:16:17 -0400 (Fri, 16 Mar 2012) | 5 lines Revert "CXF-4180 LogUtils should default to CXF's Slf4jLogger if it can't find Log4J or JCL driver" Need to revert so the unit tests will run to test other changes. This reverts commit d164ba6a68a2cdfba110064c687ac32707029772. ........ ........ r1301711 | dkulp | 2012-03-16 15:16:27 -0400 (Fri, 16 Mar 2012) | 4 lines Downgrade to 3.3.1 of ASM as code compiled with ASM 4.0 is NOT compatible with 3.3.1 and is causing some strange conflicts that need more investigation ........ ........ r1301714 | dkulp | 2012-03-16 15:42:20 -0400 (Fri, 16 Mar 2012) | 2 lines Add in fastinfoset bundle so the fastinfoset stuff works ........ ........ ........ r1302937 | dkulp | 2012-03-20 11:24:41 -0400 (Tue, 20 Mar 2012) | 4 lines Recording revisions 1302574,1302822 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ ........ r1302938 | dkulp | 2012-03-20 11:24:42 -0400 (Tue, 20 Mar 2012) | 58 lines Blocking revisions 1300208,1300226,1300260,1300360,1301516,1302743,1302744,1302745 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1300208 | sergeyb | 2012-03-13 12:01:30 -0400 (Tue, 13 Mar 2012) | 2 lines [CXF-4179,CXF-3141] Introducing ContextProviders and moving the search extension to its own module ........ ........ r1300226 | sergeyb | 2012-03-13 12:38:16 -0400 (Tue, 13 Mar 2012) | 2 lines [CXF-4179,CXF-3141] Adding a missing file ........ ........ r1300260 | dkulp | 2012-03-13 14:04:01 -0400 (Tue, 13 Mar 2012) | 2 lines Fix some compile errors and warnings ........ ........ r1300360 | sergeyb | 2012-03-13 17:27:59 -0400 (Tue, 13 Mar 2012) | 2 lines Fixing the compilation/test issues caused by the search ext move, sorry ........ ........ r1301516 | coheigea | 2012-03-16 09:51:45 -0400 (Fri, 16 Mar 2012) | 4 lines Updates to the STS caching mechanism. - Tokens have a default TTL of 30 minutes now. - Removed STSTokenStore interface ........ ........ r1302743 | dkulp | 2012-03-19 21:21:40 -0400 (Mon, 19 Mar 2012) | 4 lines Don't log the full message for the "records". Just clutters the svn page in JIRA as we already have it recorded there from the original merge. ........ ........ r1302744 | dkulp | 2012-03-19 21:21:50 -0400 (Mon, 19 Mar 2012) | 3 lines [CXF-4184] For JMS TextMessage, keep the payload as String using Reader/Writer instead of streams. ........ ........ r1302745 | dkulp | 2012-03-19 21:21:54 -0400 (Mon, 19 Mar 2012) | 3 lines Bit of an optimization of MessageImpl internals to reduce work for content lookups, particularly for non-default types ........ ........ ........ r1303012 | dkulp | 2012-03-20 13:14:36 -0400 (Tue, 20 Mar 2012) | 10 lines Merged revisions 1302998 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1302998 | dkulp | 2012-03-20 13:01:47 -0400 (Tue, 20 Mar 2012) | 3 lines [CXF-4123, CXF-4185] When using a global registry (OSGi), the servlet should not destroy the registry when refreshed. ........ ........ ........ r1303013 | dkulp | 2012-03-20 13:14:41 -0400 (Tue, 20 Mar 2012) | 4 lines Recording revisions 1302997,1302998 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ ........ r1303014 | dkulp | 2012-03-20 13:14:43 -0400 (Tue, 20 Mar 2012) | 16 lines Blocking revisions 1302573,1302999 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ r1302573 | dkulp | 2012-03-19 13:56:35 -0400 (Mon, 19 Mar 2012) | 2 lines Too much stuff on the console during tests ........ ........ r1302999 | sergeyb | 2012-03-20 13:02:39 -0400 (Tue, 20 Mar 2012) | 2 lines [CXF-4184] Also updating JAXB provider to check for Reader/Writer instances ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
