Skip to content

Commit

Permalink
[BACKLOG-35836] Code changes for moving Postegres bulk loader from co…
Browse files Browse the repository at this point in the history
…re to plugin
  • Loading branch information
sVarma1992 committed May 31, 2022
1 parent 7673284 commit 7153f36
Show file tree
Hide file tree
Showing 25 changed files with 1,726 additions and 774 deletions.
13 changes: 13 additions & 0 deletions assemblies/plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<pdi-google-analytics-plugin.version>9.4.0.0-SNAPSHOT</pdi-google-analytics-plugin.version>
<pdi-salesforce-plugin.version>9.4.0.0-SNAPSHOT</pdi-salesforce-plugin.version>
<ms-access-plugin.version>${project.version}</ms-access-plugin.version>
<postgresql-db-bulk-loader-plugin.version>${project.version}</postgresql-db-bulk-loader-plugin.version>
<lucid-db-streaming-loader-plugin.version>${project.version}</lucid-db-streaming-loader-plugin.version>
<gp-bulk-loader-plugin.version>${project.version}</gp-bulk-loader-plugin.version>
<pentaho-googledrive-vfs-plugin.version>${project.version}</pentaho-googledrive-vfs-plugin.version>
Expand Down Expand Up @@ -189,6 +190,18 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>postgresql-db-bulk-loader-plugins</artifactId>
<version>${postgresql-db-bulk-loader-plugin.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>lucid-db-streaming-loader-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion engine/src/main/resources/kettle-steps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
<step id="SQLFileOutput"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.SQLFileOutput</description> <classname>org.pentaho.di.trans.steps.sqlfileoutput.SQLFileOutputMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Output</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.SQLFileOutput</tooltip> <iconfile>ui/images/SFO.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/SQL+File+Output</documentation_url> <cases_url/> <forum_url/> </step>
<step id="SplitFieldToRows3"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.SplitFieldToRows3</description> <classname>org.pentaho.di.trans.steps.splitfieldtorows.SplitFieldToRowsMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.SplitFieldToRows3</tooltip> <iconfile>ui/images/SFtR.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Split+field+to+rows</documentation_url> <cases_url/> <forum_url/> </step>
<step id="PropertyInput"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.PropertyInput</description> <classname>org.pentaho.di.trans.steps.propertyinput.PropertyInputMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Input</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.PropertyInput</tooltip> <iconfile>ui/images/PFI.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Property+Input</documentation_url> <cases_url/> <forum_url/> </step>
<step id="PGBulkLoader"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.PGBulkLoader</description> <classname>org.pentaho.di.trans.steps.pgbulkloader.PGBulkLoaderMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Bulk</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.PGBulkLoader</tooltip> <iconfile>ui/images/BLKPG.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/PostgreSQL+Bulk+Loader</documentation_url> <cases_url/> <forum_url/> </step>
<step id="LDIFInput"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.LDIFInput</description> <classname>org.pentaho.di.trans.steps.ldifinput.LDIFInputMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Input</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.LDIFInput</tooltip> <iconfile>ui/images/LDI.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/LDIF+Input</documentation_url> <cases_url/> <forum_url/> </step>
<step id="PropertyOutput"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.PropertyOutput</description> <classname>org.pentaho.di.trans.steps.propertyoutput.PropertyOutputMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Output</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.PropertyOutput</tooltip> <iconfile>ui/images/PFO.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Properties+Output</documentation_url> <cases_url/> <forum_url/> </step>
<step id="SwitchCase"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.SwitchCase</description> <classname>org.pentaho.di.trans.steps.switchcase.SwitchCaseMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Flow</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.SwitchCase</tooltip> <iconfile>ui/images/SWC.svg</iconfile> <documentation_url>Products/Switch-Case</documentation_url> <cases_url/> <forum_url/> </step>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ BaseStep.TypeTooltipDesc.SetValueConstant=Set value of a field to a constant
BaseStep.TypeLongDesc.GenerateRows=Generate rows
BaseStep.TypeLongDesc.SortRows=Sort rows
BaseStep.SafeMode.Exception.DoubleFieldnames=The field with name [{0}] occurs twice in a row. This is not allowed.
BaseStep.TypeLongDesc.PGBulkLoader=PostgreSQL bulk loader
BaseStep.TypeLongDesc.PropertyInput=Property input
StepMeta.Exception.UnableToLoadStepInfo=Unable to load step info from XML step node
BaseStep.TypeTooltipDesc.XSDValidator=Validate XML source (files or streams) against XML Schema Definition.
Expand Down
1 change: 1 addition & 0 deletions plugins/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ __List of the current core plugins:__
* lucid-db-streaming-loader
* meta-inject
* ms-access-bulk-loader
* postgresql-db-bulk-loader
* engine-configuration
* pur
* repositories
Expand Down
1 change: 1 addition & 0 deletions plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<module>salesforce</module>
<module>pur</module>
<module>ms-access</module>
<module>postgresql-db-bulk-loader</module>
<module>xml</module>
<module>streaming</module>
</modules>
Expand Down
55 changes: 55 additions & 0 deletions plugins/postgresql-db-bulk-loader/assemblies/plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?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>postgresql-db-bulk-loader-assemblies</artifactId>
<version>9.4.0.0-SNAPSHOT</version>
</parent>

<artifactId>postgresql-db-bulk-loader-plugins</artifactId>
<version>9.4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI postgresql-db-bulk-loader Plugins Distribution</name>
<description></description>

<dependencies>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>postgresql-db-bulk-loader-plugins-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>postgresql-db-bulk-loader-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>postgresql-db-bulk-loader-plugins-impl,postgresql-db-bulk-loader-plugins-ui</excludeArtifactIds>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<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>postgresql-db-bulk-loader-plugin</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>postgresql-db-bulk-loader-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>
</fileSets>

<dependencySets>
<dependencySet>
<outputDirectory>.</outputDirectory>
<includes>
<include>org.pentaho.di.plugins:postgresql-db-bulk-loader-plugins-impl:jar</include>
<include>org.pentaho.di.plugins:postgresql-db-bulk-loader-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/postgresql-db-bulk-loader/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>postgresql-db-bulk-loader</artifactId>
<version>9.4.0.0-SNAPSHOT</version>
</parent>

<artifactId>postgresql-db-bulk-loader-assemblies</artifactId>
<version>9.4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Postgresql DB Bulk Loader Plugins Assemblies</name>

<modules>
<module>plugin</module>
</modules>
</project>
58 changes: 58 additions & 0 deletions plugins/postgresql-db-bulk-loader/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>postgresql-db-bulk-loader</artifactId>
<version>9.4.0.0-SNAPSHOT</version>
</parent>

<artifactId>postgresql-db-bulk-loader-plugins-impl</artifactId>
<name>PDI Postgresql DB Bulk Loader 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-2019 by Hitachi Vantara : http://www.pentaho.com
* Copyright (C) 2002-2022 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-2022 by Hitachi Vantara : http://www.pentaho.com
*
*******************************************************************************
*
Expand Down
Loading

0 comments on commit 7153f36

Please sign in to comment.