cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1231343 - /cxf/branches/2.3.x-fixes/
Date Fri, 13 Jan 2012 22:21:46 GMT
Author: dkulp
Date: Fri Jan 13 22:21:46 2012
New Revision: 1231343

URL: http://svn.apache.org/viewvc?rev=1231343&view=rev
Log:
Blocked revisions 1228274,1229967,1230802,1230990,1231218-1231219,1231307,1231309,1231311,1231315
via svnmerge

................
  r1228274 | coheigea | 2012-01-06 12:03:12 -0500 (Fri, 06 Jan 2012) | 10 lines
  
  [CXF-2864] - Support UsernameToken derived keys
   - Part I : Added support for derived keys from a UsernameToken when it's used as the ProtectionToken
of the SymmetricBinding.
   - One important point is that it can only be used correctly for EITHER signature or encryption,
but not both, as the salt in the U/T is different for both.
  
  
  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/service/StaticService.java
  	services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java
................
  r1229967 | sergeyb | 2012-01-11 07:00:32 -0500 (Wed, 11 Jan 2012) | 16 lines
  
  Merged revisions 1229966 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1229966 | sergeyb | 2012-01-11 11:58:07 +0000 (Wed, 11 Jan 2012) | 9 lines
    
    Merged revisions 1229965 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1229965 | sergeyb | 2012-01-11 11:56:19 +0000 (Wed, 11 Jan 2012) | 1 line
      
      [CXF-4015] Mapping xsd:integer to long
    ........
  ................
................
  r1230802 | dkulp | 2012-01-12 16:53:33 -0500 (Thu, 12 Jan 2012) | 17 lines
  
  Merged revisions 1230801 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1230801 | dkulp | 2012-01-12 16:52:38 -0500 (Thu, 12 Jan 2012) | 10 lines
    
    Merged revisions 1230800 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1230800 | dkulp | 2012-01-12 16:51:43 -0500 (Thu, 12 Jan 2012) | 2 lines
      
      Add some NPE guards in Jibx tooling
      Fix an issue reported on the list.
    ........
  ................
................
  r1230990 | coheigea | 2012-01-13 06:01:57 -0500 (Fri, 13 Jan 2012) | 2 lines
  
  Removing unnecessary signature validation check using Id/XPath
   - Since WSS4J moved to use JSR-105 APIs for signature validation all signed Elements are
available for direct comparison
................
  r1231218 | dkulp | 2012-01-13 13:20:01 -0500 (Fri, 13 Jan 2012) | 16 lines
  
  Recorded merge of revisions 1228272,1230988 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1228272 | coheigea | 2012-01-06 12:00:21 -0500 (Fri, 06 Jan 2012) | 3 lines
    
    [CXF-2864] - Support UsernameToken derived keys
     - Part I : Added support for derived keys from a UsernameToken when it's used as the
ProtectionToken of the SymmetricBinding.
     - One important point is that it can only be used correctly for EITHER signature or encryption,
but not both, as the salt in the U/T is different for both.
  ........
    r1230988 | coheigea | 2012-01-13 06:01:26 -0500 (Fri, 13 Jan 2012) | 2 lines
    
    Removing unnecessary signature validation check using Id/XPath
     - Since WSS4J moved to use JSR-105 APIs for signature validation all signed Elements
are available for direct comparison
  ........
