project templates: choosing app server

java/java-impl/src/com/intellij/openapi/module/BasePackageParameterFactory.java

@@ -60,7 +60,7 @@ public class BasePackageParameterFactory extends ProjectTemplateParameterFactory
 
       @Override
       public String getLabel() {
-        return "Base package:";
+        return "Base \u001Bpackage:";
       }
 
       @Override

platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java

@@ -30,6 +30,7 @@ public abstract class ProjectTemplateParameterFactory {
   // standard ids
   public static final String IJ_BASE_PACKAGE = "IJ_BASE_PACKAGE";
   public static final String IJ_PROJECT_NAME = "IJ_PROJECT_NAME";
+  public static final String IJ_APPLICATION_SERVER = "IJ_APPLICATION_SERVER";
 
   public abstract String getParameterId();
 

platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java

@@ -19,6 +19,7 @@ package com.intellij.execution.impl;
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.ide.util.projectWizard.ProjectTemplateComponent;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
@@ -39,7 +40,7 @@ import javax.swing.*;
 import java.util.*;
 
 
-public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, ProjectComponent {
+public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, ProjectComponent, ProjectTemplateComponent {
   private final Project myProject;
 
   private final Map<String, ConfigurationType> myTypesByName = new LinkedHashMap<String, ConfigurationType>();
@@ -1140,4 +1141,9 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable,
       myProviderKeysMap.put(id.toString(), id);
     }
   }
+
+  @Override
+  public String getStorageFile() {
+    return "workspace.xml";
+  }
 }

platform/platform-api/src/com/intellij/ui/CollectionComboBoxModel.java

@@ -32,6 +32,10 @@ public class CollectionComboBoxModel extends AbstractCollectionComboBoxModel {
     myItems = Collections.unmodifiableList(items);
   }
 
+  public CollectionComboBoxModel(List items) {
+    super(items.isEmpty() ? null : items.get(0));
+    myItems = items;
+  }
 
   @NotNull
   final protected List getItems() {