svn commit: r1889547 - in /manifoldcf/branches/release-2.19-branch: ./ connectors/alfresco-webscript/ connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/

[kwright]

Author: kwright
Date: Thu May  6 04:56:30 2021
New Revision: 1889547

URL: http://svn.apache.org/viewvc?rev=1889547&view=rev
Log:
Pull up alfresco test fix from trunk

Added:
    
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/testConfiguration.properties
      - copied unchanged from r1889546, 
manifoldcf/trunk/connectors/alfresco-webscript/testConfiguration.properties
Modified:
    manifoldcf/branches/release-2.19-branch/   (props changed)
    
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/build.xml
    
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java

Propchange: manifoldcf/branches/release-2.19-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1889546

Modified: 
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/build.xml
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/build.xml?rev=1889547&r1=1889546&r2=1889547&view=diff
==============================================================================
--- 
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/build.xml 
(original)
+++ 
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/build.xml 
Thu May  6 04:56:30 2021
@@ -121,6 +121,7 @@
             <jvmarg 
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
             <jvmarg 
value="-DcombinedWarPath=${mcf-dist}/web/war/mcf-combined-service.war"/>
             <jvmarg 
value="-DalfrescoServerWarPath=../test-materials-proprietary/alfresco-indexer-webscripts-war-${alfresco-indexer.version}.war"/>
+            <jvmarg value="-DconfigPath=../testConfiguration.properties"/>
             <jvmarg value="-Xms512m"/>
             <jvmarg value="-Xmx1024m"/>
             <jvmarg value="-Xss1024k"/>

Modified: 
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java?rev=1889547&r1=1889546&r2=1889547&view=diff
==============================================================================
--- 
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
 (original)
+++ 
manifoldcf/branches/release-2.19-branch/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
 Thu May  6 04:56:30 2021
@@ -58,16 +58,19 @@ public class BaseITHSQLDB extends org.ap
     alfrescoServer.setStopAtShutdown(true);
 
     String alfrescoServerWarPath = 
"../../connectors/alfresco-webscript/test-materials-proprietary/alfresco.war";
-
+    String jettyConfigPath = 
"../../connectors/alfresco-webscript/testConfiguration.properties";
+    
     if (System.getProperty("alfrescoServerWarPath") != null)
       alfrescoServerWarPath = System.getProperty("alfrescoServerWarPath");
-
+    if (System.getProperty("configPath") != null)
+      jettyConfigPath = System.getProperty("configPath");
+    
     ContextHandlerCollection contexts = new ContextHandlerCollection();
     alfrescoServer.setHandler(contexts);
 
     WebAppContext alfrescoServerApi = new 
WebAppContext(alfrescoServerWarPath,"/alfresco");
     alfrescoServerApi.setParentLoaderPriority(false);
-    HashLoginService dummyLoginService = new 
HashLoginService("TEST-SECURITY-REALM");
+    HashLoginService dummyLoginService = new 
HashLoginService("TEST-SECURITY-REALM", jettyConfigPath);
     alfrescoServerApi.getSecurityHandler().setLoginService(dummyLoginService);
     contexts.addHandler(alfrescoServerApi);