cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r822642 - /cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
Date Wed, 07 Oct 2009 10:17:41 GMT
Author: sergeyb
Date: Wed Oct  7 10:17:41 2009
New Revision: 822642

URL: http://svn.apache.org/viewvc?rev=822642&view=rev
Log:
Removing redundant PropertyPlaceholderConfigurer

Modified:
    cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml

Modified: cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml?rev=822642&r1=822641&r2=822642&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/resources/META-INF/spring/cxf-transport-osgi.xml
Wed Oct  7 10:17:41 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"
/>
 



Mime
View raw message