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/10/12 13:54:35 UTC
svn commit: r1631164 - in /manifoldcf/trunk/connectors:
alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/
alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfr...
Author: kwright
Date: Sun Oct 12 11:54:35 2014
New Revision: 1631164
URL: http://svn.apache.org/r1631164
Log:
More UI changes; part of CONNECTORS-1061.
Modified:
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/AlfrescoAuthorityConnector.java Sun Oct 12 11:54:35 2014
@@ -33,9 +33,6 @@ public class AlfrescoAuthorityConnector
private AlfrescoClient alfrescoClient;
- private static final AuthorizationResponse denied = new AuthorizationResponse(
- new String[]{"DEAD_AUTHORITY"}, AuthorizationResponse.RESPONSE_UNREACHABLE);
-
public void setClient(AlfrescoClient client) {
alfrescoClient = client;
}
@@ -46,11 +43,12 @@ public class AlfrescoAuthorityConnector
String protocol = getConfig(config, "protocol", "http");
String hostname = getConfig(config, "hostname", "localhost");
+ String port = getConfig(config, "port", "8080");
String endpoint = getConfig(config, "endpoint", "/alfresco/service");
String username = getConfig(config, "username", null);
String password = getObfuscatedConfig(config, "password", null);
- alfrescoClient = new WebScriptsAlfrescoClient(protocol, hostname, endpoint,
+ alfrescoClient = new WebScriptsAlfrescoClient(protocol, hostname + ":" + port, endpoint,
null, null, username, password);
}
@@ -97,6 +95,7 @@ public class AlfrescoAuthorityConnector
*/
@Override
public void disconnect() throws ManifoldCFException {
+ alfrescoClient = null;
super.disconnect();
}
@@ -106,7 +105,7 @@ public class AlfrescoAuthorityConnector
*/
@Override
public AuthorizationResponse getDefaultAuthorizationResponse(String userName) {
- return denied;
+ return RESPONSE_UNREACHABLE;
}
/*
@@ -121,13 +120,13 @@ public class AlfrescoAuthorityConnector
if (permissions.getUsername() == null
|| permissions.getUsername().isEmpty()
|| permissions.getAuthorities().isEmpty())
- return new AuthorizationResponse(null, AuthorizationResponse.RESPONSE_USERNOTFOUND);
+ return RESPONSE_USERNOTFOUND;
else
return new AuthorizationResponse(
permissions.getAuthorities().toArray(new String[permissions.getAuthorities().size()]),
AuthorizationResponse.RESPONSE_OK);
} catch (AlfrescoDownException e) {
- return new AuthorizationResponse(null, AuthorizationResponse.RESPONSE_UNREACHABLE);
+ return RESPONSE_UNREACHABLE;
}
}
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/ConfigurationHandler.java Sun Oct 12 11:54:35 2014
@@ -32,6 +32,7 @@ import java.util.Map;
public class ConfigurationHandler {
private static final String PARAM_PROTOCOL = "protocol";
private static final String PARAM_HOSTNAME = "hostname";
+ private static final String PARAM_PORT = "port";
private static final String PARAM_ENDPOINT = "endpoint";
private static final String PARAM_USERNAME = "username";
private static final String PARAM_PASSWORD = "password";
@@ -45,6 +46,7 @@ public class ConfigurationHandler {
static {
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_PROTOCOL, "http");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_HOSTNAME, "localhost");
+ DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_PORT, "8080");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_ENDPOINT, "/alfresco/service");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_USERNAME, "");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_PASSWORD, "");
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java Sun Oct 12 11:54:35 2014
@@ -44,7 +44,6 @@ public class AlfrescoConnector extends B
private static final String ACTIVITY_FETCH = "fetch document";
private static final String[] activitiesList = new String[]{ACTIVITY_FETCH};
private AlfrescoClient alfrescoClient;
- private Boolean enableDocumentProcessing = Boolean.TRUE;
private static final String CONTENT_URL_PROPERTY = "contentUrlPath";
private static final String AUTHORITIES_PROPERTY = "readableAuthorities";
@@ -74,14 +73,14 @@ public class AlfrescoConnector extends B
String protocol = getConfig(config, "protocol", "http");
String hostname = getConfig(config, "hostname", "localhost");
+ String port = getConfig(config, "port", "8080");
String endpoint = getConfig(config, "endpoint", "/alfresco/service");
String storeProtocol = getConfig(config, "storeprotocol", "workspace");
String storeId = getConfig(config, "storeid", "SpacesStore");
String username = getConfig(config, "username", null);
String password = getObfuscatedConfig(config, "password", null);
- this.enableDocumentProcessing = new Boolean(getConfig(config, "enabledocumentprocessing", "false"));
- alfrescoClient = new WebScriptsAlfrescoClient(protocol, hostname, endpoint,
+ alfrescoClient = new WebScriptsAlfrescoClient(protocol, hostname + ":" + port, endpoint,
storeProtocol, storeId, username, password);
}
@@ -121,6 +120,7 @@ public class AlfrescoConnector extends B
@Override
public void disconnect() throws ManifoldCFException {
+ alfrescoClient = null;
super.disconnect();
}
@@ -195,8 +195,9 @@ public class AlfrescoConnector extends B
IProcessActivity activities, int jobMode, boolean usesDefaultAuthority)
throws ManifoldCFException, ServiceInterruption {
- try {
- for (String doc : documentIdentifiers) {
+ boolean enableDocumentProcessing = ConfigurationHandler.getEnableDocumentProcessing(spec);
+ for (String doc : documentIdentifiers) {
+ try {
String nextVersion = statuses.getIndexedVersionString(doc);
@@ -255,7 +256,7 @@ public class AlfrescoConnector extends B
continue;
}
- String documentVersion = new Long(modifiedDate.getTime()).toString();
+ String documentVersion = (enableDocumentProcessing?"+":"-") + new Long(modifiedDate.getTime()).toString();
if(!activities.checkDocumentNeedsReindexing(doc, documentVersion))
continue;
@@ -318,7 +319,7 @@ public class AlfrescoConnector extends B
continue;
}
- if (this.enableDocumentProcessing) {
+ if (enableDocumentProcessing) {
if (lSize != null) {
stream = alfrescoClient.fetchContent(contentUrlPath);
if (stream == null) {
@@ -350,9 +351,9 @@ public class AlfrescoConnector extends B
}
}
+ } catch (AlfrescoDownException e) {
+ handleAlfrescoDownException(e,"processing");
}
- } catch (AlfrescoDownException e) {
- handleAlfrescoDownException(e,"processing");
}
}
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java Sun Oct 12 11:54:35 2014
@@ -31,14 +31,24 @@ import java.util.*;
public class ConfigurationHandler {
private static final String PARAM_PROTOCOL = "protocol";
private static final String PARAM_HOSTNAME = "hostname";
+ private static final String PARAM_PORT = "port";
private static final String PARAM_ENDPOINT = "endpoint";
private static final String PARAM_STORE_PROTOCOL = "storeprotocol";
- private static final String PARAM_ENABLE_DOCUMENT_PROCESSING = "enabledocumentprocessing";
private static final String PARAM_STORE_ID = "storeid";
private static final String PARAM_USERNAME = "username";
private static final String PARAM_PASSWORD = "password";
- // Output Specification for Filtering
+ // Output Specification
+
+ /**
+ * Node describing document processing
+ */
+ public static final String NODE_ENABLEDOCUMENTPROCESSING = "enabledocumentprocessing";
+ /**
+ * Attribute value
+ */
+ public static final String ATTRIBUTE_VALUE = "value";
+
/**
* Node describing a Site
*/
@@ -96,9 +106,9 @@ public class ConfigurationHandler {
static {
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_PROTOCOL, "http");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_HOSTNAME, "localhost");
+ DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_PORT, "8080");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_ENDPOINT, "/alfresco/service");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_STORE_PROTOCOL, "workspace");
- DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_ENABLE_DOCUMENT_PROCESSING, "true");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_STORE_ID, "SpacesStore");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_USERNAME, "");
DEFAULT_CONFIGURATION_PARAMETERS.put(PARAM_PASSWORD, "");
@@ -240,6 +250,18 @@ public class ConfigurationHandler {
out.print(
"<table class=\"displaytable\">\n"
);
+
+ out.print(
+ " <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
+ " <tr>\n"+
+ " <td class=\"description\"><nobr>" + Messages.getBodyString(locale, "Alfresco.EnableDocumentProcessingQuestion") + "</nobr></td>\n"+
+ " <td class=\"value\">\n"+
+ " <input name=\""+seqPrefix+"enabledocumentprocessing_present\" type=\"hidden\" value=\"true\"/>\n"+
+ " <input name=\""+seqPrefix+"enabledocumentprocessing\" type=\"checkbox\" "+(getEnableDocumentProcessing(os)?"checked=\"true\" ":"")+"value=\"true\"/>\n"+
+ " </td>\n"+
+ " </tr>\n"
+ );
+
for(String node:SPECIFICATION_MAP.keySet()){
out.print(
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
@@ -332,33 +354,56 @@ public class ConfigurationHandler {
}
else{
- for(String node:SPECIFICATION_MAP.keySet()){
- i = 0;
- int fieldCounter = 0;
- while (i < os.getChildCount()) {
- SpecificationNode sn = os.getChild(i++);
- if(sn.getType().equals(node)){
- String prefix = seqPrefix+node+"_" + Integer.toString(fieldCounter);
- for(String var:SPECIFICATION_MAP.get(node)){
- out.print(
- "<input type=\"hidden\" name=\""+prefix+"_"+var+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue(var))+"\"/>\n");
- }
- fieldCounter++;
- }
+ out.print(
+ "<input type=\"hidden\" name=\""+seqPrefix+"enabledocumentprocessing_present\" value=\"true\"/>\n"+
+ "<input type=\"hidden\" name=\""+seqPrefix+"enabledocumentprocessing\" value=\""+getEnableDocumentProcessing(os)+"\"/>\n"
+ );
+ for(String node:SPECIFICATION_MAP.keySet()){
+ i = 0;
+ int fieldCounter = 0;
+ while (i < os.getChildCount()) {
+ SpecificationNode sn = os.getChild(i++);
+ if(sn.getType().equals(node)){
+ String prefix = seqPrefix+node+"_" + Integer.toString(fieldCounter);
+ for(String var:SPECIFICATION_MAP.get(node)){
+ out.print(
+ "<input type=\"hidden\" name=\""+prefix+"_"+var+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue(var))+"\"/>\n"
+ );
+ }
+ fieldCounter++;
}
-
- out.print("<input type=\"hidden\" name=\""+seqPrefix+node+"_count\" value=\""+Integer.toString(fieldCounter)+"\"/>\n");
}
+
+ out.print("<input type=\"hidden\" name=\""+seqPrefix+node+"_count\" value=\""+Integer.toString(fieldCounter)+"\"/>\n");
}
}
+ }
public static String processSpecificationPost(IPostParameters variableContext, Locale locale, Specification os,
int connectionSequenceNumber) throws ManifoldCFException {
- // Remove old Nodes
int i;
String seqPrefix = "s"+connectionSequenceNumber+"_";
-
+
+ String enablePresent = variableContext.getParameter(seqPrefix+"enabledocumentprocessing_present");
+ if (enablePresent != null) {
+ String enableValue = variableContext.getParameter(seqPrefix+"enabledocumentprocessing");
+ if (enableValue == null)
+ enableValue = "false";
+ i = 0;
+ while (i < os.getChildCount())
+ {
+ SpecificationNode specNode = os.getChild(i);
+ if (specNode.getType().equals(NODE_ENABLEDOCUMENTPROCESSING))
+ os.removeChild(i);
+ else
+ i++;
+ }
+ SpecificationNode sn = new SpecificationNode(NODE_ENABLEDOCUMENTPROCESSING);
+ sn.setAttribute(ATTRIBUTE_VALUE,enableValue);
+ os.addChild(os.getChildCount(),sn);
+ }
+
for(String node:SPECIFICATION_MAP.keySet()){
String x = variableContext.getParameter(seqPrefix+node+"_count");
@@ -418,13 +463,29 @@ public class ConfigurationHandler {
int connectionSequenceNumber)
throws ManifoldCFException, IOException
{
+ out.print(
+ "\n"+
+ "<table class=\"displaytable\">\n"
+ );
+
+ out.print(
+ " <tr>\n"+
+ " <td class=\"description\"><nobr>" + Messages.getBodyString(locale, "Alfresco.EnableDocumentProcessingQuestion") + "</nobr></td>\n"+
+ " <td class=\"value\">\n"+
+ " "+getEnableDocumentProcessing(os)+"\n"+
+ " </td>\n"+
+ " </tr>\n"
+ );
+
+ out.print(
+ " <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"
+ );
+
int i = 0;
for(String node:SPECIFICATION_MAP.keySet()){
Collection<String> vars = SPECIFICATION_MAP.get(node);
out.print(
- "\n"+
- "<table class=\"displaytable\">\n"+
" <tr>\n"+
" <td class=\"description\"><nobr>"+ Messages.getBodyString(locale, "Alfresco.SpecificFilteringConfiguration",new String[]{Messages.getString(locale,"Alfresco."+node)}) +"</nobr></td>\n"+
" <td class=\"boxcell\">\n"+
@@ -470,9 +531,12 @@ public class ConfigurationHandler {
out.print(
" </table>\n"+
" </td>\n"+
- " </tr>\n"+
- "</table>\n");
+ " </tr>\n"
+ );
}
+ out.print(
+ "</table>\n"
+ );
}
public static String getSpecificationVersion(Specification os){
@@ -507,4 +571,15 @@ public class ConfigurationHandler {
return filters;
}
+
+ public static boolean getEnableDocumentProcessing(Specification spec) {
+ boolean rval = true;
+ for(int i = 0; i < spec.getChildCount(); i++){
+ SpecificationNode node = spec.getChild(i);
+ if(node.getType().equals(NODE_ENABLEDOCUMENTPROCESSING))
+ rval = new Boolean(node.getAttributeValue(ATTRIBUTE_VALUE)).booleanValue();
+ }
+ return rval;
+ }
+
}
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_en_US.properties Sun Oct 12 11:54:35 2014
@@ -17,7 +17,8 @@ Alfresco.Server=Server
Alfresco.ProtocolColon=Protocol:
Alfresco.HostnameColon=Host name:
-Alfresco.EndpointColon=Endpoint:
+Alfresco.PortColon=Port:
+Alfresco.EndpointColon=Context:
Alfresco.UsernameColon=User name:
Alfresco.PasswordColon=Password:
@@ -25,6 +26,10 @@ Alfresco.Continue=Continue
Alfresco.Delete=Delete
Alfresco.Add=Add
-Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
-Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
-Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty
+Alfresco.EndpointMustNotBeEmpty=Context must not be empty
+Alfresco.HostNameCannotContainColonOrSlash=Hostname must not contain ':' or '/'
+Alfresco.PortMustNotBeEmpty=Port must not be empty
+Alfresco.PortMustBeAnInteger=Port must be an integer
+Alfresco.EndpointMustStartWithSlash=Context must start with '/'
+
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_ja_JP.properties Sun Oct 12 11:54:35 2014
@@ -17,7 +17,8 @@ Alfresco.Server=Server
Alfresco.ProtocolColon=Protocol:
Alfresco.HostnameColon=Host name:
-Alfresco.EndpointColon=Endpoint:
+Alfresco.PortColon=Port:
+Alfresco.EndpointColon=Context:
Alfresco.UsernameColon=User name:
Alfresco.PasswordColon=Password:
@@ -25,6 +26,10 @@ Alfresco.Continue=Continue
Alfresco.Delete=Delete
Alfresco.Add=Add
-Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
-Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
-Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty
+Alfresco.EndpointMustNotBeEmpty=Context must not be empty
+Alfresco.HostNameCannotContainColonOrSlash=Hostname must not contain ':' or '/'
+Alfresco.PortMustNotBeEmpty=Port must not be empty
+Alfresco.PortMustBeAnInteger=Port must be an integer
+Alfresco.EndpointMustStartWithSlash=Context must start with '/'
+
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/common_zh_CN.properties Sun Oct 12 11:54:35 2014
@@ -17,7 +17,8 @@ Alfresco.Server=Server
Alfresco.ProtocolColon=Protocol:
Alfresco.HostnameColon=Host name:
-Alfresco.EndpointColon=Endpoint:
+Alfresco.PortColon=Port:
+Alfresco.EndpointColon=Context:
Alfresco.UsernameColon=User name:
Alfresco.PasswordColon=Password:
@@ -25,6 +26,10 @@ Alfresco.Continue=Continue
Alfresco.Delete=Delete
Alfresco.Add=Add
-Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
-Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
-Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty
+Alfresco.EndpointMustNotBeEmpty=Context must not be empty
+Alfresco.HostNameCannotContainColonOrSlash=Hostname must not contain ':' or '/'
+Alfresco.PortMustNotBeEmpty=Port must not be empty
+Alfresco.PortMustBeAnInteger=Port must be an integer
+Alfresco.EndpointMustStartWithSlash=Context must start with '/'
+
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties Sun Oct 12 11:54:35 2014
@@ -17,18 +17,21 @@ Alfresco.Server=Server
Alfresco.ProtocolColon=Protocol:
Alfresco.HostnameColon=Host name:
-Alfresco.EndpointColon=Endpoint:
+Alfresco.PortColon=Port:
+Alfresco.EndpointColon=Context:
Alfresco.UsernameColon=User name:
Alfresco.PasswordColon=Password:
Alfresco.StoreProtocolColon=Store protocol:
Alfresco.StoreIDColon=Store ID:
Alfresco.EnableDocumentProcessingQuestion=Enable document processing?
-Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
-Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
-Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
-Alfresco.StoreProtocolMustNotBeEmpty=Store protocol must not be empty!
-Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty
+Alfresco.EndpointMustNotBeEmpty=Context must not be empty
+Alfresco.HostNameCannotContainColonOrSlash=Hostname must not contain ':' or '/'
+Alfresco.PortMustNotBeEmpty=Port must not be empty
+Alfresco.PortMustBeAnInteger=Port must be an integer
+Alfresco.EndpointMustStartWithSlash=Context must start with '/'
+Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty
Alfresco.site=site
Alfresco.site_name=Site name
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties Sun Oct 12 11:54:35 2014
@@ -17,18 +17,21 @@ Alfresco.Server=Server
Alfresco.ProtocolColon=Protocol:
Alfresco.HostnameColon=Host name:
-Alfresco.EndpointColon=Endpoint:
+Alfresco.PortColon=Port:
+Alfresco.EndpointColon=Context:
Alfresco.UsernameColon=User name:
Alfresco.PasswordColon=Password:
Alfresco.StoreProtocolColon=Store protocol:
Alfresco.StoreIDColon=Store ID:
Alfresco.EnableDocumentProcessingQuestion=Enable document processing?
-Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
-Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
-Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
-Alfresco.StoreProtocolMustNotBeEmpty=Store protocol must not be empty!
-Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty
+Alfresco.EndpointMustNotBeEmpty=Context must not be empty
+Alfresco.HostNameCannotContainColonOrSlash=Hostname must not contain ':' or '/'
+Alfresco.PortMustNotBeEmpty=Port must not be empty
+Alfresco.PortMustBeAnInteger=Port must be an integer
+Alfresco.EndpointMustStartWithSlash=Context must start with '/'
+Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty
Alfresco.site=site
Alfresco.site_name=Site name
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties Sun Oct 12 11:54:35 2014
@@ -17,18 +17,21 @@ Alfresco.Server=Server
Alfresco.ProtocolColon=Protocol:
Alfresco.HostnameColon=Host name:
-Alfresco.EndpointColon=Endpoint:
+Alfresco.PortColon=Port:
+Alfresco.EndpointColon=Context:
Alfresco.UsernameColon=User name:
Alfresco.PasswordColon=Password:
Alfresco.StoreProtocolColon=Store protocol:
Alfresco.StoreIDColon=Store ID:
Alfresco.EnableDocumentProcessingQuestion=Enable document processing?
-Alfresco.ProtocolMustNotBeEmpty=Protocol must not be empty!
-Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty!
-Alfresco.EndpointMustNotBeEmpty=Endpoint must not be empty!
-Alfresco.StoreProtocolMustNotBeEmpty=Store protocol must not be empty!
-Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty!
+Alfresco.HostNameMustNotBeEmpty=Hostname must not be empty
+Alfresco.EndpointMustNotBeEmpty=Context must not be empty
+Alfresco.HostNameCannotContainColonOrSlash=Hostname must not contain ':' or '/'
+Alfresco.PortMustNotBeEmpty=Port must not be empty
+Alfresco.PortMustBeAnInteger=Port must be an integer
+Alfresco.EndpointMustStartWithSlash=Context must start with '/'
+Alfresco.StoreIDMustNotBeEmpty=Store ID must not be empty
Alfresco.site=site
Alfresco.site_name=Site name
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js Sun Oct 12 11:54:35 2014
@@ -28,12 +28,36 @@ function checkConfigForSave() {
editconnection.hostname.focus();
return false;
}
+ if (editconnection.hostname.value.indexOf(":") != -1 || editconnection.hostname.value.indexOf("/") != -1) {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.HostNameCannotContainColonOrSlash'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.hostname.focus();
+ return false;
+ }
+ if (editconnection.port.value == "") {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.PortMustNotBeEmpty'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.port.focus();
+ return false;
+ }
+ if (!isInteger(editconnection.port.value)) {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.PortMustBeAnInteger'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.port.focus();
+ return false;
+ }
if (editconnection.endpoint.value == "") {
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.EndpointMustNotBeEmpty'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
editconnection.endpoint.focus();
return false;
}
+ if (editconnection.endpoint.value.substring(0,1) != "/") {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.EndpointMustStartWithSlash'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.endpoint.focus();
+ return false;
+ }
return true;
}
// -->
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html Sun Oct 12 11:54:35 2014
@@ -47,6 +47,14 @@
</tr>
<tr>
<td class="description">
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PortColon'))</nobr>
+ </td>
+ <td class="value">
+ <input name="port" type="text" size="5" value="$Encoder.attributeEscape($port)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
</td>
<td class="value">
@@ -74,6 +82,7 @@
#else
<input type="hidden" name="protocol" value="$Encoder.attributeEscape($protocol)" />
<input type="hidden" name="hostname" value="$Encoder.attributeEscape($hostname)" />
+<input type="hidden" name="port" value="$Encoder.attributeEscape($port)" />
<input type="hidden" name="endpoint" value="$Encoder.attributeEscape($endpoint)" />
<input type="hidden" name="username" value="$Encoder.attributeEscape($username)" />
<input type="hidden" name="password" value="$Encoder.attributeEscape($password)" />
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html Sun Oct 12 11:54:35 2014
@@ -34,6 +34,14 @@
</tr>
<tr>
<td class="description" colspan="1">
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PortColon'))</nobr>
+ </td>
+ <td class="value" colspan="3">
+ <nobr>$Encoder.bodyEscape($port)</nobr><br/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description" colspan="1">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
</td>
<td class="value" colspan="3">
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js Sun Oct 12 11:54:35 2014
@@ -28,12 +28,36 @@ function checkConfigForSave() {
editconnection.hostname.focus();
return false;
}
+ if (editconnection.hostname.value.indexOf(":") != -1 || editconnection.hostname.value.indexOf("/") != -1) {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.HostNameCannotContainColonOrSlash'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.hostname.focus();
+ return false;
+ }
+ if (editconnection.port.value == "") {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.PortMustNotBeEmpty'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.port.focus();
+ return false;
+ }
+ if (!isInteger(editconnection.port.value)) {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.PortMustBeAnInteger'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.port.focus();
+ return false;
+ }
if (editconnection.endpoint.value == "") {
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.EndpointMustNotBeEmpty'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
editconnection.endpoint.focus();
return false;
}
+ if (editconnection.endpoint.value.substring(0,1) != "/") {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.EndpointMustStartWithSlash'))");
+ SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
+ editconnection.endpoint.focus();
+ return false;
+ }
if (editconnection.storeid.value == "") {
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.StoreIDMustNotBeEmpty'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html Sun Oct 12 11:54:35 2014
@@ -47,6 +47,14 @@
</tr>
<tr>
<td class="description">
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PortColon'))</nobr>
+ </td>
+ <td class="value">
+ <input name="port" type="text" size="5" value="$Encoder.attributeEscape($port)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
</td>
<td class="value">
@@ -60,17 +68,12 @@
</td>
<td class="value">
<select id="storeprotocol" name="protocol">
- #if($storeprotocol == "http")
- <option value="http" selected="selected">http</option>
- #else
- <option value="http">http</option>
- #end
- #if($storeprotocol == "https")
- <option value="https" selected="selected">https</option>
+ #if($storeprotocol == "archive")
+ <option value="http" selected="selected">archive</option>
#else
- <option value="https">https</option>
+ <option value="http">archive</option>
#end
- #if($storeprotocol == "https")
+ #if($storeprotocol == "workspace")
<option value="workspace" selected="selected">workspace</option>
#else
<option value="workspace">workspace</option>
@@ -103,22 +106,13 @@
<input name="password" type="password" size="32" value="$Encoder.attributeEscape($password)"/>
</td>
</tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td class="description">
- <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EnableDocumentProcessingQuestion'))</nobr>
- </td>
- <td class="value">
- <input name="enabledocumentprocessing" type="checkbox" value="$enabledocumentprocessing"/>
- </td>
- </tr>
</table>
#else
<input type="hidden" name="protocol" value="$Encoder.attributeEscape($protocol)" />
<input type="hidden" name="hostname" value="$Encoder.attributeEscape($hostname)" />
+<input type="hidden" name="port" value="$Encoder.attributeEscape($port)" />
<input type="hidden" name="endpoint" value="$Encoder.attributeEscape($endpoint)" />
<input type="hidden" name="storeprotocol" value="$Encoder.attributeEscape($storeprotocol)" />
-<input type="hidden" name="enabledocumentprocessing" value="$enabledocumentprocessing" />
<input type="hidden" name="storeid" value="$Encoder.attributeEscape($storeid)" />
<input type="hidden" name="username" value="$Encoder.attributeEscape($username)" />
<input type="hidden" name="password" value="$Encoder.attributeEscape($password)" />
Modified: manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html Sun Oct 12 11:54:35 2014
@@ -34,6 +34,14 @@
</tr>
<tr>
<td class="description" colspan="1">
+ <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.PortColon'))</nobr>
+ </td>
+ <td class="value" colspan="3">
+ <nobr>$Encoder.bodyEscape($port)</nobr><br/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description" colspan="1">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EndpointColon'))</nobr>
</td>
<td class="value" colspan="3">
@@ -74,13 +82,4 @@
<nobr>********</nobr><br/>
</td>
</tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td class="description" colspan="1">
- <nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.EnableDocumentProcessingQuestion'))</nobr>
- </td>
- <td class="value" colspan="3">
- <nobr>$enabledocumentprocessing</nobr><br/>
- </td>
- </tr>
</table>
Modified: manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java?rev=1631164&r1=1631163&r2=1631164&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java (original)
+++ manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jira/JiraAuthorityConnector.java Sun Oct 12 11:54:35 2014
@@ -48,9 +48,6 @@ import java.util.Map.Entry;
*/
public class JiraAuthorityConnector extends BaseAuthorityConnector {
- /** Deny access token for default authority */
- private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
-
// Configuration tabs
private static final String JIRA_SERVER_TAB_PROPERTY = "JiraAuthorityConnector.Server";
private static final String JIRA_PROXY_TAB_PROPERTY = "JiraAuthorityConnector.Proxy";