Author: vpakan(a)redhat.com Date: 2010-11-25 10:37:15 -0500 (Thu, 25 Nov 2010) New Revision: 26940 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java Log: Support JBoss EAP Server Type v. 5.x Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-11-25 15:34:08 UTC (rev 26939) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-11-25 15:37:15 UTC (rev 26940) @@ -389,6 +389,7 @@ public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Middleware"; public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Middleware"; + public static final String JBOSS_EAP_5_x = "JBoss Enterprise Middleware"; public static final String JBOSS_COMMUNITY = "JBoss Community"; } @@ -396,6 +397,7 @@ public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Application Platform 4.3 Runtime"; public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0 Runtime"; + public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x Runtime"; public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime"; } @@ -403,6 +405,7 @@ public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Application Platform 4.3"; public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0"; + public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x"; public static final String JBOSS_AS_5_1 = "JBoss AS 5.1"; } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-11-25 15:34:08 UTC (rev 26939) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-11-25 15:37:15 UTC (rev 26940) @@ -77,7 +77,12 @@ Activator.getDefault().getLog().log(status); e.printStackTrace(); } - if (projectProperties.containsKey("JBossEap5.0")){ + if (projectProperties.containsKey("JBossEap5.x")){ + JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap5.x"); //$NON-NLS-1$ + JBOSS_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_EAP_5_x; + JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_5_x; + JBOSS_SERVER_TYPE = IDELabel.ServerType.JBOSS_EAP_5_x; + }else if (projectProperties.containsKey("JBossEap5.0")){ JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap5.0"); //$NON-NLS-1$ JBOSS_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_EAP_5_0; JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_5_0;