Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PDI-19907 - Moved Dimension Lookup into Plugin #8992

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PDI-19907 - Moved Dimension Lookup into Plugin #8992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion engine/src/main/resources/kettle-steps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<step id="Unique"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.UniqueRows</description> <classname>org.pentaho.di.trans.steps.uniquerows.UniqueRowsMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Transform</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Uniquerows</tooltip> <iconfile>ui/images/UNQ.svg</iconfile> <documentation_url>Products/Unique_Rows</documentation_url> <cases_url/> <forum_url/> </step>
<step id="DBLookup"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.DatabaseLookup</description> <classname>org.pentaho.di.trans.steps.databaselookup.DatabaseLookupMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Lookup</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Databaselookup</tooltip> <iconfile>ui/images/DLU.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Database+lookup</documentation_url> <cases_url/> <forum_url/> </step>
<step id="DBJoin"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.DatabaseJoin</description> <classname>org.pentaho.di.trans.steps.databasejoin.DatabaseJoinMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Lookup</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Databasejoin</tooltip> <iconfile>ui/images/DBJ.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Database+Join</documentation_url> <cases_url/> <forum_url/> </step>
<step id="DimensionLookup"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.DimensionUpdate</description> <classname>org.pentaho.di.trans.steps.dimensionlookup.DimensionLookupMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.DataWarehouse</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Dimensionupdate</tooltip> <iconfile>ui/images/DIM.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Dimension+Lookup-Update</documentation_url> <cases_url/> <forum_url/> </step>
<step id="ScriptValueMod,ScriptValue"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.JavaScriptMod</description> <classname>org.pentaho.di.trans.steps.scriptvalues_mod.ScriptValuesMetaMod</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Scripting</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.JavaScriptValueMod</tooltip> <iconfile>ui/images/SCR_mod.svg</iconfile> <documentation_url>Products/Modified_Java_Script_Value</documentation_url> <cases_url/> <forum_url/> </step>
<step id="JoinRows"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.JoinRows</description> <classname>org.pentaho.di.trans.steps.joinrows.JoinRowsMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Joins</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.JoinRows</tooltip> <iconfile>ui/images/JRW.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Join+Rows+%28Cartesian+product%29</documentation_url> <cases_url/> <forum_url/> </step>
<step id="Update"> <description>i18n:org.pentaho.di.trans.step:BaseStep.TypeLongDesc.Update</description> <classname>org.pentaho.di.trans.steps.update.UpdateMeta</classname> <category>i18n:org.pentaho.di.trans.step:BaseStep.Category.Output</category> <tooltip>i18n:org.pentaho.di.trans.step:BaseStep.TypeTooltipDesc.Update</tooltip> <iconfile>ui/images/UPD.svg</iconfile> <documentation_url>http://wiki.pentaho.com/display/EAI/Update</documentation_url> <cases_url/> <forum_url/> </step>
Expand Down
28 changes: 28 additions & 0 deletions plugins/db/dimlookup/assemblies/plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?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>dimlookup-assemblies</artifactId>
<version>9.6.0.0-SNAPSHOT</version>
</parent>

<artifactId>dimlookup-plugins</artifactId>
<version>9.6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Dimension Lookup Plugins Distribution</name>
<description></description>

<dependencies>
<dependency>
<groupId>org.pentaho.di.plugins</groupId>
<artifactId>dimlookup-plugins-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

</project>
36 changes: 36 additions & 0 deletions plugins/db/dimlookup/assemblies/plugin/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<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>db-dimensionlookup-plugin</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>dimensionlookup</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:dimlookup-plugins-core:jar</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>


2 changes: 2 additions & 0 deletions plugins/db/dimlookup/assemblies/plugin/src/main/resources/version.xml
View file
Open in desktop
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/db/dimlookup/assemblies/pom.xml
View file
Open in desktop
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>dimlookup</artifactId>
<version>9.6.0.0-SNAPSHOT</version>
</parent>

<artifactId>dimlookup-assemblies</artifactId>
<version>9.6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>PDI Dimension Lookup Assemblies</name>

<modules>
<module>plugin</module>
</modules>
</project>
71 changes: 71 additions & 0 deletions plugins/db/dimlookup/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?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>dimlookup</artifactId>
<version>9.6.0.0-SNAPSHOT</version>
</parent>

<artifactId>dimlookup-plugins-core</artifactId>
<name>PDI Dimension Lookup Plugins Core</name>

<properties>
<poi.version>4.1.1</poi.version>
<platform.version>9.6.0.0-SNAPSHOT</platform.version>
</properties>

<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>pentaho-kettle</groupId>
<artifactId>kettle-ui-swt</artifactId>
<scope>provided</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>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.220</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
0 ...steps/dimensionlookup/DimensionCache.java → ...steps/dimensionlookup/DimensionCache.java
View file
Open in desktop
File renamed without changes.
0 ...teps/dimensionlookup/DimensionLookup.java → ...teps/dimensionlookup/DimensionLookup.java
View file
Open in desktop
File renamed without changes.
0 .../dimensionlookup/DimensionLookupData.java → .../dimensionlookup/DimensionLookupData.java
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions .../dimensionlookup/DimensionLookupMeta.java → .../dimensionlookup/DimensionLookupMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.pentaho.di.core.util.Utils;
import org.pentaho.di.core.ProvidesModelerMeta;
import org.pentaho.di.core.SQLStatement;
import org.pentaho.di.core.annotations.Step;
import org.pentaho.di.core.database.Database;
import org.pentaho.di.core.database.DatabaseMeta;
import org.pentaho.di.core.exception.KettleDatabaseException;
Expand Down Expand Up @@ -77,6 +78,13 @@
*
*/
@InjectionSupported( localizationPrefix = "DimensionLookup.Injection.", groups = { "KEYS", "FIELDS" } )
@Step( id = "DimensionLookup",
name = "BaseStep.TypeLongDesc.DimensionUpdate",
description = "BaseStep.TypeTooltipDesc.Dimensionupdate",
categoryDescription = "i18n:org.pentaho.di.trans.step:BaseStep.Category.DataWarehouse",
i18nPackageName = "org.pentaho.di.trans.steps.dimensionlookup",
documentationUrl = "http://wiki.pentaho.com/display/EAI/Dimension+Lookup-Update",
image = "DIM.svg" )
public class DimensionLookupMeta extends BaseDatabaseStepMeta implements StepMetaInterface, ProvidesModelerMeta {
private static Class<?> PKG = DimensionLookupMeta.class; // for i18n purposes, needed by Translator2!!

Expand Down
0 ...imensionlookup/DimensionLookupDialog.java → ...imensionlookup/DimensionLookupDialog.java
View file
Open in desktop
File renamed without changes.
0 ui/src/main/resources/ui/images/DIM.png → ...dimlookup/core/src/main/resources/DIM.png
View file
Open in desktop
File renamed without changes
36 changes: 18 additions & 18 deletions ui/src/main/resources/ui/images/DIM.svg → ...dimlookup/core/src/main/resources/DIM.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading