Permalink
Browse files

This commit was manufactured by cvs2svn to create tag 'R1_5_3'.

  • Loading branch information...
5 parents e3c4d37 + 636efbb + 5978bb9 + b518f08 + a7f8c1a commit 7fa7852a36ce38091f0229f7c9f490ee3bc737cf ndai committed Feb 3, 2007
Showing with 807 additions and 1,882 deletions.
  1. +1 −1 features/org.eclipse.jst.server_adapters.feature/feature.xml
  2. +1 −1 features/org.eclipse.jst.server_adapters.feature/sourceTemplateFeature/feature.xml
  3. +1 −1 features/org.eclipse.jst.server_core.feature/feature.xml
  4. +1 −1 features/org.eclipse.jst.server_core.feature/sourceTemplateFeature/feature.xml
  5. +1 −1 features/org.eclipse.jst.server_sdk.feature/feature.xml
  6. +1 −1 features/org.eclipse.jst.server_tests.feature/feature.xml
  7. +1 −1 features/org.eclipse.jst.server_ui.feature/feature.xml
  8. +1 −1 features/org.eclipse.jst.server_ui.feature/sourceTemplateFeature/feature.xml
  9. +1 −1 features/org.eclipse.jst.server_userdoc.feature/feature.xml
  10. +1 −1 features/org.eclipse.wst.server_core.feature/feature.xml
  11. +1 −1 features/org.eclipse.wst.server_core.feature/sourceTemplateFeature/feature.xml
  12. +1 −1 features/org.eclipse.wst.server_sdk.feature/feature.xml
  13. +1 −1 features/org.eclipse.wst.server_tests.feature/feature.xml
  14. +1 −1 features/org.eclipse.wst.server_ui.feature/feature.xml
  15. +1 −1 features/org.eclipse.wst.server_ui.feature/sourceTemplateFeature/feature.xml
  16. +1 −1 features/org.eclipse.wst.server_userdoc.feature/feature.xml
  17. +1 −1 plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
  18. +2 −2 plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/PublishUtil.java
  19. +21 −5 ...ins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java
  20. +78 −3 ...ver.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeClasspathContainerInitializer.java
  21. +5 −6 plugins/org.eclipse.jst.server.generic.core/META-INF/MANIFEST.MF
  22. +23 −31 ...org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/Resolver.java
  23. +1 −1 plugins/org.eclipse.jst.server.generic.jboss/.classpath
  24. +2 −0 plugins/org.eclipse.jst.server.generic.jboss/.cvsignore
  25. +7 −0 plugins/org.eclipse.jst.server.generic.jboss/.settings/org.eclipse.jdt.core.prefs
  26. +2 −1 plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
  27. +9 −0 plugins/org.eclipse.jst.server.generic.jboss/buildfiles/jboss323.xml
  28. +0 −5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
  29. +0 −28 plugins/org.eclipse.jst.server.generic.modules/.project
  30. +3 −4 plugins/org.eclipse.jst.server.generic.ui/META-INF/MANIFEST.MF
  31. +1 −9 plugins/org.eclipse.jst.server.generic.ui/plugin.xml
  32. +1 −1 ...generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericLaunchConfigurationTabGroup.java
  33. +3 −3 ...generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
  34. +1 −4 ...jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.java
  35. +0 −3 ...rver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerUIMessages.properties
  36. +3 −3 ...server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
  37. +3 −8 ...eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericUiPlugin.java
  38. +2 −2 ...server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
  39. +1 −1 ...ipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/JRESelectDecorator.java
  40. +12 −305 ...ins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
  41. +158 −20 ...rver.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
  42. +0 −204 ...neric.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
  43. +0 −61 ...neric.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/UpdateServerPropertyOperation.java
  44. +1 −1 plugins/org.eclipse.jst.server.installable/META-INF/MANIFEST.MF
  45. +2 −2 plugins/org.eclipse.jst.server.installable/plugin.properties
  46. +5 −5 plugins/org.eclipse.jst.server.installable/plugin.xml
  47. +0 −7 plugins/org.eclipse.jst.server.pde/.classpath
  48. +0 −2 plugins/org.eclipse.jst.server.pde/.cvsignore
  49. +0 −28 plugins/org.eclipse.jst.server.pde/.project
  50. +0 −13 plugins/org.eclipse.jst.server.pde/META-INF/MANIFEST.MF
  51. +0 −34 plugins/org.eclipse.jst.server.pde/about.html
  52. +0 −19 plugins/org.eclipse.jst.server.pde/build.properties
  53. +0 −266 plugins/org.eclipse.jst.server.pde/build.xml
  54. BIN plugins/org.eclipse.jst.server.pde/icons/obj16/wiz_new_server_plugin.gif
  55. +0 −24 plugins/org.eclipse.jst.server.pde/plugin.properties
  56. +0 −22 plugins/org.eclipse.jst.server.pde/plugin.xml
  57. +0 −63 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/ServerPdePlugin.java
  58. +0 −31 ....jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerPluginNewWizard.java
  59. +0 −285 ...eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/GenericServerTemplate.java
  60. +0 −44 plugins/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/Messages.java
  61. +0 −19 ...ns/org.eclipse.jst.server.pde/src/org/eclipse/jst/server/generic/pde/internal/messages.properties
  62. +0 −41 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/buildfiles/$server_name$.xml
  63. BIN plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/icons/server.gif
  64. +0 −142 plugins/org.eclipse.jst.server.pde/templates_3.0/genericserver/servers/$server_name$.serverdef
  65. +1 −1 plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
  66. +6 −2 ....server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/PublishOperation2.java
  67. +5 −2 ...ver.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerBehaviour.java
  68. +1 −1 plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
  69. +3 −0 plugins/org.eclipse.wst.server.core/plugin.properties
  70. +16 −1 plugins/org.eclipse.wst.server.core/plugin.xml
  71. +21 −3 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
  72. +1 −1 ...rg.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/InstallableServer.java
  73. +1 −1 ...s/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Messages.properties
  74. +5 −7 ...rg.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModulePublishInfo.java
  75. +30 −0 ...g.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/NullClientDelegate.java
  76. +37 −0 ...st.server.core/servercore/org/eclipse/wst/server/core/internal/NullLaunchableAdapterDelegate.java
  77. +13 −1 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
  78. +14 −2 ...ins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPlugin.java
  79. +8 −1 ...rg.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPublishInfo.java
  80. +7 −7 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/XMLMemento.java
  81. +1 −1 plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModule.java
  82. +3 −0 plugins/org.eclipse.wst.server.ui/.settings/org.eclipse.core.resources.prefs
  83. +1 −1 plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
  84. +1 −1 plugins/org.eclipse.wst.server.ui/plugin.xml
  85. +2 −1 ...ns/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/ServerLaunchConfigurationTab.java
  86. +7 −2 ...ns/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/editor/ServerEditor.java
  87. +12 −1 ...e.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/RestartModuleAction.java
  88. +60 −0 ...server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/SubTasksWizardFragment.java
  89. +83 −39 ...st.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/TasksWizardFragment.java
  90. +69 −27 ...wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/ModifyModulesComposite.java
  91. +35 −2 ...pse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
  92. +1 −2 ...eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/TasksComposite.java
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_adapters.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_core.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_sdk.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_tests.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_ui.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.server_userdoc.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_core.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_sdk.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_tests.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_ui.feature.source"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.server_userdoc.feature"
label="%featureName"
- version="1.6.0.qualifier"
+ version="1.5.3.qualifier"
provider-name="%providerName">
<description>
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.core; singleton:=true
-Bundle-Version: 1.0.103.qualifier
+Bundle-Version: 1.0.105.qualifier
Bundle-Activator: org.eclipse.jst.server.core.internal.JavaServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -16,8 +16,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.jst.server.core.internal.JavaServerPlugin;
@@ -662,7 +662,7 @@ private static void addZipEntries(ZipOutputStream zout, IModuleResource[] resour
ZipEntry ze = new ZipEntry(entryPath);
long ts = 0;
- IFolder folder = (IFolder) mf.getAdapter(IFolder.class);
+ IContainer folder = (IContainer) mf.getAdapter(IContainer.class);
if (folder != null)
ts = folder.getLocalTimeStamp();
@@ -48,8 +48,19 @@
}
private static void addMapping(String id, String id2, String version) {
+ ArrayList list = null;
try {
- mappings.put(id, RuntimeManager.getRuntimeComponentType(id2).getVersion(version));
+ list = (ArrayList) mappings.get(id);
+ } catch (Exception e) {
+ // ignore
+ }
+
+ if (list == null)
+ list = new ArrayList(2);
+
+ try {
+ list.add(RuntimeManager.getRuntimeComponentType(id2).getVersion(version));
+ mappings.put(id, list);
} catch (Exception e) {
// ignore
}
@@ -119,9 +130,6 @@ public List getRuntimeComponents() {
return components;
// define server runtime component
- String typeId = runtime.getRuntimeType().getId();
- IRuntimeComponentVersion mapped = (IRuntimeComponentVersion) mappings.get(typeId);
-
Map properties = new HashMap(5);
if (runtime.getLocation() != null)
properties.put("location", runtime.getLocation().toPortableString());
@@ -138,7 +146,15 @@ public List getRuntimeComponents() {
properties.put(CLASSPATH, path.toPortableString());
}
- components.add(RuntimeManager.createRuntimeComponent(mapped, properties));
+ String typeId = runtime.getRuntimeType().getId();
+ if (mappings.containsKey(typeId)) {
+ ArrayList list = (ArrayList) mappings.get(typeId);
+ int size = list.size();
+ for (int i = 0; i < size; i++) {
+ IRuntimeComponentVersion mapped = (IRuntimeComponentVersion) list.get(i);
+ components.add(RuntimeManager.createRuntimeComponent(mapped, properties));
+ }
+ }
// define JRE component
IJavaRuntime javaRuntime = (IJavaRuntime) runtime.loadAdapter(IJavaRuntime.class, null);
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * Copyright (c) 2003, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,11 +10,18 @@
**********************************************************************/
package org.eclipse.jst.server.core.internal;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.*;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
/**
*
*/
@@ -69,9 +76,77 @@ public void requestClasspathContainerUpdate(IPath containerPath, IJavaProject pr
if (runtimeId != null)
runtime = ServerCore.findRuntime(runtimeId);
delegate.requestClasspathContainerUpdate(runtime, containerSuggestion.getClasspathEntries());
+ //JavaCore.setClasspathContainer(containerPath, new IJavaProject[] { project },
+ // new IClasspathContainer[] { containerSuggestion }, new NullProgressMonitor());
+ updateClasspath(runtime, containerPath, containerSuggestion);
+ }
+ }
+ }
+ }
+
+ private void updateClasspath(final IRuntime runtime, final IPath containerPath, final IClasspathContainer containerSuggestion) {
+ class UpdateClasspathJob extends Job {
+ public UpdateClasspathJob() {
+ super(NLS.bind(Messages.updateClasspathContainers, runtime.getName()));
+ }
+
+ public boolean belongsTo(Object family) {
+ return ServerPlugin.PLUGIN_ID.equals(family);
+ }
+
+ public IStatus run(IProgressMonitor monitor) {
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ List list = new ArrayList();
+ if (projects != null) {
+ int size = projects.length;
+ for (int i = 0; i < size; i++) {
+ if (projects[i].isAccessible()) {
+ try {
+ if (!projects[i].isNatureEnabled(JavaCore.NATURE_ID))
+ continue;
+
+ IJavaProject javaProject = JavaCore.create(projects[i]); // TODO is java project?
+
+ boolean found = false;
+ IClasspathEntry[] ce = javaProject.getRawClasspath();
+ for (int j = 0; j < ce.length; j++) {
+ if (ce[j].getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
+ if (containerPath.isPrefixOf(ce[j].getPath()))
+ found = true;
+ }
+ }
+
+ Trace.trace(Trace.FINEST, "Classpath change on: " + projects[i] + " " + found);
+
+ if (found)
+ list.add(javaProject);
+ } catch (Exception e) {
+ Trace.trace(Trace.SEVERE, "Could not update classpath container", e);
+ }
+ }
+ }
+ }
+
+ int size = list.size();
+ if (size > 0) {
+ IJavaProject[] javaProjects = new IJavaProject[size];
+ list.toArray(javaProjects);
+ IClasspathContainer[] containers = new IClasspathContainer[size];
+ for (int i = 0; i < size; i++)
+ containers[i] = containerSuggestion;
+
+ try {
+ JavaCore.setClasspathContainer(containerPath, javaProjects, containers, monitor);
+ } catch (JavaModelException jme) {
+ return jme.getStatus();
+ }
}
+
+ return Status.OK_STATUS;
}
}
+ UpdateClasspathJob job = new UpdateClasspathJob();
+ job.schedule();
}
/** (non-Javadoc)
@@ -18,15 +18,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.jdt.launching;visibility:="reexport";bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,1.2.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.2.0)",
- org.eclipse.ant.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.common;bundle-version="[2.2.0,2.3.0)";visibility:=reexport,
+ org.eclipse.ant.ui;resolution:="optional";bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.common;visibility:="reexport";bundle-version="[2.2.0,2.3.0)",
org.eclipse.emf.ecore;bundle-version="[2.2.0,2.3.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.ui.externaltools;bundle-version="[3.1.100,3.3.0)";resolution:=optional,
+ org.eclipse.ui.externaltools;resolution:="optional";bundle-version="[3.1.100,3.3.0)",
org.apache.ant;bundle-version="[1.6.5,1.7.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)"
+ org.eclipse.debug.ui;resolution:="optional";bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
Oops, something went wrong.

0 comments on commit 7fa7852

Please sign in to comment.