Author: dkulp Date: Fri Aug 19 17:34:53 2011 New Revision: 1159700 URL: http://svn.apache.org/viewvc?rev=1159700&view=rev Log: Blocked revisions 1156471,1156473,1156565,1156569,1156571,1156636-1156637,1156646,1156648,1157759,1157774,1157861-1157862,1158148,1158249,1158323,1159476,1159478-1159479,1159486 via svnmerge
................ r1156471 | dkulp | 2011-08-11 00:11:14 -0400 (Thu, 11 Aug 2011) | 1 line [maven-release-plugin] prepare release cxf-2.4.2 ................ r1156473 | dkulp | 2011-08-11 00:11:57 -0400 (Thu, 11 Aug 2011) | 1 line [maven-release-plugin] prepare for next development iteration ................ r1156565 | dkulp | 2011-08-11 06:38:59 -0400 (Thu, 11 Aug 2011) | 2 lines Fix SCM ................ r1156569 | dkulp | 2011-08-11 07:02:42 -0400 (Thu, 11 Aug 2011) | 1 line [maven-release-plugin] prepare release cxf-2.4.2 ................ r1156571 | dkulp | 2011-08-11 07:03:22 -0400 (Thu, 11 Aug 2011) | 1 line [maven-release-plugin] prepare for next development iteration ................ r1156636 | dkulp | 2011-08-11 10:45:41 -0400 (Thu, 11 Aug 2011) | 9 lines Merged revisions 1156634 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1156634 | ningjiang | 2011-08-11 10:33:54 -0400 (Thu, 11 Aug 2011) | 1 line CXF-3734 CXF ServerFactoryBean should not wire the thread default bus by default ........ ................ r1156637 | dkulp | 2011-08-11 10:46:29 -0400 (Thu, 11 Aug 2011) | 12 lines Blocked revisions 1156559,1156584 via svnmerge ........ r1156559 | sergeyb | 2011-08-11 05:48:59 -0400 (Thu, 11 Aug 2011) | 1 line [CXF-3733] Adding empty rs/security/xml module ........ r1156584 | sergeyb | 2011-08-11 08:00:14 -0400 (Thu, 11 Aug 2011) | 1 line [CXF-3733] Moving common code from systests/rs-security to rt/rs/security/xml ........ ................ r1156646 | dkulp | 2011-08-11 11:17:59 -0400 (Thu, 11 Aug 2011) | 1 line [maven-release-plugin] prepare release cxf-2.4.2 ................ r1156648 | dkulp | 2011-08-11 11:18:45 -0400 (Thu, 11 Aug 2011) | 1 line [maven-release-plugin] prepare for next development iteration ................ r1157759 | coheigea | 2011-08-15 06:15:16 -0400 (Mon, 15 Aug 2011) | 1 line Adding a test for a SignedSupportingToken/EndorsingSupportingToken ................ r1157774 | coheigea | 2011-08-15 06:56:09 -0400 (Mon, 15 Aug 2011) | 1 line Adding a commented out test for using a SAML Token as an Endorsing token for the Transport Binding. ................ r1157861 | coheigea | 2011-08-15 10:28:59 -0400 (Mon, 15 Aug 2011) | 1 line Upgrading to WSS4J 1.6.3-SNAPSHOT to pick up key generation changes ................ r1157862 | coheigea | 2011-08-15 10:33:55 -0400 (Mon, 15 Aug 2011) | 1 line Correcting a bug in AlgorithmSuite ................ r1158148 | ay | 2011-08-16 04:23:17 -0400 (Tue, 16 Aug 2011) | 9 lines Merged revisions 1158144 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1158144 | ay | 2011-08-16 10:13:51 +0200 (Tue, 16 Aug 2011) | 1 line [CXF-3744] fixing TransformOutInterceptor's fault case handling ........ ................ r1158249 | sergeyb | 2011-08-16 08:54:53 -0400 (Tue, 16 Aug 2011) | 9 lines Merged revisions 1158246 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1158246 | sergeyb | 2011-08-16 13:52:29 +0100 (Tue, 16 Aug 2011) | 1 line [CXF-3745] Support for default namespaces in OutTransformWriter ........ ................ r1158323 | ay | 2011-08-16 11:20:27 -0400 (Tue, 16 Aug 2011) | 9 lines Merged revisions 1158311 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1158311 | ay | 2011-08-16 16:49:21 +0200 (Tue, 16 Aug 2011) | 1 line [CXF-3744] fixing TransformOutInterceptor's position ........ ................ r1159476 | dkulp | 2011-08-18 22:02:38 -0400 (Thu, 18 Aug 2011) | 9 lines Merged revisions 1157850 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1157850 | dkulp | 2011-08-15 10:02:40 -0400 (Mon, 15 Aug 2011) | 1 line Remove stack traces on console ........ ................ r1159478 | dkulp | 2011-08-18 22:05:44 -0400 (Thu, 18 Aug 2011) | 21 lines Recorded merge of revisions 1157761,1157775,1157863-1157864 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1157761 | coheigea | 2011-08-15 06:16:41 -0400 (Mon, 15 Aug 2011) | 1 line Adding a test for a SignedSupportingToken/EndorsingSupportingToken ........ r1157775 | coheigea | 2011-08-15 06:56:44 -0400 (Mon, 15 Aug 2011) | 1 line Adding a commented out test for using a SAML Token as an Endorsing token for the Transport Binding. ........ r1157863 | coheigea | 2011-08-15 10:34:37 -0400 (Mon, 15 Aug 2011) | 1 line Upgrading to WSS4J 1.6.3-SNAPSHOT to pick up key generation changes ........ r1157864 | coheigea | 2011-08-15 10:34:54 -0400 (Mon, 15 Aug 2011) | 1 line Correcting a bug in AlgorithmSuite ........ ................ r1159479 | dkulp | 2011-08-18 22:06:27 -0400 (Thu, 18 Aug 2011) | 56 lines Blocked revisions 1156836,1157233,1157237,1157743,1157757,1157760,1157777,1158157,1158725,1158838,1159020-1159022 via svnmerge ........ r1156836 | sergeyb | 2011-08-11 17:19:20 -0400 (Thu, 11 Aug 2011) | 1 line [CXF-3733] Moving XML encryption and sig interceptors from systests/rs-security to rt/rs/security/xml ........ r1157233 | sergeyb | 2011-08-12 16:14:37 -0400 (Fri, 12 Aug 2011) | 1 line [CXF-3661] Support for enveloping signatures ........ r1157237 | sergeyb | 2011-08-12 16:28:12 -0400 (Fri, 12 Aug 2011) | 1 line [CXF-3661] Adding a single proxy test ........ r1157743 | sergeyb | 2011-08-15 05:06:33 -0400 (Mon, 15 Aug 2011) | 1 line [CXF-3677] Updating tests to receive encrypted content on the client side ........ r1157757 | sergeyb | 2011-08-15 06:13:38 -0400 (Mon, 15 Aug 2011) | 1 line Adding a missing file ........ r1157760 | sergeyb | 2011-08-15 06:16:38 -0400 (Mon, 15 Aug 2011) | 1 line And removing Override ........ r1157777 | sergeyb | 2011-08-15 07:07:21 -0400 (Mon, 15 Aug 2011) | 1 line [CXF-3733] Moving initial SAML code from systests/rs-security to rt/rs/security/xml ........ r1158157 | sergeyb | 2011-08-16 04:56:49 -0400 (Tue, 16 Aug 2011) | 1 line [CXF-3587] Adding a test for SAML token included in the form request ........ r1158725 | dkulp | 2011-08-17 10:08:15 -0400 (Wed, 17 Aug 2011) | 1 line Add some notices that should be there ........ r1158838 | dkulp | 2011-08-17 13:13:54 -0400 (Wed, 17 Aug 2011) | 1 line Fix relative path ........ r1159020 | dsosnoski | 2011-08-18 00:11:46 -0400 (Thu, 18 Aug 2011) | 1 line Set contextual properties for protocol variation to be used for communicating with serverside RM endpoint. ........ r1159021 | dsosnoski | 2011-08-18 00:12:22 -0400 (Thu, 18 Aug 2011) | 1 line Prefer contextual properties in setting the protocol version to be used. ........ r1159022 | dsosnoski | 2011-08-18 00:12:51 -0400 (Thu, 18 Aug 2011) | 1 line Fix test to work with protocol variation. ........ ................ r1159486 | dkulp | 2011-08-18 22:32:03 -0400 (Thu, 18 Aug 2011) | 10 lines Merged revisions 1159483 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1159483 | dkulp | 2011-08-18 22:27:49 -0400 (Thu, 18 Aug 2011) | 2 lines [CXF-3738] Remove bc license, add epl license "Patch" from Robert Liguori ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
