Skip to content

Commit

Permalink
[BACKLOG-38620]-code changes for moving put-a-file-with-ftp from core…
Browse files Browse the repository at this point in the history
… to plugin
  • Loading branch information
SahithiKommagani6 committed Sep 21, 2023
1 parent e43208e commit 34f213e
Show file tree
Hide file tree
Showing 27 changed files with 446 additions and 8 deletions.
13 changes: 13 additions & 0 deletions assemblies/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<connected-to-repository-plugin.version>${project.version}</connected-to-repository-plugin.version>
<export-repository-plugin.version>${project.version}</export-repository-plugin.version>
<ftp-delete-plugin.version>${project.version}</ftp-delete-plugin.version>
<put-a-file-with-ftp-plugin.version>${project.version}</put-a-file-with-ftp-plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -773,6 +774,18 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>put-a-file-with-ftp-plugins</artifactId>
<version>${put-a-file-with-ftp-plugin.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>


Expand Down
1 change: 0 additions & 1 deletion engine/src/main/resources/kettle-job-entries.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<job-entry id="SHELL"> <description>i18n:org.pentaho.di.job.entry:JobEntry.Shell.TypeDesc</description> <classname>org.pentaho.di.job.entries.shell.JobEntryShell</classname> <category>i18n:org.pentaho.di.job:JobCategory.Category.Scripting</category> <tooltip>i18n:org.pentaho.di.job.entry:JobEntry.Shell.Tooltip</tooltip> <iconfile>ui/images/SHL.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Shell</documentation_url> <cases_url/> <forum_url/> </job-entry>
<job-entry id="SQL"> <description>i18n:org.pentaho.di.job.entry:JobEntry.SQL.TypeDesc</description> <classname>org.pentaho.di.job.entries.sql.JobEntrySQL</classname> <category>i18n:org.pentaho.di.job:JobCategory.Category.Scripting</category> <tooltip>i18n:org.pentaho.di.job.entry:JobEntry.SQL.Tooltip</tooltip> <iconfile>ui/images/SQL.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/SQL</documentation_url> <cases_url/> <forum_url/> </job-entry>
<job-entry id="FTP"> <description>i18n:org.pentaho.di.job.entry:JobEntry.FTP.TypeDesc</description> <classname>org.pentaho.di.job.entries.ftp.JobEntryFTP</classname> <category>i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer</category> <tooltip>i18n:org.pentaho.di.job.entry:JobEntry.FTP.Tooltip</tooltip> <iconfile>ui/images/GFTP.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Get+a+file+with+FTP</documentation_url> <cases_url/> <forum_url/> </job-entry>
<job-entry id="FTP_PUT"> <description>i18n:org.pentaho.di.job.entry:JobEntry.FTPPUT.TypeDesc</description> <classname>org.pentaho.di.job.entries.ftpput.JobEntryFTPPUT</classname> <category>i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer</category> <tooltip>i18n:org.pentaho.di.job.entry:JobEntry.FTPPUT.Tooltip</tooltip> <iconfile>ui/images/PFTP.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Put+a+file+with+FTP</documentation_url> <cases_url/> <forum_url/> </job-entry>
<job-entry id="FTPS_GET"> <description>i18n:org.pentaho.di.job.entry:JobEntry.FTPSGet.TypeDesc</description> <classname>org.pentaho.di.job.entries.ftpsget.JobEntryFTPSGet</classname> <category>i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer</category> <tooltip>i18n:org.pentaho.di.job.entry:JobEntry.FTPSGet.Tooltip</tooltip> <iconfile>ui/images/GFTPS.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Get+a+file+with+FTPS</documentation_url> <cases_url/> <forum_url/> </job-entry>
<job-entry id="FTPS_PUT"> <description>i18n:org.pentaho.di.job.entry:JobEntry.FTPSPut.TypeDesc</description> <classname>org.pentaho.di.job.entries.ftpsput.JobEntryFTPSPUT</classname> <category>i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer</category> <tooltip>i18n:org.pentaho.di.job.entry:JobEntry.FTPSPut.Tooltip</tooltip> <iconfile>ui/images/PFTPS.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Upload+files+to+FTPS</documentation_url> <cases_url/> <forum_url/> </job-entry>
<job-entry id="SFTP"> <description>i18n:org.pentaho.di.job.entry:JobEntry.SFTP.TypeDesc</description> <classname>org.pentaho.di.job.entries.sftp.JobEntrySFTP</classname> <category>i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer</category> <tooltip>i18n:org.pentaho.di.job.entry:JobEntry.SFTP.Tooltip</tooltip> <iconfile>ui/images/GSFTP.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Get+a+file+with+SFTP</documentation_url> <cases_url/> <forum_url/> </job-entry>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ JobEntry.SQL.Tooltip=Executes SQL on a certain database connection
JobEntry.WaitForFile.TypeDesc=Wait for file
JobEntry.GetPOP.TypeDesc=Get mails (POP3/IMAP)
JobEntry.DeleteFiles.Tooltip=Delete files
JobEntry.FTPPUT.Tooltip=Put a file with FTP
JobEntry.TableExists.Tooltip=Checks if a table exists on a database connection
JobEntry.MysqlBulkFile.Tooltip=Load from a mysql table into a file
JobEntry.MysqlBulkFile.TypeDesc=Bulk load from MySQL into file
Expand All @@ -30,7 +29,6 @@ JobEntry.CopyFiles.Tooltip=Copy files
JobEntry.XAction.Tooltip=Runs an XAction Script
JobEntry.MysqlBulkLoad.Tooltip=Load data from a file into a Mysql table
JobEntry.Shell.TypeDesc=Shell
JobEntry.FTPPUT.TypeDesc=Put a file with FTP
JobEntry.UnZip.Tooltip=Unzip file in a target folder
JobEntry.FileCompare.TypeDesc=File compare
JobEntry.WriteToLog.Tooltip=Write message to log
Expand Down
2 changes: 2 additions & 0 deletions plugins/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ __List of the current core plugins:__
* connected-to-repository
* export-repository
* ftp-delete
* put-a-file-with-ftp

__Deprecated plugins:__

* xml-input-stream
Expand Down
1 change: 1 addition & 0 deletions plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<module>excel</module>
<module>pentaho-reporting</module>
<module>rest</module>
<module>put-a-file-with-ftp</module>
</modules>
</profile>

Expand Down
59 changes: 59 additions & 0 deletions plugins/put-a-file-with-ftp/assemblies/plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>put-a-file-with-ftp-assemblies</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
</parent>


<artifactId>put-a-file-with-ftp-plugins</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Put a File With FTP Plugins Distribution</name>
<description></description>
<properties>
<resources.directory>${project.basedir}/src/main/resources</resources.directory>
</properties>

<dependencies>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>put-a-file-with-ftp-plugins-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>put-a-file-with-ftp-plugins-ui</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>add-libs</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
<includeScope>compile</includeScope>
<excludeArtifactIds>put-a-file-with-ftp-plugins-impl,put-a-file-with-ftp-plugins-ui</excludeArtifactIds>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>put-a-file-with-ftp-plugin</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>put-a-file-with-ftp-plugins</baseDirectory>

<files>
<file>
<source>${project.basedir}/src/main/resources/version.xml</source>
<outputDirectory>.</outputDirectory>
<filtered>true</filtered>
</file>
</files>

<fileSets>
<!-- the staging dir -->
<fileSet>
<directory>${project.build.directory}/assembly</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
<fileSet>
<directory>${resources.directory}</directory>
<outputDirectory>.</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>

<dependencySets>
<dependencySet>
<outputDirectory>.</outputDirectory>
<includes>
<include>org.pentaho.di.plugins:put-a-file-with-ftp-plugins-impl:jar</include>
<include>org.pentaho.di.plugins:put-a-file-with-ftp-plugins-ui:jar</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<version>${project.version}</version>
22 changes: 22 additions & 0 deletions plugins/put-a-file-with-ftp/assemblies/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>put-a-file-with-ftp</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>put-a-file-with-ftp-assemblies</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Put a File With FTP Plugins Assemblies</name>

<modules>
<module>plugin</module>
</modules>
</project>
58 changes: 58 additions & 0 deletions plugins/put-a-file-with-ftp/impl/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>put-a-file-with-ftp</artifactId>
<version>10.1.0.0-SNAPSHOT</version>
</parent>

<artifactId>put-a-file-with-ftp-plugins-impl</artifactId>
<name>PDI Put a File With FTP Plugins Impl</name>

<dependencies>
<dependency>
<groupId>pentaho-kettle</groupId>
<artifactId>kettle-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>pentaho-kettle</groupId>
<artifactId>kettle-engine</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.healthmarketscience.jackcess</groupId>
<artifactId>jackcess</artifactId>
<scope>compile</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pentaho-kettle</groupId>
<artifactId>kettle-core</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pentaho-kettle</groupId>
<artifactId>kettle-engine</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand All @@ -22,6 +22,7 @@

package org.pentaho.di.job.entries.ftpput;

import org.pentaho.di.core.annotations.JobEntry;
import org.pentaho.di.job.entry.validator.AndValidator;
import org.pentaho.di.job.entry.validator.JobEntryValidatorUtils;

Expand Down Expand Up @@ -74,6 +75,12 @@
* @since 15-09-2007
*/

@JobEntry( id = "FTP_PUT", name = "JobEntry.FTPPUT.TypeDesc",
i18nPackageName = "org.pentaho.di.job.entries.ftpput",
description = "JobEntry.FTPPUT.Tooltip",
categoryDescription = "i18n:org.pentaho.di.job:JobCategory.Category.FileTransfer",
image = "ui/images/PFTP.svg",
documentationUrl = "http://wiki.pentaho.com/display/EAI/Put+a+file+with+FTP" )
public class JobEntryFTPPUT extends JobEntryBase implements Cloneable, JobEntryInterface {
private static Class<?> PKG = JobEntryFTPPUT.class; // for i18n purposes, needed by Translator2!!

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#
#
#Thu Oct 07 08:44:46 CEST 2010
JobEntry.FTPPUT.Tooltip=Put a file with FTP
JobEntry.FTPPUT.TypeDesc=Put a file with FTP
JobFTPPUT.ActiveConns.Label=Use active FTP connection\:
JobFTPPUT.Port.Label=Port
JobFTPPUT.Log.SetActiveConnection=set active ftp connection mode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*******************************************************************************
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Pentaho Data Integration
*
* Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2023 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Loading

0 comments on commit 34f213e

Please sign in to comment.