................
  r1231219 | dkulp | 2012-01-13 13:21:30 -0500 (Fri, 13 Jan 2012) | 32 lines
  
  Blocked revisions 1228087,1230196-1230197,1230262,1231217 via svnmerge
  
  ................
    r1228087 | coheigea | 2012-01-06 06:15:27 -0500 (Fri, 06 Jan 2012) | 1 line
    
    [CXF-4010] - Fix for failing tests
  ................
    r1230196 | owulff | 2012-01-11 14:17:21 -0500 (Wed, 11 Jan 2012) | 1 line
    
    [CXF-3985] Support for attributes with multiple values in LdapClaimsHandler
  ................
    r1230197 | owulff | 2012-01-11 14:17:43 -0500 (Wed, 11 Jan 2012) | 1 line
    
    [CXF-4021] Claims element support in RST for validate binding
  ................
    r1230262 | owulff | 2012-01-11 16:34:33 -0500 (Wed, 11 Jan 2012) | 1 line
    
    Failing sts systest fixed
  ................
    r1231217 | dkulp | 2012-01-13 13:14:55 -0500 (Fri, 13 Jan 2012) | 10 lines
    
    Merged revisions 1227823 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1227823 | dkulp | 2012-01-05 15:46:10 -0500 (Thu, 05 Jan 2012) | 2 lines
      
      [CXF-3989] Recorded scopes are "mapped" keys, make sure we map the key
      when setting and getting the scope
    ........
  ................
................
  r1231307 | dkulp | 2012-01-13 16:26:08 -0500 (Fri, 13 Jan 2012) | 16 lines
  
  Merged revisions 1231271 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1231271 | dkulp | 2012-01-13 14:44:54 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1230787 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1230787 | dkulp | 2012-01-12 16:13:36 -0500 (Thu, 12 Jan 2012) | 1 line
      
      Update to newer bundle plugin
    ........
  ................
................
  r1231309 | dkulp | 2012-01-13 16:27:25 -0500 (Fri, 13 Jan 2012) | 17 lines
  
  Merged revisions 1231304 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1231304 | dkulp | 2012-01-13 16:20:44 -0500 (Fri, 13 Jan 2012) | 10 lines
    
    Merged revisions 1231299 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1231299 | dkulp | 2012-01-13 16:16:26 -0500 (Fri, 13 Jan 2012) | 2 lines
      
      [CXF-4017] Update addCrossImportsType to handle other types of particles
      Patch from Benoit Lacelle used as a basis
    ........
  ................
................
  r1231311 | dkulp | 2012-01-13 16:28:42 -0500 (Fri, 13 Jan 2012) | 17 lines
  
  Merged revisions 1231305 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1231305 | dkulp | 2012-01-13 16:22:03 -0500 (Fri, 13 Jan 2012) | 10 lines
    
    Merged revisions 1231301 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1231301 | dkulp | 2012-01-13 16:16:37 -0500 (Fri, 13 Jan 2012) | 2 lines
      
      [CXF-4016] Fix problems of having only an XmlRootElement annotation on a
      fault bean
    ........
  ................
................
  r1231315 | dkulp | 2012-01-13 16:31:57 -0500 (Fri, 13 Jan 2012) | 345 lines
  
  Blocked revisions 1231227,1231235,1231240-1231241,1231252,1231254,1231256,1231258-1231259,1231261,1231266-1231267,1231270,1231273-1231275,1231306
via svnmerge
  
  ................
    r1231227 | dkulp | 2012-01-13 13:29:33 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228209 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228209 | dkulp | 2012-01-06 09:46:34 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Set svn:ignore properties
    ........
  ................
    r1231235 | dkulp | 2012-01-13 13:42:35 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228228 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228228 | dkulp | 2012-01-06 10:22:56 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Fix a bunch more warnings inside methods, private methods, and tests that can be ported
