<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-transportpce-inventory">
<feature name="odl-transportpce-inventory">
<feature>scheduler</feature>
- <feature>pax-jdbc-mysql</feature>
+ <feature>pax-jdbc-mariadb</feature>
<feature>pax-jdbc-pool-dbcp2</feature>
<configfile finalname="etc/org.ops4j.datasource-transportpce.cfg" override="false">
mvn:${project.groupId}/${project.artifactId}/${project.version}/cfg/datasource
-osgi.jdbc.driver.name=mysql
-url=jdbc:mysql://${transportpce.db.host}/${transportpce.db.database}?useUnicode=true&characterEncoding=utf8
+osgi.jdbc.driver.name=mariadb
+url=jdbc:mariadb://${transportpce.db.host}/${transportpce.db.database}?useUnicode=true&characterEncoding=utf8
pool=dbcp2
user=${transportpce.db.username}
password=${transportpce.db.password}
-dataSourceName=transportpce
+databaseName=${transportpce.db.database}
+dataSourceName=transportpce
\ No newline at end of file
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <!--<dependency>
+ <!--dependency>
<groupId>org.apache.karaf.scheduler</groupId>
<artifactId>org.apache.karaf.scheduler.core</artifactId>
<version>4.0.9</version>
<scope>provided</scope>
- </dependency> -->
+ </dependency-->
</dependencies>
</project>
private final DataSource dataSource;
private final DeviceTransactionManager deviceTransactionManager;
- private final INode221 inode221;
+ //private final INode221 inode221;
private final INode121 inode121;
- public INode(DataSource dataSource, DeviceTransactionManager deviceTransactionManager, INode121 inode121,
- INode221 inode221) {
+ public INode(DataSource dataSource, DeviceTransactionManager deviceTransactionManager,
+ INode121 inode121
+ //, INode221 inode221
+ ) {
this.dataSource = dataSource;
this.deviceTransactionManager = deviceTransactionManager;
this.inode121 = inode121;
- this.inode221 = inode221;
+ //this.inode221 = inode221;
}
public boolean addNode(String deviceId, String openROADMversion) {
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 -->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
- odl:use-default-for-reference-types="true">
+ odl:use-default-for-reference-types="true" xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
<reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"
odl:type="default"/>
<argument ref="deviceTransactionManager"/>
</bean>
- <bean id="iNode22" class="org.opendaylight.transportpce.inventory.INode22">
- <argument ref="dataSource"/>
- <argument ref="deviceTransactionManager"/>
- </bean>
-
<bean id="iNode121" class="org.opendaylight.transportpce.inventory.INode121">
<argument ref="dataSource"/>
<argument ref="deviceTransactionManager"/>
<argument ref="dataSource"/>
<argument ref="deviceTransactionManager"/>
<argument ref="iNode121"/>
- <argument ref="iNode22"/>
+
</bean>
<bean id="overlayNetworkChangeListener"