diff --git a/assemblies/plugins/pom.xml b/assemblies/plugins/pom.xml index 1595c9bc36df..afe5e9a08614 100644 --- a/assemblies/plugins/pom.xml +++ b/assemblies/plugins/pom.xml @@ -73,6 +73,7 @@ ${project.version} ${project.version} ${project.version} + ${project.version} diff --git a/engine/src/main/resources/kettle-job-entries.xml b/engine/src/main/resources/kettle-job-entries.xml index f9fe9d38d0b6..8f27fa7ba930 100644 --- a/engine/src/main/resources/kettle-job-entries.xml +++ b/engine/src/main/resources/kettle-job-entries.xml @@ -10,7 +10,6 @@ i18n:org.pentaho.di.job.entry:JobEntry.FTPSPut.TypeDesc org.pentaho.di.job.entries.ftpsput.JobEntryFTPSPUT i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer i18n:org.pentaho.di.job.entry:JobEntry.FTPSPut.Tooltip ui/images/PFTPS.svg http://wiki.pentaho.com/display/EAI/Upload+files+to+FTPS i18n:org.pentaho.di.job.entry:JobEntry.SFTP.TypeDesc org.pentaho.di.job.entries.sftp.JobEntrySFTP i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer i18n:org.pentaho.di.job.entry:JobEntry.SFTP.Tooltip ui/images/GSFTP.svg http://wiki.pentaho.com/display/EAI/Get+a+file+with+SFTP i18n:org.pentaho.di.job.entry:JobEntry.SFTPPut.TypeDesc org.pentaho.di.job.entries.sftpput.JobEntrySFTPPUT i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer i18n:org.pentaho.di.job.entry:JobEntry.SFTPPut.Tooltip ui/images/PSFTP.svg http://wiki.pentaho.com/display/EAI/Put+a+file+with+SFTP - i18n:org.pentaho.di.job.entry:JobEntry.FTPDELETE.TypeDesc org.pentaho.di.job.entries.ftpdelete.JobEntryFTPDelete i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer i18n:org.pentaho.di.job.entry:JobEntry.FTPDELETE.Tooltip ui/images/FTPD.svg http://wiki.pentaho.com/display/EAI/FTP+Delete i18n:org.pentaho.di.job.entry:JobEntry.TableExists.TypeDesc org.pentaho.di.job.entries.tableexists.JobEntryTableExists i18n:org.pentaho.di.job:JobCategory.Category.Conditions i18n:org.pentaho.di.job.entry:JobEntry.TableExists.Tooltip ui/images/TEX.svg http://wiki.pentaho.com/display/EAI/Table+Exists+%28Job+Entry%29 i18n:org.pentaho.di.job.entry:JobEntry.FileExists.TypeDesc org.pentaho.di.job.entries.fileexists.JobEntryFileExists i18n:org.pentaho.di.job:JobCategory.Category.Conditions i18n:org.pentaho.di.job.entry:JobEntry.FileExists.Tooltip ui/images/FEX.svg Products/File_Exists_(Job_Entry) i18n:org.pentaho.di.job.entry:JobEntry.Evaluation.TypeDesc org.pentaho.di.job.entries.eval.JobEntryEval i18n:org.pentaho.di.job:JobCategory.Category.Scripting i18n:org.pentaho.di.job.entry:JobEntry.Evaluation.Tooltip ui/images/SCR_mod.svg http://wiki.pentaho.com/display/EAI/Evaluating+conditions+in+The+JavaScript+job+entry diff --git a/engine/src/main/resources/org/pentaho/di/job/entry/messages/messages_en_US.properties b/engine/src/main/resources/org/pentaho/di/job/entry/messages/messages_en_US.properties index 20dbd968fc2b..ac8eb9fcae85 100644 --- a/engine/src/main/resources/org/pentaho/di/job/entry/messages/messages_en_US.properties +++ b/engine/src/main/resources/org/pentaho/di/job/entry/messages/messages_en_US.properties @@ -86,8 +86,6 @@ JobEntry.CopyMoveResultFilenames.TypeDesc=Process result filenames JobEntry.CopyMoveResultFilenames.Tooltip=Copy, move or delete result filenames JobEntry.XMLWellFormed.TypeDesc=Check if XML file is well formed JobEntry.XMLWellFormed.Tooltip=Check if one or several XML files is/are well formed -JobEntry.FTPDELETE.TypeDesc=FTP delete -JobEntry.FTPDELETE.Tooltip=Delete files in a remote host JobEntry.DeleteFolders.TypeDesc=Delete folders JobEntry.DeleteFolders.Tooltip=Delete specified folders.\nAttention : if a the folder contains files, PDI will delete them all! JobEntry.ColumnsExist.TypeDesc=Columns exist in a table diff --git a/plugins/README.md b/plugins/README.md index 074380c9eb18..0b56ae6ada3f 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -48,6 +48,7 @@ __List of the current core plugins:__ * get-repository-names * connected-to-repository * export-repository +* ftp-delete __Deprecated plugins:__ diff --git a/plugins/ftp-delete/assemblies/plugin/pom.xml b/plugins/ftp-delete/assemblies/plugin/pom.xml new file mode 100644 index 000000000000..c250750733aa --- /dev/null +++ b/plugins/ftp-delete/assemblies/plugin/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + + org.pentaho.di.plugins + ftp-delete-assemblies + 10.1.0.0-SNAPSHOT + + + + ftp-delete-plugins + 10.1.0.0-SNAPSHOT + pom + + PDI FTP Delete Plugins Distribution + + + ${project.basedir}/src/main/resources + + + + org.pentaho.di.plugins + ftp-delete-plugins-impl + ${project.version} + + + org.pentaho.di.plugins + ftp-delete-plugins-ui + ${project.version} + + + + + + + maven-dependency-plugin + + + add-libs + generate-resources + + copy-dependencies + + + ${project.build.directory}/assembly/lib + compile + ftp-delete-plugins-impl,ftp-delete-plugins-ui + + + + + + + + diff --git a/plugins/ftp-delete/assemblies/plugin/src/assembly/assembly.xml b/plugins/ftp-delete/assemblies/plugin/src/assembly/assembly.xml new file mode 100644 index 000000000000..bde04281818b --- /dev/null +++ b/plugins/ftp-delete/assemblies/plugin/src/assembly/assembly.xml @@ -0,0 +1,41 @@ + + ftp-delete-plugin + + zip + + ftp-delete-plugins + + + + ${project.basedir}/src/main/resources/version.xml + . + true + + + + + + + ${project.build.directory}/assembly + . + + + + ${resources.directory} + . + true + + + + + + . + + org.pentaho.di.plugins:ftp-delete-plugins-impl:jar + org.pentaho.di.plugins:ftp-delete-plugins-ui:jar + + false + + + \ No newline at end of file diff --git a/plugins/ftp-delete/assemblies/plugin/src/main/resources/version.xml b/plugins/ftp-delete/assemblies/plugin/src/main/resources/version.xml new file mode 100644 index 000000000000..7724ea192ce1 --- /dev/null +++ b/plugins/ftp-delete/assemblies/plugin/src/main/resources/version.xml @@ -0,0 +1,2 @@ + +${project.version} \ No newline at end of file diff --git a/plugins/ftp-delete/assemblies/pom.xml b/plugins/ftp-delete/assemblies/pom.xml new file mode 100644 index 000000000000..2e7da7fe6ce6 --- /dev/null +++ b/plugins/ftp-delete/assemblies/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + + org.pentaho.di.plugins + ftp-delete + 10.1.0.0-SNAPSHOT + + + ftp-delete-assemblies + 10.1.0.0-SNAPSHOT + pom + + PDI FTP Delete Plugins Assemblies + + + plugin + + \ No newline at end of file diff --git a/plugins/ftp-delete/impl/pom.xml b/plugins/ftp-delete/impl/pom.xml new file mode 100644 index 000000000000..749e298613c1 --- /dev/null +++ b/plugins/ftp-delete/impl/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + + + org.pentaho.di.plugins + ftp-delete + 10.1.0.0-SNAPSHOT + + + ftp-delete-plugins-impl + PDI FTP Delete Plugins Impl + + + + pentaho-kettle + kettle-core + provided + + + pentaho-kettle + kettle-engine + provided + + + com.healthmarketscience.jackcess + jackcess + compile + + + + + org.mockito + mockito-all + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + pentaho-kettle + kettle-core + tests + test + + + pentaho-kettle + kettle-engine + tests + test + + + \ No newline at end of file diff --git a/engine/src/main/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDelete.java b/plugins/ftp-delete/impl/src/main/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDelete.java similarity index 98% rename from engine/src/main/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDelete.java rename to plugins/ftp-delete/impl/src/main/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDelete.java index 63d6a9058a1e..0fb200f211d1 100644 --- a/engine/src/main/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDelete.java +++ b/plugins/ftp-delete/impl/src/main/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDelete.java @@ -2,7 +2,7 @@ * * Pentaho Data Integration * - * Copyright (C) 2002-2022 by Hitachi Vantara : http://www.pentaho.com + * Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com * ******************************************************************************* * @@ -22,6 +22,7 @@ package org.pentaho.di.job.entries.ftpdelete; +import org.pentaho.di.core.annotations.JobEntry; import org.pentaho.di.job.entry.validator.AndValidator; import org.pentaho.di.job.entry.validator.JobEntryValidatorUtils; @@ -76,6 +77,12 @@ * @since 05-11-2003 * */ +@JobEntry( id = "FTP_DELETE", name = "JobEntry.FTPDELETE.TypeDesc", + i18nPackageName = "org.pentaho.di.job.entries.ftpdelete", + description = "JobEntry.FTPDELETE.Tooltip", + categoryDescription = "i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer", + image = "ui/images/FTPD.svg", + documentationUrl = "http://wiki.pentaho.com/display/EAI/FTP+Delete" ) public class JobEntryFTPDelete extends JobEntryBase implements Cloneable, JobEntryInterface { private static Class PKG = JobEntryFTPDelete.class; // for i18n purposes, needed by Translator2!! diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_en_US.properties b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_en_US.properties similarity index 98% rename from engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_en_US.properties rename to plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_en_US.properties index bccbdcf005e5..589dff1cdaa0 100644 --- a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_en_US.properties +++ b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_en_US.properties @@ -2,6 +2,8 @@ # # #Thu May 15 20:31:26 CEST 2008 +JobEntry.FTPDELETE.TypeDesc=FTP delete +JobEntry.FTPDELETE.Tooltip=Delete files in a remote host JobEntryFTPDelete.Started=Started FTP job to {0} JobFTPDelete.Server.Label=FTP server name / IP address\: JobFTPDelete.FolderExists.OK=Folder {0} exists in the remote host. diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_es_AR.properties b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_es_AR.properties similarity index 100% rename from engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_es_AR.properties rename to plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_es_AR.properties diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_fr_FR.properties b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_fr_FR.properties similarity index 100% rename from engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_fr_FR.properties rename to plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_fr_FR.properties diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_it_IT.properties b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_it_IT.properties similarity index 100% rename from engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_it_IT.properties rename to plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_it_IT.properties diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ja_JP.properties b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ja_JP.properties similarity index 100% rename from engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ja_JP.properties rename to plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ja_JP.properties diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ko_KR.properties b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ko_KR.properties similarity index 100% rename from engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ko_KR.properties rename to plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_ko_KR.properties diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_zh_CN.properties b/plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_zh_CN.properties similarity index 100% rename from engine/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_zh_CN.properties rename to plugins/ftp-delete/impl/src/main/resources/org/pentaho/di/job/entries/ftpdelete/messages/messages_zh_CN.properties diff --git a/engine/src/test/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDeleteLoadSaveTest.java b/plugins/ftp-delete/impl/src/test/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDeleteLoadSaveTest.java similarity index 97% rename from engine/src/test/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDeleteLoadSaveTest.java rename to plugins/ftp-delete/impl/src/test/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDeleteLoadSaveTest.java index 98832bff3a28..3cfa2ded1a75 100644 --- a/engine/src/test/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDeleteLoadSaveTest.java +++ b/plugins/ftp-delete/impl/src/test/java/org/pentaho/di/job/entries/ftpdelete/JobEntryFTPDeleteLoadSaveTest.java @@ -2,7 +2,7 @@ * * Pentaho Data Integration * - * Copyright (C) 2002-2018 by Hitachi Vantara : http://www.pentaho.com + * Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com * ******************************************************************************* * diff --git a/plugins/ftp-delete/pom.xml b/plugins/ftp-delete/pom.xml new file mode 100644 index 000000000000..3e53dfa07f83 --- /dev/null +++ b/plugins/ftp-delete/pom.xml @@ -0,0 +1,118 @@ + + + 4.0.0 + + + org.pentaho.di.plugins + pdi-plugins + 10.1.0.0-SNAPSHOT + + + ftp-delete + 10.1.0.0-SNAPSHOT + pom + + PDI FTP Delete Plugins + This plugin is for pentaho Data integration (ETL) a.k.a kettle + http://www.pentaho.com/ + + + impl + ui + assemblies + + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + 4.6 + 3.3.0-I20070606-0010 + 10.1.0.0-SNAPSHOT + + + + + + pentaho-kettle + kettle-engine + ${pdi.version} + provided + + + pentaho-kettle + kettle-core + ${pdi.version} + provided + + + pentaho-kettle + kettle-ui-swt + ${pdi.version} + provided + + + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + ${org.eclipse.swt.version} + provided + + + * + * + + + + + org.eclipse + jface + ${jface.version} + provided + + + * + * + + + + + + pentaho-kettle + kettle-core + ${pdi.version} + tests + test + + + pentaho-kettle + kettle-engine + ${pdi.version} + tests + test + + + + com.healthmarketscience.jackcess + jackcess + 1.2.6 + compile + + + * + * + + + + + + diff --git a/plugins/ftp-delete/ui/pom.xml b/plugins/ftp-delete/ui/pom.xml new file mode 100644 index 000000000000..0fbd55a4b794 --- /dev/null +++ b/plugins/ftp-delete/ui/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + + org.pentaho.di.plugins + ftp-delete + 10.1.0.0-SNAPSHOT + + + ftp-delete-plugins-ui + PDI FTP Delete Plugins UI + + + + org.pentaho.di.plugins + ftp-delete-plugins-impl + ${project.version} + + + + pentaho-kettle + kettle-core + provided + + + pentaho-kettle + kettle-engine + provided + + + pentaho-kettle + kettle-ui-swt + provided + + + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + provided + + + * + * + + + + + diff --git a/ui/src/main/java/org/pentaho/di/ui/job/entries/ftpdelete/JobEntryFTPDeleteDialog.java b/plugins/ftp-delete/ui/src/main/java/org/pentaho/di/ui/job/entries/ftpdelete/JobEntryFTPDeleteDialog.java similarity index 99% rename from ui/src/main/java/org/pentaho/di/ui/job/entries/ftpdelete/JobEntryFTPDeleteDialog.java rename to plugins/ftp-delete/ui/src/main/java/org/pentaho/di/ui/job/entries/ftpdelete/JobEntryFTPDeleteDialog.java index 5a892b58f8d7..2560c230e21f 100644 --- a/ui/src/main/java/org/pentaho/di/ui/job/entries/ftpdelete/JobEntryFTPDeleteDialog.java +++ b/plugins/ftp-delete/ui/src/main/java/org/pentaho/di/ui/job/entries/ftpdelete/JobEntryFTPDeleteDialog.java @@ -2,7 +2,7 @@ * * Pentaho Data Integration * - * Copyright (C) 2002-2022 by Hitachi Vantara : http://www.pentaho.com + * Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com * ******************************************************************************* * @@ -48,6 +48,7 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.pentaho.di.core.Const; +import org.pentaho.di.core.annotations.PluginDialog; import org.pentaho.di.core.util.Utils; import org.pentaho.di.core.Props; import org.pentaho.di.i18n.BaseMessages; @@ -82,6 +83,8 @@ * @author Samatar * @since 27-04-2008 */ +@PluginDialog( id = "FTP_DELETE", image = "FTPD.svg", pluginType = PluginDialog.PluginType.JOBENTRY, + documentationUrl = "http://wiki.pentaho.com/display/EAI/FTP+Delete" ) public class JobEntryFTPDeleteDialog extends JobEntryDialog implements JobEntryDialogInterface { private static Class PKG = JobEntryFTPDelete.class; // for i18n purposes, needed by Translator2!! diff --git a/plugins/ftp-delete/ui/src/main/resources/FTPD.png b/plugins/ftp-delete/ui/src/main/resources/FTPD.png new file mode 100644 index 000000000000..cefa2537fae1 Binary files /dev/null and b/plugins/ftp-delete/ui/src/main/resources/FTPD.png differ diff --git a/plugins/ftp-delete/ui/src/main/resources/FTPD.svg b/plugins/ftp-delete/ui/src/main/resources/FTPD.svg new file mode 100644 index 000000000000..67412a3c3d89 --- /dev/null +++ b/plugins/ftp-delete/ui/src/main/resources/FTPD.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/pom.xml b/plugins/pom.xml index 97357eb7a623..0087f7e7310c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -53,6 +53,7 @@ mail mail-validator-job export-repository + ftp-delete