svn commit: r1599694 - in /manifoldcf/branches/CONNECTORS-946: connectors/nulltransformation/ framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java

[kwright]

Author: kwright
Date: Tue Jun  3 17:08:29 2014
New Revision: 1599694

URL: http://svn.apache.org/r1599694
Log:
More fixes

Modified:
    manifoldcf/branches/CONNECTORS-946/connectors/nulltransformation/   (props 
changed)
    
manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java

Propchange: manifoldcf/branches/CONNECTORS-946/connectors/nulltransformation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun  3 17:08:29 2014
@@ -0,0 +1,10 @@
+build
+dist
+doc
+target
+test-output
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output

Modified: 
manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java?rev=1599694&r1=1599693&r2=1599694&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-946/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/PipelineManager.java
 Tue Jun  3 17:08:29 2014
@@ -27,7 +27,7 @@ import java.util.*;
 * connections and their specification data.
 * 
 * <br><br>
-* <b>pipelines</b>
+* <b>jobpipelines</b>
 * <table border="1" cellpadding="3" cellspacing="0">
 * <tr class="TableHeadingColor">
 * 
<th>Field</th><th>Type</th><th>Description&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
@@ -58,14 +58,14 @@ public class PipelineManager extends org
   public PipelineManager(IThreadContext threadContext, IDBInterface database)
     throws ManifoldCFException
   {
-    super(database,"pipelines");
+    super(database,"jobpipelines");
   }
 
   /** Install or upgrade.
   *@param ownerTable is the name of the table that owns this one.
   *@param owningTablePrimaryKey is the primary key of the owning table.
   */
-  public void install(String ownerTable, String owningTablePrimaryKey, String 
transformationTableName, String transformationNameField)
+  public void install(String ownerTable, String owningTablePrimaryKey, String 
transformationTableName, String transformationTableNameField)
     throws ManifoldCFException
   {
     // Standard practice: Outer loop to support upgrades
@@ -77,7 +77,7 @@ public class PipelineManager extends org
         HashMap map = new HashMap();
         map.put(ownerIDField,new 
ColumnDescription("BIGINT",false,false,ownerTable,owningTablePrimaryKey,false));
         map.put(ordinalField,new 
ColumnDescription("BIGINT",false,false,null,null,false));
-        map.put(transformationNameField,new 
ColumnDescription("VARCHAR(32)",false,false,transformationTableName,transformationNameField,false));
+        map.put(transformationNameField,new 
ColumnDescription("VARCHAR(32)",false,false,transformationTableName,transformationTableNameField,false));
         map.put(transformationDescriptionField,new 
ColumnDescription("VARCHAR(255)",false,true,null,null,false));
         map.put(transformationSpecField,new 
ColumnDescription("LONGTEXT",false,true,null,null,false));
         performCreate(map,null);