svn commit: r686347 - in /cxf/branches/2.1.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/poli...

[dkulp]

Author: dkulp
Date: Fri Aug 15 12:36:09 2008
New Revision: 686347

URL: http://svn.apache.org/viewvc?rev=686347&view=rev
Log:
Initialized merge tracking via "svnmerge" with revisions "1-686332" from 
https://svn.apache.org/repos/asf/cxf/trunk

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java
   (props changed)
    
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java
   (props changed)
    
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
   (props changed)
    
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/
   (props changed)
    
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
   (props changed)
    
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/
   (props changed)

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:686343

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
    svnmerge-integrated = /cxf/trunk:1-686332

Propchange: 
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP11Constants.java
            ('svn:mergeinfo' removed)

Propchange: 
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SP12Constants.java
            ('svn:mergeinfo' removed)

Propchange: 
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
            ('svn:mergeinfo' removed)

Propchange: 
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/
            ('svn:mergeinfo' removed)

Propchange: 
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
            ('svn:mergeinfo' removed)

Propchange: 
cxf/branches/2.1.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/
            ('svn:mergeinfo' removed)