Author: Grid.Qian Date: 2008-06-10 23:15:05 -0400 (Tue, 10 Jun 2008) New Revision: 8701 Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java Log: JBIDE-2261: add log for exception Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-06-10 23:55:46 UTC (rev 8700) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-06-11 03:15:05 UTC (rev 8701) @@ -15,8 +15,6 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -30,13 +28,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.osgi.util.NLS; -import org.jboss.tools.ws.core.JbossWSCorePlugin; -import org.jboss.tools.ws.core.classpath.JbossWSRuntime; -import org.jboss.tools.ws.core.classpath.JbossWSRuntimeListConverter; -import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager; import org.jboss.tools.ws.core.messages.JbossWSCoreMessages; /** Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-06-10 23:55:46 UTC (rev 8700) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-06-11 03:15:05 UTC (rev 8701) @@ -34,6 +34,7 @@ import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.jboss.tools.ws.core.utils.StatusUtils; +import org.jboss.tools.ws.creation.core.JBossWSCreationCore; import org.jboss.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; @@ -66,6 +67,7 @@ project = JBossWSCreationUtils.getJavaProjectByName(model .getWebProjectName()); } catch (JavaModelException e) { + JBossWSCreationCore.getDefault().logError(e); return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } @@ -92,6 +94,7 @@ null); clientCls.save(null, true); } catch (Exception e1) { + JBossWSCreationCore.getDefault().logError(e1); return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } @@ -111,6 +114,7 @@ clientClsType.createMethod(sb.toString(), null, true, null); clientCls.save(null, true); } catch (JavaModelException e) { + JBossWSCreationCore.getDefault().logError(e); return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } @@ -250,7 +254,7 @@ } } } catch (JavaModelException e) { - e.printStackTrace(); + JBossWSCreationCore.getDefault().logError(e); } return units; } @@ -320,6 +324,7 @@ wrapperCls.save(null, true); return wrapperCls; } catch (Exception e) { + JBossWSCreationCore.getDefault().logError(e); return null; } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-06-10 23:55:46 UTC (rev 8700) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2008-06-11 03:15:05 UTC (rev 8701) @@ -23,6 +23,7 @@ import org.eclipse.wst.ws.internal.wsrt.IWebService; import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient; import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; +import org.jboss.tools.ws.creation.core.JBossWSCreationCore; import org.jboss.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; @@ -62,6 +63,7 @@ .getWsdlURL()); model.setCustomPackage(reader.packageFromTargetNamespace()); } catch (WSDLException e) { + JBossWSCreationCore.getDefault().logError(e); return StatusUtils.errorStatus(e.getLocalizedMessage(), e); } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2008-06-10 23:55:46 UTC (rev 8700) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/RemoveClientJarsCommand.java 2008-06-11 03:15:05 UTC (rev 8701) @@ -25,6 +25,7 @@ import org.jboss.tools.ws.core.classpath.JbossWSRuntimeClassPathInitializer.JbossWSRuntimeClasspathContainer; import org.jboss.tools.ws.core.messages.JbossWSCoreMessages; import org.jboss.tools.ws.core.utils.StatusUtils; +import org.jboss.tools.ws.creation.core.JBossWSCreationCore; import org.jboss.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; @@ -56,6 +57,7 @@ project = JBossWSCreationUtils.getJavaProjectByName(model .getWebProjectName()); } catch (JavaModelException e) { + JBossWSCreationCore.getDefault().logError(e); return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample); } status = removeClassPath(project); @@ -75,14 +77,12 @@ } } } catch (JavaModelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + JBossWSCreationCore.getDefault().logError(e); } try { project.getRawClasspath(); } catch (JavaModelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + JBossWSCreationCore.getDefault().logError(e); } return status; } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-06-10 23:55:46 UTC (rev 8700) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImpl.java 2008-06-11 03:15:05 UTC (rev 8701) @@ -21,6 +21,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.jboss.tools.ws.core.utils.StatusUtils; +import org.jboss.tools.ws.creation.core.JBossWSCreationCore; import org.jboss.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; @@ -59,6 +60,7 @@ .errorStatus(JBossWSCreationCoreMessages.Error_No_Annotation); } } catch (JavaModelException e) { + JBossWSCreationCore.getDefault().logError(e); return StatusUtils.errorStatus(NLS.bind( JBossWSCreationCoreMessages.Error_No_Class, new String[] { implClass, project })); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java 2008-06-10 23:55:46 UTC (rev 8700) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSProviderInvokeCommand.java 2008-06-11 03:15:05 UTC (rev 8701) @@ -17,6 +17,7 @@ import java.io.LineNumberReader; import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; @@ -24,8 +25,8 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.jboss.tools.ws.core.JbossWSCorePlugin; import org.jboss.tools.ws.core.utils.StatusUtils; +import org.jboss.tools.ws.creation.core.JBossWSCreationCore; import org.jboss.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; @@ -44,8 +45,15 @@ public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - String runtimeLocation = JbossWSCorePlugin.getDefault() - .getPreferenceStore().getString("jbosswsruntimelocation"); + String runtimeLocation; + try { + runtimeLocation = JBossWSCreationUtils.getJbossWSRuntimeLocation(ResourcesPlugin.getWorkspace().getRoot().getProject(model + .getWebProjectName())); + } catch (CoreException e1) { + JBossWSCreationCore.getDefault().logError(e1); + //unable to get runtime location + return e1.getStatus(); + } String commandLocation = runtimeLocation + Path.SEPARATOR + "bin"; String command = "sh wsprovide.sh "; if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) { @@ -72,9 +80,9 @@ } } catch (IOException e) { - e.printStackTrace(); + JBossWSCreationCore.getDefault().logError(e); } catch (InterruptedException e) { - e.printStackTrace(); + JBossWSCreationCore.getDefault().logError(e); } refreshProject(model.getWebProjectName(), monitor); @@ -87,8 +95,7 @@ JBossWSCreationUtils.getProjectByName(project).refreshLocal(2, monitor); } catch (CoreException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + JBossWSCreationCore.getDefault().logError(e); } }