Skip to content

Commit c4b6c98

Browse files
committed
use REST for nodetool info
1 parent 0d94d6e commit c4b6c98

19 files changed

+1724
-5
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "scylla-jmx"]
2+
branch = master
3+
url = git@github.com:scylladb/scylla-jmx.git
4+
path = scylla-jmx

build.xml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
4141
<property name="build.lib" value="${basedir}/lib"/>
4242
<property name="build.dir" value="${basedir}/build"/>
43+
<property name="build.scylla-jmx-parent" value="${basedir}/scylla-jmx/scylla-jmx-parent/"/>
44+
<property name="build.scylla-apiclient" value="${basedir}/scylla-jmx/scylla-apiclient/target"/>
4345
<property name="build.dir.lib" value="${basedir}/build/lib"/>
4446
<property name="build.test.dir" value="${build.dir}/test"/>
4547
<property name="build.classes" value="${build.dir}/classes"/>
@@ -166,6 +168,11 @@
166168
<exclude name="**/*-sources.jar"/>
167169
<exclude name="**/ant-*.jar"/>
168170
</fileset>
171+
<fileset dir="${build.scylla-apiclient}">
172+
<include name="**/scylla-apiclient*.jar" />
173+
<exclude name="**/*-sources.jar"/>
174+
<exclude name="**/ant-*.jar"/>
175+
</fileset>
169176
</path>
170177

171178
<macrodef name="create-javadoc">
@@ -453,6 +460,19 @@
453460
<dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6" />
454461
<dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/>
455462
<dependency groupId="org.ow2.asm" artifactId="asm" version="5.0.4" />
463+
464+
<dependency groupId="org.glassfish.jersey.core" artifactId="jersey-common" version="2.22.1" />
465+
<dependency groupId="javax.ws.rs" artifactId="javax.ws.rs-api" version="2.0.1" />
466+
<dependency groupId="javax.ws.rs" artifactId="jsr311-api" version="1.1.1" />
467+
<dependency groupId="org.glassfish.jersey.core" artifactId="jersey-client" version="2.22.1" />
468+
<dependency groupId="org.glassfish" artifactId="javax.json" version="1.0.4" />
469+
<dependency groupId="javax.activation" artifactId="activation" version="1.1" />
470+
<dependency groupId="com.google.guava" artifactId="guava" version="18.0" />
471+
<dependency groupId="com.google.collections" artifactId="google-collections" version="1.0" />
472+
<dependency groupId="javax.activation" artifactId="activation" version="1.1" />
473+
<dependency groupId="javax.annotation" artifactId="javax.annotation-api" version="1.2" />
474+
<dependency groupId="org.glassfish.jersey.bundles.repackaged" artifactId="jersey-guava" version="2.22.1" />
475+
456476
</dependencyManagement>
457477
<developer id="adelapena" name="Andres de la Peña"/>
458478
<developer id="alakshman" name="Avinash Lakshman"/>
@@ -816,7 +836,7 @@
816836
depends="maven-ant-tasks-retrieve-build,build-project" description="Compile Cassandra classes"/>
817837
<target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
818838

819-
<target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
839+
<target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,mvn-scylla-apiclient-jar"
820840
name="build-project">
821841
<echo message="${ant.project.name}: ${ant.file}"/>
822842
<!-- Order matters! -->
@@ -1054,6 +1074,17 @@
10541074
</jar>
10551075
</target>
10561076

1077+
<target name="mvn-scylla-apiclient-jar">
1078+
<artifact:mvn mavenVersion="${maven.version}" pom="${build.scylla-jmx-parent}/pom.xml">
1079+
<arg value="-pl"/>
1080+
<arg value=":scylla-apiclient"/>
1081+
<arg value="package"/>
1082+
</artifact:mvn>
1083+
<copy todir="${build.lib}">
1084+
<fileset dir="${build.scylla-apiclient}" includes="*.jar"/>
1085+
</copy>
1086+
</target>
1087+
10571088
<!-- creates release tarballs -->
10581089
<target name="artifacts" depends="jar,javadoc,gen-doc"
10591090
description="Create Cassandra release artifacts">
@@ -1069,6 +1100,7 @@
10691100
<include name="${final.scylla-tools.name}.jar" />
10701101
<include name="${ant.project.name}-thrift-${version}.jar" />
10711102
</fileset>
1103+
<fileset dir="${build.scylla-apiclient}" includes="*.jar"/>
10721104
</copy>
10731105
<copy todir="${dist.dir}/javadoc">
10741106
<fileset dir="${javadoc.dir}"/>
@@ -1216,6 +1248,7 @@
12161248
<include name="commons*.jar"/>
12171249
</zipgroupfileset>
12181250
<zipgroupfileset dir="${build.lib}" includes="*.jar"/>
1251+
<zipgroupfileset dir="${build.scylla-apiclient}" includes="*.jar"/>
12191252
</jar>
12201253
<jar jarfile="${build.test.dir}/benchmarks.jar">
12211254
<manifest>

lib/hk2-api-2.4.0-b31.jar

169 KB
Binary file not shown.

lib/hk2-locator-2.4.0-b31.jar

175 KB
Binary file not shown.

lib/hk2-utils-2.4.0-b31.jar

98.7 KB
Binary file not shown.

lib/javax.annotation-api-1.2.jar

25.7 KB
Binary file not shown.

lib/javax.inject-2.4.0-b31.jar

5.81 KB
Binary file not shown.

lib/javax.json-1.0.4.jar

83.2 KB
Binary file not shown.

lib/javax.json-api-1.0.jar

19.3 KB
Binary file not shown.

lib/javax.ws.rs-api-2.0.1.jar

113 KB
Binary file not shown.

0 commit comments

Comments
 (0)