[jbosstools-commits] JBoss Tools SVN: r35730 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2011-10-17 11:24:58 -0400 (Mon, 17 Oct 2011)
New Revision: 35730

Modified:
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
JBIDE-9793 - Ensuring created server has correct name

Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF	2011-10-17 15:11:32 UTC (rev 35729)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF	2011-10-17 15:24:58 UTC (rev 35730)
@@ -25,7 +25,7 @@
  org.eclipse.wst.server.ui;bundle-version="[1.1.3,2.0.0)",
  org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.m2e.core.ui;bundle-version="1.0.100",
- org.eclipse.wst.common.modulecore;bundle-version="1.2.101"
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.100"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.jboss.tools.common.databinding,

Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java	2011-10-17 15:11:32 UTC (rev 35729)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java	2011-10-17 15:24:58 UTC (rev 35730)
@@ -41,6 +41,7 @@
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.IServerType;
 import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
 import org.eclipse.wst.server.core.ServerUtil;
 import org.jboss.ide.eclipse.as.core.util.FileUtil;
 import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
@@ -259,7 +260,10 @@
 		IRuntime rt = (IRuntime)getProperty(AdapterWizardPageModel.RUNTIME_DELEGATE);
 		String mode = (String)getProperty(AdapterWizardPageModel.MODE);
 
-		IServer server = ExpressServerUtils.createServer(rt, type, "Openshift Server1");
+		String serverNameBase = getApplication().getName() + " Openshift Server";
+		String serverName = org.jboss.ide.eclipse.as.core.util.ServerUtil.getDefaultServerName(serverNameBase);
+		
+		IServer server = ExpressServerUtils.createServer(rt, type, serverName);
 		ExpressServerUtils.fillServerWithOpenshiftDetails(server, getApplication().getApplicationUrl(), 
 				getUser().getRhlogin(), getUser().getPassword(), 
 				getUser().getDomain().getNamespace(), getApplication().getName(), mode);