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/11 14:18:42 UTC
svn commit: r1631040 - in /manifoldcf/branches/dev_1x: ./
connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/
connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifol...
Author: kwright
Date: Sat Oct 11 12:18:41 2014
New Revision: 1631040
URL: http://svn.apache.org/r1631040
Log:
Pull up fix for CONNECTORS-1061 from trunk.
Added:
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/
- copied from r1631039, manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html
manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1631039
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Sat Oct 11 12:18:41 2014
@@ -3,6 +3,10 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1061: More fixes for the Alfresco webscript connector
+UI, and create a UI test.
+(Karl Wright)
+
CONNECTORS-1066: Do not include blank or null fixed fields in Solr
documents; also, provide facility to strip empty fields from general
metadata in Metadata Adjuster.
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/ConfigurationHandler.java Sat Oct 11 12:18:41 2014
@@ -237,9 +237,11 @@ public class ConfigurationHandler {
// Field Mapping tab
if (tabName.equals(Messages.getString(locale, "Alfresco.FilteringConfiguration")) && connectionSequenceNumber == actualSequenceNumber)
{
+ out.print(
+ "<table class=\"displaytable\">\n"
+ );
for(String node:SPECIFICATION_MAP.keySet()){
out.print(
- "<table class=\"displaytable\">\n"+
" <tr><td class=\"separator\" colspan=\"2\"><hr/></td></tr>\n"+
" <tr>\n"+
" <td class=\"description\"><nobr>" + Messages.getBodyString(locale, "Alfresco.SpecificFilteringConfiguration",new String[]{Messages.getString(locale,"Alfresco."+node)}) + "</nobr></td>\n"+
@@ -249,9 +251,13 @@ public class ConfigurationHandler {
" <td class=\"formcolumnheader\"></td>\n");
Collection<String> vars = SPECIFICATION_MAP.get(node);
for(String var:vars){
- out.print("<td class=\"formcolumnheader\"><nobr>" + Messages.getString(locale,"Alfresco."+var) + "</nobr></td>\n");
+ out.print(
+ " <td class=\"formcolumnheader\"><nobr>" + Messages.getString(locale,"Alfresco."+var) + "</nobr></td>\n"
+ );
}
- out.print("</tr>\n");
+ out.print(
+ " </tr>\n"
+ );
int fieldCounter = 0;
i = 0;
@@ -260,23 +266,30 @@ public class ConfigurationHandler {
if (sn.getType().equals(node)) {
String prefix = seqPrefix+node+"_" + Integer.toString(fieldCounter);
out.print(
- " <tr class=\""+(((fieldCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
- " <td class=\"formcolumncell\">\n"+
- " <a name=\""+prefix+"\">\n"+
- " <input type=\"button\" value=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Delete") + "\" alt=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Delete") + ""+Integer.toString(fieldCounter+1)+"\" onclick='javascript:"+seqPrefix+"delete"+node+"("+Integer.toString(fieldCounter)+");'/>\n"+
- " <input type=\"hidden\" name=\""+prefix+"_op\" value=\"Continue\"/>\n");
+ " <tr class=\""+(((fieldCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n"+
+ " <td class=\"formcolumncell\">\n"+
+ " <a name=\""+prefix+"\">\n"+
+ " <input type=\"button\" value=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Delete") + "\" alt=\""+ Messages.getBodyJavascriptString(locale, "Alfresco.Delete") + ""+Integer.toString(fieldCounter+1)+"\" onclick='javascript:"+seqPrefix+"delete"+node+"("+Integer.toString(fieldCounter)+");'/>\n"+
+ " <input type=\"hidden\" name=\""+prefix+"_op\" value=\"Continue\"/>\n");
for(String var:vars){
- out.print("<input type=\"hidden\" name=\""+prefix+"_"+var+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue(var))+"\"/>\n");
+ out.print(
+ " <input type=\"hidden\" name=\""+prefix+"_"+var+"\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sn.getAttributeValue(var))+"\"/>\n"
+ );
}
- out.print(" </a>\n"+
- " </td>\n");
+ out.print(
+ " </a>\n"+
+ " </td>\n"
+ );
for(String var:vars){
out.print(
- " <td class=\"formcolumncell\">\n"+
- " <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(sn.getAttributeValue(var))+"</nobr>\n"+
- " </td>\n");
+ " <td class=\"formcolumncell\">\n"+
+ " <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(sn.getAttributeValue(var))+"</nobr>\n"+
+ " </td>\n");
}
+ out.print(
+ " </tr>\n"
+ );
fieldCounter++;
}
@@ -284,11 +297,11 @@ public class ConfigurationHandler {
if (fieldCounter == 0)
{
out.print(
- "<tr class=\"formrow\"><td class=\"formmessage\" colspan=\"3\">"+ Messages.getBodyJavascriptString(locale, "Alfresco.NoFilteringConfiguration") + "</td></tr>\n");
+ " <tr class=\"formrow\"><td class=\"formmessage\" colspan=\""+(vars.size()+1)+"\">"+ Messages.getBodyJavascriptString(locale, "Alfresco.NoFilteringConfiguration") + "</td></tr>\n");
}
out.print(
- " <tr class=\"formrow\"><td class=\"formseparator\" colspan=\"3\"><hr/></td></tr>\n"+
+ " <tr class=\"formrow\"><td class=\"formseparator\" colspan=\""+(vars.size()+1)+"\"><hr/></td></tr>\n"+
" <tr class=\"formrow\">\n"+
" <td class=\"formcolumncell\">\n"+
" <a name=\""+seqPrefix+node+"\">\n"+
@@ -298,18 +311,25 @@ public class ConfigurationHandler {
" <input type=\"hidden\" name=\""+seqPrefix+node+"_op\" value=\"Continue\"/>\n"+
" </td>\n");
for(String var:vars){
- out.print(" <td class=\"formcolumncell\">\n"+
- " <nobr><input type=\"text\" size=\"15\" name=\""+seqPrefix+var+"\" value=\"\"/></nobr>\n"+
- " </td>\n");
+ out.print(
+ " <td class=\"formcolumncell\">\n"+
+ " <nobr><input type=\"text\" size=\"15\" name=\""+seqPrefix+var+"\" value=\"\"/></nobr>\n"+
+ " </td>\n");
}
- out.print("</tr>\n"+
- " </table>\n"+
- " </td>\n"+
- " </tr>\n");
+ out.print(
+ " </tr>\n"+
+ " </table>\n"+
+ " </td>\n"+
+ " </tr>\n"
+ );
}
+ out.print(
+ "</table>\n"
+ );
+
}
else{
for(String node:SPECIFICATION_MAP.keySet()){
@@ -400,9 +420,6 @@ public class ConfigurationHandler {
{
int i = 0;
-
-
-
for(String node:SPECIFICATION_MAP.keySet()){
Collection<String> vars = SPECIFICATION_MAP.get(node);
out.print(
@@ -415,25 +432,31 @@ public class ConfigurationHandler {
" <tr class=\"formheaderrow\">\n");
for(String var:vars)
out.print(
- " <td class=\"formcolumnheader\"><nobr>" + Messages.getBodyString(locale, "Alfresco."+var) + "</nobr></td>\n");
+ " <td class=\"formcolumnheader\"><nobr>" + Messages.getBodyString(locale, "Alfresco."+var) + "</nobr></td>\n"
+ );
- out.print(" </tr>\n");
+ out.print(
+ " </tr>\n"
+ );
- int fieldCounter = 0;
+ int fieldCounter = 0;
i = 0;
while (i < os.getChildCount()) {
SpecificationNode sn = os.getChild(i++);
if (sn.getType().equals(node)) {
out.print(
- " <tr class=\""+(((fieldCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n");
+ " <tr class=\""+(((fieldCounter % 2)==0)?"evenformrow":"oddformrow")+"\">\n"
+ );
for(String var:vars)
out.print(
- " <td class=\"formcolumncell\">\n"+
- " <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(sn.getAttributeValue(var))+"</nobr>\n"+
- " </td>\n");
+ " <td class=\"formcolumncell\">\n"+
+ " <nobr>"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(sn.getAttributeValue(var))+"</nobr>\n"+
+ " </td>\n"
+ );
out.print(
- " </tr>\n");
+ " </tr>\n"
+ );
fieldCounter++;
}
}
@@ -441,14 +464,13 @@ public class ConfigurationHandler {
if (fieldCounter == 0)
{
out.print(
- " <tr class=\"formrow\"><td class=\"formmessage\" colspan=\"3\">"+ Messages.getBodyJavascriptString(locale, "Alfresco.NoSpecificFilteringConfiguration",new String[]{node}) + "</td></tr>\n"
- );
+ " <tr class=\"formrow\"><td class=\"formmessage\" colspan=\""+vars.size()+"\">"+ Messages.getBodyJavascriptString(locale, "Alfresco.NoSpecificFilteringConfiguration",new String[]{node}) + "</td></tr>\n"
+ );
}
out.print(
" </table>\n"+
" </td>\n"+
" </tr>\n"+
- " </tr>\n"+
"</table>\n");
}
}
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_en_US.properties Sat Oct 11 12:18:41 2014
@@ -40,7 +40,7 @@ Alfresco.metadata=metadata
Alfresco.metadata_source=Metadata source
Alfresco.metadata_value=Metadata value
-Alfresco.FilteringConfiguration=Alfresco Filtering Configuration
+Alfresco.FilteringConfiguration=Filtering Configuration
Alfresco.SpecificFilteringConfiguration=Alfresco {0} filtering configuration:
Alfresco.NoSpecificFilteringConfiguration=No filtering configuration specified for {0}
Alfresco.NoFilteringConfiguration=No filtering configuration specified
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_ja_JP.properties Sat Oct 11 12:18:41 2014
@@ -40,7 +40,7 @@ Alfresco.metadata=metadata
Alfresco.metadata_source=Metadata source
Alfresco.metadata_value=Metadata value
-Alfresco.FilteringConfiguration=Alfresco Filtering Configuration
+Alfresco.FilteringConfiguration=Filtering Configuration
Alfresco.SpecificFilteringConfiguration=Alfresco {0} filtering configuration:
Alfresco.NoSpecificFilteringConfiguration=No filtering configuration specified for {0}
Alfresco.NoFilteringConfiguration=No filtering configuration specified
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/common_zh_CN.properties Sat Oct 11 12:18:41 2014
@@ -40,7 +40,7 @@ Alfresco.metadata=metadata
Alfresco.metadata_source=Metadata source
Alfresco.metadata_value=Metadata value
-Alfresco.FilteringConfiguration=Alfresco Filtering Configuration
+Alfresco.FilteringConfiguration=Filtering Configuration
Alfresco.SpecificFilteringConfiguration=Alfresco {0} filtering configuration:
Alfresco.NoSpecificFilteringConfiguration=No filtering configuration specified for {0}
Alfresco.NoFilteringConfiguration=No filtering configuration specified
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration.js Sat Oct 11 12:18:41 2014
@@ -1,3 +1,20 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<script type="text/javascript">
<!--
function checkConfig() {
@@ -5,12 +22,6 @@ function checkConfig() {
}
function checkConfigForSave() {
- if (editconnection.protocol.value == "") {
- alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.ProtocolMustNotBeEmpty'))");
- SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
- editconnection.protocol.focus();
- return false;
- }
if (editconnection.hostname.value == "") {
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.HostNameMustNotBeEmpty'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/editConfiguration_Server.html Sat Oct 11 12:18:41 2014
@@ -1,11 +1,40 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
#if($tabName == "$ResourceBundle.getString('Alfresco.Server')")
<table class="displaytable">
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.ProtocolColon'))</nobr>
</td>
<td class="value">
- <input name="protocol" type="text" size="32" value="$Encoder.attributeEscape($protocol)" />
+ <select id="protocol" name="protocol">
+ #if($protocol == "http")
+ <option value="http" selected="selected">http</option>
+ #else
+ <option value="http">http</option>
+ #end
+ #if($protocol == "https")
+ <option value="https" selected="selected">https</option>
+ #else
+ <option value="https">https</option>
+ #end
+ </select>
</td>
</tr>
<tr>
@@ -24,6 +53,7 @@
<input name="endpoint" type="text" size="32" value="$Encoder.attributeEscape($endpoint)" />
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.UsernameColon'))</nobr>
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/alfrescowebscript/viewConfiguration.html Sat Oct 11 12:18:41 2014
@@ -1,3 +1,20 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<table class="displaytable">
<tr>
<td class="description" colspan="1">
@@ -23,6 +40,7 @@
<nobr>$Encoder.bodyEscape($endpoint)</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.UsernameColon'))</nobr>
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration.js Sat Oct 11 12:18:41 2014
@@ -1,3 +1,20 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<script type="text/javascript">
<!--
function checkConfig() {
@@ -5,12 +22,6 @@ function checkConfig() {
}
function checkConfigForSave() {
- if (editconnection.protocol.value == "") {
- alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.ProtocolMustNotBeEmpty'))");
- SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
- editconnection.protocol.focus();
- return false;
- }
if (editconnection.hostname.value == "") {
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.HostnameMustNotBeEmpty'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
@@ -23,12 +34,6 @@ function checkConfigForSave() {
editconnection.endpoint.focus();
return false;
}
- if (editconnection.storeprotocol.value == "") {
- alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.StoreProtocolMustNotBeEmpty'))");
- SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
- editconnection.storeprotocol.focus();
- return false;
- }
if (editconnection.storeid.value == "") {
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.StoreIDMustNotBeEmpty'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('Alfresco.Server'))");
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/editConfiguration_Server.html Sat Oct 11 12:18:41 2014
@@ -1,11 +1,40 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
#if($tabName == "Server")
<table class="displaytable">
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.ProtocolColon'))</nobr>
</td>
<td class="value">
- <input name="protocol" type="text" size="32" value="$Encoder.attributeEscape($protocol)" />
+ <select id="protocol" name="protocol">
+ #if($protocol == "http")
+ <option value="http" selected="selected">http</option>
+ #else
+ <option value="http">http</option>
+ #end
+ #if($protocol == "https")
+ <option value="https" selected="selected">https</option>
+ #else
+ <option value="https">https</option>
+ #end
+ </select>
</td>
</tr>
<tr>
@@ -24,12 +53,29 @@
<input name="endpoint" type="text" size="32" value="$Encoder.attributeEscape($endpoint)" />
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.StoreProtocolColon'))</nobr>
</td>
<td class="value">
- <input name="storeprotocol" type="text" size="32" value="$Encoder.attributeEscape($storeprotocol)"/>
+ <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>
+ #else
+ <option value="https">https</option>
+ #end
+ #if($storeprotocol == "https")
+ <option value="workspace" selected="selected">workspace</option>
+ #else
+ <option value="workspace">workspace</option>
+ #end
+ </select>
</td>
</tr>
<tr>
@@ -40,6 +86,7 @@
<input name="storeid" type="text" size="32" value="$Encoder.attributeEscape($storeid)"/>
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('Alfresco.UsernameColon'))</nobr>
@@ -56,6 +103,7 @@
<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>
Modified: manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html?rev=1631040&r1=1631039&r2=1631040&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco-webscript/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/viewConfiguration.html Sat Oct 11 12:18:41 2014
@@ -1,3 +1,20 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<table class="displaytable">
<tr>
<td class="description" colspan="1">
@@ -23,6 +40,7 @@
<nobr>$Encoder.bodyEscape($endpoint)</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.StoreProtocolColon'))</nobr>
@@ -39,6 +57,7 @@
<nobr>$Encoder.bodyEscape($storeid)</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.UsernameColon'))</nobr>
@@ -55,6 +74,7 @@
<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>