back.
    ........
  ................
    r1231240 | dkulp | 2012-01-13 13:50:19 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228230 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228230 | dkulp | 2012-01-06 10:28:41 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Warning fixes in tools that can be ported back
    ........
  ................
    r1231241 | dkulp | 2012-01-13 13:52:37 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228231 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228231 | dkulp | 2012-01-06 10:29:42 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Systest warning fixes that can be ported back
    ........
  ................
    r1231252 | dkulp | 2012-01-13 14:09:37 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228268 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228268 | dkulp | 2012-01-06 11:57:50 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Another 300+ backportable rawtypes warning fixes
    ........
  ................
    r1231254 | dkulp | 2012-01-13 14:11:18 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228277 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228277 | dkulp | 2012-01-06 12:05:27 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Fix java5 compile issue
    ........
  ................
    r1231256 | dkulp | 2012-01-13 14:17:44 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228359 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228359 | dkulp | 2012-01-06 14:27:41 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Another couple hundred back-portable rawTypes warnings fixed
    ........
  ................
    r1231258 | dkulp | 2012-01-13 14:21:18 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228770 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228770 | dkulp | 2012-01-07 22:15:06 -0500 (Sat, 07 Jan 2012) | 2 lines
      
      JAX-WS Spec jars use plan List<Handler> which raises rawType warnings.  All we
can do is suppress them in this case.
    ........
  ................
    r1231259 | dkulp | 2012-01-13 14:23:47 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1228850 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228850 | dkulp | 2012-01-08 09:05:32 -0500 (Sun, 08 Jan 2012) | 2 lines
      
      Fix it test with maven 2.2.1
    ........
  ................
    r1231261 | dkulp | 2012-01-13 14:29:14 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1229348 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1229348 | dkulp | 2012-01-09 16:06:37 -0500 (Mon, 09 Jan 2012) | 1 line
      
      JAXB generated code for a couple types has rawtype issues
    ........
  ................
    r1231266 | dkulp | 2012-01-13 14:35:50 -0500 (Fri, 13 Jan 2012) | 10 lines
    
    Merged revisions 1229476 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1229476 | dkulp | 2012-01-10 01:20:45 -0500 (Tue, 10 Jan 2012) | 2 lines
      
      Apparently the command line checkstyle is stricter than the in-eclipse
      version.  Not sure why yet.
    ........
  ................
    r1231267 | dkulp | 2012-01-13 14:39:20 -0500 (Fri, 13 Jan 2012) | 10 lines
    
    Merged revisions 1230218 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1230218 | dkulp | 2012-01-11 15:07:26 -0500 (Wed, 11 Jan 2012) | 2 lines
      
      Move to in-process as it's randomly failing out of process and no idea
      why yet.
    ........
  ................
    r1231270 | dkulp | 2012-01-13 14:43:19 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1230222 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1230222 | dkulp | 2012-01-11 15:08:14 -0500 (Wed, 11 Jan 2012) | 1 line
      
      Fix some compiler warnings
    ........
  ................
    r1231273 | dkulp | 2012-01-13 14:46:54 -0500 (Fri, 13 Jan 2012) | 9 lines
    
    Merged revisions 1231212 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1231212 | dkulp | 2012-01-13 13:03:32 -0500 (Fri, 13 Jan 2012) | 1 line
      
      [CXF-4024] Update jetty version
    ........
  ................
    r1231274 | dkulp | 2012-01-13 14:47:48 -0500 (Fri, 13 Jan 2012) | 27 lines
    
    Recorded merge of revisions 1228085,1228270,1230194-1230195,1230255 via svnmerge from

    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1228085 | coheigea | 2012-01-06 06:14:30 -0500 (Fri, 06 Jan 2012) | 1 line
      
      [CXF-4010] - Fix for failing tests
    ........
      r1228270 | coheigea | 2012-01-06 11:58:33 -0500 (Fri, 06 Jan 2012) | 3 lines
      
      [CXF-2864] - Support UsernameToken derived keys
       - Part I : Added support for derived keys from a UsernameToken when it's used as the
ProtectionToken of the SymmetricBinding.
       - One important point is that it can only be used correctly for EITHER signature or
