Author: dkulp Date: Wed Nov 23 21:04:33 2011 New Revision: 1205593 URL: http://svn.apache.org/viewvc?rev=1205593&view=rev Log: Merged revisions 1205574 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1205574 | dkulp | 2011-11-23 15:40:46 -0500 (Wed, 23 Nov 2011) | 9 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.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.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml?rev=1205593&r1=1205592&r2=1205593&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (original) +++ cxf/branches/2.3.x-fixes/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml Wed Nov 23 21:04:33 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
