manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1534971 - in /manifoldcf/branches/CONNECTORS-792/framework: crawler-ui/src/main/webapp/ ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/
Date Wed, 23 Oct 2013 10:11:20 GMT
Author: kwright
Date: Wed Oct 23 10:11:20 2013
New Revision: 1534971

URL: http://svn.apache.org/r1534971
Log:
Allow auth domain to be set in the UI

Modified:
    manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
    manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/execute.jsp
    manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/viewauthority.jsp
    manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties

Modified: manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1534971&r1=1534970&r2=1534971&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
(original)
+++ manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/editauthority.jsp
Wed Oct 23 10:11:20 2013
@@ -61,6 +61,7 @@
 	int maxConnections = 10;
 	ConfigParams parameters = new ConfigParams();
 	String prereq = null;
+	String authDomain = "";
 
 	if (connection != null)
 	{
@@ -72,6 +73,9 @@
 		parameters = connection.getConfigParams();
 		maxConnections = connection.getMaxConnections();
 		prereq = connection.getPrerequisiteMapping();
+		authDomain = connection.getAuthDomain();
+		if (authDomain == null)
+			authDomain = "";
 	}
 	else
 		connectionName = null;
@@ -390,6 +394,10 @@
 %>
 				</td>
 			</tr>
+			<tr>
+				<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorizationDomainColon")%></nobr></td>
+				<td class="value" colspan="4"><nobr><input type="text" name="authdomain"
size="40" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(authDomain)%>'/></nobr></td>
+			</tr>
 		    </table>
 <%
 	  }
@@ -398,6 +406,7 @@
 		// Hiddens for the "Type" tab
 %>
 		    <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/>
+		    <input type="hidden" name="authdomain" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(authDomain)%>'/>
 <%
 	  }
 

Modified: manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/execute.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/execute.jsp?rev=1534971&r1=1534970&r2=1534971&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/execute.jsp (original)
+++ manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/execute.jsp Wed
Oct 23 10:11:20 2013
@@ -259,7 +259,10 @@
 							y = null;
 						connection.setPrerequisiteMapping(y);
 					}
-					
+					x = variableContext.getParameter("authdomain");
+					if (x != null && x.length() > 0)
+						connection.setAuthDomain(x);
+
 					String error = AuthorityConnectorFactory.processConfigurationPost(threadContext,connection.getClassName(),variableContext,pageContext.getRequest().getLocale(),connection.getConfigParams());
 					
 					if (error != null)

Modified: manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1534971&r1=1534970&r2=1534971&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/viewauthority.jsp
(original)
+++ manifoldcf/branches/CONNECTORS-792/framework/crawler-ui/src/main/webapp/viewauthority.jsp
Wed Oct 23 10:11:20 2013
@@ -84,6 +84,9 @@
 			connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.uninstalled");
 		int maxCount = connection.getMaxConnections();
 		String prereq = connection.getPrerequisiteMapping();
+		String authDomain = connection.getAuthDomain();
+		if (authDomain == null)
+			authDomain = "";
 		
 		ConfigParams parameters = connection.getConfigParams();
 
@@ -141,7 +144,7 @@
 			</tr>
 			<tr>
 				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.PrerequisiteUserMappingColon")%></nobr></td>
-				<td class="value" colspan="3">
+				<td class="value" colspan="1">
 <%
 		if (prereq != null)
 		{
@@ -157,6 +160,8 @@
 		}
 %>
 				</td>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorizationDomainColon")%></nobr></td>
+				<td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authDomain)%></nobr></td>
 			</tr>
 			<tr>
 				<td class="separator" colspan="4"><hr/></td>

Modified: manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1534971&r1=1534970&r2=1534971&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
(original)
+++ manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
Wed Oct 23 10:11:20 2013
@@ -830,6 +830,7 @@ viewauthority.Threwexception=Threw excep
 viewauthority.qmark=?
 viewauthority.PrerequisiteUserMappingColon=Prerequisite user mapping:
 viewauthority.NoPrerequisites=No prerequisites
+viewauthority.AuthorizationDomainColon=Authorization domain:
 
 viewmapper.ApacheManifoldCFViewMappingConnectionStatus=Apache ManifoldCF: View Mapping Connection
Status
 viewmapper.DeleteConnection=Delete connection

Modified: manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1534971&r1=1534970&r2=1534971&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
(original)
+++ manifoldcf/branches/CONNECTORS-792/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
Wed Oct 23 10:11:20 2013
@@ -831,6 +831,7 @@ viewauthority.Threwexception=例å¤�
 viewauthority.qmark=?
 viewauthority.PrerequisiteUserMappingColon=前提ユーザーマッピング:
 viewauthority.NoPrerequisites=条件無し
+viewauthority.AuthorizationDomainColon=Authorization domain:
 
 viewmapper.ApacheManifoldCFViewMappingConnectionStatus=Apache ManifoldCF: マッピングコネクション状態の表示
 viewmapper.DeleteConnection=コネクションを削除



Mime
View raw message