Author: dkulp
Date: Wed Nov 23 20:40:46 2011
New Revision: 1205574
URL: http://svn.apache.org/viewvc?rev=1205574&view=rev
Log:
Merged revisions 1202617 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1202617 | sergeyb | 2011-11-16 05:18:51 -0500 (Wed, 16 Nov 2011) | 1 line
Removing a redundant import from a jaxws archetype resource
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml?rev=1205574&r1=1205573&r2=1205574&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
(original)
+++
cxf/branches/2.4.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
Wed Nov 23 20:40:46 2011
@@ -24,7 +24,6 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<jaxws:endpoint