Yaniv Dary has submitted this change and it was merged. Change subject: packaging: sync to the level of engine ...................................................................... packaging: sync to the level of engine 1. Cleanup file layout, files are organized the same manner as studio exports them: tos_project - tos_project. etl_export - project export, used directory from zip: ovirt_engine_dwh src/ovirt_engine_dwh src/routines 2. Single jar creation for entire etl project. 3. Use jboss modules to run projects. 4. Build cleanup. 5. Spec cleanup. 7. Remove unneeded code. 8. Probably more... Change-Id: I2b4858e62a9095a9a3faf9a41ad8053f8c2e86c7 Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> --- M .gitignore M Makefile R README A build-tools-root/jboss-modules-maven-plugin/pom.xml A build-tools-root/jboss-modules-maven-plugin/src/main/java/org/ovirt/engine/build/Module.java A build-tools-root/jboss-modules-maven-plugin/src/main/java/org/ovirt/engine/build/ModulesMojo.java A build-tools-root/pom.xml A build/python-check.sh.in A build/shell-check.sh D data-warehouse/history_etl/etl_sources/packaging/pom.xml D data-warehouse/history_etl/etl_sources/packaging/root_etl_deploy.sh D data-warehouse/history_etl/etl_sources/packaging/root_etl_undeploy.sh D data-warehouse/history_etl/etl_sources/pom.xml D data-warehouse/history_etl/etl_sources/talendRoutines/pom.xml D data-warehouse/history_etl/history_service/etl-common-functions.sh D data-warehouse/history_etl/history_service/history_service.sh D data-warehouse/history_etl/pom.xml R etl_export/ovirt_engine_dwh/aggregationtodaily_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/aggregationtohourly_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/configurationsync_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/dailytimekeepingjob_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/deletetimekeepingjob_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/historydelete_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/historyetl_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/hostconfigcheck_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/hourlytimekeepingjob_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/minimalversioncheck_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/osenumupdate_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/parallelrun_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/samplerunjobs_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/sampletimekeepingjob_3_3/contexts/Default.properties R etl_export/ovirt_engine_dwh/statisticssync_3_3/contexts/Default.properties R etl_export/src/ovirt_engine_dwh/aggregationtodaily_3_3/AggregationToDaily.java R etl_export/src/ovirt_engine_dwh/aggregationtohourly_3_3/AggregationToHourly.java R etl_export/src/ovirt_engine_dwh/configurationsync_3_3/ConfigurationSync.java R etl_export/src/ovirt_engine_dwh/dailytimekeepingjob_3_3/DailyTimeKeepingJob.java R etl_export/src/ovirt_engine_dwh/deletetimekeepingjob_3_3/DeleteTimeKeepingJob.java R etl_export/src/ovirt_engine_dwh/historydelete_3_3/HistoryDelete.java R etl_export/src/ovirt_engine_dwh/historyetl_3_3/HistoryETL.java R etl_export/src/ovirt_engine_dwh/hostconfigcheck_3_3/HostConfigCheck.java R etl_export/src/ovirt_engine_dwh/hourlytimekeepingjob_3_3/HourlyTimeKeepingJob.java R etl_export/src/ovirt_engine_dwh/minimalversioncheck_3_3/MinimalVersionCheck.java R etl_export/src/ovirt_engine_dwh/osenumupdate_3_3/OsEnumUpdate.java R etl_export/src/ovirt_engine_dwh/parallelrun_3_3/ParallelRun.java R etl_export/src/ovirt_engine_dwh/samplerunjobs_3_3/SampleRunJobs.java R etl_export/src/ovirt_engine_dwh/sampletimekeepingjob_3_3/SampleTimeKeepingJob.java R etl_export/src/ovirt_engine_dwh/statisticssync_3_3/StatisticsSync.java R etl_export/src/routines/DataOperation.java R etl_export/src/routines/Mathematical.java R etl_export/src/routines/Numeric.java R etl_export/src/routines/Relational.java R etl_export/src/routines/RoutineHistoryETL.java R etl_export/src/routines/StringHandling.java R etl_export/src/routines/TalendDataGenerator.java R etl_export/src/routines/TalendDate.java R etl_export/src/routines/TalendString.java R etl_export/src/routines/system/AssertCatcherUtils.java R etl_export/src/routines/system/BufferedOutput.java R etl_export/src/routines/system/Constant.java R etl_export/src/routines/system/DBDateParser.java R etl_export/src/routines/system/Document.java R etl_export/src/routines/system/DocumentGenerateOrderHelper.java R etl_export/src/routines/system/DocumentHelper.java R etl_export/src/routines/system/DocumentLookupCache.java R etl_export/src/routines/system/DocumentToFlat.java R etl_export/src/routines/system/FastDateParser.java R etl_export/src/routines/system/FormatterUtils.java R etl_export/src/routines/system/GlobalResource.java R etl_export/src/routines/system/IPersistableComparableLookupRow.java R etl_export/src/routines/system/IPersistableLookupRow.java R etl_export/src/routines/system/IPersistableRow.java R etl_export/src/routines/system/JSONObject.java R etl_export/src/routines/system/LocaleProvider.java R etl_export/src/routines/system/LogCatcherUtils.java R etl_export/src/routines/system/MetterCatcherUtils.java R etl_export/src/routines/system/NameSpaceTool.java R etl_export/src/routines/system/ParserUtils.java R etl_export/src/routines/system/PrintfFormat.java R etl_export/src/routines/system/ResumeUtil.java R etl_export/src/routines/system/RunStat.java R etl_export/src/routines/system/RunTrace.java R etl_export/src/routines/system/RuntimeUtils.java R etl_export/src/routines/system/SharedDBConnection.java R etl_export/src/routines/system/SharedDBPreparedStatement.java R etl_export/src/routines/system/StatCatcherUtils.java R etl_export/src/routines/system/StringUtils.java R etl_export/src/routines/system/TDieException.java R etl_export/src/routines/system/TRunJobException.java R etl_export/src/routines/system/TalendDataSource.java R etl_export/src/routines/system/TalendThread.java R etl_export/src/routines/system/TalendThreadPool.java R etl_export/src/routines/system/TalendThreadResult.java R etl_export/src/routines/system/TalendTimestampWithTZ.java R etl_export/src/routines/system/TypeConvert.java R etl_export/src/routines/system/UnicodeReader.java R etl_export/src/routines/system/XMLHelper.java R etl_export/src/routines/system/api/ESBConsumer.java R etl_export/src/routines/system/api/ESBEndpointInfo.java R etl_export/src/routines/system/api/ESBEndpointRegistry.java R etl_export/src/routines/system/api/ESBJobInterruptedException.java R etl_export/src/routines/system/api/ESBProviderCallback.java R etl_export/src/routines/system/api/TalendESBJob.java R etl_export/src/routines/system/api/TalendESBJobFactory.java R etl_export/src/routines/system/api/TalendESBRoute.java R etl_export/src/routines/system/api/TalendJob.java R etl_export/src/routines/system/api/TalendMDMJob.java A ovirt-engine-dwh.spec.in R ovirt-engine-dwh/advancedPersistentLookupLib/pom.xml R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/exception/ExceptionHandler.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/utils/data/map/MultiLazyValuesMap.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/utils/time/TimeMeasure.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/commons/utils/time/TimeStack.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/core/model/process/ILookupMode.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/core/model/process/IMatchingMode.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/common/ICommonLookup.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/common/ILookupManagerUnit.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/memory/AdvancedMemoryLookup.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/memory/IMemoryLookup.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/AbstractOrderedBeanLookup.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/AbstractPersistentLookup.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/IPersistableLookup.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/IPersistentLookupManager.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/IPersistentRowManager.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/MemoryHelper.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupAll.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupMatchAll.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupMatchFirst.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/OrderedBeanLookupMatchLast.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/PersistentLookupManager.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/PersistentRowSorterIterator.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/PersistentSortedLookupManager.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/lookup/persistent/RowProvider.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/persistent/IRowCreator.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/persistent/IRowProvider.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/persistent/utils/FileUtils.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/IMapHashFile.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/beans/ILightSerializable.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/beans/IPersistentBean.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/beans/KeyForMap.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/hashimpl/DataContainer.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/hashimpl/FlowSorterIterator.java R ovirt-engine-dwh/advancedPersistentLookupLib/src/main/java/org/talend/designer/components/thash/io/hashimpl/SortedMultipleHashFile.java A ovirt-engine-dwh/dependencies/pom.xml A ovirt-engine-dwh/dependencies/src/main/modules/org/ovirt/engine/dwh/main/module.xml A ovirt-engine-dwh/dependencies/src/main/modules/org/postgresql/main/module.xml R ovirt-engine-dwh/historyETL/pom.xml A ovirt-engine-dwh/historyETL/src/main/java/ovirt_engine_dwh A ovirt-engine-dwh/historyETL/src/main/java/routines A ovirt-engine-dwh/historyETL/src/main/resources/ovirt_engine_dwh R ovirt-engine-dwh/pom.xml A packaging/bin/etl-common-functions.sh.in A packaging/bin/history_service.sh.in R packaging/dbscripts/common_sp.sql R packaging/dbscripts/create_db.sh R packaging/dbscripts/create_functions.sql R packaging/dbscripts/create_reports_views.sql R packaging/dbscripts/create_schema.sh R packaging/dbscripts/create_sp.sql R packaging/dbscripts/create_tables.sql R packaging/dbscripts/create_views_3_0.sql R packaging/dbscripts/create_views_3_1.sql R packaging/dbscripts/create_views_3_2.sql R packaging/dbscripts/create_views_3_3.sql R packaging/dbscripts/dbcustomfunctions.sh R packaging/dbscripts/dbfunctions.sh R packaging/dbscripts/insert_calendar_table_values.sql R packaging/dbscripts/insert_data.sql R packaging/dbscripts/insert_enum_values.sql R packaging/dbscripts/insert_timekeeping_values.sql R packaging/dbscripts/ovirt-engine-history-db-install.sh R packaging/dbscripts/refreshStoredProcedures.sh R packaging/dbscripts/upgrade.sh R packaging/dbscripts/upgrade/03_01_0000_set_version.sql R packaging/dbscripts/upgrade/03_02_0010_add_vm_users_usage_tables.sql R packaging/dbscripts/upgrade/03_02_0020_add_storage_domain_status_columns.sql R packaging/dbscripts/upgrade/03_02_0030_drop_auto_suspend_column.sql R packaging/dbscripts/upgrade/03_02_0040_add_more_reports_enum_values.sql R packaging/dbscripts/upgrade/03_02_0050_add_function_to_update_enum_table.sql R packaging/dbscripts/upgrade/03_02_0060_updated_enums.sql R packaging/dbscripts/upgrade/03_02_0070_changed_vm_ip_column_to_text.sql R packaging/dbscripts/upgrade/03_02_0080_added_missing_os_enums.sql R packaging/dbscripts/upgrade/03_02_0090_updated_enums.sql R packaging/dbscripts/upgrade/03_03_0010_add_vm_client_ip.sql R packaging/dbscripts/upgrade/03_03_0020_add_pool_info.sql R packaging/dbscripts/upgrade/03_03_0030_change_vm_disks_tables.sql R packaging/dbscripts/upgrade/03_03_0040_add_vm_guest_user_login_info.sql R packaging/dbscripts/upgrade/03_03_0050_changed_users_vm_ip_column_to_text.sql R packaging/dbscripts/upgrade/post_upgrade/0010_change_enum_lang_code.sql R packaging/dbscripts/upgrade/pre_upgrade/add_comment_col_to_schema_version.sql R packaging/dbscripts/upgrade/pre_upgrade/add_function_to_update_enum_table.sql R packaging/dbscripts/upgrade/pre_upgrade/set_default_lang_code.sql R packaging/dbscripts/upgrade/pre_upgrade/set_etl_minimal_version.sql A packaging/etc/ovirt-engine-dwhd.conf.d/README.in R packaging/legacy-setup/common_utils.py R packaging/legacy-setup/decorators.py R packaging/legacy-setup/ovirt-engine-dwh-setup.py D packaging/ovirt-engine-dwh.spec.in D packaging/resources/ovirt-engine-dwhd.logrotate D packaging/resources/ovirt_engine_dwh_watchdog.cron R packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.sysv.in A packaging/sys-etc/cron.hourly/ovirt_engine_dwh_watchdog.cron.in A packaging/sys-etc/logrotate.d/ovirt-engine-dwhd.in M pom.xml R tos_project/.project R tos_project/.settings/org.eclipse.core.resources.prefs R tos_project/code/routines/RoutineHistoryETL_0.1.item R tos_project/code/routines/RoutineHistoryETL_0.1.properties R tos_project/code/routines/RoutineHistoryETL_3.3.item R tos_project/code/routines/RoutineHistoryETL_3.3.properties R tos_project/code/routines/system/DataOperation_0.1.item R tos_project/code/routines/system/DataOperation_0.1.properties R tos_project/code/routines/system/Mathematical_0.1.item R tos_project/code/routines/system/Mathematical_0.1.properties R tos_project/code/routines/system/Numeric_0.1.item R tos_project/code/routines/system/Numeric_0.1.properties R tos_project/code/routines/system/Relational_0.1.item R tos_project/code/routines/system/Relational_0.1.properties R tos_project/code/routines/system/StringHandling_0.1.item R tos_project/code/routines/system/StringHandling_0.1.properties R tos_project/code/routines/system/TalendDataGenerator_0.1.item R tos_project/code/routines/system/TalendDataGenerator_0.1.properties R tos_project/code/routines/system/TalendDate_0.1.item R tos_project/code/routines/system/TalendDate_0.1.properties R tos_project/code/routines/system/TalendString_0.1.item R tos_project/code/routines/system/TalendString_0.1.properties R tos_project/configuration/ExpressionBuilder/AggregationToDaily.xml R tos_project/configuration/ExpressionBuilder/AggregationToHourly.xml R tos_project/configuration/ExpressionBuilder/ConfigurationSync.xml R tos_project/configuration/ExpressionBuilder/DeleteTimeKeepingJob.xml R tos_project/configuration/ExpressionBuilder/HistoryAggregate.xml R tos_project/configuration/ExpressionBuilder/HistoryETL.xml R tos_project/configuration/ExpressionBuilder/OsEnumUpdate.xml R tos_project/configuration/ExpressionBuilder/SampleRunJobs.xml R tos_project/configuration/ExpressionBuilder/SampleTimeKeepingJob.xml R tos_project/configuration/ExpressionBuilder/StatisticsSync.xml R tos_project/context/connectionJDBC_3.3.item R tos_project/context/connectionJDBC_3.3.properties R tos_project/process/AggregationToDaily_3.3.item R tos_project/process/AggregationToDaily_3.3.properties R tos_project/process/AggregationToHourly_3.3.item R tos_project/process/AggregationToHourly_3.3.properties R tos_project/process/ConfigurationSync_3.3.item R tos_project/process/ConfigurationSync_3.3.properties R tos_project/process/DailyTimeKeepingJob_3.3.item R tos_project/process/DailyTimeKeepingJob_3.3.properties R tos_project/process/DeleteTimeKeepingJob_3.3.item R tos_project/process/DeleteTimeKeepingJob_3.3.properties R tos_project/process/HistoryDelete_3.3.item R tos_project/process/HistoryDelete_3.3.properties R tos_project/process/HistoryETL_3.3.item R tos_project/process/HistoryETL_3.3.properties R tos_project/process/HostConfigCheck_3.3.item R tos_project/process/HostConfigCheck_3.3.properties R tos_project/process/HourlyTimeKeepingJob_3.3.item R tos_project/process/HourlyTimeKeepingJob_3.3.properties R tos_project/process/MinimalVersionCheck_3.3.item R tos_project/process/MinimalVersionCheck_3.3.properties R tos_project/process/OsEnumUpdate_3.3.item R tos_project/process/OsEnumUpdate_3.3.properties R tos_project/process/ParallelRun_3.3.item R tos_project/process/ParallelRun_3.3.properties R tos_project/process/SampleRunJobs_3.3.item R tos_project/process/SampleRunJobs_3.3.properties R tos_project/process/SampleTimeKeepingJob_3.3.item R tos_project/process/SampleTimeKeepingJob_3.3.properties R tos_project/process/StatisticsSync_3.3.item R tos_project/process/StatisticsSync_3.3.properties R tos_project/talend.project 268 files changed, 1,158 insertions(+), 740 deletions(-) Approvals: Yaniv Dary: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/22404 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b4858e62a9095a9a3faf9a41ad8053f8c2e86c7 Gerrit-PatchSet: 10 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alonbl@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl@redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay@redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo@redhat.com> Gerrit-Reviewer: Yaniv Dary <ydary@redhat.com>