<type>xml</type>
<classifier>features</classifier>
</dependency>
- <dependency>
- <!-- finalname="configuration/initial/akka.conf" -->
- <groupId>${project.groupId}</groupId>
- <artifactId>sal-clustering-config</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>akkaconf</classifier>
- </dependency>
- <dependency>
- <!-- finalname="configuration/factory/akka.conf" override="true" -->
- <groupId>${project.groupId}</groupId>
- <artifactId>sal-clustering-config</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>factoryakkaconf</classifier>
- </dependency>
- <dependency>
- <!-- finalname="configuration/initial/module-shards.conf" -->
- <groupId>${project.groupId}</groupId>
- <artifactId>sal-clustering-config</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>moduleshardconf</classifier>
- </dependency>
- <dependency>
- <!-- finalname="configuration/initial/modules.conf" -->
- <groupId>${project.groupId}</groupId>
- <artifactId>sal-clustering-config</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>moduleconf</classifier>
- </dependency>
- <dependency>
- <!-- finalname="etc/org.opendaylight.controller.cluster.datastore.cfg" -->
- <groupId>${project.groupId}</groupId>
- <artifactId>sal-clustering-config</artifactId>
- <version>${project.version}</version>
- <type>cfg</type>
- <classifier>datastore</classifier>
- </dependency>
</dependencies>
</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<features name="odl-mdsal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
- <feature name="odl-mdsal-broker" version="${project.version}">
- <configfile finalname="configuration/initial/akka.conf">
- mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
- </configfile>
- <configfile finalname="configuration/factory/akka.conf" override="true">
- mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/factoryakkaconf
- </configfile>
- <configfile finalname="configuration/initial/module-shards.conf">
- mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/moduleshardconf
- </configfile>
- <configfile finalname="configuration/initial/modules.conf">
- mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/moduleconf
- </configfile>
- <configfile finalname="etc/org.opendaylight.controller.cluster.datastore.cfg">
- mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/cfg/datastore
- </configfile>
- </feature>
-</features>
<version>1.10.0-SNAPSHOT</version>
<packaging>feature</packaging>
- <properties>
- <!-- CONTROLLER-1584 -->
- <skip.karaf.featureTest>true</skip.karaf.featureTest>
- </properties>
+ <name>OpenDaylight :: Controller :: Clustered Datastore</name>
+ <description>Controller Clustered Datastore (akka-based)</description>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yangtools-artifacts</artifactId>
+ <version>3.0.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>4.0.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>odl-mdsal-broker-local</artifactId>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>odl-apache-commons-text</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-apache-commons-text</artifactId>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>odl-yangtools-codec</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>odl-mdsal-eos-dom</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>odl-mdsal-dom-broker</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>odl-mdsal-binding-dom-adapter</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>odl-controller-blueprint</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cds-access-api</artifactId>
<groupId>${project.groupId}</groupId>
<artifactId>sal-cluster-admin-impl</artifactId>
</dependency>
+
+ <dependency>
+ <!-- finalname="configuration/initial/akka.conf" -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>sal-clustering-config</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>akkaconf</classifier>
+ </dependency>
+ <dependency>
+ <!-- finalname="configuration/factory/akka.conf" override="true" -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>sal-clustering-config</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>factoryakkaconf</classifier>
+ </dependency>
+ <dependency>
+ <!-- finalname="configuration/initial/module-shards.conf" -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>sal-clustering-config</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>moduleshardconf</classifier>
+ </dependency>
+ <dependency>
+ <!-- finalname="configuration/initial/modules.conf" -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>sal-clustering-config</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>moduleconf</classifier>
+ </dependency>
+ <dependency>
+ <!-- finalname="etc/org.opendaylight.controller.cluster.datastore.cfg" -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>sal-clustering-config</artifactId>
+ <version>${project.version}</version>
+ <type>cfg</type>
+ <classifier>datastore</classifier>
+ </dependency>
</dependencies>
</project>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
<feature name="odl-mdsal-distributed-datastore" version="${project.version}">
<feature version="[5,6)">odl-apache-commons-text</feature>
+ <feature version="[3,4)">odl-yangtools-codec</feature>
+ <feature version="[4,5)">odl-mdsal-eos-dom</feature>
+ <feature version="[4,5)">odl-mdsal-dom-broker</feature>
+ <configfile finalname="configuration/initial/akka.conf">
+ mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
+ </configfile>
+ <configfile finalname="configuration/factory/akka.conf" override="true">
+ mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/factoryakkaconf
+ </configfile>
+ <configfile finalname="configuration/initial/module-shards.conf">
+ mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/moduleshardconf
+ </configfile>
+ <configfile finalname="configuration/initial/modules.conf">
+ mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/moduleconf
+ </configfile>
+ <configfile finalname="etc/org.opendaylight.controller.cluster.datastore.cfg">
+ mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/cfg/datastore
+ </configfile>
</feature>
</features>
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.md.sal.dom.broker.impl.jmx;
+package org.opendaylight.controller.cluster.datastore.jmx.mbeans;
/**
* MXBean interface for retrieving write Tx commit statistics.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.md.sal.dom.broker.impl.jmx;
+package org.opendaylight.controller.cluster.datastore.jmx.mbeans;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
<!-- JMX beans for the data broker -->
- <bean id="commitStatsMXBean" class="org.opendaylight.controller.md.sal.dom.broker.impl.jmx.CommitStatsMXBeanImpl"
+ <bean id="commitStatsMXBean" class="org.opendaylight.controller.cluster.datastore.jmx.mbeans.CommitStatsMXBeanImpl"
init-method="register" destroy-method="unregister">
<argument ref="commitStatsTracker"/>
<argument value="DOMDataBroker"/>
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.md.sal.dom.broker.impl.jmx;
+package org.opendaylight.controller.cluster.datastore.jmx.mbeans;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;