<version>1.6.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
- <jolokia-bridge.version>0.2.0-SNAPSHOT</jolokia-bridge.version>
- <jolokia.version>1.1.4</jolokia.version>
+ <jolokia.version>1.3.1</jolokia.version>
+ <odl-jolokia-osgi.version>0.3.0-SNAPSHOT</odl-jolokia-osgi.version>
</properties>
<dependencies>
<artifactId>jolokia-osgi</artifactId>
<version>${jolokia.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>odl-jolokia-osgi</artifactId>
+ <version>${odl-jolokia-osgi.version}</version>
+ <type>cfg</type>
+ <classifier>configuration</classifier>
+ </dependency>
</dependencies>
<scm>
<feature version="${project.version}">odl-jolokia</feature>
</feature>
<feature name="odl-jolokia" version="${project.version}" description="Jolokia JMX/HTTP bridge">
+ <configfile finalname="/etc/org.jolokia.osgi.cfg">mvn:org.opendaylight.controller/odl-jolokia-osgi/{{VERSION}}/cfg/configuration</configfile>
<feature>http</feature>
<bundle>mvn:org.jolokia/jolokia-osgi/{{VERSION}}</bundle>
</feature>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>commons.opendaylight</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <relativePath>../opendaylight</relativePath>
+ </parent>
+
+ <artifactId>odl-jolokia-osgi</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/classes/org.jolokia.osgi.cfg</file>
+ <type>cfg</type>
+ <classifier>configuration</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <tag>HEAD</tag>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ </scm>
+</project>
--- /dev/null
+#ODL Default Jolokia Configuration File
+org.jolokia.authMode=basic
+org.jolokia.user=admin
+org.jolokia.password=admin
<module>opendaylight/commons/liblldp</module>
<module>opendaylight/commons/enunciate-parent</module>
<module>benchmark</module>
+ <module>opendaylight/commons/jolokia</module>
<!-- Karaf Distribution -->
<module>karaf</module>