You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2009/10/07 12:30:13 UTC
svn commit: r822648 - in /cxf/branches/2.2.x-fixes: ./
rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
Author: sergeyb
Date: Wed Oct 7 10:30:13 2009
New Revision: 822648
URL: http://svn.apache.org/viewvc?rev=822648&view=rev
Log:
Merged revisions 822642 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r822642 | sergeyb | 2009-10-07 11:17:41 +0100 (Wed, 07 Oct 2009) | 1 line
Removing redundant PropertyPlaceholderConfigurer
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:822642
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml?rev=822648&r1=822647&r2=822648&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml Wed Oct 7 10:30:13 2009
@@ -28,19 +28,12 @@
http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="ignoreUnresolvablePlaceholders" value="true"/>
- <property name="ignoreResourceNotFound" value="true" />
- <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
- <property name="location" value="file:/${karaf.base}/etc/org.apache.cxf.osgi.cfg"/>
- </bean>
-
- <osgix:cm-properties id="cxfOsgiProps" persistent-id="org.apache.cxf.osgi">
+ <osgix:cm-properties id="cxfOsgiProperties" persistent-id="org.apache.cxf.osgi">
<prop key="org.apache.cxf.servlet.context">/cxf</prop>
- <prop key="org.apache.cxf.servlet.name">cxf-servlet-osgi-transport</prop>
+ <prop key="org.apache.cxf.servlet.name">cxf-osgi-transport-servlet</prop>
</osgix:cm-properties>
- <ctx:property-placeholder properties-ref="cxfOsgiProps"/>
+ <ctx:property-placeholder properties-ref="cxfOsgiProperties"/>
<bean id="destinationRegistry" class="org.apache.cxf.transport.http_osgi.OsgiDestinationRegistry" />