svn commit: r1599715 - in /manifoldcf/branches/CONNECTORS-946/framework: crawler-ui/src/main/webapp/ ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/

[kwright]

Author: kwright
Date: Tue Jun  3 18:12:20 2014
New Revision: 1599715

URL: http://svn.apache.org/r1599715
Log:
Finish viewjob

Modified:
    
manifoldcf/branches/CONNECTORS-946/framework/crawler-ui/src/main/webapp/viewjob.jsp
    
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
    
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties

Modified: 
manifoldcf/branches/CONNECTORS-946/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1599715&r1=1599714&r2=1599715&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-946/framework/crawler-ui/src/main/webapp/viewjob.jsp
 (original)
+++ 
manifoldcf/branches/CONNECTORS-946/framework/crawler-ui/src/main/webapp/viewjob.jsp
 Tue Jun  3 18:12:20 2014
@@ -82,10 +82,12 @@
        IJobManager manager = JobManagerFactory.make(threadContext);
         IOutputConnectionManager outputManager = 
OutputConnectionManagerFactory.make(threadContext);
        IRepositoryConnectionManager connManager = 
RepositoryConnectionManagerFactory.make(threadContext);
-       
+       ITransformationConnectionManager transformationManager = 
TransformationConnectionManagerFactory.make(threadContext);
+
        IOutputConnectorPool outputConnectorPool = 
OutputConnectorPoolFactory.make(threadContext);
        IRepositoryConnectorPool repositoryConnectorPool = 
RepositoryConnectorPoolFactory.make(threadContext);
-       
+       ITransformationConnectorPool transformationConnectorPool = 
TransformationConnectorPoolFactory.make(threadContext);
+
        String jobID = variableContext.getParameter("jobid");
        IJobDescription job = manager.load(new Long(jobID));
        if (job == null)
@@ -152,6 +154,8 @@
                //threadContext.save("OutputConnection",outputConnection);
                
//threadContext.save("DocumentSpecification",job.getSpecification());
                //threadContext.save("RepositoryConnection",connection);
+               int displaySequence = 0;
+
 %>
                <table class="displaytable">
                        <tr>
@@ -165,10 +169,40 @@
                                <td class="separator" colspan="4"><hr/></td>
                        </tr>
                        <tr>
-                               <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.OutputConnectionColon")%></nobr></td>
-                               <td 
class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getOutputConnectionName())%></td>
-                               <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.RepositoryConnectionColon")%></nobr></td>
-                               <td 
class="value"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getConnectionName())%></td>
+                               <td class="description" 
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.PipelineColon")%></nobr></td>
+                               <td class="boxcell" colspan="3">
+                                       <table class="formtable">
+                                               <tr class="formheaderrow">
+                                                       <td 
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageNumber")%></nobr></td>
+                                                       <td 
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageDescription")%></nobr></td>
+                                                       <td 
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageConnectionName")%></nobr></td>
+                                               </tr>
+                                               <tr class="<%=((displaySequence 
% 2)==0)?"evenformrow":"oddformrow"%>">
+                                                       <td 
class="formcolumncell"><%=(++displaySequence)%>.</td>
+                                                       <td 
class="formcolumncell"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.RepositoryStage")%></td>
+                                                       <td 
class="formcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getConnectionName())%></td>
+                                               </tr>
+<%
+               for (int j = 0; j < job.countPipelineStages(); j++)
+               {
+                       String transformationConnectionName = 
job.getPipelineStageConnectionName(j);
+                       String transformationDescription = 
job.getPipelineStageDescription(j);
+%>
+                                               <tr class="<%=((displaySequence 
% 2)==0)?"evenformrow":"oddformrow"%>">
+                                                       <td 
class="formcolumncell"><%=(++displaySequence)%>.</td>
+                                                       <td 
class="formcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(transformationDescription)%></td>
+                                                       <td 
class="formcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(transformationConnectionName)%></td>
+                                               </tr>
+<%
+               }
+%>
+                                               <tr class="<%=((displaySequence 
% 2)==0)?"evenformrow":"oddformrow"%>">
+                                                       <td 
class="formcolumncell"><%=(++displaySequence)%>.</td>
+                                                       <td 
class="formcolumncell"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.OutputStage")%></td>
+                                                       <td 
class="formcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getOutputConnectionName())%></td>
+                                               </tr>
+                                       </table>
+                               </td>
                        </tr>
                        <tr>
                                <td class="separator" colspan="4"><hr/></td>

Modified: 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1599715&r1=1599714&r2=1599715&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
 Tue Jun  3 18:12:20 2014
@@ -841,6 +841,14 @@ error.Return=Return
 
 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: View Job
 viewjob.ViewAJob=View a Job
+
+viewjob.PipelineColon=Pipeline:
+viewjob.StageNumber=Stage
+viewjob.StageDescription=Description
+viewjob.StageConnectionName=Connection name
+viewjob.RepositoryStage=(Repository)
+viewjob.OutputStage=(Output)
+
 viewjob.ScheduleTypeColon=Schedule type:
 viewjob.MinimumRecrawlIntervalColon=Minimum recrawl interval:
 viewjob.MaximumRecrawlIntervalColon=Maximum recrawl interval:

Modified: 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1599715&r1=1599714&r2=1599715&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
 Tue Jun  3 18:12:20 2014
@@ -868,6 +868,14 @@ error.Return=戻る
 
 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF：ジョブ情報
 viewjob.ViewAJob=ジョブ情報
+
+viewjob.PipelineColon=Pipeline:
+viewjob.StageNumber=Stage
+viewjob.StageDescription=Description
+viewjob.StageConnectionName=Connection name
+viewjob.RepositoryStage=(Repository)
+viewjob.OutputStage=(Output)
+
 viewjob.ScheduleTypeColon=スケジュールタイプ：
 viewjob.MinimumRecrawlIntervalColon=最小再読込み間隔：
 viewjob.MaximumRecrawlIntervalColon=最大再クロール間隔：

Modified: 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties?rev=1599715&r1=1599714&r2=1599715&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
 (original)
+++ 
manifoldcf/branches/CONNECTORS-946/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
 Tue Jun  3 18:12:20 2014
@@ -868,6 +868,14 @@ error.Return=返回
 
 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: 作业信息
 viewjob.ViewAJob=作业信息
+
+viewjob.PipelineColon=Pipeline:
+viewjob.StageNumber=Stage
+viewjob.StageDescription=Description
+viewjob.StageConnectionName=Connection name
+viewjob.RepositoryStage=(Repository)
+viewjob.OutputStage=(Output)
+
 viewjob.ScheduleTypeColon=调度类型:
 viewjob.MinimumRecrawlIntervalColon=最小重新爬取间隔:
 viewjob.MaximumRecrawlIntervalColon=最大重新爬取间隔: