You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/08/14 11:30:10 UTC

svn commit: r1513775 - /cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Author: coheigea
Date: Wed Aug 14 09:30:10 2013
New Revision: 1513775

URL: http://svn.apache.org/r1513775
Log:
[CXF-5202] - Missing some default value in the blueprint xml of XKMS osgi bundle - thanks to Xilai Dai

Modified:
    cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Modified: cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1513775&r1=1513774&r2=1513775&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ cxf/trunk/services/xkms/xkms-osgi/src/main/resources/OSGI-INF/blueprint/blueprint.xml Wed Aug 14 09:30:10 2013
@@ -11,7 +11,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/blueprint/core"
     xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
-    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
     xmlns:ext="http://www.osgi.org/xmlns/blueprint-ext/v1.1.0"
     xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
                         http://www.osgi.org/xmlns/blueprint-ext/v1.1.0 https://svn.apache.org/repos/asf/aries/tags/blueprint-0.3.1/blueprint-core/src/main/resources/org/apache/aries/blueprint/ext/blueprint-ext.xsd  
@@ -20,13 +20,16 @@
                         http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
 ">
 
-	<cm:property-placeholder persistent-id="org.apache.cxf.xkms">
+	<cm:property-placeholder persistent-id="org.apache.cxf.xkms" update-strategy="reload">
 		<cm:default-properties>
 			<cm:property name="xkms.enableXKRSS" value="true"/>
+			<cm:property name="xkms.certificate.repo" value="ldap"/>
+			<cm:property name="xkms.file.storageDir" value="data/xkms/certificates"/>
 			<cm:property name="xkms.ldap.url" value="tcp:localhost:389"/>
 			<cm:property name="xkms.ldap.user" value=""/>
 			<cm:property name="xkms.ldap.pwd" value=""/>
 			<cm:property name="xkms.ldap.retry" value="2"/>
+			<cm:property name="xkms.ldap.rootDN" value=""/>
 		</cm:default-properties>
 	</cm:property-placeholder>