The jst.j2ee changes are from
[283176] NPE in EARArtifactEdit.getModuleByManifestURI(String uri)
[283209] !MESSAGE Exception while reading /EAR5Client/.classpath
[283318] Single root check failing when source folder mapped but deleted
[283580] EAR 5.0 libs performance and missing updates
[283601] For Web Project verify source folders and web content do not collide
The jst.j2ee.core change is from
[283632] EJb ref validation in EAR validator need to throw error message
The jst.ws.consumption.ui changes are
[283399] Web Services > Server & Runtime preference undefined
[283312] ANT Client gen- message missing server name subst. variable
The jst.ws.creation.ui change is
[276538] Ant console output seems to imply that parameter can be set but really it should not be
The wst.jsdt.core change is
[283616] Hierarchy does not display super type for types in libraries
The wst.server.core changes are
[282909] Can't create a new server if rename an existing one
[282922] Server will not change to republish status after web module changed
The wst.sse.core and wst.html.core changes are from
[282205] HTMLHeadTokenizer can get stuck in an infinite loop
diff --git a/features/org.eclipse.wst.server_core.feature.patch/buildnotes_org.eclipse.wst.server_core.feature.patch.html b/features/org.eclipse.wst.server_core.feature.patch/buildnotes_org.eclipse.wst.server_core.feature.patch.html
index 8ab45d1..4eceb51 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/buildnotes_org.eclipse.wst.server_core.feature.patch.html
+++ b/features/org.eclipse.wst.server_core.feature.patch/buildnotes_org.eclipse.wst.server_core.feature.patch.html
@@ -17,6 +17,7 @@
<p>Bug <a href='https://bugs.eclipse.org/279110'>279110</a>. Server status stuck on 'Republish'</p>
<ul><li>org.eclipse.wst.internet.monitor.core</li></ul>
<p>Bug <a href='https://bugs.eclipse.org/279101'>279101</a>. TCP/IP HTTP parser is case sensitive, when the specs say it shouldn't be</p>
-
+<p>Bug <a href='https://bugs.eclipse.org/282909'>282909</a>. Can't create a new server if rename an existing one</p>
+<p>Bug <a href='https://bugs.eclipse.org/282909'>282922</a>. Server will not change to republish status after web module changed</p>
</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.server_core.feature.patch/feature.properties b/features/org.eclipse.wst.server_core.feature.patch/feature.properties
index 1c22244..41014e4 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.server_core.feature.patch/feature.properties
@@ -29,6 +29,8 @@
\n\
Bug https://bugs.eclipse.org/279101 TCP/IP HTTP parser is case sensitive, when the specs say it shouldn't be\n\
Bug https://bugs.eclipse.org/279110 Server status stuck on 'Republish'\n\
+Bug https://bugs.eclipse.org/282909 Can't create a new server if rename an existing one\n\
+Bug https://bugs.eclipse.org/282922 Server will not change to republish status after web module changed\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
index 519c51b..4515795 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java
@@ -798,20 +798,26 @@
return false;
// shallow search: check for root modules first
- boolean rv = modules.contains(requestedModule);
+ boolean deployed = modules.contains(requestedModule);
- // deep search: look into all the child modules
- rv = !visitModule(modules.toArray(new IModule[0]), new IModuleVisitor(){
- public boolean visit(IModule[] modules2) {
- for (int i =0;i<=modules2.length-1;i++){
- if (modules2[i].equals(requestedModule))
- return false;
- }
- return !modules2.equals(requestedModule);
- }}, null);
+ if( !deployed){
+ // deep search: look into all the child modules
+ Iterator<IModule> itr = modules.iterator();
+ while(itr.hasNext() && !deployed){
+ IModule[] m = new IModule[] {itr.next()};
+ deployed = !visitModule(m, new IModuleVisitor(){
+ public boolean visit(IModule[] modules2) {
+ for (int i =0;i<=modules2.length-1;i++){
+ if (modules2[i].equals(requestedModule))
+ return false;
+ }
+ return !modules2.equals(requestedModule);
+ }}, null);
+ }
+ }
- Trace.trace(Trace.FINEST, "< isModuleDeployed() rv="+rv);
- return rv;
+ Trace.trace(Trace.FINEST, "< isModuleDeployed() deployed="+deployed);
+ return deployed;
}
protected void stopAutoPublish() {
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPlugin.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPlugin.java
index 3b92f41..f814ecf 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPlugin.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ServerPlugin.java
@@ -386,7 +386,8 @@
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
Object obj = iterator.next();
- if (obj instanceof IServerAttributes && name.equalsIgnoreCase(((IServerAttributes)obj).getName()))
+ if (obj instanceof IServerAttributes &&
+ (name.equalsIgnoreCase(((IServerAttributes)obj).getName()) || name.equalsIgnoreCase(((IServerAttributes)obj).getId())))
return true;
if (obj instanceof IRuntime && name.equalsIgnoreCase(((IRuntime)obj).getName()))
return true;
