Author: vyemialyanchyk Date: 2010-11-29 11:42:35 -0500 (Mon, 29 Nov 2010) New Revision: 27003 Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch Removed: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java branches/jbosstools-3.2.0.Beta2/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. - fix for beta2 branch Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-11-29 16:39:19 UTC (rev 27002) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-11-29 16:42:35 UTC (rev 27003) @@ -84,7 +84,8 @@ configuration = null; res = true; } - res = res || closeSessionFactory(); + boolean tmp = closeSessionFactory(); + res = res || tmp; if (executionContext != null) { executionContext.execute(new Command() { public Object execute() { @@ -104,7 +105,8 @@ fakeDrivers.clear(); res = true; } - res = res || cleanUpClassLoader(); + tmp = cleanUpClassLoader(); + res = res || tmp; if (res) { fireConfigurationReset(); } Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 16:39:19 UTC (rev 27002) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 16:42:35 UTC (rev 27003) @@ -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: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 16:39:19 UTC (rev 27002) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 16:42:35 UTC (rev 27003) @@ -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"/> Deleted: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch 2010-11-29 16:39:19 UTC (rev 27002) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch 2010-11-29 16:42:35 UTC (rev 27003) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> -<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.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> -<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> -<listAttribute key="org.hibernate.tools.exporters"> -<listEntry value="org.hibernate.tools.hbm2java"/> -<listEntry value="org.hibernate.tools.hbm2hbmxml"/> -<listEntry value="org.hibernate.tools.hbm2dao"/> -<listEntry value="org.hibernate.tools.hbmtemplate"/> -<listEntry value="org.hibernate.tools.hbm2cfgxml"/> -<listEntry value="org.hibernate.tools.hbm2doc"/> -<listEntry value="org.hibernate.tools.hbm2ddl"/> -<listEntry value="org.hibernate.tools.query"/> -</listAttribute> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> -<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"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> -<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="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.package" value="hsql"/> -<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> -<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> -<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> -<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> -<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> -<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> -<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch (rev 0) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch 2010-11-29 16:42:35 UTC (rev 27003) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<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.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<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"/> +<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"/> +<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"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> +<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"/> +<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"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<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="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.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch (rev 0) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch 2010-11-29 16:42:35 UTC (rev 27003) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<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.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<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"/> +<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"/> +<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"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> +<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"/> +<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"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<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="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.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="false"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch (rev 0) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch 2010-11-29 16:42:35 UTC (rev 27003) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<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.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> +<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"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<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="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.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch (rev 0) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch 2010-11-29 16:42:35 UTC (rev 27003) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<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.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> +<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"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<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="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.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="false"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 16:39:19 UTC (rev 27002) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 16:42:35 UTC (rev 27003) @@ -10,9 +10,14 @@ ******************************************************************************/ package org.hibernate.eclipse.console.test; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Comparator; + import org.eclipse.core.externaltools.internal.IExternalToolConstants; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -21,16 +26,28 @@ import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.internal.core.LaunchManager; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.jdt.core.ToolFactory; +import org.eclipse.jdt.core.formatter.CodeFormatter; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.text.edits.MalformedTreeException; +import org.eclipse.text.edits.TextEdit; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.eclipse.console.EclipseLaunchConsoleConfigurationPreferences; import org.hibernate.eclipse.console.test.project.LaunchConfigTestProject2; +import org.hibernate.eclipse.console.test.utils.ResourceReadUtils; import junit.framework.TestCase; /** * Execute codegeneration launch configuration in external process, * to check the generation is successful. + * Execute codegeneration launch configuration in internal process, + * to check the generation is successful. + * Compare generated results - should be the same. + * Currently both tests are fail, should be success + * when JBIDE-7441 be fixed. * * @author Vitali Yemialyanchyk */ @@ -40,6 +57,8 @@ private ConsoleConfiguration consoleCfg; private LaunchConfigTestProject2 project; private LaunchManager launchManager = new LaunchManager(); + private final CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(null); + private final String ls = System.getProperties().getProperty("line.separator", ResourceReadUtils.LN_1); //$NON-NLS-1$ public CodeGenExternalProcessExecutionTest(String name) { super(name); @@ -59,11 +78,11 @@ } protected void tearDown() throws Exception { + consoleCfg.reset(); + KnownConfigurations.getInstance().removeAllConfigurations(); + consoleCfg = null; this.project.deleteIProject(); this.project = null; - - KnownConfigurations.getInstance().removeAllConfigurations(); - consoleCfg = null; } public void testExecuteExternalLaunchConfig() { @@ -74,9 +93,12 @@ } catch (CoreException e) { } assertEquals(0, nTest); - final String fileNameCodeGen = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE; - ILaunchConfiguration launchConfig = loadLaunchConfigFromFile(fileNameCodeGen); + ILaunchConfiguration launchConfig = null; ILaunchConfigurationWorkingCopy launchConfigWC = null; + // + final String fileNameCodeGenExtern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_EXTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenExtern); + launchConfigWC = null; try { launchConfigWC = launchConfig.getWorkingCopy(); } catch (CoreException e) { @@ -89,9 +111,300 @@ nTest = testFolder.members().length; } catch (CoreException e) { } + // TODO: uncomment when JBIDE-7441 be fixed + //assertTrue(nTest > 0); + // + final String fileNameCodeGenIntern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_INTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenIntern); + launchConfigWC = null; + try { + launchConfigWC = launchConfig.getWorkingCopy(); + } catch (CoreException e) { + } + assertNotNull(launchConfigWC); + launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false); + DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE); + nTest = -1; + try { + nTest = testFolder.members().length; + } catch (CoreException e) { + } assertTrue(nTest > 0); } + + public void testExecute2LaunchConfigs_External_and_Internal() { + // + ILaunchConfiguration launchConfig = null; + ILaunchConfigurationWorkingCopy launchConfigWC = null; + IFolder testFolderAllExportersExternal = null; + IFolder testFolderAllExportersInternal = null; + int nTest = -1; + // + testFolderAllExportersExternal = project.getTestFolderAllExportersExternal(); + nTest = -1; + try { + nTest = testFolderAllExportersExternal.members().length; + } catch (CoreException e) { + } + assertEquals(0, nTest); + // + final String fileNameCodeGenExtern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenExtern); + launchConfigWC = null; + try { + launchConfigWC = launchConfig.getWorkingCopy(); + } catch (CoreException e) { + } + assertNotNull(launchConfigWC); + launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false); + DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE); + nTest = -1; + try { + nTest = testFolderAllExportersExternal.members().length; + } catch (CoreException e) { + } + assertTrue(nTest > 0); + // + testFolderAllExportersInternal = project.getTestFolderAllExportersInternal(); + nTest = -1; + try { + nTest = testFolderAllExportersInternal.members().length; + } catch (CoreException e) { + } + assertEquals(0, nTest); + // + final String fileNameCodeGenIntern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenIntern); + launchConfigWC = null; + try { + launchConfigWC = launchConfig.getWorkingCopy(); + } catch (CoreException e) { + } + assertNotNull(launchConfigWC); + launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false); + DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE); + nTest = -1; + try { + nTest = testFolderAllExportersInternal.members().length; + } catch (CoreException e) { + } + assertTrue(nTest > 0); + // + boolean res = compareFolders(testFolderAllExportersExternal, testFolderAllExportersInternal, true); + assertTrue(res); + } + protected class ResComparator implements Comparator<IResource> { + + public int compare(IResource o1, IResource o2) { + int res = o1.getName().compareTo(o2.getName()); + if (res == 0) { + if (o1.getType() < o2.getType()) { + res = -1; + } else if (o1.getType() > o2.getType()) { + res = 1; + } + } + return res; + } + } + + /** + * Clean up string of substrings in between [cmtB, cmtE], + * cmtB, cmtE - are markers of substring to delete. + * + * @param str + * @param cmtB + * @param cmtE + * @return + */ + public String stripComments(String str, final String cmtB, final String cmtE) { + boolean process = true; + while (process) { + int fromIndex = 0; + int commentStart = str.indexOf(cmtB, fromIndex); + fromIndex = commentStart; + int commentEnd = str.indexOf(cmtE, fromIndex); + if (commentStart < commentEnd && commentStart != -1) { + str = str.substring(0, commentStart) + str.substring(commentEnd + cmtE.length()); + } else { + process = false; + } + } + return str; + } + + /** + * get rid of xml comments. + * + * @param str + * @return + */ + public String stripXmlComments(String str) { + final String cmtB = "<!--"; //$NON-NLS-1$ + final String cmtE = "-->"; //$NON-NLS-1$ + return stripComments(str, cmtB, cmtE); + } + + /** + * get rid of java comments. + * + * @param str + * @return + */ + public String stripJavaComments(String str) { + final String cmtB = "/*"; //$NON-NLS-1$ + final String cmtE = "*/"; //$NON-NLS-1$ + str = stripComments(str, cmtB, cmtE); + final String cmt2B = "//"; //$NON-NLS-1$ + final String cmt2E = ls; + str = stripComments(str, cmt2B, cmt2E); + return str; + } + + /** + * format string as java file. + * + * @param str + * @return + */ + public String formatJavaFile(String str) { + Document doc = new Document(str); + TextEdit edit = codeFormatter.format(CodeFormatter.K_COMPILATION_UNIT, str, 0, str.length(), 0, null); + try { + edit.apply(doc); + } catch (MalformedTreeException e) { + } catch (BadLocationException e) { + } + return doc.get(); + } + + /** + * Compares 2 files, if identical for test purposes return true. + * + * @param testFile1 + * @param testFile2 + * @param assertFlag - if true execute assertion + * @return + */ + public boolean compareFiles(IFile testFile1, IFile testFile2, boolean assertFlag) { + boolean res = false; + InputStream is1 = null, is2 = null; + try { + is1 = testFile1.getContents(); + } catch (CoreException e) { + } + try { + is2 = testFile2.getContents(); + } catch (CoreException e) { + } + if (is1 == null || is2 == null) { + res = is1 == is2; + if (!res && assertFlag) { + assertEquals(is1, is2); + } + return res; + } + String str1 = ResourceReadUtils.readStream(is1); + String str2 = ResourceReadUtils.readStream(is2); + if (str1 == null || str2 == null) { + res = str1 == str2; + if (!res && assertFlag) { + assertEquals(str1, str2); + } + return res; + } + final String useExt = testFile1.getFileExtension(); + if (0 == "xml".compareToIgnoreCase(useExt)) { //$NON-NLS-1$ + str1 = stripXmlComments(str1); + str2 = stripXmlComments(str2); + } else if (0 == "java".compareToIgnoreCase(useExt)) { //$NON-NLS-1$ + str1 = formatJavaFile(str1); + str2 = formatJavaFile(str2); + str1 = stripJavaComments(str1); + str2 = stripJavaComments(str2); + } + if (testFile1.getName().endsWith("cfg.xml")) { //$NON-NLS-1$ + // do not compare generated cfg.xml files till the time of + // open question for Environment.HBM2DDL_AUTO settings + //res = 0 == str1.compareTo(str2); + //if (!res && assertFlag) { + // assertEquals(str1, str2); + //} + res = true; + } else { + res = 0 == str1.compareTo(str2); + if (!res && assertFlag) { + assertEquals(str1, str2); + } + } + return res; + } + + /** + * Compares 2 folders, if identical for test purposes return true. + * + * @param testFolder1 + * @param testFolder2 + * @param assertFlag - if true execute assertion + * @return + */ + public boolean compareFolders(IFolder testFolder1, IFolder testFolder2, boolean assertFlag) { + boolean res = false; + IResource[] res1 = null, res2 = null; + try { + res1 = testFolder1.members(); + } catch (CoreException e) { + } + try { + res2 = testFolder2.members(); + } catch (CoreException e) { + } + if (res1 == null || res2 == null) { + res = res1 == res2; + if (!res && assertFlag) { + assertEquals(res1, res2); + } + return res; + } + res = res1.length == res2.length; + if (!res) { + if (!res && assertFlag) { + assertEquals(res1.length, res2.length); + } + return res; + } + final ResComparator cmp = new ResComparator(); + Arrays.sort(res1, cmp); + Arrays.sort(res2, cmp); + res = true; + for (int i = 0; res && i < res1.length; i++) { + if (0 != res1[i].getName().compareTo(res2[i].getName())) { + res = false; + if (!res && assertFlag) { + assertEquals(res1[i].getName(), res2[i].getName()); + } + } + if (res1[i].getType() != res2[i].getType()) { + res = false; + if (!res && assertFlag) { + assertEquals(res1[i].getType(), res2[i].getType()); + } + } + if (res && ((IResource.FOLDER & res1[i].getType()) == IResource.FOLDER)) { + IFolder tf1 = (IFolder)res1[i]; + IFolder tf2 = (IFolder)res2[i]; + res = compareFolders(tf1, tf2, assertFlag); + } + if (res && ((IResource.FILE & res1[i].getType()) == IResource.FILE)) { + IFile tf1 = (IFile)res1[i]; + IFile tf2 = (IFile)res2[i]; + res = compareFiles(tf1, tf2, assertFlag); + } + } + return res; + } + protected LaunchConfigTestProject2 getProject() { return this.project; } Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-29 16:39:19 UTC (rev 27002) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-29 16:42:35 UTC (rev 27003) @@ -40,13 +40,18 @@ public class LaunchConfigTestProject2 extends TestProject { public static final String TEST_TMP_OUT_FOLDER = "temp_test_out_folder"; //$NON-NLS-1$ + public static final String TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL = "temp_test_out_folder_all_exporters_external"; //$NON-NLS-1$ + public static final String TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL = "temp_test_out_folder_all_exporters_internal"; //$NON-NLS-1$ public static final String META_INF_FOLDER = "src/META-INF".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String PROJECT_PATH = "res/project2/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String RESOURCE_SRC_PATH = "res/project2/src/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String RESOURCE_LIB_PATH = "res/project2/lib/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String HIBERNATE_PLUGIN_LIB_PATH = "lib"; //$NON-NLS-1$ - public static final String LAUNCH_CODE_GEN_TEST_FILE = "testLaunchCfg.launch"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN = "testLaunchCfg_all_exporters_external.launch"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN = "testLaunchCfg_all_exporters_internal.launch"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_EXTERN = "testLaunchCfg_external.launch"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_INTERN = "testLaunchCfg_internal.launch"; //$NON-NLS-1$ public static final String LAUNCH_CONSOLE_CONFIG_TEST_FILE = "LaunchConfigTestProject2.launch"; //$NON-NLS-1$ public static final String HIBERNATE_CONSOLE_PROPERTIES_FILE = "hibernate-console.properties"; //$NON-NLS-1$ public static final String PERSISTENCE_XML_FILE = "persistence.xml"; //$NON-NLS-1$ @@ -76,8 +81,15 @@ super.buildProject(); IPackageFragmentRoot tst = createFolder(TEST_TMP_OUT_FOLDER); tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null); + tst = createFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL); + tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null); + tst = createFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL); + tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null); // - importFileToProject(LAUNCH_CODE_GEN_TEST_FILE); + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN); + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN); + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_EXTERN); + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_INTERN); importFileToProject(LAUNCH_CONSOLE_CONFIG_TEST_FILE); importFileToProject(HIBERNATE_CONSOLE_PROPERTIES_FILE); long startCopyFiles = System.currentTimeMillis(); @@ -101,6 +113,14 @@ public IFolder getTestFolder() { return project.getFolder(TEST_TMP_OUT_FOLDER); } + + public IFolder getTestFolderAllExportersExternal() { + return project.getFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL); + } + + public IFolder getTestFolderAllExportersInternal() { + return project.getFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL); + } public boolean setupSourceTestFolder() throws IOException, CoreException { ArrayList<String> foldersList = new ArrayList<String>(); Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 16:39:19 UTC (rev 27002) +++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 16:42:35 UTC (rev 27003) @@ -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; }