[173524] Update facet version dependancy
diff --git a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
index 4f784ec..4cb7eee 100644
--- a/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.core/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.103,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
index 3acb7ba..93d8951 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,1.1.0)",
org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)"
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)"
Eclipse-LazyStart: true
Bundle-ClassPath: genericjboss.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
index 68cb12f..381d8a4 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
org.eclipse.jst.server.generic.ui;bundle-version="[1.0.100,1.1.0)",
org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)"
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)"
Eclipse-LazyStart: true
Bundle-ClassPath: genericjonas.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
index dd9d50d..9a2bbb3 100644
--- a/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.oc4j/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
org.eclipse.jst.server.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.jst.server.ui;bundle-version="[1.0.102,1.1.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)"
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)"
Eclipse-LazyStart: true
Bundle-ClassPath: genericoc4j.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
index b25d0fe..6e7b028 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/META-INF/MANIFEST.MF
@@ -22,6 +22,6 @@
org.eclipse.jst.server.core;bundle-version="[1.0.103,1.1.0)",
org.eclipse.jst.server.ui;bundle-version="[1.0.103,1.1.0)",
org.eclipse.jst.server.tomcat.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)"
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java
index d94227d..5cde78f 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/editor/ConfigurationWebModuleEditorPart.java
@@ -259,7 +259,7 @@
form.setContent(section);
form.reflow(true);
-
+
initialize();
}
@@ -323,8 +323,7 @@
while (iterator.hasNext()) {
WebModule module = (WebModule) iterator.next();
TableItem item = new TableItem(webAppTable, SWT.NONE);
-
- // FIX-ME
+
String memento = module.getMemento();
String projectName = "";
Image projectImage = null;
@@ -333,7 +332,6 @@
projectImage = TomcatUIPlugin.getImage(TomcatUIPlugin.IMG_PROJECT_MISSING);
IModule module2 = ServerUtil.getModule(memento);
if (module2 != null) {
-
projectName = labelProvider.getText(module2);
projectImage = labelProvider.getImage(module2);
item.setData(module2);
diff --git a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
index affdb1d..ecff7a0 100644
--- a/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.ui/META-INF/MANIFEST.MF
@@ -21,8 +21,8 @@
org.eclipse.jst.server.core;bundle-version="[1.0.103,1.1.0)",
org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)",
org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
index 43fc95c..114043d 100644
--- a/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.websphere.core/META-INF/MANIFEST.MF
@@ -25,9 +25,9 @@
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.wst.common.core;bundle-version="[1.0.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.0.0,1.2.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.0.0,1.2.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.0.0,1.2.0)"
+ org.eclipse.wst.common.project.facet.ui;bundle-version="[1.0.0,1.3.0)"
Eclipse-LazyStart: true
Export-Package: org.eclipse.jst.server.websphere.core
Bundle-RequiredExecutionEnvironment: J2SE-1.4
