Revision: 3221
Author: [email protected]
Date: Mon Dec 21 11:04:05 2009
Log: Updated the pom.xml to the kettle-engine 3.2.2 as the 3.0 engine is no
longer available.
Updated the jars on the classpath so the pom and classpath are both
building with the same jars.
http://code.google.com/p/power-architect/source/detail?r=3221
Added:
/trunk/lib/kettle-core-3.2.2.jar
/trunk/lib/kettle-db-3.2.2.jar
/trunk/lib/kettle-engine-3.2.2.jar
Deleted:
/trunk/lib/kettle-engine-3.0.jar
Modified:
/trunk/.classpath
/trunk/pom.xml
/trunk/regress/ca/sqlpower/architect/etl/kettle/CreateKettleJobTest.java
/trunk/src/ca/sqlpower/architect/etl/kettle/KettleJob.java
=======================================
--- /dev/null
+++ /trunk/lib/kettle-core-3.2.2.jar Mon Dec 21 11:04:05 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/lib/kettle-db-3.2.2.jar Mon Dec 21 11:04:05 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/lib/kettle-engine-3.2.2.jar Mon Dec 21 11:04:05 2009
File is too large to display a diff.
=======================================
--- /trunk/lib/kettle-engine-3.0.jar Fri Nov 16 13:52:12 2007
+++ /dev/null
File is too large to display a diff.
=======================================
--- /trunk/.classpath Wed Nov 11 09:01:58 2009
+++ /trunk/.classpath Mon Dec 21 11:04:05 2009
@@ -24,7 +24,6 @@
<classpathentry kind="lib" path="lib/jakarta-regexp-1.2.jar"/>
<classpathentry kind="lib" path="lib/jcommon-1.0.0.jar"/>
<classpathentry kind="lib" path="lib/jfreechart-1.0.1.jar"/>
- <classpathentry kind="lib" path="lib/kettle-engine-3.0.jar"/>
<classpathentry kind="lib" path="lib/log4j.jar"/>
<classpathentry kind="lib" path="lib/mail.jar"/>
<classpathentry kind="lib" path="osx_packaging_utils/osx_adapter.jar"/>
@@ -39,5 +38,8 @@
<classpathentry kind="lib" path="lib/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="lib/velocity-tools-generic-1.4.jar"/>
<classpathentry kind="lib" path="lib/jsr305.jar"/>
+ <classpathentry kind="lib" path="lib/kettle-engine-3.2.2.jar"/>
+ <classpathentry kind="lib" path="lib/kettle-core-3.2.2.jar"/>
+ <classpathentry kind="lib" path="lib/kettle-db-3.2.2.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
=======================================
--- /trunk/pom.xml Wed Dec 3 14:25:02 2008
+++ /trunk/pom.xml Mon Dec 21 11:04:05 2009
@@ -5,7 +5,7 @@
<groupId>ca.sqlpower</groupId>
<artifactId>power-architect</artifactId>
<packaging>jar</packaging>
- <version>0.9.12-SNAPSHOT</version>
+ <version>0.9.14-SNAPSHOT</version>
<name>power-architect</name>
<url>http://code.google.com/p/power-architect</url>
@@ -151,7 +151,7 @@
<configuration>
<izpackBasedir>installer</izpackBasedir>
<descriptor>ext-tools-home/izpack/install.xml</descriptor>
-
<installerFile>dist/Architect-Setup-Windows-jdbc-${project.version}</installerFile>
+
<installerFile>dist/Architect-Setup-Windows-jdbc-${project.version}.jar</installerFile>
</configuration>
</execution>
</executions>
@@ -222,17 +222,38 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
- <groupId>org.pentaho.di</groupId>
+ <groupId>pentaho.kettle</groupId>
<artifactId>kettle-engine</artifactId>
- <version>3.0</version>
+ <version>3.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>mondrian</groupId>
+ <groupId>pentaho.kettle</groupId>
+ <artifactId>kettle-core</artifactId>
+ <version>3.2.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>pentaho.kettle</groupId>
+ <artifactId>kettle-db</artifactId>
+ <version>3.2.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>pentaho</groupId>
<artifactId>mondrian</artifactId>
- <version>3.0.3.11016</version>
+ <version>3.0.3</version>
<scope>compile</scope>
</dependency>
@@ -293,4 +314,10 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>pentaho-repo</id>
+ <url>http://repo.pentaho.org/artifactory/pentaho/</url>
+ </repository>
+ </repositories>
</project>
=======================================
---
/trunk/regress/ca/sqlpower/architect/etl/kettle/CreateKettleJobTest.java
Mon Jun 1 07:48:14 2009
+++
/trunk/regress/ca/sqlpower/architect/etl/kettle/CreateKettleJobTest.java
Mon Dec 21 11:04:05 2009
@@ -238,15 +238,15 @@
}
}
- public void testOutputToXMLCancel() throws IOException {
+ public void testOutputToXMLCancel() throws Exception {
outputToXMLTesting(UserPromptResponse.CANCEL, true);
}
- public void testOutputToXMLFileValidatorWriteOk() throws IOException {
+ public void testOutputToXMLFileValidatorWriteOk() throws Exception {
outputToXMLTesting(UserPromptResponse.OK, false);
}
- public void testOutputToXMLFileValidatorWriteNotOk() throws
IOException {
+ public void testOutputToXMLFileValidatorWriteNotOk() throws Exception {
outputToXMLTesting(UserPromptResponse.NOT_OK, true);
}
@@ -392,7 +392,7 @@
* the outputToXML file.
* @throws IOException
*/
- private void outputToXMLTesting(final UserPromptResponse fvr, boolean
checkOriginalXML) throws IOException {
+ private void outputToXMLTesting(final UserPromptResponse fvr, boolean
checkOriginalXML) throws Exception {
TransMeta transMeta = createTransMeta();
JobMeta job = createJobMeta();
=======================================
--- /trunk/src/ca/sqlpower/architect/etl/kettle/KettleJob.java Mon Dec 21
08:27:43 2009
+++ /trunk/src/ca/sqlpower/architect/etl/kettle/KettleJob.java Mon Dec 21
11:04:05 2009
@@ -397,7 +397,11 @@
for (TransMeta transMeta : transformations) {
File file = new File(getTransFilePath(transMeta.getName()));
transMeta.setFilename(file.getName());
- outputs.put(file, transMeta.getXML());
+ try {
+ outputs.put(file, transMeta.getXML());
+ } catch (KettleException e) {
+ throw new RuntimeException(e);
+ }
if (monitor.isCancelled()) {
cancel();
return;
@@ -544,7 +548,8 @@
//This is done here so we know where the files are being
saved and that they are saved
for (int i = 1; i < jm.nrJobEntries(); i++) {
JobEntryTrans trans = (JobEntryTrans)
(jm.getJobEntry(i).getEntry());
- trans.setDirectory(directory);
+ trans.setDirectory(directory.getDirectoryName());
+ trans.setDirectoryPath(directory.getPath());
}
jm.setDirectory(directory);
