Author: vyemialyanchyk Date: 2010-11-29 09:53:24 -0500 (Mon, 29 Nov 2010) New Revision: 27000 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java Log: https://jira.jboss.org/browse/JBIDE-7746 - try to fix issue for linux test env. Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 14:53:24 UTC (rev 27000) @@ -9,9 +9,9 @@ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hibernate.codegen.CodeGenMain"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="..../AppData/Local/Temp/codegenbuildxml/4fbe6bbb-9013-4ef2-8175-5b13f714ae00/build.xml"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="qwert"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ....\hibernate_eclipse_plugins_short\z-codegen\target\org.hibernate.codegen-1.0.0.GA.jar"/> -<stringAttribute key="org.hibernate.tools.buildXml" value="\qwert\target\build.xml"/> -<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="....\trunk\hibernatetools\plugins\org.hibernate.eclipse\lib\extern\org.hibernate.codegen.jar"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ..../hibernate_eclipse_plugins_short/z-codegen/target/org.hibernate.codegen-1.0.0.GA.jar"/> +<stringAttribute key="org.hibernate.tools.buildXml" value="/qwert/target/build.xml"/> +<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="..../trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/extern/org.hibernate.codegen.jar"/> <stringAttribute key="org.hibernate.tools.configurationname" value="qwert"/> <booleanAttribute key="org.hibernate.tools.ejb3" value="true"/> <listAttribute key="org.hibernate.tools.exporters"> @@ -48,39 +48,39 @@ <mapAttribute key="org.hibernate.tools.exporters.8.properties"> <mapEntry key="file_pattern" value="{package-name}/{class-name}.java"/> <mapEntry key="for_each" value="11111111111111"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> <mapEntry key="template_name" value="pojo/Pojo.ftl"/> -<mapEntry key="template_path" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="template_path" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.9" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.9.extension_id" value="org.hibernate.tools.hbm2dao"/> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.properties"> <mapEntry key="outputFileName" value="schema.sql"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> <mapEntry key="schemaUpdate" value="true"/> <mapEntry key="scriptToConsole" value="true"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> @@ -89,24 +89,24 @@ <mapEntry key="destdir2" value="qw"/> <mapEntry key="ejb3" value="true"/> <mapEntry key="jdk5" value="true"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.properties"> <mapEntry key="file_pattern" value="${package-name}/${class-name}.java"/> <mapEntry key="for_each" value="entity"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> <mapEntry key="template_name" value="pojo/Pojo.ftl"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.jdk5" value="true"/> -<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> <stringAttribute key="org.hibernate.tools.package" value="qqqqqqqqqqqqqqqqqqqqqqqqqqqq"/> <booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="false"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="false"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="false"/> -<stringAttribute key="org.hibernate.tools.revengfile" value="\qwert\src\hibernate.reveng.xml"/> +<stringAttribute key="org.hibernate.tools.revengfile" value="/qwert/src/hibernate.reveng.xml"/> <booleanAttribute key="org.hibernate.tools.schema2hbm" value="true"/> <booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> <booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 14:53:24 UTC (rev 27000) @@ -9,9 +9,9 @@ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hibernate.codegen.CodeGenMain"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="...../AppData/Local/Temp/codegenbuildxml/4fbe6bbb-9013-4ef2-8175-5b13f714ae00/build.xml"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="qwert"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ....\hibernate_eclipse_plugins_short\z-codegen\target\org.hibernate.codegen-1.0.0.GA.jar"/> -<stringAttribute key="org.hibernate.tools.buildXml" value="\qwert\target\build.xml"/> -<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="....\trunk\hibernatetools\plugins\org.hibernate.eclipse\lib\extern\org.hibernate.codegen.jar"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ..../hibernate_eclipse_plugins_short/z-codegen/target/org.hibernate.codegen-1.0.0.GA.jar"/> +<stringAttribute key="org.hibernate.tools.buildXml" value="/qwert/target/build.xml"/> +<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="..../trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/extern/org.hibernate.codegen.jar"/> <stringAttribute key="org.hibernate.tools.configurationname" value="qwert"/> <booleanAttribute key="org.hibernate.tools.ejb3" value="true"/> <listAttribute key="org.hibernate.tools.exporters"> @@ -50,37 +50,37 @@ <mapEntry key="for_each" value="11111111111111"/> <mapEntry key="outputdir" value="temp_test_out_folder"/> <mapEntry key="template_name" value="pojo/Pojo.ftl"/> -<mapEntry key="template_path" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="template_path" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.9" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.9.extension_id" value="org.hibernate.tools.hbm2dao"/> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.properties"> <mapEntry key="outputFileName" value="schema.sql"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> <mapEntry key="schemaUpdate" value="true"/> <mapEntry key="scriptToConsole" value="true"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.properties"> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> @@ -89,14 +89,14 @@ <mapEntry key="destdir2" value="qw"/> <mapEntry key="ejb3" value="true"/> <mapEntry key="jdk5" value="true"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="true"/> <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.properties"> <mapEntry key="file_pattern" value="${package-name}/${class-name}.java"/> <mapEntry key="for_each" value="entity"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/> <mapEntry key="template_name" value="pojo/Pojo.ftl"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.jdk5" value="true"/> @@ -106,7 +106,7 @@ <booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="false"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="false"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="false"/> -<stringAttribute key="org.hibernate.tools.revengfile" value="\qwert\src\hibernate.reveng.xml"/> +<stringAttribute key="org.hibernate.tools.revengfile" value="/qwert/src/hibernate.reveng.xml"/> <booleanAttribute key="org.hibernate.tools.schema2hbm" value="true"/> <booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> <booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch 2010-11-29 14:53:24 UTC (rev 27000) @@ -3,7 +3,7 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/> <stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> <booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> <listAttribute key="org.hibernate.tools.exporters"> @@ -34,11 +34,11 @@ <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> <mapEntry key="outputFileName" value="asdf.txt"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_external"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_external"/> <mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> -<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_external"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_external"/> <stringAttribute key="org.hibernate.tools.package" value="hsql"/> <booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch 2010-11-29 14:53:24 UTC (rev 27000) @@ -3,7 +3,7 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/> <stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> <booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> <listAttribute key="org.hibernate.tools.exporters"> @@ -34,11 +34,11 @@ <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> <mapEntry key="outputFileName" value="asdf.txt"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_internal"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_internal"/> <mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> -<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_internal"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_internal"/> <stringAttribute key="org.hibernate.tools.package" value="hsql"/> <booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch 2010-11-29 14:53:24 UTC (rev 27000) @@ -3,7 +3,7 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/> <stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> <booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> <listAttribute key="org.hibernate.tools.exporters"> @@ -34,11 +34,11 @@ <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> <mapEntry key="outputFileName" value="asdf.txt"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/> <mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> -<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/> <stringAttribute key="org.hibernate.tools.package" value="hsql"/> <booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch 2010-11-29 14:53:24 UTC (rev 27000) @@ -3,7 +3,7 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/> <stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> <booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> <listAttribute key="org.hibernate.tools.exporters"> @@ -34,11 +34,11 @@ <stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> <mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> <mapEntry key="outputFileName" value="asdf.txt"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/> <mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> </mapAttribute> <booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> -<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/> <stringAttribute key="org.hibernate.tools.package" value="hsql"/> <booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> <booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 14:53:24 UTC (rev 27000) @@ -81,23 +81,7 @@ consoleCfg.reset(); KnownConfigurations.getInstance().removeAllConfigurations(); consoleCfg = null; - // - Exception ex = null; - for (int i = 0; i < 4; i++) { - ex = null; - try { - this.project.deleteIProject(); - i = 4; - } catch (Exception e) { - ex = e; - if (i < 3) { - Thread.sleep(3000); - } - } - } - if (ex != null) { - throw ex; - } + this.project.deleteIProject(); this.project = null; } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 11:00:12 UTC (rev 26999) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 14:53:24 UTC (rev 27000) @@ -88,13 +88,27 @@ } public void deleteIProject(boolean deleteContent) { - try { - IContainer container = project.getParent(); - project.delete(deleteContent, true, null); - container.refreshLocal(IResource.DEPTH_ONE, null); - } catch (CoreException ce) { - throw new RuntimeException(ce); + Exception ex = null; + for (int i = 0; i < 4; i++) { + ex = null; + try { + IContainer container = project.getParent(); + project.delete(deleteContent, true, null); + container.refreshLocal(IResource.DEPTH_ONE, null); + i = 4; + } catch (CoreException e) { + ex = e; + if (i < 3) { + try { + Thread.sleep(3000); + } catch (InterruptedException e1) { + } + } + } } + if (ex != null) { + throw new RuntimeException(ex); + } javaProject = null; project = null; }