June 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r8703 - in trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core: messages and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-06-11 03:52:58 -0400 (Wed, 11 Jun 2008) New Revision: 8703 Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java Log: JBIDE-2261: format message Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-06-11 04:46:33 UTC (rev 8702) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSClassPathCommand.java 2008-06-11 07:52:58 UTC (rev 8703) @@ -19,9 +19,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.IAccessRule; import org.eclipse.jdt.core.IClasspathAttribute; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; @@ -87,7 +85,7 @@ } catch (CoreException e) { status = StatusUtils.errorStatus( - JbossWSCoreMessages.ERROR_ADD_FACET_JBOSSWS, e); + JbossWSCoreMessages.Error_Add_Facet_JBossWS, e); } return status; } Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties 2008-06-11 04:46:33 UTC (rev 8702) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCore.properties 2008-06-11 07:52:58 UTC (rev 8703) @@ -1,16 +1,3 @@ -PROGRESS_INSTALL_JBOSSWS_RUNTIME=JBoss Web Service Runtime -DIR_LIB=lib -DIR_CLIENT=client -DIR_WEB_INF=WEB-INF -DIR_WEB_CONTENT=WebContent -ERROR_COPY=Exception while copy JBossWS jars -WS_LOCATION=jbosswsruntimelocation -JBOSSWS_RUNTIME_LIB=JbossWSRuntimeLib -JBOSSWS_RUNTIME=JBoss WS Runtime -JBOSSAS=JBOSS -ERROR_WS_LOCATION=The JBoss WS Runtime Location is NULL -ERROR_WS_CLASSPATH=A error comes up when create JBoss WS Classpath -ERROR_ADD_FACET_JBOSSWS=Exception while install JBossWS facet======= Progress_Install_JBossWS_Runtime=JBoss Web Service Runtime Dir_Lib=lib Dir_Client=client @@ -22,4 +9,5 @@ JBossWS_Runtime=JBoss WS Runtime JBossAS=JBOSS Error_WS_Location=The JBoss WS Runtime Location is NULL -Error_WS_Classpath=A error comes up when create JBoss WS Classpath>>>>>>> .r8593 +Error_WS_Classpath=A error comes up when create JBoss WS Classpath +Error_Add_Facet_JBossWS=Exception while install JBossWS facet Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java 2008-06-11 04:46:33 UTC (rev 8702) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/messages/JbossWSCoreMessages.java 2008-06-11 07:52:58 UTC (rev 8703) @@ -36,7 +36,7 @@ public static String JBossAS; public static String Error_WS_Location; public static String Error_WS_Classpath; - public static String ERROR_ADD_FACET_JBOSSWS; + public static String Error_Add_Facet_JBossWS; static {

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8702 - in trunk/ws/plugins: org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-06-11 00:46:33 -0400 (Wed, 11 Jun 2008) New Revision: 8702 Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java Log: JBIDE-2261: validation for removing runtime Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-11 03:15:05 UTC (rev 8701) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-11 04:46:33 UTC (rev 8702) @@ -13,7 +13,6 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.launching.JavaRuntime; import org.jboss.tools.ws.core.messages.JbossWSCoreMessages; -import org.jboss.tools.ws.core.utils.JbossWSCoreUtils; /** * @author Grid Qian @@ -23,6 +22,7 @@ public JbossWSRuntimeClassPathInitializer() { } + private String segment; @Override @@ -33,10 +33,10 @@ JbossWSCoreMessages.JBossWS_Runtime_Lib)) { JbossWSRuntimeClasspathContainer container = new JbossWSRuntimeClasspathContainer( containerPath); + segment = containerPath.segment(1); JavaCore.setClasspathContainer(containerPath, new IJavaProject[] { project }, new IClasspathContainer[] { container }, null); - segment = containerPath.segment(1); } } @@ -68,8 +68,12 @@ public IClasspathEntry[] getClasspathEntries() { if (entries == null) { ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); - JbossWSRuntime jbws = JbossWSRuntimeManager.getInstance().findRuntimeByName(segment); - IPath wsPath = new Path(jbws.getHomeDir()); + JbossWSRuntime jbws = JbossWSRuntimeManager.getInstance() + .findRuntimeByName(segment); + IPath wsPath = null; + if (jbws != null) { + wsPath = new Path(jbws.getHomeDir()); + } if (wsPath != null) { IPath libPath = wsPath.append(JbossWSCoreMessages.Dir_Lib); list.addAll(Arrays.asList(getEntries(libPath))); @@ -101,15 +105,16 @@ } return list.toArray(new IClasspathEntry[list.size()]); } - public void removeEntry(String jarName){ - if(entries == null){ - return; + + public void removeEntry(String jarName) { + if (entries == null) { + return; } - IClasspathEntry[] newEntries = new IClasspathEntry[entries.length-1]; - int i=0; - for(IClasspathEntry entry: entries){ - if(!entry.toString().contains(jarName)){ - newEntries[i++] = entry; + IClasspathEntry[] newEntries = new IClasspathEntry[entries.length - 1]; + int i = 0; + for (IClasspathEntry entry : entries) { + if (!entry.toString().contains(jarName)) { + newEntries[i++] = entry; } } entries = newEntries; Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-11 03:15:05 UTC (rev 8701) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-11 04:46:33 UTC (rev 8702) @@ -249,9 +249,11 @@ QualifiedName qRuntimeName = IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME; String name = null; try { - name = facetedProject.getProject().getPersistentProperty(qRuntimeName); + name = facetedProject.getProject().getPersistentProperty( + qRuntimeName); if (name != null && name.equals(oldName)) { - facetedProject.getProject().setPersistentProperty(qRuntimeName, newName); + facetedProject.getProject().setPersistentProperty( + qRuntimeName, newName); } } catch (CoreException e) { // TODO Auto-generated catch block @@ -261,4 +263,27 @@ } } + public static boolean isRuntimeUsed(String name) { + IProjectFacet facet = ProjectFacetsManager + .getProjectFacet("jbossws.core"); + Set<IFacetedProject> facetedProjects = null; + try { + facetedProjects = ProjectFacetsManager.getFacetedProjects(facet); + } catch (CoreException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + for (IFacetedProject facetedProject : facetedProjects) { + QualifiedName qRuntimeName = IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME; + try { + if(name.equals(facetedProject.getProject().getPersistentProperty(qRuntimeName))){ + return true; + } + } catch (CoreException e) { + e.printStackTrace(); + } + } + return false; + } + } \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-11 03:15:05 UTC (rev 8701) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-11 04:46:33 UTC (rev 8702) @@ -58,6 +58,7 @@ import org.jboss.tools.ws.ui.messages.JbossWSUIMessages; import org.jboss.tools.ws.ui.utils.UIUtils; import org.jboss.tools.ws.core.classpath.JbossWSRuntime; +import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager; /** * @author Grid Qian @@ -337,7 +338,8 @@ } } if (!checked) { - if (tableView.getCheckedElements() == null) { + if (tableView.getCheckedElements() == null + || tableView.getCheckedElements().length == 0) { tableView.setChecked(runtimes.get(0), true); checkedElement = runtimes.get(0); } @@ -1031,7 +1033,7 @@ @SuppressWarnings("unchecked") private void removeRuntime(JbossWSRuntime r) { - boolean used = isRuntimeUsed(r.getName()); + boolean used = JbossWSRuntimeManager.isRuntimeUsed(r.getName()); String title = JbossWSUIMessages.JBossWS_Runtime_Delete_Confirm_Title; String message = (used) ? NLS.bind( JbossWSUIMessages.JBossWS_Runtime_Delete_Used_Confirm, r @@ -1054,17 +1056,5 @@ checkedElement = null; } } - - private boolean isRuntimeUsed(String runtimeName) { - // IProject[] ps = ResourcesPlugin.getWorkspace().getRoot() - // .getProjects(); - // for (int i = 0; i < ps.length; i++) { - // ISeamProject sp = SeamCorePlugin.getSeamProject(ps[i], false); - // if (sp != null && runtimeName.equals(sp.getRuntimeName())) { - // return true; - // } - // } - return false; - } } } \ No newline at end of file

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8701 - in trunk/ws/plugins: org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands and 1 other directory.

by jbosstools-commits＠lists.jboss.org

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); } }

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8700 - trunk/tests/features/org.jboss.tools.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-06-10 19:55:46 -0400 (Tue, 10 Jun 2008) New Revision: 8700 Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml Log: Archives tests added to build Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-06-10 22:08:53 UTC (rev 8699) +++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-06-10 23:55:46 UTC (rev 8700) @@ -369,5 +369,10 @@ install-size="0" version="0.0.0"/> + <plugin + id="org.jboss.ide.eclipse.archives.test" + download-size="0" + install-size="0" + version="0.0.0"/> + </feature> -

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8699 - in trunk/core: plugins and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-06-10 18:08:53 -0400 (Tue, 10 Jun 2008) New Revision: 8699 Removed: trunk/core/plugins/org.jboss.ide.eclipse.firstrun/ trunk/core/plugins/org.jboss.ide.eclipse.jdt.j2ee.core/ trunk/core/plugins/org.jboss.ide.eclipse.jdt.j2ee.ui/ Modified: trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml Log: removing legacy / duplicate code that should have been gone long ago Modified: trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml =================================================================== --- trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml 2008-06-10 21:44:52 UTC (rev 8698) +++ trunk/core/features/org.jboss.ide.eclipse.feature/feature.xml 2008-06-10 22:08:53 UTC (rev 8699) @@ -463,18 +463,6 @@ version="0.0.0"/> <plugin - id="org.jboss.ide.eclipse.jdt.j2ee.core" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.ide.eclipse.jdt.j2ee.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin id="org.jboss.ide.eclipse.jdt.ui" download-size="0" install-size="0" @@ -487,12 +475,6 @@ version="0.0.0"/> <plugin - id="org.jboss.ide.eclipse.firstrun" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin id="org.jboss.ide.eclipse.help" download-size="0" install-size="0"

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8698 - trunk/tests/features/org.jboss.ide.eclipse.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-06-10 17:44:52 -0400 (Tue, 10 Jun 2008) New Revision: 8698 Modified: trunk/tests/features/org.jboss.ide.eclipse.test.feature/feature.xml Log: Archives tests added to build Modified: trunk/tests/features/org.jboss.ide.eclipse.test.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.ide.eclipse.test.feature/feature.xml 2008-06-10 20:51:32 UTC (rev 8697) +++ trunk/tests/features/org.jboss.ide.eclipse.test.feature/feature.xml 2008-06-10 21:44:52 UTC (rev 8698) @@ -418,12 +418,6 @@ </license> <plugin - id="org.jboss.ide.eclipse.core.test" - download-size="0" - install-size="0" - version="1.0.0"/> - - <plugin id="org.jboss.ide.eclipse.archives.test" download-size="0" install-size="0"

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8697 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-06-10 16:51:32 -0400 (Tue, 10 Jun 2008) New Revision: 8697 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java Log: safe change to wtp api Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java 2008-06-10 19:54:34 UTC (rev 8696) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/UnregisterInServerXmlHandler.java 2008-06-10 20:51:32 UTC (rev 8697) @@ -10,12 +10,12 @@ ******************************************************************************/ package org.jboss.tools.jst.web.model.handlers; -import java.util.*; +import java.util.Properties; import org.eclipse.core.resources.IProject; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IServer; - +import org.eclipse.wst.server.core.ServerCore; import org.jboss.tools.common.meta.action.impl.AbstractHandler; import org.jboss.tools.common.meta.action.impl.XActionImpl; import org.jboss.tools.common.model.ServiceDialog; @@ -24,7 +24,6 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; import org.jboss.tools.jst.web.server.RegistrationHelper; -import org.jboss.tools.jst.web.server.ServerManager; public class UnregisterInServerXmlHandler extends AbstractHandler { String textTemplate = null; @@ -71,7 +70,7 @@ void unregisterFromAllServers(XModelObject object) throws XModelException { IProject project = EclipseResourceUtil.getProject(object); - IServer[] ss = ServerManager.getInstance().getServers(); + IServer[] ss = ServerCore.getServers(); for (int i = 0; i < ss.length; i++) { if(RegistrationHelper.isRegistered(project, ss[i])) { RegistrationHelper.unregister(project, ss[i]);

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8696 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-06-10 15:54:34 -0400 (Tue, 10 Jun 2008) New Revision: 8696 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java Log: http://jira.jboss.com/jira/browse/JBIDE-675 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-06-10 19:00:25 UTC (rev 8695) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-06-10 19:54:34 UTC (rev 8696) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.jsf.vpe.jsf.test.jbide; +import junit.framework.Test; + import org.eclipse.core.resources.IFile; import org.eclipse.swt.custom.StyledText; import org.eclipse.ui.IEditorInput; @@ -93,6 +95,8 @@ .trim()); styledText.insert("t"); + TestUtil.delay(450); + TestUtil.waitForJobs(); } if(getException()!=null) { throw getException(); @@ -154,6 +158,8 @@ .trim()); styledText.insert("t"); + TestUtil.delay(450); + TestUtil.waitForJobs(); } if(getException()!=null) { throw getException(); @@ -183,6 +189,8 @@ styledText.setCaretOffset(285); styledText.insert("<test></test>"); + TestUtil.delay(450); + TestUtil.waitForJobs(); IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part .getSourceEditor().getTextViewer(), 290); Node node = (Node) treeNode;

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8695 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui/action and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-06-10 15:00:25 -0400 (Tue, 10 Jun 2008) New Revision: 8695 Removed: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml Log: JBIDE-2209 - part of moving the action sets to start / stop servers into as.ui. This was the removal portion which was forgotten. Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2008-06-10 18:49:26 UTC (rev 8694) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2008-06-10 19:00:25 UTC (rev 8695) @@ -27,25 +27,6 @@ </attributeEditor> </extension> -  - <extension id="e" name="XML Editors" point="org.jboss.tools.common.model.ui.xmlEditor"> <xmlEditor class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor"

17 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r8694 - in trunk/core/tests/org.jboss.ide.eclipse.archives.test: inputs/projects/JBIDE2315 and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-06-10 14:49:26 -0400 (Tue, 10 Jun 2008) New Revision: 8694 Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/bin/ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/folder/ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/folder/file.txt trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/src/ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java Log: JBIDE-2315 - test Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath =================================================================== --- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath (rev 0) +++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.classpath 2008-06-10 18:49:26 UTC (rev 8694) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages =================================================================== --- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages (rev 0) +++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.packages 2008-06-10 18:49:26 UTC (rev 8694) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<packages> + <package name="worksnot.jar" type="jar" todir="/JBIDE2315" exploded="false" inWorkspace="true"> + <fileset dir="/JBIDE2315/folder" includes="**/*" inWorkspace="true" flatten="false"> + <properties></properties> + </fileset> + <properties> + <property name="org.jboss.ide.eclipse.as.core.packages.ModuleIDPropertyKey" value="1213079049734"></property> + </properties> + </package> + <properties></properties> +</packages> \ No newline at end of file Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project =================================================================== --- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project (rev 0) +++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/.project 2008-06-10 18:49:26 UTC (rev 8694) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JBIDE2315</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/projects/JBIDE2315/folder/file.txt =================================================================== Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java =================================================================== --- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-10 18:43:44 UTC (rev 8693) +++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-06-10 18:49:26 UTC (rev 8694) @@ -11,6 +11,7 @@ import org.jboss.ide.eclipse.archives.test.model.XBUnmarshallTest; import org.jboss.ide.eclipse.archives.test.projects.JBIDE2099Test; import org.jboss.ide.eclipse.archives.test.projects.JBIDE2311Test; +import org.jboss.ide.eclipse.archives.test.projects.JBIDE2315Test; import org.jboss.ide.eclipse.archives.test.util.TruezipUtilTest; public class ArchivesTestSuite extends TestSuite { @@ -27,6 +28,7 @@ // jiras suite.addTestSuite(JBIDE2099Test.class); suite.addTestSuite(JBIDE2311Test.class); + suite.addTestSuite(JBIDE2315Test.class); return suite; } Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java =================================================================== --- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java (rev 0) +++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/projects/JBIDE2315Test.java 2008-06-10 18:49:26 UTC (rev 8694) @@ -0,0 +1,37 @@ +package org.jboss.ide.eclipse.archives.test.projects; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate; +import org.jboss.ide.eclipse.archives.test.ArchivesTest; +import org.jboss.tools.common.test.util.TestProjectProvider; + +public class JBIDE2315Test extends TestCase { + private TestProjectProvider provider; + private IProject project; + + protected void setUp() throws Exception { + provider = new TestProjectProvider(ArchivesTest.PLUGIN_ID, + "inputs" + Path.SEPARATOR + "projects" + Path.SEPARATOR + "JBIDE2315", + null, true); + project = provider.getProject(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + } + + protected void tearDown() throws Exception { + provider.dispose(); + } + + public void testJBIDE2311() { + ArchiveBuildDelegate delegate = new ArchiveBuildDelegate(); + try { + delegate.fullProjectBuild(project.getLocation()); + } catch( RuntimeException re ) { + fail(re.getMessage()); + } + } +}

17 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2008