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 2014/11/17 16:07:57 UTC
svn commit: r1640168 - in
/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main:
java/org/apache/manifoldcf/authorities/authorities/sharepoint/
java/org/apache/manifoldcf/crawler/connectors/sharepoint/
resources/org/apache/manif...
Author: kwright
Date: Mon Nov 17 15:07:57 2014
New Revision: 1640168
URL: http://svn.apache.org/r1640168
Log:
Get UI to work
Modified:
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java Mon Nov 17 15:07:57 2014
@@ -513,8 +513,8 @@ public class SharePointAuthority extends
velocityContext.put("SERVERNAME", serverName);
velocityContext.put("SERVERPORT", serverPort);
velocityContext.put("SERVERLOCATION", serverLocation);
- velocityContext.put("USERNAME", userName);
- velocityContext.put("PASSWORD", password);
+ velocityContext.put("SERVERUSERNAME", userName);
+ velocityContext.put("SERVERPASSWORD", password);
if (keystore != null)
velocityContext.put("KEYSTORE", keystore);
velocityContext.put("CERTIFICATELIST", certificates);
@@ -588,11 +588,11 @@ public class SharePointAuthority extends
if (serverLocation != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERLOCATION,serverLocation);
- String userName = variableContext.getParameter("userName");
+ String userName = variableContext.getParameter("serverUserName");
if (userName != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERUSERNAME,userName);
- String password = variableContext.getParameter("password");
+ String password = variableContext.getParameter("serverPassword");
if (password != null)
parameters.setObfuscatedParameter(SharePointConfig.PARAM_SERVERPASSWORD,variableContext.mapKeyToPassword(password));
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Mon Nov 17 15:07:57 2014
@@ -2228,11 +2228,11 @@ public class SharePointRepository extend
if (serverLocation != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERLOCATION,serverLocation);
- String userName = variableContext.getParameter("userName");
+ String userName = variableContext.getParameter("serverUserName");
if (userName != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERUSERNAME,userName);
- String password = variableContext.getParameter("password");
+ String password = variableContext.getParameter("serverPassword");
if (password != null)
parameters.setObfuscatedParameter(SharePointConfig.PARAM_SERVERPASSWORD,variableContext.mapKeyToPassword(password));
@@ -2433,8 +2433,8 @@ public class SharePointRepository extend
velocityContext.put("SERVERNAME", serverName);
velocityContext.put("SERVERPORT", serverPort);
velocityContext.put("SERVERLOCATION", serverLocation);
- velocityContext.put("USERNAME", userName);
- velocityContext.put("PASSWORD", password);
+ velocityContext.put("SERVERUSERNAME", userName);
+ velocityContext.put("SERVERPASSWORD", password);
if (keystore != null)
velocityContext.put("KEYSTORE", keystore);
velocityContext.put("CERTIFICATELIST", certificates);
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js Mon Nov 17 15:07:57 2014
@@ -50,10 +50,10 @@ function checkConfig()
editconnection.serverLocation.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.AValidSharePointUserNameHasTheForm'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
@@ -125,11 +125,11 @@ function checkConfigForSave()
editconnection.serverPort.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.TheConnectionRequiresAValidSharePointUserName'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html Mon Nov 17 15:07:57 2014
@@ -98,11 +98,11 @@
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.UserName'))</nobr></td>
- <td class="value"><input type="text" size="32" name="userName" value="$Encoder.attributeEscape($USERNAME)"/></td>
+ <td class="value"><input type="text" size="32" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/></td>
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Password'))</nobr></td>
- <td class="value"><input type="password" size="32" name="password" value="$Encoder.attributeEscape($PASSWORD)"/></td>
+ <td class="value"><input type="password" size="32" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/></td>
</tr>
<tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
@@ -162,8 +162,8 @@
<input type="hidden" name="serverName" value="$Encoder.attributeEscape($SERVERNAME)"/>
<input type="hidden" name="serverPort" value="$SERVERPORT"/>
<input type="hidden" name="serverLocation" value="$Encoder.attributeEscape($SERVERLOCATION)"/>
-<input type="hidden" name="userName" value="$Encoder.attributeEscape($USERNAME)"/>
-<input type="hidden" name="password" value="$Encoder.attributeEscape($PASSWORD)"/>
+<input type="hidden" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/>
+<input type="hidden" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/>
<input type="hidden" name="proxyhost" value="$Encoder.attributeEscape($PROXYHOST)"/>
<input type="hidden" name="proxyport" value="$Encoder.attributeEscape($PROXYPORT)"/>
<input type="hidden" name="proxyuser" value="$Encoder.attributeEscape($PROXYUSER)"/>
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html Mon Nov 17 15:07:57 2014
@@ -71,7 +71,7 @@
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.UserName'))</nobr></td>
<td class="value">
- $Encoder.bodyEscape($USERNAME)
+ $Encoder.bodyEscape($SERVERUSERNAME)
</td>
</tr>
<tr>
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js Mon Nov 17 15:07:57 2014
@@ -71,10 +71,10 @@ function checkConfig()
editconnection.serverLocation.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.AValidSharePointUserNameHasTheForm'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
@@ -118,11 +118,11 @@ function checkConfigForSave()
editconnection.serverPort.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.TheConnectionRequiresAValidSharePointUserName'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.Server'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html Mon Nov 17 15:07:57 2014
@@ -81,11 +81,11 @@
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.UserName'))</nobr></td>
- <td class="value"><input type="text" size="32" name="userName" value="$Encoder.attributeEscape($USERNAME)"/></td>
+ <td class="value"><input type="text" size="32" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/></td>
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.Password'))</nobr></td>
- <td class="value"><input type="password" size="32" name="password" value="$Encoder.attributeEscape($PASSWORD)"/></td>
+ <td class="value"><input type="password" size="32" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/></td>
</tr>
<tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
@@ -144,8 +144,8 @@
<input type="hidden" name="serverName" value="$Encoder.attributeEscape($SERVERNAME)"/>
<input type="hidden" name="serverPort" value="$SERVERPORT"/>
<input type="hidden" name="serverLocation" value="$Encoder.attributeEscape($SERVERLOCATION)"/>
-<input type="hidden" name="userName" value="$Encoder.attributeEscape($USERNAME)"/>
-<input type="hidden" name="password" value="$Encoder.attributeEscape($PASSWORD)"/>
+<input type="hidden" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/>
+<input type="hidden" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/>
<input type="hidden" name="proxyhost" value="$Encoder.attributeEscape($PROXYHOST)"/>
<input type="hidden" name="proxyport" value="$Encoder.attributeEscape($PROXYPORT)"/>
<input type="hidden" name="proxyuser" value="$Encoder.attributeEscape($PROXYUSER)"/>
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html?rev=1640168&r1=1640167&r2=1640168&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html Mon Nov 17 15:07:57 2014
@@ -59,7 +59,7 @@
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.UserName'))</nobr></td>
<td class="value">
- $Encoder.bodyEscape($USERNAME)
+ $Encoder.bodyEscape($SERVERUSERNAME)
</td>
</tr>
<tr>