From 7213ff0c76fb235080e83265b9d43d033b2cc3f6 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 15 Jan 2012 16:36:17 +0000 Subject: [PATCH] * Build: Put Implementation-Version in manifests --- apps/addressbook/build.xml | 2 ++ apps/i2psnark/java/build.xml | 2 ++ apps/i2ptunnel/java/build.xml | 2 ++ apps/ministreaming/java/build.xml | 1 + apps/routerconsole/java/build.xml | 2 ++ .../java/src/net/i2p/router/web/FileDumpHelper.java | 9 +++++---- apps/sam/java/build.xml | 1 + apps/streaming/java/build.xml | 1 + apps/susidns/src/build.xml | 1 + apps/susimail/build.xml | 1 + apps/systray/java/build.xml | 1 + build.xml | 4 +++- core/java/build.xml | 1 + router/java/build.xml | 1 + 14 files changed, 24 insertions(+), 5 deletions(-) diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml index 2fe77475c..ad27a0090 100644 --- a/apps/addressbook/build.xml +++ b/apps/addressbook/build.xml @@ -55,6 +55,7 @@ + @@ -73,6 +74,7 @@ + diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml index edc92ed5b..c5a3b106f 100644 --- a/apps/i2psnark/java/build.xml +++ b/apps/i2psnark/java/build.xml @@ -60,6 +60,7 @@ + @@ -98,6 +99,7 @@ + diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml index 1778ffb87..1b6227914 100644 --- a/apps/i2ptunnel/java/build.xml +++ b/apps/i2ptunnel/java/build.xml @@ -62,6 +62,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml index 8904bafb3..235088fc3 100644 --- a/apps/ministreaming/java/build.xml +++ b/apps/ministreaming/java/build.xml @@ -50,6 +50,7 @@ + diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index f49153486..f8014d8d1 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -90,6 +90,7 @@ + @@ -169,6 +170,7 @@ + diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java index 6c95734f7..eea306aa2 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java @@ -113,17 +113,18 @@ public class FileDumpHelper extends HelperBase { if (att == null) att = new Attributes(); buf.append(""); + String iv = getAtt(att, "Implementation-Version"); + if (iv != null) + buf.append("").append(iv).append(""); String s = getAtt(att, "Base-Revision"); if (s != null && s.length() > 20) { + if (iv != null) + buf.append("
"); buf.append("" + "").append(s.substring(0, 20)).append("" + "
" + "").append(s.substring(20)).append("
"); - } else { - s = getAtt(att, "Implementation-Version"); - if (s != null) - buf.append("").append(s).append(""); } buf.append(""); s = getAtt(att, "Created-By"); diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml index d55ed0d61..4433c0575 100644 --- a/apps/sam/java/build.xml +++ b/apps/sam/java/build.xml @@ -66,6 +66,7 @@ + diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml index b5c842f5b..5f278f307 100644 --- a/apps/streaming/java/build.xml +++ b/apps/streaming/java/build.xml @@ -63,6 +63,7 @@ + diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml index d287e5a4d..3fff55a34 100644 --- a/apps/susidns/src/build.xml +++ b/apps/susidns/src/build.xml @@ -97,6 +97,7 @@ + diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml index 8a8d33c4a..3368283d1 100644 --- a/apps/susimail/build.xml +++ b/apps/susimail/build.xml @@ -45,6 +45,7 @@ + diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml index 4dd50f0c9..5baf4ab62 100644 --- a/apps/systray/java/build.xml +++ b/apps/systray/java/build.xml @@ -44,6 +44,7 @@ + diff --git a/build.xml b/build.xml index dd49fd8cb..298f08089 100644 --- a/build.xml +++ b/build.xml @@ -182,12 +182,14 @@ - + + + diff --git a/core/java/build.xml b/core/java/build.xml index d62750859..c3eaf5c07 100644 --- a/core/java/build.xml +++ b/core/java/build.xml @@ -58,6 +58,7 @@ + diff --git a/router/java/build.xml b/router/java/build.xml index ea9f7b613..e933086cf 100644 --- a/router/java/build.xml +++ b/router/java/build.xml @@ -72,6 +72,7 @@ +