[124016] fixed defaults problem
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
index 8ae475d..79a75e3 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServer.java
@@ -271,6 +271,16 @@
File f = new File(path);
return f.exists();
}
-
+
+ public void setDefaults(IProgressMonitor monitor) {
+ List props = this.getServerDefinition().getProperty();
+ Map instancePropsMap = new HashMap();
+ for (Iterator iter = props.iterator(); iter.hasNext();) {
+ Property element = (Property) iter.next();
+ if(Property.CONTEXT_SERVER.equalsIgnoreCase(element.getContext()))
+ instancePropsMap.put(element.getId(), element.getDefault());
+ }
+ setServerInstanceProperties(instancePropsMap);
+ }
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
index 02509ff..2a16abb 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/core/internal/GenericServerRuntime.java
@@ -12,7 +12,10 @@
import java.io.File;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.launching.IVMInstall;
@@ -21,6 +24,7 @@
import org.eclipse.jst.server.core.IJavaRuntime;
import org.eclipse.jst.server.generic.servertype.definition.ArchiveType;
import org.eclipse.jst.server.generic.servertype.definition.Classpath;
+import org.eclipse.jst.server.generic.servertype.definition.Property;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
import org.eclipse.wst.server.core.model.RuntimeDelegate;
/**
@@ -164,4 +168,16 @@
setAttribute(SERVER_DEFINITION_ID, s);
}
+ public void setDefaults(IProgressMonitor monitor) {
+ List props = this.getServerTypeDefinition().getProperty();
+ Map instancePropsMap = new HashMap();
+ for (Iterator iter = props.iterator(); iter.hasNext();) {
+ Property element = (Property) iter.next();
+ if(Property.CONTEXT_RUNTIME.equalsIgnoreCase(element.getContext()))
+ instancePropsMap.put(element.getId(), element.getDefault());
+ }
+ setServerInstanceProperties(instancePropsMap);
+
+
+ }
}
\ No newline at end of file