Merge "BUG-997 Use shared schema context factory in netconf-connector"

[controller.git] / opendaylight / distribution / opendaylight-karaf / src / main / resources / etc / custom.properties

diff --git a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties
index 9a868660809fded6cc6026c721ff2e83f9df9f78..e9a6992521250d612c1924e4f0fa46548f63d741 100644 (file)
--- a/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties
+++ b/opendaylight/distribution/opendaylight-karaf/src/main/resources/etc/custom.properties
@@ -1,5 +1,5 @@
 # Extra packages to import from the boot class loader
-org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch
+org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch
 
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578
 # Extend the framework to avoid the resources to be presented with
@@ -25,18 +25,11 @@ netconf.ssh.port=1830
 netconf.ssh.pk.path = ./configuration/RSA.pk
 
 
-netconf.config.persister.active=1,2
-# read startup configuration
-netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter
-netconf.config.persister.1.properties.directoryStorage=configuration/initial/
+netconf.config.persister.active=1
 
-# include only xml files, files with other extensions will be skipped, multiple extensions are permitted e.g. netconf.config.persister.1.properties.includeExtensions=xml,cfg,config
-netconf.config.persister.1.properties.includeExtensions=xml
-netconf.config.persister.1.readonly=true
-
-netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter
-netconf.config.persister.2.properties.fileStorage=configuration/current/controller.currentconfig.xml
-netconf.config.persister.2.properties.numberOfBackups=1
+netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter
+netconf.config.persister.1.properties.fileStorage=etc/opendaylight/current/controller.currentconfig.xml
+netconf.config.persister.1.properties.numberOfBackups=1
 
 # logback configuration
 logback.configurationFile=configuration/logback.xml
@@ -111,4 +104,4 @@ org.jolokia.listenForHttpService=false
 java.util.logging.config.file=configuration/tomcat-logging.properties
 
 #Hosttracker hostsdb key scheme setting
-hosttracker.keyscheme=IP
\ No newline at end of file
+hosttracker.keyscheme=IP