Author: lzoubek(a)redhat.com Date: 2011-08-17 11:20:25 -0400 (Wed, 17 Aug 2011) New Revision: 34011 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java Log: botext:rename JBOSS_AS server config proeperty to AS Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2011-08-17 14:39:34 UTC (rev 34010) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.properties 2011-08-17 15:20:25 UTC (rev 34011) @@ -2,7 +2,7 @@ # all properties are optional, all defined paths should exist # <java version>,<jre/jdk home> JAVA=1.6,/opt/sun-jdk-1.6.0.19/jre -#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>,<optional remote system host>,<optional remote home> +#EAP|AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>,<optional remote system host>,<optional remote home> # note : when server is type of SOA, version is version of SOA (not the bundled EAP) SERVER=EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as #SERVER=EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as,remote.example.com,/opt/jboss-eap-5.0/jboss-as Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java 2011-08-17 14:39:34 UTC (rev 34010) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/ServerBean.java 2011-08-17 15:20:25 UTC (rev 34011) @@ -28,7 +28,7 @@ // where to unzip it? File runtimeOutput; File runtimeHomeAbs = new File(runtimeHome).getAbsoluteFile(); - if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(type)) { + if (TestConfigurator.Values.SERVER_TYPE_AS.equals(type)) { runtimeOutput=runtimeHomeAbs.getParentFile(); } else { Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-17 14:39:34 UTC (rev 34010) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2011-08-17 15:20:25 UTC (rev 34011) @@ -58,7 +58,7 @@ public static final String SERVER_TYPE_EPP = "EPP"; public static final String SERVER_TYPE_EAP = "EAP"; public static final String SERVER_TYPE_SOA = "SOA"; - public static final String SERVER_TYPE_JBOSSAS = "JBOSS_AS"; + public static final String SERVER_TYPE_AS = "AS"; public static final String SERVER_WITH_DEFAULT_JAVA = "default"; } /** @@ -208,7 +208,7 @@ } if (s.type().equals(ServerType.JbossAS) && !currentConfig.getServer().type - .equals(Values.SERVER_TYPE_JBOSSAS)) { + .equals(Values.SERVER_TYPE_AS)) { ReasonLogger.serverTypeMatch(s.type().toString(), currentConfig.getServer().type); return null; } 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-17 14:39:34 UTC (rev 34010) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2011-08-17 15:20:25 UTC (rev 34011) @@ -140,7 +140,7 @@ } } - else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType)) { + else if (TestConfigurator.Values.SERVER_TYPE_AS.equals(serverType)) { if ("4.2".equals(version)) { return new ServerInfo(JBossCommunityJBoss42Runtime.LABEL,JBossCommunityJBossAS42.LABEL); }