You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/06/27 13:54:24 UTC
svn commit: r1497316 - in /manifoldcf/branches/CONNECTORS-703/framework:
crawler-ui/src/main/webapp/
ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/
Author: kwright
Date: Thu Jun 27 11:54:24 2013
New Revision: 1497316
URL: http://svn.apache.org/r1497316
Log:
Add UI support for viewing prerequisites.
Modified:
manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewauthority.jsp
manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewmapper.jsp
manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Modified: manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1497316&r1=1497315&r2=1497316&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original)
+++ manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewauthority.jsp Thu Jun 27 11:54:24 2013
@@ -83,6 +83,15 @@
if (connectorName == null)
connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.uninstalled");
int maxCount = connection.getMaxConnections();
+ Set<String> prereqs = connection.getPrerequisites();
+ String[] prereqList = new String[prereqs.size()];
+ int i = 0;
+ for (String s : prereqs)
+ {
+ prereqList[i++] = s;
+ }
+ java.util.Arrays.sort(prereqList);
+
ConfigParams parameters = connection.getConfigParams();
// Do stuff so we can call out to display the parameters
@@ -120,15 +129,44 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NameColon")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
- <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.DescriptionColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NameColon")%></nobr></td>
+ <td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+ <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.DescriptionColon")%></nobr></td>
+ <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ </tr>
+ <tr>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ <tr>
+ <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityTypeColon")%></nobr></td>
+ <td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+ <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnectionsColon")%></nobr></td>
+ <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityTypeColon")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnectionsColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+ <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.PrerequisiteUserMappingsColon")%></nobr></td>
+ <td class="value" colspan="3">
+<%
+ if (prereqList.length != 0)
+ {
+ for (int j = 0; j < prereqList.length; j++)
+ {
+%>
+ <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(prereqList[j])%></nobr><br/>
+<%
+ }
+ }
+ else
+ {
+%>
+ <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NoPrerequisites")%></nobr>
+<%
+ }
+%>
+ </td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
@@ -145,7 +183,8 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
- <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatusColon")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+ <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatusColon")%></nobr></td>
+ <td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
</tr>
<tr>
<td class="separator" colspan="4"><hr/></td>
Modified: manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewmapper.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewmapper.jsp?rev=1497316&r1=1497315&r2=1497316&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewmapper.jsp (original)
+++ manifoldcf/branches/CONNECTORS-703/framework/crawler-ui/src/main/webapp/viewmapper.jsp Thu Jun 27 11:54:24 2013
@@ -83,6 +83,15 @@
if (connectorName == null)
connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"viewmapper.uninstalled");
int maxCount = connection.getMaxConnections();
+ Set<String> prereqs = connection.getPrerequisites();
+ String[] prereqList = new String[prereqs.size()];
+ int i = 0;
+ for (String s : prereqs)
+ {
+ prereqList[i++] = s;
+ }
+ java.util.Arrays.sort(prereqList);
+
ConfigParams parameters = connection.getConfigParams();
// Now, test the connection.
@@ -134,6 +143,31 @@
<td class="separator" colspan="4"><hr/></td>
</tr>
<tr>
+ <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.PrerequisiteUserMappingsColon")%></nobr></td>
+ <td class="value" colspan="3">
+<%
+ if (prereqList.length != 0)
+ {
+ for (int j = 0; j < prereqList.length; j++)
+ {
+%>
+ <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(prereqList[j])%></nobr><br/>
+<%
+ }
+ }
+ else
+ {
+%>
+ <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.NoPrerequisites")%></nobr>
+<%
+ }
+%>
+ </td>
+ </tr>
+ <tr>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ <tr>
<td colspan="4">
<%
MappingConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out),pageContext.getRequest().getLocale(),parameters);
Modified: manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1497316&r1=1497315&r2=1497316&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Thu Jun 27 11:54:24 2013
@@ -818,6 +818,8 @@ viewauthority.Connectorisnotinstalled=Co
viewauthority.uninstalled=(uninstalled)
viewauthority.Threwexception=Threw exception:
viewauthority.qmark=?
+viewauthority.PrerequisiteUserMappingsColon=Prerequisite user mappings:
+viewauthority.NoPrerequisites=No prerequisites
viewmapper.ApacheManifoldCFViewMappingConnectionStatus=Apache ManifoldCF: View Mapping Connection Status
viewmapper.DeleteConnection=Delete connection
@@ -836,3 +838,5 @@ viewmapper.EditThisMappingConnection=Edi
viewmapper.Delete=Delete
viewmapper.DeleteThisMappingConnection=Delete this mapping connection
viewmapper.qmark=?
+viewmapper.PrerequisiteUserMappingsColon=Prerequisite user mappings:
+viewmapper.NoPrerequisites=No prerequisites
Modified: manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1497316&r1=1497315&r2=1497316&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-703/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Thu Jun 27 11:54:24 2013
@@ -819,6 +819,8 @@ viewauthority.Connectorisnotinstalled=Co
viewauthority.uninstalled=(uninstalled)
viewauthority.Threwexception=Threw exception:
viewauthority.qmark=?
+viewauthority.PrerequisiteUserMappingsColon=Prerequisite user mappings:
+viewauthority.NoPrerequisites=No prerequisites
viewmapper.ApacheManifoldCFViewMappingConnectionStatus=Apache ManifoldCF: View Mapping Connection Status
viewmapper.DeleteConnection=Delete connection
@@ -837,3 +839,5 @@ viewmapper.EditThisMappingConnection=Edi
viewmapper.Delete=åé¤
viewmapper.DeleteThisMappingConnection=Delete this mapping connection
viewmapper.qmark=?
+viewmapper.PrerequisiteUserMappingsColon=Prerequisite user mappings:
+viewmapper.NoPrerequisites=No prerequisites