210694 Inconsistencies with servers created in the workspace by default 211073 Excessive number of output in the .log file

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 f1c2b01..5ce43b8 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

@@ -15,5 +15,6 @@
 
 <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=204165'>204165</a>. too much time spent in ServerUtil.getModule(IProject)</p>
 <p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=209907'>209907</a>. Deadlock, slow activation associated with org.eclipse.wst.server.core</p>
-
+<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=210694'>210694</a>. Inconsistencies with servers created in the workspace by default</p>
+<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=211073'>211073</a>. Excessive number of output in the .log file as a result of the fix to bug 204165</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 33bfbdd..7923eba 100644
--- a/features/org.eclipse.wst.server_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.server_core.feature.patch/feature.properties

@@ -32,6 +32,8 @@
 \n\
 Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=204165 too much time spent in ServerUtil.getModule(IProject)\n\
 Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=209907 Deadlock, slow activation associated with org.eclipse.wst.server.core\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=210694 Inconsistencies with servers created in the workspace by default\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=211073 Excessive number of output in the .log file as a result of the fix to bug 204165\n\
 \n\
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\

diff --git a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
index c77b4b4..bff742e 100644
--- a/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.server.core; singleton:=true
-Bundle-Version: 1.0.109.qualifier
+Bundle-Version: 1.0.110.qualifier
 Bundle-Activator: org.eclipse.wst.server.core.internal.ServerPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
index 7a42139..27ab7d0 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java

@@ -481,9 +481,11 @@
 			Iterator iterator = servers.iterator();
 			while (iterator.hasNext()) {
 				Server server = (Server) iterator.next();
-
-				IMemento child = memento.createChild("server");
-				server.save(child);
+				
+				if (server.getFile() == null) {
+					IMemento child = memento.createChild("server");
+					server.save(child);
+				}
 			}
 
 			memento.saveToFile(filename);
@@ -764,7 +766,7 @@
 				IServer server = loadServer(file, ProgressUtil.getSubMonitorFor(monitor, 1000));
 				if (server != null) {
 					if (getServer(server.getId()) == null)
-						registerServer(server);
+						addServer(server);
 					monitor.done();
 					return true;
 				}
@@ -885,7 +887,7 @@
 		
 		IServer server = findServer(file);
 		if (server != null) {
-			deregisterServer(server);
+			removeServer(server);
 			return true;
 		}
 		

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 c7ea71a..bf69e6a 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

@@ -247,7 +247,7 @@
 	
     protected void deleteFromFile() throws CoreException {
         super.deleteFromFile();
-        ResourceManager.getInstance().deregisterServer(this);
+        ResourceManager.getInstance().removeServer(this);
     }
 
     protected void deleteFromMetadata() {
@@ -256,7 +256,7 @@
 
 	protected void saveToFile(IProgressMonitor monitor) throws CoreException {
 		super.saveToFile(monitor);
-		ResourceManager.getInstance().registerServer(this);
+		ResourceManager.getInstance().addServer(this);
 	}
 
 	protected void saveToMetadata(IProgressMonitor monitor) {

diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
index 1f5d2c6..e01bbce 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java

@@ -100,6 +100,8 @@
 	 * Temporary method to patch 204165. Do not use, see equivalent API in 2.0.
 	 */
 	public IModule[] getModules204165(IProject project) {
+		if (!project.isAccessible())
+         return new IModule[0];
 		return createModules(project);
 	}