Author: dkulp
Date: Wed Jun 11 13:18:07 2008
New Revision: 666826

URL: http://svn.apache.org/viewvc?rev=666826&view=rev
Log:
Merged revisions 666824 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r666824 | dkulp | 2008-06-11 16:14:48 -0400 (Wed, 11 Jun 2008) | 2 lines
  
  Fix a file name so the validator gets picked up
........

Added:
    
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/tools.service.validator.xml
      - copied unchanged from r666824, 
cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/tools.service.validator.xml
Removed:
    
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/service.validator.xml
Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml

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

Modified: cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=666826&r1=666825&r2=666826&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Wed Jun 11 13:18:07 
2008
@@ -332,9 +332,6 @@
                                     
<resource>META-INF/cxf/bus-extensions.xml</resource>
                                 </transformer>
                                 <transformer 
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
-                                    
<resource>META-INF/service.validator.xml</resource>
-                                </transformer>
-                                <transformer 
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
                                     
<resource>META-INF/wsdl.plugin.xml</resource>
                                 </transformer>                     
                                 <transformer 
implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">


Reply via email to