encryption, but not both, as the salt in the U/T is different for both.
    ........
      r1230194 | owulff | 2012-01-11 14:11:51 -0500 (Wed, 11 Jan 2012) | 1 line
      
      [CXF-4021] Claims element support in RST for validate binding
    ........
      r1230195 | owulff | 2012-01-11 14:12:06 -0500 (Wed, 11 Jan 2012) | 1 line
      
      [CXF-3985] Support for attributes with multiple values in LdapClaimsHandler
    ........
      r1230255 | owulff | 2012-01-11 16:18:07 -0500 (Wed, 11 Jan 2012) | 1 line
      
      Failing sts systest fixed
    ........
  ................
    r1231275 | dkulp | 2012-01-13 14:49:17 -0500 (Fri, 13 Jan 2012) | 127 lines
    
    Blocked revisions 1228499,1228771,1228848,1229038,1229332,1229349,1229391,1229777-1229780,1230132,1230156,1230219,1230221,1230568-1230569,1230685,1230746,1230788-1230789,1230794,1230813,1230816,1230888,1231035,1231172,1231213
via svnmerge
    
    ........
      r1228499 | dkulp | 2012-01-06 18:24:33 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Non-backportable warning fixes.  Down to 600 warnings.
    ........
      r1228771 | dkulp | 2012-01-07 22:19:02 -0500 (Sat, 07 Jan 2012) | 2 lines
      
      Getting closer to getting warnings resolved
    ........
      r1228848 | dkulp | 2012-01-08 08:59:37 -0500 (Sun, 08 Jan 2012) | 2 lines
      
      By proper use of generics, a bunch of casts are not needed.
    ........
      r1229038 | dkulp | 2012-01-09 01:18:49 -0500 (Mon, 09 Jan 2012) | 2 lines
      
      Minor code cleanups to remove some unneeded comparisons
    ........
      r1229332 | dkulp | 2012-01-09 15:07:20 -0500 (Mon, 09 Jan 2012) | 1 line
      
      Cleanup rawtypes issues in JAX-RS
    ........
      r1229349 | dkulp | 2012-01-09 16:06:54 -0500 (Mon, 09 Jan 2012) | 1 line
      
      Update JMSSessionCallbacks to specify the type
    ........
      r1229391 | dkulp | 2012-01-09 17:12:36 -0500 (Mon, 09 Jan 2012) | 1 line
      
      Fix compile failure on java5
    ........
      r1229777 | dkulp | 2012-01-10 17:45:31 -0500 (Tue, 10 Jan 2012) | 1 line
      
      Remove spring requirement for WSPolicyFeature
    ........
      r1229778 | dkulp | 2012-01-10 17:45:40 -0500 (Tue, 10 Jan 2012) | 1 line
      
      CHange generated package name to not conflict with rt-core stuff
    ........
      r1229779 | dkulp | 2012-01-10 17:45:58 -0500 (Tue, 10 Jan 2012) | 1 line
      
      Move tools split packages from api to appropriate place in tool.
    ........
      r1229780 | dkulp | 2012-01-10 17:46:18 -0500 (Tue, 10 Jan 2012) | 1 line
      
      Move some utility methods into similar class in common
    ........
      r1230132 | dkulp | 2012-01-11 11:30:33 -0500 (Wed, 11 Jan 2012) | 2 lines
      
      Move QueryHandlerRegistryImpl to private package to prevent a
      split-package
    ........
      r1230156 | dkulp | 2012-01-11 12:18:09 -0500 (Wed, 11 Jan 2012) | 2 lines
      
      Move org.apache.cxf.frontend stuff out of rt-core and deprecated the
      one class.
    ........
      r1230219 | dkulp | 2012-01-11 15:07:56 -0500 (Wed, 11 Jan 2012) | 2 lines
      
      Move service/factory stuff all to rt/core to avoid another split
      package.
    ........
      r1230221 | dkulp | 2012-01-11 15:08:05 -0500 (Wed, 11 Jan 2012) | 1 line
      
      Checkstyle issue
    ........
      r1230568 | dkulp | 2012-01-12 09:46:29 -0500 (Thu, 12 Jan 2012) | 3 lines
      
      Move all the policy stuff out of api into rt/ws/policy to avoid the
      split package.  (This introduces a hard dependency on ws-policy.jar in
      many places.   Will work on that tomorrow.)
    ........
      r1230569 | dkulp | 2012-01-12 09:47:08 -0500 (Thu, 12 Jan 2012) | 2 lines
      
      Allow bus extensions to be marked optional which allows them to not be
      loaded at all if dependencies are not available.
    ........
      r1230685 | dkulp | 2012-01-12 13:31:47 -0500 (Thu, 12 Jan 2012) | 3 lines
      
      Fix the split package issue for org.apache.cxf.ws.addressing
      Move impls into impl subpackage, put some stubs in addressing
      Make sure more classes don't use the impls (still some in RM)
    ........
      r1230746 | dkulp | 2012-01-12 15:07:17 -0500 (Thu, 12 Jan 2012) | 1 line
      
      Resolve the org.apache.cxf.jaxb split package issue
    ........
      r1230788 | dkulp | 2012-01-12 16:13:47 -0500 (Thu, 12 Jan 2012) | 1 line
      
      Fix java5 compile failures
    ........
      r1230789 | dkulp | 2012-01-12 16:14:01 -0500 (Thu, 12 Jan 2012) | 2 lines
      
      Start working toward making each jar an individual osgi bundle.
      LOTS of import version range adjustments needed.
    ........
      r1230794 | dkulp | 2012-01-12 16:31:20 -0500 (Thu, 12 Jan 2012) | 1 line
      
      Fix java5 compile error
    ........
      r1230813 | dkulp | 2012-01-12 17:06:10 -0500 (Thu, 12 Jan 2012) | 1 line
      
      Fix some more java5 compile failures
    ........
      r1230816 | dkulp | 2012-01-12 17:19:29 -0500 (Thu, 12 Jan 2012) | 1 line
      
      Mark junit optional
    ........
      r1230888 | dkulp | 2012-01-12 22:51:39 -0500 (Thu, 12 Jan 2012) | 1 line
      
      Minor osgi updates
    ........
      r1231035 | dkulp | 2012-01-13 07:21:51 -0500 (Fri, 13 Jan 2012) | 2 lines
      
      Moving one package from common -> api resolves split-package with common
      and allows it to be a standalone osgi bundle.
    ........
      r1231172 | dkulp | 2012-01-13 11:49:27 -0500 (Fri, 13 Jan 2012) | 1 line
      
      Move the neethi dep down a layer
    ........
      r1231213 | dkulp | 2012-01-13 13:03:46 -0500 (Fri, 13 Jan 2012) | 2 lines
      
      Updates to get all the bundles loading in karaf (no idea if they work
      but they at least load :)  )
    ........
  ................
    r1231306 | dkulp | 2012-01-13 16:23:06 -0500 (Fri, 13 Jan 2012) | 25 lines
    
    Blocked revisions 1227822,1227865,1227899,1228212,1228232 via svnmerge
    
    ........
      r1227822 | dkulp | 2012-01-05 15:45:57 -0500 (Thu, 05 Jan 2012) | 1 line
      
      Update common-utilities and codegen plugin (and some users of it) to fix usage of raw
types, change to new style for loops, etc...
    ........
      r1227865 | dkulp | 2012-01-05 17:01:36 -0500 (Thu, 05 Jan 2012) | 2 lines
      
      Fix a bunch more eclipse warnings
      Update eclipse setup to not need two of the warnings turned off anymore
    ........
      r1227899 | dkulp | 2012-01-05 18:58:20 -0500 (Thu, 05 Jan 2012) | 1 line
      
      Fix rawType warnings up to rt-core
    ........
      r1228212 | dkulp | 2012-01-06 09:52:07 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Fix another 200 rawtype warnings
    ........
      r1228232 | dkulp | 2012-01-06 10:33:23 -0500 (Fri, 06 Jan 2012) | 2 lines
      
      Revert a couple tests that cannot be pulled back as they require API changes
    ........
  ................
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.



Mime
View raw message