geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r551314 - in /geronimo/sandbox/geronimo-netbeans-plugin: ./ src/main/java/org/apache/geronimo/netbeans/ src/main/java/org/apache/geronimo/netbeans/customizer/ src/main/java/org/apache/geronimo/netbeans/ide/ src/main/java/org/apache/geronimo...
Date Wed, 27 Jun 2007 20:36:39 GMT
Author: jlaskowski
Date: Wed Jun 27 13:36:38 2007
New Revision: 551314

URL: http://svn.apache.org/viewvc?view=rev&rev=551314
Log:
Migrate from ErrorManager to Logger (other serverplugins modules did this so it seems to be kinda NB logging standard)

Modified:
    geronimo/sandbox/geronimo-netbeans-plugin/   (props changed)
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeployer.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerDataSupport.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerSupport.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoJ2eePlatformFactory.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartRunnable.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartServer.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStopRunnable.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/LogWriter.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoInstantiatingIterator.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginProperties.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginUtils.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarApplicationsChildren.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarModulesChildren.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEjbModulesChildren.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoServletsChildren.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoWebApplicationsChildren.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/Util.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/OpenURLAction.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/ShowAdminToolAction.java
    geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/util/GeronimoProperties.java

Propchange: geronimo/sandbox/geronimo-netbeans-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 27 13:36:38 2007
@@ -0,0 +1 @@
+.classpath

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeployer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeployer.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeployer.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeployer.java Wed Jun 27 13:36:38 2007
@@ -26,6 +26,9 @@
 import java.util.Vector;
 import java.io.File;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.enterprise.deploy.spi.Target;
 import javax.enterprise.deploy.spi.TargetModuleID;
 import javax.enterprise.deploy.spi.status.ProgressEvent;
@@ -34,7 +37,6 @@
 import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
 import javax.enterprise.deploy.spi.status.ClientConfiguration;
 import javax.enterprise.deploy.spi.status.DeploymentStatus;
-import org.openide.ErrorManager;
 import org.openide.util.RequestProcessor;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
@@ -134,16 +136,16 @@
                 // wait until the url becomes active
                 checkUrlReady(moduleID);
             }
-        } catch (MalformedURLException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+        } catch (MalformedURLException mue) {
+            Logger.getLogger("global").log(Level.INFO, null, mue);
             fireHandleProgressEvent(null, new GeronimoDeploymentStatus(ActionType.EXECUTE, CommandType.DISTRIBUTE,
                     StateType.FAILED, "Failed"));
-        } catch (MissingResourceException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+        } catch (MissingResourceException mre) {
+            Logger.getLogger("global").log(Level.INFO, null, mre);
             fireHandleProgressEvent(null, new GeronimoDeploymentStatus(ActionType.EXECUTE, CommandType.DISTRIBUTE,
                     StateType.FAILED, "Failed"));
-        } catch (IOException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+        } catch (IOException ioe) {
+            Logger.getLogger("global").log(Level.INFO, null, ioe);
             fireHandleProgressEvent(null, new GeronimoDeploymentStatus(ActionType.EXECUTE, CommandType.DISTRIBUTE,
                     StateType.FAILED, "Failed"));
         }
@@ -165,7 +167,7 @@
                         new Object[] { searchPattern, null });
             }
         } catch (Exception ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         }
     }
 

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java Wed Jun 27 13:36:38 2007
@@ -1,7 +1,5 @@
 package org.apache.geronimo.netbeans;
 
-import java.util.HashMap;
-import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -14,23 +12,27 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.openide.ErrorManager;
-import org.openide.util.NbBundle;
+
+import javax.enterprise.deploy.shared.factories.DeploymentFactoryManager;
 import javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
 import javax.enterprise.deploy.spi.factories.DeploymentFactory;
-import javax.enterprise.deploy.shared.factories.DeploymentFactoryManager;
+
 import org.apache.geronimo.netbeans.ide.ui.GeronimoPluginProperties;
 import org.apache.geronimo.netbeans.ide.ui.GeronimoPluginUtils;
