Author: dkulp Date: Thu Oct 27 20:42:37 2011 New Revision: 1190013 URL: http://svn.apache.org/viewvc?rev=1190013&view=rev Log: Blocked revisions 1186645,1188283,1188287,1188292,1188829,1188909,1189387,1189470,1189703,1189708,1189997,1189999 via svnmerge
................ r1186645 | ffang | 2011-10-20 03:47:28 -0400 (Thu, 20 Oct 2011) | 9 lines Merged revisions 1186634 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1186634 | ffang | 2011-10-20 15:10:30 +0800 (?\229?\155?\155, 20 10 2011) | 1 line [CXF-3866]CXF-Service List page mess up in some case ........ ................ r1188283 | dkulp | 2011-10-24 14:42:01 -0400 (Mon, 24 Oct 2011) | 10 lines Merged revisions 1187609 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1187609 | dkulp | 2011-10-21 20:36:13 -0400 (Fri, 21 Oct 2011) | 2 lines Opt into geronimo-specs SPI things so we can remove the DynamicImport * things from the wsn bundles. ........ ................ r1188287 | dkulp | 2011-10-24 14:48:53 -0400 (Mon, 24 Oct 2011) | 9 lines Merged revisions 1187645 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1187645 | dkulp | 2011-10-21 22:32:51 -0400 (Fri, 21 Oct 2011) | 1 line Update javamail version we pull in for osgi ........ ................ r1188292 | dkulp | 2011-10-24 14:57:46 -0400 (Mon, 24 Oct 2011) | 10 lines Merged revisions 1188076 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1188076 | coheigea | 2011-10-24 06:23:17 -0400 (Mon, 24 Oct 2011) | 2 lines Updating all test instances that use CipherSuites to accept AES cipher-suites - This fixes all JDK 1.7 TLS test failures (DES cipher suites are not included in JDK 1.7) ........ ................ r1188829 | dkulp | 2011-10-25 13:50:52 -0400 (Tue, 25 Oct 2011) | 9 lines Merged revisions 1188646 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1188646 | sergeyb | 2011-10-25 09:19:43 -0400 (Tue, 25 Oct 2011) | 1 line [CXF-3877] Updating services pages handler to optionally ignore endpoints with non-matching contexts, patch on behalf of Johan Edstrom applied with few mofifications ........ ................ r1188909 | dkulp | 2011-10-25 17:03:49 -0400 (Tue, 25 Oct 2011) | 9 lines Merged revisions 1188893 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1188893 | dkulp | 2011-10-25 16:30:03 -0400 (Tue, 25 Oct 2011) | 1 line Get the test off port 8080 ........ ................ r1189387 | coheigea | 2011-10-26 15:02:21 -0400 (Wed, 26 Oct 2011) | 7 lines Added new policy validators for the Symmetric binding + Asymmetric binding - Started properly validating a load more policies Conflicts: services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/SAMLTokenProvider.java ................ r1189470 | dkulp | 2011-10-26 17:20:15 -0400 (Wed, 26 Oct 2011) | 14 lines Recorded merge of revisions 1189352-1189353 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1189352 | coheigea | 2011-10-26 14:06:32 -0400 (Wed, 26 Oct 2011) | 2 lines Added new policy validators for the Symmetric binding + Asymmetric binding - Started properly validating a load more policies ........ r1189353 | coheigea | 2011-10-26 14:06:53 -0400 (Wed, 26 Oct 2011) | 1 line Fixing problem with last commit. ........ ................ r1189703 | coheigea | 2011-10-27 06:51:39 -0400 (Thu, 27 Oct 2011) | 1 line Added support to also encrypt SignatureConfirmation elements when the SignatureProtection property of the binding is enabled ................ r1189708 | coheigea | 2011-10-27 07:49:55 -0400 (Thu, 27 Oct 2011) | 1 line Added a check for an X.509 token in the InitiatorToken of the AsymmetricBindingPolicyValidator ................ r1189997 | dkulp | 2011-10-27 16:22:37 -0400 (Thu, 27 Oct 2011) | 13 lines Recorded merge of revisions 1189702,1189707 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1189702 | coheigea | 2011-10-27 06:50:58 -0400 (Thu, 27 Oct 2011) | 1 line Added support to also encrypt SignatureConfirmation elements when the SignatureProtection property of the binding is enabled ........ r1189707 | coheigea | 2011-10-27 07:49:17 -0400 (Thu, 27 Oct 2011) | 1 line Added a check for an X.509 token in the InitiatorToken of the AsymmetricBindingPolicyValidator ........ ................ r1189999 | dkulp | 2011-10-27 16:23:05 -0400 (Thu, 27 Oct 2011) | 20 lines Blocked revisions 1189538,1189786,1189820,1189868 via svnmerge ........ r1189538 | dkulp | 2011-10-26 19:43:50 -0400 (Wed, 26 Oct 2011) | 1 line [CXF-3885] Add options to wsdl2java for various SourceDataBinding usage ........ r1189786 | dkulp | 2011-10-27 10:40:17 -0400 (Thu, 27 Oct 2011) | 1 line [CXF-3885] Add system test for source databinding ........ r1189820 | coheigea | 2011-10-27 12:00:43 -0400 (Thu, 27 Oct 2011) | 1 line Removed the sts_issue_operation sample and added a new "sts" sample that uses the new STS implementation ........ r1189868 | dkulp | 2011-10-27 12:56:15 -0400 (Thu, 27 Oct 2011) | 1 line Fix the parent in the sts/systest pom ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
