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/03/18 17:42:23 UTC
svn commit: r1457852 - in
/manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main:
java/org/apache/manifoldcf/crawler/connectors/livelink/
native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/
Author: kwright
Date: Mon Mar 18 16:42:23 2013
New Revision: 1457852
URL: http://svn.apache.org/r1457852
Log:
Add UI support for selecting SSL via checkbox.
Modified:
manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties
manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties
Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1457852&r1=1457851&r2=1457852&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Mon Mar 18 16:42:23 2013
@@ -691,6 +691,10 @@ public class LivelinkAuthority extends o
" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"LivelinkConnector.ServerPassword") + "</nobr></td>\n"+
" <td class=\"value\"><input type=\"password\" size=\"32\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/></td>\n"+
" </tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>"+Messages.getBodyString(locale,"LivelinkConnector.ServerUseSSL")+"</nobr></td>\n"+
+" <td class=\"value\"><input type=\"checkbox\" name=\"serverssl\" value=\"yes\""+(serverUseSSL.equals("yes")?" checked=\"\"":"")+"/><input type=\"hidden\" name=\"serverssl_present\" value=\"true\"/></td>\n"+
+" </tr>\n"+
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"
);
out.print(
@@ -745,7 +749,9 @@ public class LivelinkAuthority extends o
"<input type=\"hidden\" name=\"serverport\" value=\""+serverPort+"\"/>\n"+
"<input type=\"hidden\" name=\"serverdomain\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverDomain)+"\"/>\n"+
"<input type=\"hidden\" name=\"serverusername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverUserName)+"\"/>\n"+
-"<input type=\"hidden\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/>\n"
+"<input type=\"hidden\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/>\n"+
+"<input type=\"hidden\" name=\"serverssl\" value=\""+serverUseSSL+"\"/>\n"+
+"<input type=\"hidden\" name=\"serverssl_present\" value=\"true\"/>\n"
);
}
@@ -836,6 +842,14 @@ public class LivelinkAuthority extends o
String serverKeystoreValue = variableContext.getParameter("serverkeystoredata");
if (serverKeystoreValue != null)
parameters.setParameter(LiveLinkParameters.serverKeystore,serverKeystoreValue);
+ String serverSSLPresent = variableContext.getParameter("serverssl_present");
+ if (serverSSLPresent != null)
+ {
+ String serverSSL = variableContext.getParameter("serverssl");
+ if (serverSSL == null)
+ serverSSL = "no";
+ parameters.setParameter(LiveLinkParameters.serverSSL,serverSSL);
+ }
String serverConfigOp = variableContext.getParameter("serverconfigop");
if (serverConfigOp != null)
Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1457852&r1=1457851&r2=1457852&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Mon Mar 18 16:42:23 2013
@@ -1663,6 +1663,10 @@ public class LivelinkConnector extends o
" <td class=\"description\"><nobr>"+Messages.getBodyString(locale,"LivelinkConnector.ServerPassword")+"</nobr></td>\n"+
" <td class=\"value\"><input type=\"password\" size=\"32\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/></td>\n"+
" </tr>\n"+
+" <tr>\n"+
+" <td class=\"description\"><nobr>"+Messages.getBodyString(locale,"LivelinkConnector.ServerUseSSL")+"</nobr></td>\n"+
+" <td class=\"value\"><input type=\"checkbox\" name=\"serverssl\" value=\"yes\""+(serverUseSSL.equals("yes")?" checked=\"\"":"")+"/><input type=\"hidden\" name=\"serverssl_present\" value=\"true\"/></td>\n"+
+" </tr>\n"+
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"
);
out.print(
@@ -1717,7 +1721,9 @@ public class LivelinkConnector extends o
"<input type=\"hidden\" name=\"serverport\" value=\""+serverPort+"\"/>\n"+
"<input type=\"hidden\" name=\"serverdomain\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverDomain)+"\"/>\n"+
"<input type=\"hidden\" name=\"serverusername\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverUserName)+"\"/>\n"+
-"<input type=\"hidden\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/>\n"
+"<input type=\"hidden\" name=\"serverpassword\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(serverPassword)+"\"/>\n"+
+"<input type=\"hidden\" name=\"serverssl\" value=\""+serverUseSSL+"\"/>\n"+
+"<input type=\"hidden\" name=\"serverssl_present\" value=\"true\"/>\n"
);
}
@@ -1921,7 +1927,15 @@ public class LivelinkConnector extends o
String serverKeystoreValue = variableContext.getParameter("serverkeystoredata");
if (serverKeystoreValue != null)
parameters.setParameter(LiveLinkParameters.serverKeystore,serverKeystoreValue);
-
+ String serverSSLPresent = variableContext.getParameter("serverssl_present");
+ if (serverSSLPresent != null)
+ {
+ String serverSSL = variableContext.getParameter("serverssl");
+ if (serverSSL == null)
+ serverSSL = "no";
+ parameters.setParameter(LiveLinkParameters.serverSSL,serverSSL);
+ }
+
String serverConfigOp = variableContext.getParameter("serverconfigop");
if (serverConfigOp != null)
{
Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties?rev=1457852&r1=1457851&r2=1457852&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_en_US.properties Mon Mar 18 16:42:23 2013
@@ -134,3 +134,4 @@ LivelinkConnector.CacheLRUSizeMustBeAnIn
LivelinkConnector.ServerDomain=Server domain (if using NTLM):
LivelinkConnector.ServerSSLCertificateList=Server SSL certificate list:
+LivelinkConnector.ServerUseSSL=Use SSL to communicate with server:
Modified: manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties?rev=1457852&r1=1457851&r2=1457852&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties (original)
+++ manifoldcf/branches/CONNECTORS-664/connectors/livelink/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/livelink/common_ja_JP.properties Mon Mar 18 16:42:23 2013
@@ -131,3 +131,7 @@ LivelinkConnector.CacheLifetimeCannotBeN
LivelinkConnector.CacheLifetimeMustBeAnInteger=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
LivelinkConnector.CacheLRUSizeCannotBeNull=ãã£ãã·ã¥LRUãµã¤ãºãå
¥åãã¦ãã ãã
LivelinkConnector.CacheLRUSizeMustBeAnInteger=ãã£ãã·ã¥LRUãµã¤ãºã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
+
+LivelinkConnector.ServerDomain=Server domain (if using NTLM):
+LivelinkConnector.ServerSSLCertificateList=Server SSL certificate list:
+LivelinkConnector.ServerUseSSL=Use SSL to communicate with server: