Merge pull request #7901 from tevans78/revertPR7524-from-19.0.0.6

Revert "Fix inject trace"
OpenLiberty · Jun 17, 2019 · 0950189 · 0950189
2 parents a710257 + 8ebb586
commit 0950189
Show file tree

Hide file tree

Showing 70 changed files with 333 additions and 659 deletions.
diff --git a/...pp.manager.war/src/com/ibm/ws/app/manager/ear/internal/EARDeployedAppInfoFactoryImpl.java b/...pp.manager.war/src/com/ibm/ws/app/manager/ear/internal/EARDeployedAppInfoFactoryImpl.java
@@ -48,9 +48,7 @@
 @Component(service = DeployedAppInfoFactory.class,
            property = { "service.vendor=IBM", "type:String=ear" })
 public class EARDeployedAppInfoFactoryImpl extends AbstractDeployedAppInfoFactory implements DeployedAppInfoFactory {
-    private static final TraceComponent _tc = Tr.register(EARDeployedAppInfoFactoryImpl.class, new String[] { "webcontainer", "applications", "app.manager" },
-                                                          "com.ibm.ws.app.manager.war.internal.resources.Messages",
-                                                          "com.ibm.ws.app.manager.ear.internal.EARDeployedAppInfoFactoryImpl");
+    private static final TraceComponent _tc = Tr.register(EARDeployedAppInfoFactoryImpl.class);
 
     @Reference
     protected DeployedAppServices deployedAppServices;
@@ -178,7 +176,7 @@ protected WsResource resolveExpansion(String appName) {
      * time stamp.
      *
      * @param absPath The absolute path of the file which is to be tested.
-     * @param file    The file which is to be tested.
+     * @param file The file which is to be tested.
      *
      * @return The new time stamp of the file, if the file is to be expanded.
      *         Null if the file is not to be expanded.
@@ -274,11 +272,11 @@ protected void expand(
      * expand the application to the expanded applications location.
      *
      * @param appInfo Information for the application for which to create
-     *                    deployment information.
+     *            deployment information.
      * @return Deployment information for the application.
      *
      * @throws UnableToAdaptException Thrown if the deployment information
-     *                                    count not be created.
+     *             count not be created.
      */
     @Override
     public DeployedAppInfo createDeployedAppInfo(ApplicationInformation<DeployedAppInfo> appInfo) throws UnableToAdaptException {

diff --git a/...om.ibm.ws.app.manager/src/com/ibm/ws/app/manager/internal/monitor/ApplicationMonitor.java b/...om.ibm.ws.app.manager/src/com/ibm/ws/app/manager/internal/monitor/ApplicationMonitor.java
@@ -334,9 +334,9 @@ private static abstract class BaseApplicationListener implements com.ibm.ws.adap
         /**
          * Constructs a new instance of this listener and creates the notifier to which we'll be registered. It does not actually start the listener though.
          *
-         * @param applicationProperties          The properties for the application being monitored
+         * @param applicationProperties The properties for the application being monitored
          * @param monitoringContainerInformation Information about which containers notification mechanism we should be using and which entries and containers within it we should
-         *                                           be listening to
+         *            be listening to
          * @throws UnableToAdaptException If we cannot adapt the root container to a {@link Notifier}
          */
         public BaseApplicationListener(Notification monitoringInformation,
@@ -372,7 +372,6 @@ private synchronized void stop() {
          *
          * @return This listener's ID.
          */
-        @Override
         public String getId() {
             return id;
         }
@@ -390,9 +389,9 @@ private static final class RootApplicationListener extends BaseApplicationListen
         /**
          * Constructs a new instance of this listener and creates the notifier to which we'll be registered. It does not actually start the listener though.
          *
-         * @param applicationProperties          The properties for the application being monitored
+         * @param applicationProperties The properties for the application being monitored
          * @param monitoringContainerInformation Information about which containers notification mechanism we should be using and which entries and containers within it we should
-         *                                           be listening to
+         *            be listening to
          * @throws UnableToAdaptException If we cannot adapt the root container to a {@link Notifier}
          */
         public RootApplicationListener(Container container,
@@ -445,9 +444,9 @@ private static final class ApplicationListener extends BaseApplicationListener {
         /**
          * Constructs a new instance of this listener and creates the notifier to which we'll be registered. It does not actually start the listener though.
          *
-         * @param applicationProperties          The properties for the application being monitored
+         * @param applicationProperties The properties for the application being monitored
          * @param monitoringContainerInformation Information about which containers notification mechanism we should be using and which entries and containers within it we should
-         *                                           be listening to
+         *            be listening to
          * @throws UnableToAdaptException If we cannot adapt the root container to a {@link Notifier} of if we cannot adapt the app's container to a ClassLoadingButler
          */
         public ApplicationListener(Notification monitoringInformation,
@@ -521,9 +520,9 @@ private static final class CompleteApplicationListener extends BaseApplicationLi
         /**
          * Constructs a new instance of this listener and creates the notifier to which we'll be registered. It does not actually start the listener though.
          *
-         * @param applicationProperties          The properties for the application being monitored
+         * @param applicationProperties The properties for the application being monitored
          * @param monitoringContainerInformation Information about which containers notification mechanism we should be using and which entries and containers within it we should
-         *                                           be listening to
+         *            be listening to
          * @throws UnableToAdaptException If we cannot adapt the root container to a {@link Notifier}
          */
         public CompleteApplicationListener(Container container,

diff --git a/dev/com.ibm.ws.app.manager/src/com/ibm/ws/app/manager/internal/monitor/DropinMonitor.java b/dev/com.ibm.ws.app.manager/src/com/ibm/ws/app/manager/internal/monitor/DropinMonitor.java
@@ -54,9 +54,7 @@
            configurationPolicy = ConfigurationPolicy.IGNORE,
            property = "service.vendor=IBM")
 public class DropinMonitor {
-    private static final TraceComponent _tc = Tr.register(DropinMonitor.class, new String[] { "applications", com.ibm.ws.app.manager.internal.AppManagerConstants.TRACE_GROUP },
-                                                          com.ibm.ws.app.manager.internal.AppManagerConstants.TRACE_MESSAGES,
-                                                          "com.ibm.ws.app.manager.internal.monitor.DropinMonitor");
+    private static final TraceComponent _tc = Tr.register(DropinMonitor.class);
 
     private BundleContext _ctx;
     private WsLocationAdmin locationService;
@@ -349,7 +347,7 @@ private String getAppLocation(File currentFile) {
     /**
      * Returns the message helper for the specified application handler type.
      *
-     * @param type     application handler type
+     * @param type application handler type
      * @param fileName file name from which type can be inferred if not specified
      * @return the message helper for the specified application handler type.
      */
@@ -386,9 +384,9 @@ private AppMessageHelper getAppMessageHelper(String type, String fileName) {
      * Takes a file and an optional file type, and updates the file. If no type is given it will use the
      * extension of the file given.
      *
-     * @param ca          the configuration admin service.
+     * @param ca the configuration admin service.
      * @param currentFile the file of the application to install. Can be a directory
-     * @param type        the type of the application.
+     * @param type the type of the application.
      *
      */
     private void startApplication(File currentFile, String type) {

diff --git a/...ws.beanvalidation.core/src/com/ibm/ws/beanvalidation/service/Validation20ClassLoader.java b/...ws.beanvalidation.core/src/com/ibm/ws/beanvalidation/service/Validation20ClassLoader.java
@@ -31,7 +31,7 @@
  * It should return the correct validation.xml for the module currently under execution.
  */
 public class Validation20ClassLoader extends ClassLoader {
-    private static final TraceComponent tc = Tr.register(Validation20ClassLoader.class, null, null);
+    private static final TraceComponent tc = Tr.register(Validation20ClassLoader.class);
     String moduleHint;
 
     public Validation20ClassLoader(ClassLoader parent, String hint) {

diff --git a/dev/com.ibm.ws.classloading/src/com/ibm/ws/classloading/internal/Util.java b/dev/com.ibm.ws.classloading/src/com/ibm/ws/classloading/internal/Util.java
@@ -29,7 +29,7 @@
 
 @Trivial
 final class Util {
-    static final TraceComponent tc = Tr.register(Util.class,"ClassLoadingService","com.ibm.ws.classloading.internal.resources.ClassLoadingServiceMessages");
+    static final TraceComponent tc = Tr.register(Util.class);
 
     private Util() {
         throw null;

diff --git a/dev/com.ibm.ws.classloading/src/com/ibm/ws/library/internal/Util.java b/dev/com.ibm.ws.classloading/src/com/ibm/ws/library/internal/Util.java
@@ -26,7 +26,7 @@
 import java.util.zip.ZipFile;
 
 public enum Util {;
-    private static final TraceComponent tc = Tr.register(Util.class,SharedLibraryConstants.TR_GROUP, SharedLibraryConstants.NLS_PROPS);
+    private static final TraceComponent tc = Tr.register(Util.class);
 
     @FFDCIgnore(PrivilegedActionException.class)
     static boolean isArchive(final File f) {

diff --git a/dev/com.ibm.ws.classloading/src/com/ibm/wsspi/classloading/ApiType.java b/dev/com.ibm.ws.classloading/src/com/ibm/wsspi/classloading/ApiType.java
@@ -39,7 +39,7 @@ public enum ApiType {
 
     // OSGi APIs are marked spec:api, which is obviously not in this enum.
     // This means that OSGi application API will not be visible to EE applications.
-    private static final TraceComponent tc = Tr.register(ApiType.class,"ClassLoadingService", "com.ibm.ws.classloading.internal.resources.ClassLoadingServiceMessages");
+    private static final TraceComponent tc = Tr.register(ApiType.class);
 
     private final String attributeName;
 

diff --git a/dev/com.ibm.ws.httpservice/src/com/ibm/ws/httpsvc/internal/HttpServiceContainer.java b/dev/com.ibm.ws.httpservice/src/com/ibm/ws/httpsvc/internal/HttpServiceContainer.java
@@ -38,7 +38,7 @@
  * bundle.
  */
 public class HttpServiceContainer implements HttpContainer {
-    private static final TraceComponent tc = Tr.register(HttpServiceContainer.class, com.ibm.ws.httpsvc.internal.HttpSvcConstants.TRACE_GROUP, null);
+    private static final TraceComponent tc = Tr.register(HttpServiceContainer.class);
 
     private static final class SingletonSessionManager {
         static final SessionManager instance = new SessionManager();
@@ -61,7 +61,7 @@ public HttpServiceContainer() {
 
     /**
      * Activate this DS component.
-     *
+     * 
      * @param context
      * @throws Exception
      */
@@ -77,7 +77,7 @@ protected void activate(ComponentContext context) throws Exception {
 
     /**
      * Deactivate this DS component.
-     *
+     * 
      * @param context
      * @throws Exception
      */
@@ -137,7 +137,7 @@ public synchronized void removeContextRoot(String contextRoot) {
     /**
      * DS method for runtime updates to configuration without stopping and
      * restarting the component.
-     *
+     * 
      * @param properties
      */
     protected void modified(Map<?, ?> properties) {
@@ -151,7 +151,7 @@ protected void modified(Map<?, ?> properties) {
 
     /**
      * Process configuration information.
-     *
+     * 
      * @param properties
      */
     protected synchronized void processConfig(Dictionary<?, ?> properties) {

diff --git a/dev/com.ibm.ws.httpservice/src/com/ibm/ws/httpsvc/internal/RegisteredHttpServiceImpl.java b/dev/com.ibm.ws.httpservice/src/com/ibm/ws/httpsvc/internal/RegisteredHttpServiceImpl.java
@@ -45,7 +45,7 @@
  *
  */
 public class RegisteredHttpServiceImpl implements ExtHttpService {
-    private static final TraceComponent tc = Tr.register(RegisteredHttpServiceImpl.class, com.ibm.ws.httpsvc.internal.HttpSvcConstants.TRACE_GROUP, null);
+    private static final TraceComponent tc = Tr.register(RegisteredHttpServiceImpl.class);
 
     /** DS-managed reference to the HTTP Container */
     private HttpServiceContainer container;
@@ -67,12 +67,14 @@ protected void unsetHttpContainer(HttpServiceContainer ref) {}
     private Set<Filter> localFilters;
     private ServletContextManager contextManager;
 
-    private final Object servletLock = new Object() {};
-    private final Object filterLock = new Object() {};
+    private final Object servletLock = new Object()
+    {};
+    private final Object filterLock = new Object()
+    {};
 
     /**
      * Activate this component.
-     *
+     * 
      * @param ctxt
      */
     protected void activate(ComponentContext ctxt) {
@@ -90,7 +92,7 @@ protected void activate(ComponentContext ctxt) {
 
     /**
      * Deactivate this component.
-     *
+     * 
      * @param ctxt
      */
     protected void deactivate(ComponentContext ctxt, int reason) {