+import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.filesystems.Repository;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 
 /**
  * The DeploymentFactory interface is a deployment driver for a J2EE plaform product. It returns a DeploymentManager
@@ -114,7 +116,7 @@
                     GeronimoDeploymentFactory.class.getClassLoader());
             return loader;
         } catch (Exception e) {
-            ErrorManager.getDefault().notify(ErrorManager.EXCEPTION, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
         return null;
     }
@@ -141,7 +143,7 @@
                 factories.put(serverDir, factory);
             }
         } catch (Exception e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
 
         return factory;
@@ -175,7 +177,7 @@
         try {
             geronimoURI = uri.substring(0, uri.indexOf("&"));
         } catch (Exception e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
 
         return new GeronimoDeploymentManager(df.getDeploymentManager(geronimoURI, username, password), uri, username,
@@ -209,7 +211,7 @@
         try {
             geronimoURI = uri.substring(0, uri.indexOf("&")); // NOI18N
         } catch (Exception e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
 
         return new GeronimoDeploymentManager((df != null ? df.getDisconnectedDeploymentManager(geronimoURI) : null),
@@ -239,7 +241,7 @@
                 }
             }
         } catch (IOException ioe) {
-            ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ioe.getMessage());
+            Logger.getLogger("global").log(Level.INFO, null, ioe.getMessage());
         }
     }
 

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerDataSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerDataSupport.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerDataSupport.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerDataSupport.java Wed Jun 27 13:36:38 2007
@@ -3,6 +3,9 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.swing.ButtonModel;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JToggleButton;
@@ -14,11 +17,11 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.PlainDocument;
+
 import org.apache.geronimo.netbeans.util.GeronimoProperties;
 import org.netbeans.api.java.platform.JavaPlatform;
 import org.netbeans.api.java.platform.JavaPlatformManager;
 import org.netbeans.api.java.platform.Specification;
-import org.openide.ErrorManager;
 
 /**
  * Customizer data support keeps models for all the customizer components, initializes them, tracks model changes and
@@ -214,8 +217,8 @@
         if (text != null) {
             try {
                 doc.insertString(0, text, null);
-            } catch (BadLocationException e) {
-                ErrorManager.getDefault().notify(e);
+            } catch (BadLocationException ble) {
+                Logger.getLogger("global").log(Level.INFO, null, ble);
             }
         }
         return doc;
@@ -225,8 +228,8 @@
     private String getText(Document doc) {
         try {
             return doc.getText(0, doc.getLength());
-        } catch (BadLocationException e) {
-            ErrorManager.getDefault().notify(e);
+        } catch (BadLocationException ble) {
+            Logger.getLogger("global").log(Level.INFO, null, ble);
             return null;
         }
     }

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerSupport.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerSupport.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/customizer/CustomizerSupport.java Wed Jun 27 13:36:38 2007
@@ -16,6 +16,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.swing.AbstractListModel;
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
@@ -26,8 +29,8 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.filechooser.FileFilter;
+
 import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider;
-import org.openide.ErrorManager;
 import org.openide.NotifyDescriptor;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.NbBundle;
@@ -187,7 +190,7 @@
             }
             return l;
         } catch (MalformedURLException e) {
-            ErrorManager.getDefault().notify(e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
             return new ArrayList<URL>();
         }
     }
@@ -341,7 +344,7 @@
                 try {
                     url = new URL(url.toExternalForm() + "/"); // NOI18N
                 } catch (MalformedURLException mue) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, mue);
+                    Logger.getLogger("global").log(Level.INFO, null, mue);
                 }
             }
             int oldSize = data.size();

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoJ2eePlatformFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoJ2eePlatformFactory.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoJ2eePlatformFactory.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoJ2eePlatformFactory.java Wed Jun 27 13:36:38 2007
@@ -1,34 +1,36 @@
 package org.apache.geronimo.netbeans.ide;
 
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.List;
-import java.util.WeakHashMap;
-import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
 import java.io.File;
+import java.io.FilenameFilter;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.enterprise.deploy.spi.DeploymentManager;
+
+import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
+import org.apache.geronimo.netbeans.util.GeronimoProperties;
+import org.netbeans.api.java.platform.JavaPlatform;
 import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider;
 import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
+import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform;
+import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
 import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory;
 import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl;
 import org.netbeans.spi.project.libraries.LibraryImplementation;
-import org.openide.ErrorManager;
 import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileStateInvalidException;
 import org.openide.filesystems.FileUtil;
 import org.openide.filesystems.URLMapper;
-import org.openide.util.NbBundle;
-import javax.enterprise.deploy.spi.DeploymentManager;
-import java.io.FilenameFilter;
-import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
-import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
-import org.apache.geronimo.netbeans.util.GeronimoProperties;
-import org.netbeans.api.java.platform.JavaPlatform;
 import org.openide.modules.InstalledFileLocator;
+import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 
 public class GeronimoJ2eePlatformFactory extends J2eePlatformFactory {
@@ -181,13 +183,8 @@
                         return true;
                     }
                 }
-            } catch (Exception ex) {
-                try {
-                    ErrorManager.getDefault().annotate(ex, serviceFO.getURL().toString());
-                } catch (FileStateInvalidException fsie) {
-                    // noop
-                }
-                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            } catch (Exception e) {
+                Logger.getLogger("global").log(Level.INFO, null, e);
             }
             return false;
         }

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartRunnable.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartRunnable.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartRunnable.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartRunnable.java Wed Jun 27 13:36:38 2007
@@ -4,9 +4,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.enterprise.deploy.shared.ActionType;
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.shared.StateType;
+
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
 import org.apache.geronimo.netbeans.ide.ui.GeronimoPluginProperties;
 import org.apache.geronimo.netbeans.ide.ui.GeronimoPluginUtils;
@@ -15,7 +19,6 @@
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
 import org.netbeans.modules.j2ee.deployment.plugins.api.UISupport;
 import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerServerSettings;
-import org.openide.ErrorManager;
 import org.openide.execution.NbProcessDescriptor;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
@@ -96,12 +99,7 @@
                                 // because it may contain spaces
                                 value = "\"" + value + "\""; // NOI18N
                             } catch (IOException ioe) {
-                                ErrorManager.getDefault()
-                                        .annotate(
-                                                ioe,
-                                                NbBundle.getMessage(GeronimoStartRunnable.class,
-                                                        "ERR_NonProxyHostParsingError"));
-                                ErrorManager.getDefault().notify(ErrorManager.EXCEPTION, ioe);
+                                Logger.getLogger("global").log(Level.INFO, null, ioe);
                                 value = null;
                             }
                         }
@@ -219,7 +217,7 @@
         try {
             return pd.exec(null, envp, true, null);
         } catch (java.io.IOException ioe) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
+            Logger.getLogger("global").log(Level.INFO, null, ioe);
 
             final String serverLocation = ip.getProperty(GeronimoPluginProperties.PROPERTY_SERVER_DIR);
             final String serverRunFileName = serverLocation + (Utilities.isWindows() ? STARTUP_BAT : STARTUP_SH);

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartServer.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartServer.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStartServer.java Wed Jun 27 13:36:38 2007
@@ -1,32 +1,35 @@
 package org.apache.geronimo.netbeans.ide;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerServerSettings;
-import java.io.IOException;
-import java.io.File;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.enterprise.deploy.shared.ActionType;
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.shared.StateType;
-import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
-import org.netbeans.modules.j2ee.deployment.plugins.api.ServerDebugInfo;
-import org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer;
-import org.openide.ErrorManager;
-import org.openide.util.RequestProcessor;
-import java.util.Vector;
 import javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.Target;
 import javax.enterprise.deploy.spi.TargetModuleID;
-import javax.enterprise.deploy.spi.status.ProgressEvent;
-import javax.enterprise.deploy.spi.status.ProgressListener;
-import javax.enterprise.deploy.spi.status.ProgressObject;
 import javax.enterprise.deploy.spi.exceptions.OperationUnsupportedException;
 import javax.enterprise.deploy.spi.status.ClientConfiguration;
 import javax.enterprise.deploy.spi.status.DeploymentStatus;
+import javax.enterprise.deploy.spi.status.ProgressEvent;
+import javax.enterprise.deploy.spi.status.ProgressListener;
+import javax.enterprise.deploy.spi.status.ProgressObject;
+
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
 import org.apache.geronimo.netbeans.ide.ui.GeronimoPluginProperties;
+import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
+import org.netbeans.modules.j2ee.deployment.plugins.api.ServerDebugInfo;
+import org.netbeans.modules.j2ee.deployment.plugins.spi.StartServer;
+import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerServerSettings;
 import org.openide.util.NbBundle;
+import org.openide.util.RequestProcessor;
 
 public class GeronimoStartServer extends StartServer implements ProgressObject {
 
@@ -183,11 +186,11 @@
                     }
 
                     checkingServerDir = new File(serverDir).getCanonicalPath();
-                } catch (IllegalStateException ex) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                } catch (IllegalStateException e) {
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                     result = false;
-                } catch (IOException ex) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                } catch (IOException e) {
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                     result = false;
                 }
 

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStopRunnable.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStopRunnable.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStopRunnable.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/GeronimoStopRunnable.java Wed Jun 27 13:36:38 2007
@@ -3,15 +3,18 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.enterprise.deploy.shared.ActionType;
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.shared.StateType;
+
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
 import org.apache.geronimo.netbeans.ide.ui.GeronimoPluginProperties;
 import org.apache.geronimo.netbeans.util.GeronimoProperties;
 import org.netbeans.api.java.platform.JavaPlatform;
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
-import org.openide.ErrorManager;
 import org.openide.execution.NbProcessDescriptor;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
@@ -82,8 +85,8 @@
         try {
             String envp[] = createEnvironment();
             stoppingProcess = pd.exec(null, envp, true, null);
-        } catch (java.io.IOException ioe) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
+        } catch (java.io.IOException e) {
+            Logger.getLogger("global").log(Level.INFO, null, e);
 
             startServer.fireHandleProgressEvent(null, new GeronimoDeploymentStatus(ActionType.EXECUTE,
                     CommandType.STOP, StateType.FAILED, NbBundle.getMessage(GeronimoStopRunnable.class,

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/LogWriter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/LogWriter.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/LogWriter.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/LogWriter.java Wed Jun 27 13:36:38 2007
@@ -7,11 +7,14 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.enterprise.deploy.shared.ActionType;
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.shared.StateType;
+
 import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerSupport;
-import org.openide.ErrorManager;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
 import org.openide.util.RequestProcessor.Task;
@@ -94,8 +97,8 @@
         try {
             this.logFile = logFile;
             this.reader = new BufferedReader(new FileReader(logFile));
-        } catch (FileNotFoundException ioe) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ioe);
+        } catch (FileNotFoundException e) {
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
 
         // start the logging thread
@@ -361,7 +364,7 @@
                 try {
                     reader.close();
                 } catch (IOException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             }
             try {
@@ -373,7 +376,7 @@
                 }
                 reader = new BufferedReader(new FileReader(logFile));
             } catch (IOException e) {
-                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                Logger.getLogger("global").log(Level.INFO, null, e);
             }
         }
     }
@@ -402,7 +405,7 @@
                     }
                 }
             } catch (IOException e) {
-                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                Logger.getLogger("global").log(Level.INFO, null, e);
             }
             return ready;
         }

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoInstantiatingIterator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoInstantiatingIterator.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoInstantiatingIterator.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoInstantiatingIterator.java Wed Jun 27 13:36:38 2007
@@ -5,20 +5,22 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.swing.JComponent;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+
 import org.apache.geronimo.netbeans.GeronimoDeploymentFactory;
+import org.netbeans.modules.j2ee.deployment.impl.ui.wizard.AddServerInstanceWizard;
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException;
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
 import org.openide.DialogDisplayer;
-import org.openide.ErrorManager;
 import org.openide.NotifyDescriptor;
 import org.openide.WizardDescriptor;
 import org.openide.util.NbBundle;
-import org.netbeans.modules.j2ee.deployment.impl.ui.wizard.AddServerInstanceWizard;
 
 public class GeronimoInstantiatingIterator implements WizardDescriptor.InstantiatingIterator, ChangeListener {
 
@@ -107,7 +109,7 @@
         } catch (InstanceCreationException e) {
             showInformation(e.getLocalizedMessage(), NbBundle.getMessage(AddServerPropertiesVisualPanel.class,
                     "MSG_INSTANCE_REGISTRATION_FAILED"));
-            ErrorManager.getDefault().log(ErrorManager.EXCEPTION, e.getMessage());
+            Logger.getLogger("global").log(Level.INFO, null, e.getMessage());
         }
 
         return result;

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginProperties.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginProperties.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginProperties.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginProperties.java Wed Jun 27 13:36:38 2007
@@ -1,12 +1,16 @@
 package org.apache.geronimo.netbeans.ide.ui;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.openide.filesystems.FileLock;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileSystem;
 import org.openide.filesystems.Repository;
-import org.openide.ErrorManager;
 
 public class GeronimoPluginProperties {
 
@@ -40,17 +44,17 @@
                 propertiesFile = getPropertiesFile();
                 if (null != propertiesFile)
                     inStream = propertiesFile.getInputStream();
-            } catch (java.io.FileNotFoundException e) {
-                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
-            } catch (java.io.IOException e) {
-                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            } catch (FileNotFoundException fnfe) {
+                Logger.getLogger("global").log(Level.INFO, null, fnfe);
+            } catch (IOException ioe) {
+                Logger.getLogger("global").log(Level.INFO, null, ioe);
             } finally {
                 loadPluginProperties(inStream);
                 if (null != inStream)
                     inStream.close();
             }
         } catch (java.io.IOException e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
 
     }
@@ -61,7 +65,7 @@
             try {
                 inProps.load(inStream);
             } catch (java.io.IOException e) {
-                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                Logger.getLogger("global").log(Level.INFO, null, e);
             }
         String loc = inProps.getProperty(INSTALL_ROOT_KEY);
         if (loc != null) {// try to get the default value
@@ -103,7 +107,7 @@
                     if (null != outStream)
                         outProp.store(outStream, "");
                 } catch (java.io.IOException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 } finally {
                     if (null != outStream)
                         outStream.close();
@@ -112,7 +116,7 @@
                 }
             }
         } catch (java.io.IOException e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
     }
 

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginUtils.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginUtils.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/ide/ui/GeronimoPluginUtils.java Wed Jun 27 13:36:38 2007
@@ -8,8 +8,11 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.xml.parsers.DocumentBuilderFactory;
-import org.openide.ErrorManager;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -162,7 +165,7 @@
                 }
             }
         } catch (Exception e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
         return "";
     }
@@ -204,7 +207,7 @@
                 }
             }
         } catch (Exception e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
         return "";
     }

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarApplicationsChildren.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarApplicationsChildren.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarApplicationsChildren.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarApplicationsChildren.java Wed Jun 27 13:36:38 2007
@@ -3,11 +3,14 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.QueryExp;
+
 import org.apache.geronimo.netbeans.nodes.actions.Refreshable;
-import org.openide.ErrorManager;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
@@ -58,12 +61,12 @@
                             name = name.substring(1, name.length() - 1);
 
                             keys.add(new GeronimoEarApplicationNode(name, lookup));
-                        } catch (Exception ex) {
-                            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                        } catch (Exception e) {
+                            Logger.getLogger("global").log(Level.INFO, null, e);
                         }
                     }
-                } catch (Exception ex) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                } catch (Exception e) {
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
 
                 setKeys(keys);

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarModulesChildren.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarModulesChildren.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarModulesChildren.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEarModulesChildren.java Wed Jun 27 13:36:38 2007
@@ -3,11 +3,14 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.QueryExp;
+
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
-import org.openide.ErrorManager;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
@@ -59,12 +62,12 @@
                                 keys.add(new GeronimoWebModuleNode(name, lookup, (context == null) ? null : url
                                         + context));
                             }
-                        } catch (Exception ex) {
-                            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                        } catch (Exception e) {
+                            Logger.getLogger("global").log(Level.INFO, null, e);
                         }
                     }
-                } catch (Exception ex) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                } catch (Exception e) {
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
 
                 setKeys(keys);

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEjbModulesChildren.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEjbModulesChildren.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEjbModulesChildren.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoEjbModulesChildren.java Wed Jun 27 13:36:38 2007
@@ -4,11 +4,14 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.QueryExp;
+
 import org.apache.geronimo.netbeans.nodes.actions.Refreshable;
-import org.openide.ErrorManager;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
@@ -68,8 +71,8 @@
                 keys.add(new GeronimoEjbModuleNode(name, lookup));
             }
 
-        } catch (Exception ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+        } catch (Exception e) {
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
     }
 
@@ -89,12 +92,12 @@
                     ObjectName elem = ((ObjectInstance) it.next()).getObjectName();
                     String name = elem.getKeyProperty("module"); // NOI18N
                     keys.add(new GeronimoEjbModuleNode(name, lookup, true));
-                } catch (Exception ex) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                } catch (Exception e) {
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             }
-        } catch (Exception ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+        } catch (Exception e) {
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
     }
 

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoServletsChildren.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoServletsChildren.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoServletsChildren.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoServletsChildren.java Wed Jun 27 13:36:38 2007
@@ -4,11 +4,14 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.QueryExp;
-import org.openide.ErrorManager;
+
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
@@ -55,19 +58,19 @@
                         throw new IllegalArgumentException("TODO");
                     }
                 } catch (MalformedObjectNameException ex) {
-                    ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ex.getMessage());
+                    Logger.getLogger("global").log(Level.INFO, null, ex.getMessage());
                 } catch (NullPointerException ex) {
-                    ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ex.getMessage());
+                    Logger.getLogger("global").log(Level.INFO, null, ex.getMessage());
                 } catch (IllegalArgumentException ex) {
-                    ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ex.getMessage());
+                    Logger.getLogger("global").log(Level.INFO, null, ex.getMessage());
                 } catch (SecurityException ex) {
-                    ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ex.getMessage());
+                    Logger.getLogger("global").log(Level.INFO, null, ex.getMessage());
                 } catch (InvocationTargetException ex) {
-                    ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ex.getMessage());
+                    Logger.getLogger("global").log(Level.INFO, null, ex.getMessage());
                 } catch (IllegalAccessException ex) {
-                    ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ex.getMessage());
+                    Logger.getLogger("global").log(Level.INFO, null, ex.getMessage());
                 } catch (NoSuchMethodException ex) {
-                    ErrorManager.getDefault().log(ErrorManager.EXCEPTION, ex.getMessage());
+                    Logger.getLogger("global").log(Level.INFO, null, ex.getMessage());
                 }
 
                 setKeys(keys);

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoWebApplicationsChildren.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoWebApplicationsChildren.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoWebApplicationsChildren.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/GeronimoWebApplicationsChildren.java Wed Jun 27 13:36:38 2007
@@ -3,6 +3,8 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
@@ -10,7 +12,6 @@
 
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
 import org.apache.geronimo.netbeans.nodes.actions.Refreshable;
-import org.openide.ErrorManager;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
@@ -84,11 +85,11 @@
                             }
                             keys.add(new GeronimoWebModuleNode(name, lookup, (context == null ? null : url + context)));
                         } catch (Exception ex) {
-                            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                            Logger.getLogger("global").log(Level.INFO, null, ex);
                         }
                     }
                 } catch (Exception ex) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                    Logger.getLogger("global").log(Level.INFO, null, ex);
                 }
 
                 setKeys(keys);

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/Util.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/Util.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/Util.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/Util.java Wed Jun 27 13:36:38 2007
@@ -4,6 +4,9 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.enterprise.deploy.shared.ModuleType;
 import javax.management.AttributeNotFoundException;
 import javax.management.InstanceNotFoundException;
@@ -15,8 +18,8 @@
 import javax.management.ReflectionException;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
-import org.openide.ErrorManager;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
@@ -76,19 +79,19 @@
             if (managedObj.size() == 0)
                 return false;
         } catch (SecurityException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (IllegalArgumentException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (IllegalAccessException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (InvocationTargetException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (NoSuchMethodException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (MalformedObjectNameException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (NullPointerException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         }
 
         return true;
@@ -106,15 +109,15 @@
             if (managedObj.size() > 0)
                 return true;
         } catch (IllegalArgumentException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (SecurityException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (InvocationTargetException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (IllegalAccessException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (NoSuchMethodException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         }
 
         return false;
@@ -144,21 +147,21 @@
         try {
             return server.getAttribute(new ObjectName(targetObject), name);
         } catch (InstanceNotFoundException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (AttributeNotFoundException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (MalformedObjectNameException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (NullPointerException ex) {
             // it's normal behaviour when the server is not running
         } catch (IllegalArgumentException ex) {
             // it's normal behaviour when the server is not running
         } catch (ReflectionException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (MBeanException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         } catch (IOException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         }
 
         return null;
@@ -181,14 +184,13 @@
             doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(
                     new ByteArrayInputStream(dd.getBytes()));
         } catch (SAXException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
             return null;
         } catch (IOException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+            Logger.getLogger("global").log(Level.INFO, null, ex);
             return null;
         } catch (ParserConfigurationException ex) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
-            return null;
+            Logger.getLogger("global").log(Level.INFO, null, ex);
         }
 
         org.w3c.dom.Node node = doc.getElementsByTagName("context-root").item(0);

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/OpenURLAction.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/OpenURLAction.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/OpenURLAction.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/OpenURLAction.java Wed Jun 27 13:36:38 2007
@@ -2,7 +2,9 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import org.openide.ErrorManager;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.openide.awt.HtmlBrowser.URLDisplayer;
 import org.openide.nodes.Node;
 import org.openide.util.HelpCtx;
@@ -22,7 +24,7 @@
                 try {
                     URLDisplayer.getDefault().showURL(new URL(oCookie.getWebURL()));
                 } catch (MalformedURLException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             }
         }

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/ShowAdminToolAction.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/ShowAdminToolAction.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/ShowAdminToolAction.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/nodes/actions/ShowAdminToolAction.java Wed Jun 27 13:36:38 2007
@@ -10,7 +10,6 @@
 
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
 import org.apache.geronimo.netbeans.nodes.GeronimoManagerNode;
-import org.openide.ErrorManager;
 import org.openide.awt.HtmlBrowser.URLDisplayer;
 import org.openide.nodes.Node;
 import org.openide.util.HelpCtx;
@@ -42,8 +41,8 @@
                 try {
                     URL url = new URL(((GeronimoManagerNode) node).getAdminURL());
                     URLDisplayer.getDefault().showURL(url);
-                } catch (MalformedURLException ex) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, ex);
+                } catch (MalformedURLException e) {
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             }
         }

Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/util/GeronimoProperties.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/util/GeronimoProperties.java?view=diff&rev=551314&r1=551313&r2=551314
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/util/GeronimoProperties.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/main/java/org/apache/geronimo/netbeans/util/GeronimoProperties.java Wed Jun 27 13:36:38 2007
@@ -15,13 +15,13 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.geronimo.netbeans.GeronimoDeploymentManager;
 import org.apache.geronimo.netbeans.customizer.CustomizerSupport;
 import org.netbeans.api.java.platform.JavaPlatform;
 import org.netbeans.api.java.platform.JavaPlatformManager;
 import org.netbeans.api.java.platform.Specification;
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
-import org.openide.ErrorManager;
 import org.openide.filesystems.FileUtil;
 import org.openide.modules.InstalledFileLocator;
 import org.openide.util.NbCollections;
@@ -121,13 +121,13 @@
                 try {
                     list.add(fileToUrl(jsfAPI));
                 } catch (MalformedURLException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             } else if ((jsfAPI = new File(serverDir, "/repository/jsf-libs/jsf-api.jar")).exists()) { // NOI18N
                 try {
                     list.add(fileToUrl(jsfAPI));
                 } catch (MalformedURLException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             }
 
@@ -136,17 +136,17 @@
                 try {
                     list.add(fileToUrl(jsfIMPL));
                 } catch (MalformedURLException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             } else if ((jsfIMPL = new File(serverDir, "/repository/jsf-libs/jsf-impl.jar")).exists()) { // NOI18N
                 try {
                     list.add(fileToUrl(jsfIMPL));
                 } catch (MalformedURLException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             }
         } catch (MalformedURLException e) {
-            ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+            Logger.getLogger("global").log(Level.INFO, null, e);
         }
         return list;
     }
@@ -168,7 +168,7 @@
                 try {
                     l.add(fileToUrl(files[i]));
                 } catch (MalformedURLException e) {
-                    ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                    Logger.getLogger("global").log(Level.INFO, null, e);
                 }
             }
         }
@@ -197,7 +197,7 @@
                     list.add(fileToUrl(j2eeDoc));
                 }
             } catch (MalformedURLException e) {
-                ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+                Logger.getLogger("global").log(Level.INFO, null, e);
             }
             return list;
         }



Mime
View raw message