honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Marvel: update project integration in x-plugins 

Minor fixes to finish Marvel's agent integration into x-plugins project

Original commit: elastic/x-pack-elasticsearch@5fd9501893
This commit is contained in:
Tanguy Leroux 2015-07-21 10:40:52 +02:00
parent 91786f4662
commit a1870b70bf
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
marvel/pom.xml
View File

@ -7,10 +7,10 @@
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-marvel</artifactId> <artifactId>elasticsearch-marvel</artifactId>
<name>Elastic X-Plugins - Marvel</name> <name>Elasticsearch X-Plugins - Marvel</name>
<parent> <parent>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>x-plugins</artifactId> <artifactId>x-plugins</artifactId>
<version>2.0.0-beta1-SNAPSHOT</version> <version>2.0.0-beta1-SNAPSHOT</version>
</parent> </parent>

2
marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
View File

@ -22,7 +22,7 @@ public class MarvelVersion implements Serializable {
// the (internal) format of the id is there so we can easily do after/before checks on the id // the (internal) format of the id is there so we can easily do after/before checks on the id
public static final int V_2_0_0_Beta1_ID = /*00*/2000001; public static final int V_2_0_0_Beta1_ID = /*00*/2000001;
public static final MarvelVersion V_2_0_0_Beta1 = new MarvelVersion(V_2_0_0_Beta1_ID, true, Version.V_2_0_0_Beta1, LicenseVersion.V_1_0_0); public static final MarvelVersion V_2_0_0_Beta1 = new MarvelVersion(V_2_0_0_Beta1_ID, true, Version.V_2_0_0_beta1, LicenseVersion.V_1_0_0);
public static final MarvelVersion CURRENT = V_2_0_0_Beta1; public static final MarvelVersion CURRENT = V_2_0_0_Beta1;

3
marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java
View File

@ -9,6 +9,7 @@ import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.elasticsearch.action.admin.cluster.node.info.PluginInfo; import org.elasticsearch.action.admin.cluster.node.info.PluginInfo;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.license.plugin.LicensePlugin;
import org.elasticsearch.marvel.agent.AgentService; import org.elasticsearch.marvel.agent.AgentService;
import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.plugins.PluginsService;
import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.ElasticsearchIntegrationTest;
@ -26,7 +27,7 @@ public class MarvelPluginTests extends ElasticsearchIntegrationTest {
protected Settings nodeSettings(int nodeOrdinal) { protected Settings nodeSettings(int nodeOrdinal) {
return Settings.settingsBuilder() return Settings.settingsBuilder()
.put(super.nodeSettings(nodeOrdinal)) .put(super.nodeSettings(nodeOrdinal))
.put("plugin.types", MarvelPlugin.class.getName()) .put("plugin.types", MarvelPlugin.class.getName() + "," + LicensePlugin.class.getName())
.put(PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, false) .put(PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, false)
.build(); .build();
} }

1
pom.xml
View File

@ -130,5 +130,6 @@
<module>license</module> <module>license</module>
<module>shield</module> <module>shield</module>
<module>watcher</module> <module>watcher</module>
<module>marvel</module>
</modules> </modules>
</project> </project>