1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorBase.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorBase.java Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -26,14 +26,11 @@
1.11 package com.sun.xml.internal.ws.server;
1.12
1.13 import com.sun.istack.internal.NotNull;
1.14 -import com.sun.istack.internal.Nullable;
1.15 import com.sun.xml.internal.ws.api.EndpointAddress;
1.16 import com.sun.xml.internal.ws.api.config.management.policy.ManagedClientAssertion;
1.17 import com.sun.xml.internal.ws.api.config.management.policy.ManagedServiceAssertion;
1.18 import com.sun.xml.internal.ws.api.config.management.policy.ManagementAssertion.Setting;
1.19 -import com.sun.xml.internal.ws.api.server.BoundEndpoint;
1.20 import com.sun.xml.internal.ws.api.server.Container;
1.21 -import com.sun.xml.internal.ws.api.server.Module;
1.22 import com.sun.xml.internal.ws.api.server.WSEndpoint;
1.23 import com.sun.xml.internal.ws.client.Stub;
1.24 import com.sun.org.glassfish.external.amx.AMXGlassfish;
1.25 @@ -45,16 +42,11 @@
1.26 import com.sun.org.glassfish.gmbal.ManagedObjectManagerFactory;
1.27 import java.io.IOException;
1.28 import java.lang.reflect.*;
1.29 -import java.net.URL;
1.30 -import java.util.List;
1.31 import java.util.logging.Level;
1.32 import java.util.logging.Logger;
1.33 -import javax.management.ObjectName;
1.34 -import javax.xml.namespace.QName;
1.35
1.36 // BEGIN IMPORTS FOR RewritingMOM
1.37 import java.util.ResourceBundle ;
1.38 -import java.io.Closeable ;
1.39 import java.lang.reflect.AnnotatedElement ;
1.40 import java.lang.annotation.Annotation ;
1.41 import javax.management.ObjectName ;
1.42 @@ -276,7 +268,7 @@
1.43 ObjectName ignoredName = mom.getObjectName(mom.getRoot());
1.44 // The name is null when the MOM is a NOOP.
1.45 if (ignoredName != null) {
1.46 - logger.log(Level.INFO, "Metro monitoring rootname successfully set to: " + ignoredName);
1.47 + logger.log(Level.INFO, "Metro monitoring rootname successfully set to: {0}", ignoredName);
1.48 }
1.49 return mom;
1.50 }
1.51 @@ -300,19 +292,6 @@
1.52 }
1.53 }
1.54
1.55 - public static void closeMOM(ManagedObjectManager mom) {
1.56 - try {
1.57 - final ObjectName name = mom.getObjectName(mom.getRoot());
1.58 - // The name is null when the MOM is a NOOP.
1.59 - if (name != null) {
1.60 - logger.log(Level.INFO, "Closing Metro monitoring root: " + name);
1.61 - }
1.62 - mom.close();
1.63 - } catch (java.io.IOException e) {
1.64 - logger.log(Level.WARNING, "Ignoring error when closing Managed Object Manager", e);
1.65 - }
1.66 - }
1.67 -
1.68 private static Setting clientMonitoring = Setting.NOT_SET;
1.69 private static Setting endpointMonitoring = Setting.NOT_SET;
1.70 private static int typelibDebug = -1;
1.71 @@ -382,7 +361,6 @@
1.72 private final ManagedObjectManager mom;
1.73
1.74 private final static String gmbalQuotingCharsRegex = "\n|\\|\"|\\*|\\?|:|=|,";
1.75 - private final static String jmxQuotingCharsRegex = ",|=|:|\"";
1.76 private final static String replacementChar = "-";
1.77
1.78 RewritingMOM(final ManagedObjectManager mom) { this.mom = mom; }
1.79 @@ -393,42 +371,42 @@
1.80
1.81 // The interface
1.82
1.83 - public void suspendJMXRegistration() { mom.suspendJMXRegistration(); }
1.84 - public void resumeJMXRegistration() { mom.resumeJMXRegistration(); }
1.85 - public GmbalMBean createRoot() { return mom.createRoot(); }
1.86 - public GmbalMBean createRoot(Object root) { return mom.createRoot(root); }
1.87 - public GmbalMBean createRoot(Object root, String name) {
1.88 + @Override public void suspendJMXRegistration() { mom.suspendJMXRegistration(); }
1.89 + @Override public void resumeJMXRegistration() { mom.resumeJMXRegistration(); }
1.90 + @Override public GmbalMBean createRoot() { return mom.createRoot(); }
1.91 + @Override public GmbalMBean createRoot(Object root) { return mom.createRoot(root); }
1.92 + @Override public GmbalMBean createRoot(Object root, String name) {
1.93 return mom.createRoot(root, rewrite(name));
1.94 }
1.95 - public Object getRoot() { return mom.getRoot(); }
1.96 - public GmbalMBean register(Object parent, Object obj, String name) {
1.97 + @Override public Object getRoot() { return mom.getRoot(); }
1.98 + @Override public GmbalMBean register(Object parent, Object obj, String name) {
1.99 return mom.register(parent, obj, rewrite(name));
1.100 }
1.101 - public GmbalMBean register(Object parent, Object obj) { return mom.register(parent, obj);}
1.102 - public GmbalMBean registerAtRoot(Object obj, String name) {
1.103 + @Override public GmbalMBean register(Object parent, Object obj) { return mom.register(parent, obj);}
1.104 + @Override public GmbalMBean registerAtRoot(Object obj, String name) {
1.105 return mom.registerAtRoot(obj, rewrite(name));
1.106 }
1.107 - public GmbalMBean registerAtRoot(Object obj) { return mom.registerAtRoot(obj); }
1.108 - public void unregister(Object obj) { mom.unregister(obj); }
1.109 - public ObjectName getObjectName(Object obj) { return mom.getObjectName(obj); }
1.110 - public AMXClient getAMXClient(Object obj) { return mom.getAMXClient(obj); }
1.111 - public Object getObject(ObjectName oname) { return mom.getObject(oname); }
1.112 - public void stripPrefix(String... str) { mom.stripPrefix(str); }
1.113 - public void stripPackagePrefix() { mom.stripPackagePrefix(); }
1.114 - public String getDomain() { return mom.getDomain(); }
1.115 - public void setMBeanServer(MBeanServer server){mom.setMBeanServer(server); }
1.116 - public MBeanServer getMBeanServer() { return mom.getMBeanServer(); }
1.117 - public void setResourceBundle(ResourceBundle rb) { mom.setResourceBundle(rb); }
1.118 - public ResourceBundle getResourceBundle() { return mom.getResourceBundle(); }
1.119 - public void addAnnotation(AnnotatedElement element, Annotation annotation) { mom.addAnnotation(element, annotation); }
1.120 - public void setRegistrationDebug(RegistrationDebugLevel level) { mom.setRegistrationDebug(level); }
1.121 - public void setRuntimeDebug(boolean flag) { mom.setRuntimeDebug(flag); }
1.122 - public void setTypelibDebug(int level) { mom.setTypelibDebug(level); }
1.123 - public String dumpSkeleton(Object obj) { return mom.dumpSkeleton(obj); }
1.124 - public void suppressDuplicateRootReport(boolean suppressReport) { mom.suppressDuplicateRootReport(suppressReport); }
1.125 - public void close() throws IOException { mom.close(); }
1.126 - public void setJMXRegistrationDebug(boolean x) { mom.setJMXRegistrationDebug(x); }
1.127 - public boolean isManagedObject(Object x) { return mom.isManagedObject(x); }
1.128 + @Override public GmbalMBean registerAtRoot(Object obj) { return mom.registerAtRoot(obj); }
1.129 + @Override public void unregister(Object obj) { mom.unregister(obj); }
1.130 + @Override public ObjectName getObjectName(Object obj) { return mom.getObjectName(obj); }
1.131 + @Override public AMXClient getAMXClient(Object obj) { return mom.getAMXClient(obj); }
1.132 + @Override public Object getObject(ObjectName oname) { return mom.getObject(oname); }
1.133 + @Override public void stripPrefix(String... str) { mom.stripPrefix(str); }
1.134 + @Override public void stripPackagePrefix() { mom.stripPackagePrefix(); }
1.135 + @Override public String getDomain() { return mom.getDomain(); }
1.136 + @Override public void setMBeanServer(MBeanServer server){mom.setMBeanServer(server); }
1.137 + @Override public MBeanServer getMBeanServer() { return mom.getMBeanServer(); }
1.138 + @Override public void setResourceBundle(ResourceBundle rb) { mom.setResourceBundle(rb); }
1.139 + @Override public ResourceBundle getResourceBundle() { return mom.getResourceBundle(); }
1.140 + @Override public void addAnnotation(AnnotatedElement element, Annotation annotation) { mom.addAnnotation(element, annotation); }
1.141 + @Override public void setRegistrationDebug(RegistrationDebugLevel level) { mom.setRegistrationDebug(level); }
1.142 + @Override public void setRuntimeDebug(boolean flag) { mom.setRuntimeDebug(flag); }
1.143 + @Override public void setTypelibDebug(int level) { mom.setTypelibDebug(level); }
1.144 + @Override public String dumpSkeleton(Object obj) { return mom.dumpSkeleton(obj); }
1.145 + @Override public void suppressDuplicateRootReport(boolean suppressReport) { mom.suppressDuplicateRootReport(suppressReport); }
1.146 + @Override public void close() throws IOException { mom.close(); }
1.147 + @Override public void setJMXRegistrationDebug(boolean x) { mom.setJMXRegistrationDebug(x); }
1.148 + @Override public boolean isManagedObject(Object x) { return mom.isManagedObject(x); }
1.149 }
1.150
1.151 // End of file.
