Add some PDI stuff
git-svn-id: https://svn.apache.org/repos/asf/oodt/trunk@1646686 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/pdi_plugin/ivy.xml b/tools/pdi_plugin/ivy.xml
index 61323c5..f952bae 100644
--- a/tools/pdi_plugin/ivy.xml
+++ b/tools/pdi_plugin/ivy.xml
@@ -10,22 +10,21 @@
<dependencies defaultconf="default">
- <dependency org="org.apache.oodt" name="cas-filemgr" rev="0.6" transitive="false" changing="true"/>
- <dependency org="org.apache.oodt" name="cas-metadata" rev="0.6" transitive="false" changing="true"/>
- <dependency org="org.apache.xmlrpc" name="xmlrpc" rev="3.1.3" transitive="false" changing="true"/>
+ <dependency org="org.apache.oodt" name="cas-filemgr" rev="0.7" transitive="false" changing="true"/>
+ <dependency org="org.apache.oodt" name="cas-metadata" rev="0.7" transitive="false" changing="true"/>
+ <dependency org="org.apache.ws.xmlrpc" name="xmlrpc" rev="2.0.1">
+ <exclude org="xml-apis" module="xml-apis"/>
+ <exclude org="junit" module="junit"/>
+ </dependency>
<dependency org="org.json" name="json" rev="20140107"/>
<dependency org="com.google.code.gson" name="gson" rev="2.2.4"/>
- <dependency org="org.netbeans" name="jmiutils" rev="200507110943" />
-
-
-
<!-- kettle dependencies -->
- <dependency org="pentaho-kettle" name="kettle-core" rev="TRUNK-SNAPSHOT" transitive="false" changing="true"/>
- <dependency org="pentaho-kettle" name="kettle-engine" rev="TRUNK-SNAPSHOT" transitive="false" changing="true"/>
- <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="TRUNK-SNAPSHOT" transitive="false" changing="true"/>
- <dependency org="pentaho" name="pentaho-metadata" rev="TRUNK-SNAPSHOT" changing="true" />
+ <dependency org="pentaho-kettle" name="kettle-core" rev="TRUNK-SNAPSHOT" changing="true"/>
+ <dependency org="pentaho-kettle" name="kettle-engine" rev="TRUNK-SNAPSHOT" changing="true"/>
+ <dependency org="pentaho-kettle" name="kettle-ui-swt" rev="TRUNK-SNAPSHOT" changing="true"/>
+ <dependency org="pentaho" name="pentaho-metadata" rev="TRUNK-SNAPSHOT" changing="true" transitive="true"/>
<!-- swt dependencies -->
<dependency org="org.eclipse.swt" name="swt-win32" rev="3.3.0.3346" transitive="false" changing="false"/>
diff --git a/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java b/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java
index 88b53f2..db91055 100644
--- a/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java
+++ b/tools/pdi_plugin/src/org/apache/oodt/filemgringest/FilemgrIngestStep.java
@@ -162,13 +162,15 @@
}*/
try {
- Metadata m = oodtproc.getMetadata((String)r[idx2]);
- oodtproc.ingest(oodt, new File((String)r[idx]), m);
+
+ System.setProperty("org.apache.oodt.cas.filemgr.mime.type.repository", "/tmp/mime-types.xml");
+ Metadata m = oodtproc.getMetadata((String)r[idx2]);
+ String productid = oodtproc.ingest(oodt, new File((String)r[idx]), m);
// safely add the string "Hello World!" at the end of the output row
// the row array will be resized if necessary
- Object[] outputRow = RowDataUtil.addValueData(r, data.outputRowMeta.size() - 1, "Hello World!");
+ Object[] outputRow = RowDataUtil.addValueData(r, data.outputRowMeta.size() - 1, productid);
// put the row to the output row stream
putRow(data.outputRowMeta, outputRow);
diff --git a/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java b/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java
index b4b14cc..ec24d4d 100644
--- a/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java
+++ b/tools/pdi_plugin/src/org/apache/oodt/filemgringest/OODTProcesses.java
@@ -66,7 +66,7 @@
}
- boolean ingest(OODTConfig config, File product, Metadata productMetdata) throws IngestException {
+ String ingest(OODTConfig config, File product, Metadata productMetdata) throws IngestException {
// try {
String productId = config.getIngester().ingest(config.getFmUrl(),
product, productMetdata);
@@ -79,7 +79,7 @@
+ ": attempting to continue crawling", e);
return false;
}*/
- return true;
+ return productId;
}
