Author: lzoubek(a)redhat.com Date: 2011-08-30 06:35:21 -0400 (Tue, 30 Aug 2011) New Revision: 34382 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java Log: swtbotext: support adding AS 6.1 & 7.x server runtimes Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2011-08-30 08:21:49 UTC (rev 34381) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2011-08-30 10:35:21 UTC (rev 34382) @@ -4,18 +4,20 @@ import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS7x; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss7xRuntime; import org.jboss.tools.ui.bot.ext.gen.IServer; import org.jboss.tools.ui.bot.ext.gen.IServerRuntime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS42; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS50; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS51; -import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS60; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS6x; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss42Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss50Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss51Runtime; -import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss60Runtime; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss6xRuntime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime; /** @@ -102,14 +104,11 @@ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL ); } - if ("5.0".equals(version) || "5.x".equals(version)) { + + if (version!=null && version.startsWith("5")) { return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); } - if ("5.1".equals(version)) { - return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, - JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); - } } if (TestConfigurator.Values.SERVER_TYPE_EPP.equals(serverType)) { @@ -118,7 +117,7 @@ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL ); } - if ("5.0".equals(version) || "5.x".equals(version)) { + if (version!=null && version.startsWith("5")) { return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); } @@ -130,15 +129,10 @@ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL ); } - if ("5.0".equals(version)) { + if (version!=null && version.startsWith("5")) { return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); - } - if ("5.1".equals(version) || "5.x".equals(version)) { - return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, - JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); - } - + } } else if (TestConfigurator.Values.SERVER_TYPE_AS.equals(serverType)) { if ("4.2".equals(version)) { @@ -150,9 +144,12 @@ if ("5.1".equals(version)) { return new ServerInfo(JBossCommunityJBoss51Runtime.LABEL,JBossCommunityJBossAS51.LABEL); } - if ("6.0".equals(version)) { - return new ServerInfo(JBossCommunityJBoss60Runtime.LABEL,JBossCommunityJBossAS60.LABEL); + if (version!=null && version.startsWith("6")) { + return new ServerInfo(JBossCommunityJBoss6xRuntime.LABEL,JBossCommunityJBossAS6x.LABEL); } + if (version!=null && version.startsWith("7")) { + return new ServerInfo(JBossCommunityJBoss7xRuntime.LABEL,JBossCommunityJBossAS7x.LABEL); + } } failParsing(); return null; Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-30 08:21:49 UTC (rev 34381) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-30 10:35:21 UTC (rev 34382) @@ -1564,9 +1564,9 @@ */ public static final String TEXT_JRE = "JRE:"; } - public static class JBossCommunityJBossAS60 { + public static class JBossCommunityJBossAS6x { /** - * represents item : JBoss Community->JBoss AS 6.0 + * represents item : JBoss Community->JBoss AS 6.x */ public static final IServer LABEL = new IServer() { public String getName() { return "JBoss AS 6.x";} @@ -1581,6 +1581,23 @@ */ public static final String TEXT_DIRECTORY = "Directory:"; } + public static class JBossCommunityJBossAS7x { + /** + * represents item : JBoss Community->JBoss AS 7.x + */ + public static final IServer LABEL = new IServer() { + public String getName() { return "JBoss AS 7.x";} + public List<String> getGroupPath() { + List<String> l = new Vector<String>(); + l.add("JBoss Community"); + return l; + } + }; + /** + * text field labeled 'Directory:' + */ + public static final String TEXT_DIRECTORY = "Directory:"; + } public static class ApacheTomcatv32Server { /** * represents item : Apache->Tomcat v3.2 Server @@ -10579,9 +10596,9 @@ */ public static final String TEXT_LOCATION = "Location:"; } - public static class JBossCommunityJBoss60Runtime { + public static class JBossCommunityJBoss6xRuntime { /** - * represents item : JBoss Community->JBoss 6.0 Runtime + * represents item : JBoss Community->JBoss 6.x Runtime */ public static final IServerRuntime LABEL = new IServerRuntime() { public String getName() { return "JBoss 6.x Runtime";} @@ -10596,6 +10613,23 @@ */ public static final String TEXT_DIRECTORY = "Directory:"; } + public static class JBossCommunityJBoss7xRuntime { + /** + * represents item : JBoss Community->JBoss 7.x Runtime + */ + public static final IServerRuntime LABEL = new IServerRuntime() { + public String getName() { return "JBoss 7.x Runtime";} + public List<String> getGroupPath() { + List<String> l = new Vector<String>(); + l.add("JBoss Community"); + return l; + } + }; + /** + * text field labeled 'Directory:' + */ + public static final String TEXT_DIRECTORY = "Directory:"; + } public static class ApacheApacheTomcatv32 { /** * represents item : Apache->Apache Tomcat v3.2