Updated NMU diff.
diff -Nru gmetric4j-1.0.6/build.xml gmetric4j-1.0.10/build.xml
--- gmetric4j-1.0.6/build.xml 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="gmetric4j" basedir="." default="jar">
-
- <property name="dest" value="classes"/>
- <property name="lib" value="lib"/>
- <property name="src" value="src/main"/>
- <property name="gmetric4j.jar" value="gmetric4j.jar"/>
-
- <path id="project.class.path">
- <pathelement location="${dest}"/>
- <pathelement location="${lib}/oncrpc-1.0.7.jar"/>
- <pathelement location="${lib}/junit-4.1.jar"/>
- </path>
-
- <target name="init">
- <mkdir dir="${dest}"/>
- </target>
-
- <target name="compile" depends="init">
- <javac classpathref="project.class.path"
- debug="true"
- deprecation="true"
- destdir="${dest}"
- nowarn="false"
- target="1.5"
- source="1.5">
- <src path="${src}"/>
- </javac>
- </target>
-
- <target name="jar" depends="compile">
- <jar compress="true" destfile="${gmetric4j.jar}">
- <fileset dir="${dest}"/>
- </jar>
- </target>
-
-</project>
diff -Nru gmetric4j-1.0.6/debian/changelog gmetric4j-1.0.10/debian/changelog
--- gmetric4j-1.0.6/debian/changelog 2014-03-02 20:33:25.000000000 +0100
+++ gmetric4j-1.0.10/debian/changelog 2020-05-03 21:38:08.000000000 +0200
@@ -1,3 +1,12 @@
+gmetric4j (1.0.10-0.1) unstable; urgency=medium
+
+ * Non maintainer upload.
+ * New upstream release. (Closes: #955718)
+ * Update Uploaders. (Closes: #953444)
+ * Fix watchfile. (Closes: #959681)
+
+ -- Tobias Frost <t...@debian.org> Sun, 03 May 2020 21:38:08 +0200
+
gmetric4j (1.0.6-2) unstable; urgency=low
* Recommend ganglia-monitor
diff -Nru gmetric4j-1.0.6/debian/control gmetric4j-1.0.10/debian/control
--- gmetric4j-1.0.6/debian/control 2014-03-02 20:34:03.000000000 +0100
+++ gmetric4j-1.0.10/debian/control 2020-05-03 21:38:08.000000000 +0200
@@ -2,7 +2,6 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
-Uploaders: Daniel Pocock <dan...@pocock.com.au>
Build-Depends: debhelper (>= 9), cdbs (>= 0.4.5.3), default-jdk, remotetea
Build-Depends-Indep: maven-repo-helper (>> 0.5), maven-ant-helper (>> 4), ant, ant-optional,
Standards-Version: 3.9.5
diff -Nru gmetric4j-1.0.6/debian/watch gmetric4j-1.0.10/debian/watch
--- gmetric4j-1.0.6/debian/watch 2014-03-01 15:38:07.000000000 +0100
+++ gmetric4j-1.0.10/debian/watch 2020-05-03 20:53:13.000000000 +0200
@@ -1,2 +1,3 @@
-version=3
-https://github.com/ganglia/gmetric4j/tags .*/tarball/(\d[\d\.]+)
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/gmetric4j-$1\.tar\.gz/ \
+ https://github.com/ganglia/gmetric4j/tags .*/v?(\d\S+)\.tar\.gz
diff -Nru gmetric4j-1.0.6/pom.xml gmetric4j-1.0.10/pom.xml
--- gmetric4j-1.0.6/pom.xml 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/pom.xml 2015-02-28 12:48:03.000000000 +0100
@@ -4,8 +4,8 @@
<groupId>info.ganglia.gmetric4j</groupId>
<artifactId>gmetric4j</artifactId>
<name>gmetric4j</name>
- <packaging>jar</packaging>
- <version>1.0.6</version>
+ <packaging>bundle</packaging>
+ <version>1.0.10</version>
<description>JVM instrumentation to Ganglia</description>
<url>http://github.com/ganglia/gmetric4j</url>
<licenses>
@@ -29,7 +29,8 @@
<developer>
<id>pocock</id>
<name>Daniel Pocock</name>
- <email>dan...@pocock.com.au</email>
+ <email>dan...@pocock.pro</email>
+ <url>http://danielpocock.com</url>
</developer>
</developers>
<dependencies>
@@ -41,9 +42,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.acplt</groupId>
- <artifactId>oncrpc</artifactId>
- <version>1.0.7</version>
+ <groupId>org.acplt.remotetea</groupId>
+ <artifactId>remotetea-oncrpc</artifactId>
+ <version>1.1.2</version>
</dependency>
</dependencies>
<parent>
@@ -118,6 +119,24 @@
</descriptors>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>info.ganglia.gmetric4j.*</Export-Package>
+ <Import-Package>
+ *
+ </Import-Package>
+ <Implementation-Title>gmetric4j</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
diff -Nru gmetric4j-1.0.6/README gmetric4j-1.0.10/README
--- gmetric4j-1.0.6/README 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/README 2015-02-28 12:48:03.000000000 +0100
@@ -2,8 +2,6 @@
gmetric4j - gmetric and gmond functionality in Java
Version
- gmetric4j 1.0.3
-
The latest version of this software and document will always be found at
http://github.com/ganglia/gmetric4j
@@ -23,7 +21,7 @@
Copyright
- Copyright (C) 2010-2013 Daniel Pocock <dan...@pocock.com.au>
+ Copyright (C) 2010-2015 Daniel Pocock <dan...@pocock.com.au>
Copyright (c) 2008-2011 Jasper Humphrey <jasper...@gmail.com>
diff -Nru gmetric4j-1.0.6/src/main/java/info/ganglia/gmetric4j/gmetric/GMetricPublisher.java gmetric4j-1.0.10/src/main/java/info/ganglia/gmetric4j/gmetric/GMetricPublisher.java
--- gmetric4j-1.0.6/src/main/java/info/ganglia/gmetric4j/gmetric/GMetricPublisher.java 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/src/main/java/info/ganglia/gmetric4j/gmetric/GMetricPublisher.java 2015-02-28 12:48:03.000000000 +0100
@@ -11,8 +11,15 @@
public void publish(String processName, String attributeName, String value,
GMetricType type, GMetricSlope slope, String units) throws GangliaException {
+ publish(processName, attributeName, value, type, slope, 60, 0, units);
+ }
+
+ @Override
+ public void publish(String processName, String attributeName, String value,
+ GMetricType type, GMetricSlope slope, int delay, int lifetime, String units)
+ throws GangliaException {
gm.announce(attributeName, value, type, units,
- slope, 60, 0, processName);
+ slope, delay, lifetime, processName);
}
}
diff -Nru gmetric4j-1.0.6/src/main/java/info/ganglia/gmetric4j/gmetric/Protocolv31x.java gmetric4j-1.0.10/src/main/java/info/ganglia/gmetric4j/gmetric/Protocolv31x.java
--- gmetric4j-1.0.6/src/main/java/info/ganglia/gmetric4j/gmetric/Protocolv31x.java 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/src/main/java/info/ganglia/gmetric4j/gmetric/Protocolv31x.java 2015-02-28 12:48:03.000000000 +0100
@@ -26,16 +26,21 @@
private Map<String,Integer> metricCounterMap = new HashMap<String, Integer>();
private int metadataMessageInterval;
private UUID uuid;
- private String spoofName;
+ private boolean isSpoofName;
private String localHostName;
public Protocolv31x(String group, int port, UDPAddressingMode mode, int ttl,
- int metadataMessageInterval, UUID uuid, String spoof) throws IOException {
+ int metadataMessageInterval, UUID uuid, String spoofName) throws IOException {
super(group, port, mode, ttl);
this.metadataMessageInterval = metadataMessageInterval ;
this.uuid = uuid;
- this.spoofName = spoof;
- this.localHostName = InetAddress.getLocalHost().getHostName();
+ if (spoofName != null && !spoofName.isEmpty()) {
+ this.isSpoofName = true;
+ this.localHostName = spoofName;
+ } else {
+ this.isSpoofName = false;
+ this.localHostName = InetAddress.getLocalHost().getHostName();
+ }
}
private boolean isTimeToSendMetadata( String metricName ) {
@@ -60,16 +65,8 @@
int dmax, String groupName) throws Exception {
Ganglia_metric_id metric_id = new Ganglia_metric_id();
- /*
- * Handle spoofing. No syntax checking done here !!!!
- */
- if (spoofName == null) {
- metric_id.host = localHostName;
- metric_id.spoof = false;
- } else {
- metric_id.host = spoofName;
- metric_id.spoof = true;
- }
+ metric_id.spoof = isSpoofName;
+ metric_id.host = localHostName;
metric_id.name = name;
if ( isTimeToSendMetadata( name ) ) {
diff -Nru gmetric4j-1.0.6/src/main/java/info/ganglia/gmetric4j/Publisher.java gmetric4j-1.0.10/src/main/java/info/ganglia/gmetric4j/Publisher.java
--- gmetric4j-1.0.6/src/main/java/info/ganglia/gmetric4j/Publisher.java 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/src/main/java/info/ganglia/gmetric4j/Publisher.java 2015-02-28 12:48:03.000000000 +0100
@@ -8,4 +8,9 @@
void publish( String processName, String attributeName,
String value, GMetricType type, GMetricSlope slope, String units )
throws GangliaException;
+
+ void publish( String processName, String attributeName,
+ String value, GMetricType type, GMetricSlope slope, int delay,
+ int lifetime, String units )
+ throws GangliaException;
}
diff -Nru gmetric4j-1.0.6/src/main/resources/META-INF/MANIFEST.MF gmetric4j-1.0.10/src/main/resources/META-INF/MANIFEST.MF
--- gmetric4j-1.0.6/src/main/resources/META-INF/MANIFEST.MF 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/src/main/resources/META-INF/MANIFEST.MF 2015-02-28 12:48:03.000000000 +0100
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
-Boot-Class-Path: oncrpc-1.0.7.jar
+Boot-Class-Path: remotetea-oncrpc.jar
Can-Redefine-Classes: false
diff -Nru gmetric4j-1.0.6/src/test/java/info/ganglia/gmetric4j/gmetric/GMetricIT.java gmetric4j-1.0.10/src/test/java/info/ganglia/gmetric4j/gmetric/GMetricIT.java
--- gmetric4j-1.0.6/src/test/java/info/ganglia/gmetric4j/gmetric/GMetricIT.java 2014-03-01 15:28:35.000000000 +0100
+++ gmetric4j-1.0.10/src/test/java/info/ganglia/gmetric4j/gmetric/GMetricIT.java 2015-02-28 12:48:03.000000000 +0100
@@ -17,7 +17,7 @@
@Before
public void setUp() throws IOException {
- instance = new GMetric("localhost", 8649, UDPAddressingMode.MULTICAST, 1, true);
+ instance = new GMetric("239.2.11.71", 8649, UDPAddressingMode.MULTICAST, 1, true);
}
/**
