You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2020/03/07 19:55:57 UTC
[juddi] branch master updated: JUDDI-1003 updates spring web
dependency JUDDI-1005 related,
fixes the distrubtion so that the executable jar for the migration tool is
included NOJIRA minor jsp code cleanup
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juddi.git
The following commit(s) were added to refs/heads/master by this push:
new a28db0a JUDDI-1003 updates spring web dependency JUDDI-1005 related, fixes the distrubtion so that the executable jar for the migration tool is included NOJIRA minor jsp code cleanup
a28db0a is described below
commit a28db0a7a6f30a15bcdd588057a1cfb410a9ff28
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Sat Mar 7 14:55:55 2020 -0500
JUDDI-1003 updates spring web dependency
JUDDI-1005 related, fixes the distrubtion so that the executable jar for the migration tool is included
NOJIRA minor jsp code cleanup
---
juddiv3-war/src/main/webapp/admin/mbeans.jsp | 25 +++----------------------
pom.xml | 4 ++--
uddi-client-dist/pom.xml | 1 +
3 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/juddiv3-war/src/main/webapp/admin/mbeans.jsp b/juddiv3-war/src/main/webapp/admin/mbeans.jsp
index 8fd0b12..e5411e5 100644
--- a/juddiv3-war/src/main/webapp/admin/mbeans.jsp
+++ b/juddiv3-war/src/main/webapp/admin/mbeans.jsp
@@ -38,30 +38,18 @@
} else {
long totalsuccess = 0;
long totalfailures = 0;
- String[] domains = mbserver.getDomains();
- for (int i = 0; i < domains.length; i++) {
- // out.write(domains[i] + "<br>");
- }
+
ObjectName juddi = new ObjectName("apache.juddi:counter=*");
juddi.setMBeanServer(mbserver);
Set<ObjectName> beans = mbserver.queryNames(juddi, null);
Iterator<ObjectName> it = beans.iterator();
while (it.hasNext()) {
ObjectName n = it.next();
- // out.write(n.getCanonicalName() + " ");
- // out.write(n.getKeyPropertyListString() + "<Br>");
- Hashtable<String, String> props = n.getKeyPropertyList();
- Iterator<Entry<String, String>> it2 = props.entrySet().iterator();
- while (it2.hasNext()) {
- Entry<String, String> e = it2.next();
-// out.write("key = " + e.getKey() + "<br>");
- // out.write("value = " + e.getValue() + "<br>");
- }
+
AttributeList j = (AttributeList) mbserver.getAttributes(n, new String[]{"counter"});
for (int k = 0; k < j.size(); k++) {
String attr = j.get(k).toString();
String[] kv = attr.split("=");
- //out.write("attr = " + kv[0] + " value = " + kv[1] + "<br>");
data.put(kv[0], kv[1]);
if (kv[0].toLowerCase().contains("success")) {
totalsuccess+= Long.parseLong(kv[1].trim());
@@ -71,18 +59,11 @@
}
}
- // out.write(j.getClass().getCanonicalName() + "<br>");
}
data.put("totalsuccess", totalsuccess);
data.put("totalfailures", totalfailures);
}
- // out.write("<br>");
- // out.write("<br>");
- // out.write("<br>");
- // List<MemoryPoolMXBean> memPoolBeans = ManagementFactory.getMemoryPoolMXBeans();
- // for (MemoryPoolMXBean mpb : memPoolBeans) {
- // out.write("Memory Pool: " + mpb.getName() + "<br>");
- //}
+
out.write(new org.json.JSONObject(data).toString());
%>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9364d70..a0c160e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cxf.version>3.3.4</cxf.version>
- <springframework.version>5.2.3.RELEASE</springframework.version>
- <apache.tomcat.version>9.0.30</apache.tomcat.version>
+ <springframework.version>5.2.4.RELEASE</springframework.version>
+ <apache.tomcat.version>9.0.31</apache.tomcat.version>
<jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
<jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
diff --git a/uddi-client-dist/pom.xml b/uddi-client-dist/pom.xml
index b2b8c11..65076c6 100644
--- a/uddi-client-dist/pom.xml
+++ b/uddi-client-dist/pom.xml
@@ -54,6 +54,7 @@ language governing permissions and * limitations under the License. * */ -->
<groupId>org.apache.juddi</groupId>
<artifactId>uddi-migration-tool</artifactId>
<version>${project.parent.version}</version>
+ <classifier>jar-with-dependencies</classifier>
</dependency>
<dependency>
<groupId>org.apache.juddi</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org