forked from pentaho/pentaho-kettle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PDI-11615 : Keep code in line with Pentaho CheckStyle rules
+ Merge branch 'master' of github.com:pentaho/pentaho-kettle Conflicts: engine/test-src/org/pentaho/di/trans/steps/loadsave/LoadSaveTester.java engine/test-src/org/pentaho/di/trans/steps/loadsave/getter/FieldGetter.java engine/test-src/org/pentaho/di/trans/steps/loadsave/getter/MethodGetter.java engine/test-src/org/pentaho/di/trans/steps/loadsave/validator/FieldLoadSaveValidatorFactory.java engine/test-src/org/pentaho/di/trans/steps/streamlookup/StreamLookupTest.java engine/test-src/org/pentaho/di/trans/steps/synchronizeaftermerge/SynchronizeAfterMergeTest.java engine/test-src/org/pentaho/di/trans/steps/systemdata/SystemDataTest.java test/org/pentaho/di/TestUtilities.java ui/src/org/pentaho/di/ui/util/HelpUtils.java
- Loading branch information
Showing
2,001 changed files
with
323,425 additions
and
319,786 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,89 @@ | ||
| @echo on | ||
|
|
||
| REM ************************************************** | ||
| REM ** Libraries used by Kettle: ** | ||
| REM ************************************************** | ||
|
|
||
| set RUNDIR=%CD%\dist | ||
| set XMLFILE=%CD%\%1% | ||
| set SRCDIR=%CD%\%2% | ||
|
|
||
| echo RUNDIR=%RUNDIR% | ||
| echo XMLFILE=%XMLFILE% | ||
| echo SRCDIR=%SRCDIR% | ||
|
|
||
| cd dist | ||
|
|
||
| set IS64BITJAVA=0 | ||
|
|
||
| REM ************************************************** | ||
| REM Platform Specific SWT ** | ||
| REM ************************************************** | ||
|
|
||
| REM The following line is predicated on the 64-bit Sun | ||
| REM java output from -version which | ||
| REM looks like this (at the time of this writing): | ||
| REM | ||
| REM java version "1.6.0_17" | ||
| REM Java(TM) SE Runtime Environment (build 1.6.0_17-b04) | ||
| REM Java HotSpot(TM) 64-Bit Server VM (build 14.3-b01, mixed mode) | ||
| REM | ||
| REM Below is a logic to find the directory where java can found. We will | ||
| REM temporarily change the directory to that folder where we can run java there | ||
|
|
||
| FOR /F %%a IN ('java -version 2^>^&1^|find /C "64-Bit"') DO (SET /a IS64BITJAVA=%%a) | ||
| GOTO CHECK32VS64BITJAVA | ||
| :CHECK32VS64BITJAVA | ||
|
|
||
| IF %IS64BITJAVA% == 1 GOTO :USE64 | ||
|
|
||
| :USE32 | ||
| REM =========================================== | ||
| REM Using 32bit Java, so include 32bit SWT Jar | ||
| REM =========================================== | ||
| set LIBSPATH=libswt\win32 | ||
|
|
||
| GOTO :CONTINUE | ||
| :USE64 | ||
| REM =========================================== | ||
| REM Using 64bit java, so include 64bit SWT Jar | ||
| REM =========================================== | ||
| set LIBSPATH=libswt\win64 | ||
| set SWTJAR=..\libswt\win64 | ||
|
|
||
| :CONTINUE | ||
|
|
||
|
|
||
| REM ********************** | ||
| REM Collect arguments | ||
| REM ********************** | ||
|
|
||
| set _cmdline= | ||
| :TopArg | ||
| if %1!==! goto EndArg | ||
| set _cmdline=%_cmdline% %1 | ||
| shift | ||
| goto TopArg | ||
| :EndArg | ||
|
|
||
| REM ****************************************************************** | ||
| REM ** Set java runtime options ** | ||
| REM ** Change 512m to higher values in case you run out of memory ** | ||
| REM ** or set the PENTAHO_DI_JAVA_OPTIONS environment variable ** | ||
| REM ****************************************************************** | ||
|
|
||
| set PENTAHO_DI_JAVA_OPTIONS="-Xmx512m" "-XX:MaxPermSize=256m" | ||
| set OPT="-Djava.library.path=%LIBSPATH%" "-DKETTLE_HOME=%KETTLE_HOME%" "-DKETTLE_REPOSITORY=%KETTLE_REPOSITORY%" "-DKETTLE_USER=%KETTLE_USER%" "-DKETTLE_PASSWORD=%KETTLE_PASSWORD%" "-DKETTLE_PLUGIN_PACKAGES=%KETTLE_PLUGIN_PACKAGES%" "-DKETTLE_LOG_SIZE_LIMIT=%KETTLE_LOG_SIZE_LIMIT%" "-DKETTLE_JNDI_ROOT=%KETTLE_JNDI_ROOT%" | ||
|
|
||
| REM *************** | ||
| REM ** Run... ** | ||
| REM *************** | ||
|
|
||
| REM Eventually call java instead of javaw and do not run in a separate window | ||
| set TRANSLATOR_START_OPTION=start "Translator" | ||
|
|
||
| @echo on | ||
| %TRANSLATOR_START_OPTION% java %OPT% -jar launcher\launcher-1.0.0.jar -lib ..\%LIBSPATH% -main org.pentaho.di.ui.i18n.editor.Translator2 %XMLFILE% %SRCDIR% | ||
| @echo off | ||
|
|
||
| cd %RUNDIR%\.. | ||
| @echo on | ||
|
|
||
| REM ************************************************** | ||
| REM ** Libraries used by Kettle: ** | ||
| REM ************************************************** | ||
|
|
||
| set RUNDIR=%CD%\dist | ||
| set XMLFILE=%CD%\%1% | ||
| set SRCDIR=%CD%\%2% | ||
|
|
||
| echo RUNDIR=%RUNDIR% | ||
| echo XMLFILE=%XMLFILE% | ||
| echo SRCDIR=%SRCDIR% | ||
|
|
||
| cd dist | ||
|
|
||
| set IS64BITJAVA=0 | ||
|
|
||
| REM ************************************************** | ||
| REM Platform Specific SWT ** | ||
| REM ************************************************** | ||
|
|
||
| REM The following line is predicated on the 64-bit Sun | ||
| REM java output from -version which | ||
| REM looks like this (at the time of this writing): | ||
| REM | ||
| REM java version "1.6.0_17" | ||
| REM Java(TM) SE Runtime Environment (build 1.6.0_17-b04) | ||
| REM Java HotSpot(TM) 64-Bit Server VM (build 14.3-b01, mixed mode) | ||
| REM | ||
| REM Below is a logic to find the directory where java can found. We will | ||
| REM temporarily change the directory to that folder where we can run java there | ||
|
|
||
| FOR /F %%a IN ('java -version 2^>^&1^|find /C "64-Bit"') DO (SET /a IS64BITJAVA=%%a) | ||
| GOTO CHECK32VS64BITJAVA | ||
| :CHECK32VS64BITJAVA | ||
|
|
||
| IF %IS64BITJAVA% == 1 GOTO :USE64 | ||
|
|
||
| :USE32 | ||
| REM =========================================== | ||
| REM Using 32bit Java, so include 32bit SWT Jar | ||
| REM =========================================== | ||
| set LIBSPATH=libswt\win32 | ||
|
|
||
| GOTO :CONTINUE | ||
| :USE64 | ||
| REM =========================================== | ||
| REM Using 64bit java, so include 64bit SWT Jar | ||
| REM =========================================== | ||
| set LIBSPATH=libswt\win64 | ||
| set SWTJAR=..\libswt\win64 | ||
|
|
||
| :CONTINUE | ||
|
|
||
|
|
||
| REM ********************** | ||
| REM Collect arguments | ||
| REM ********************** | ||
|
|
||
| set _cmdline= | ||
| :TopArg | ||
| if %1!==! goto EndArg | ||
| set _cmdline=%_cmdline% %1 | ||
| shift | ||
| goto TopArg | ||
| :EndArg | ||
|
|
||
| REM ****************************************************************** | ||
| REM ** Set java runtime options ** | ||
| REM ** Change 512m to higher values in case you run out of memory ** | ||
| REM ** or set the PENTAHO_DI_JAVA_OPTIONS environment variable ** | ||
| REM ****************************************************************** | ||
|
|
||
| set PENTAHO_DI_JAVA_OPTIONS="-Xmx512m" "-XX:MaxPermSize=256m" | ||
| set OPT="-Djava.library.path=%LIBSPATH%" "-DKETTLE_HOME=%KETTLE_HOME%" "-DKETTLE_REPOSITORY=%KETTLE_REPOSITORY%" "-DKETTLE_USER=%KETTLE_USER%" "-DKETTLE_PASSWORD=%KETTLE_PASSWORD%" "-DKETTLE_PLUGIN_PACKAGES=%KETTLE_PLUGIN_PACKAGES%" "-DKETTLE_LOG_SIZE_LIMIT=%KETTLE_LOG_SIZE_LIMIT%" "-DKETTLE_JNDI_ROOT=%KETTLE_JNDI_ROOT%" | ||
|
|
||
| REM *************** | ||
| REM ** Run... ** | ||
| REM *************** | ||
|
|
||
| REM Eventually call java instead of javaw and do not run in a separate window | ||
| set TRANSLATOR_START_OPTION=start "Translator" | ||
|
|
||
| @echo on | ||
| %TRANSLATOR_START_OPTION% java %OPT% -jar launcher\launcher-1.0.0.jar -lib ..\%LIBSPATH% -main org.pentaho.di.ui.i18n.editor.Translator2 %XMLFILE% %SRCDIR% | ||
| @echo off | ||
|
|
||
| cd %RUNDIR%\.. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,27 @@ | ||
| project.revision=TRUNK-SNAPSHOT | ||
| ivy.artifact.group=pentaho-kettle | ||
| ivy.artifact.id=pdi-ce | ||
| impl.vendor=Pentaho Corporation | ||
| impl.title=Pentaho Kettle CE Assembly | ||
| impl.productID=pdi-ce | ||
| package.root.dir=data-integration | ||
| swtlib.dir=libswt | ||
| plugins.dir=lib-plugins | ||
| lib.zip.filename=lib.zip | ||
|
|
||
| # Dependency revisions | ||
| dependency.kettle.revision=${project.revision} | ||
| dependency.mondrian.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-metadata.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-connections.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-big-data-plugin.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-cassandra-plugin.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-mongodb-plugin.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-hadoop-hive-jdbc-shim.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-reporting.revision=TRUNK-SNAPSHOT | ||
| dependency.reporting-engine.group=pentaho-reporting-engine | ||
| dependency.pentaho-xul.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-vfs-browser.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-reporting-core.revision=TRUNK-SNAPSHOT | ||
| dependency.pdi-palo-plugin.revision=TRUNK-SNAPSHOT | ||
| project.revision=TRUNK-SNAPSHOT | ||
| ivy.artifact.group=pentaho-kettle | ||
| ivy.artifact.id=pdi-ce | ||
| impl.vendor=Pentaho Corporation | ||
| impl.title=Pentaho Kettle CE Assembly | ||
| impl.productID=pdi-ce | ||
| package.root.dir=data-integration | ||
| swtlib.dir=libswt | ||
| plugins.dir=lib-plugins | ||
| lib.zip.filename=lib.zip | ||
|
|
||
| # Dependency revisions | ||
| dependency.kettle.revision=${project.revision} | ||
| dependency.mondrian.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-metadata.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-connections.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-big-data-plugin.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-cassandra-plugin.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-mongodb-plugin.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-hadoop-hive-jdbc-shim.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-reporting.revision=TRUNK-SNAPSHOT | ||
| dependency.reporting-engine.group=pentaho-reporting-engine | ||
| dependency.pentaho-xul.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-vfs-browser.revision=TRUNK-SNAPSHOT | ||
| dependency.pentaho-reporting-core.revision=TRUNK-SNAPSHOT | ||
| dependency.pdi-palo-plugin.revision=TRUNK-SNAPSHOT | ||
| dependency.launcher.revision=TRUNK-SNAPSHOT |
Oops, something went wrong.