Author: ljelinko Date: 2012-01-24 09:41:46 -0500 (Tue, 24 Jan 2012) New Revision: 38097 Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch Log: Template configuration moved from launchers to resources Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties 2012-01-24 14:41:26 UTC (rev 38096) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-4.3.properties 2012-01-24 14:41:46 UTC (rev 38097) @@ -1,3 +0,0 @@ -SERVER=EPP,4.3,default,${JBOSS_EPP_4_3}/jboss-as -SEAM=2.0,${JBOSS_EPP_4_3}/seam2 -DB=hsqldb18,internal, , , , , \ No newline at end of file Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties 2012-01-24 14:41:26 UTC (rev 38096) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/config_files/epp-5.1.1.properties 2012-01-24 14:41:46 UTC (rev 38097) @@ -1,3 +0,0 @@ -SERVER=EPP,5.1.1,default,${JBOSS_EPP_5_1}/jboss-as -SEAM=2.2,${JBOSS_EPP_5_1}/seam -DB=hsqldb18,internal, , , , , \ No newline at end of file Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-01-24 14:41:26 UTC (rev 38096) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-01-24 14:41:46 UTC (rev 38097) @@ -9,9 +9,13 @@ <build> <resources> <resource> - <directory>./config_files</directory> + <directory>../../resources/product_config_files</directory> <filtering>true</filtering> </resource> + <resource> + <directory>../../resources/project_config_files</directory> + <filtering>true</filtering> + </resource> </resources> <outputDirectory>../../resources/generated_config_files</outputDirectory> Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch 2012-01-24 14:41:26 UTC (rev 38096) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/prepare_workspace/prepare_workspace.launch 2012-01-24 14:41:46 UTC (rev 38097) @@ -6,8 +6,10 @@ <booleanAttribute key="M2_OFFLINE" value="false"/> <stringAttribute key="M2_PROFILES" value=""/> <listAttribute key="M2_PROPERTIES"> -<listEntry value="JBOSS_EPP_4_3=${folder_prompt:EPP 4.3 installation directory}"/> -<listEntry value="JBOSS_EPP_5_1=${folder_prompt:EPP 5.1 installation directory}"/> +<listEntry value="jbosstools.test.jboss-epp-4.3.home=${folder_prompt:EPP 4.3 installation directory}"/> +<listEntry value="jbosstools.test.jboss-epp-5.1.home=${folder_prompt:EPP 5.1 installation directory}"/> +<listEntry value="jbosstools.test.jboss-gatein.home=${folder_prompt:GateIn 3.1.0 installation directory}"/> +<listEntry value="jbosstools.test.jboss-seam.home=${folder_prompt:Seam 2.2 installation directory}"/> </listAttribute> <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> <booleanAttribute key="M2_SKIP_TESTS" value="false"/>