svn commit: r1889546 - in /manifoldcf/trunk/connectors/alfresco-webscript: build.xml connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java testConfiguration.properties

[kw...@apache.org]

Author: kwright
Date: Thu May  6 04:55:04 2021
New Revision: 1889546

URL: http://svn.apache.org/viewvc?rev=1889546&view=rev
Log:
Fix alfresco-webscript tests Jetty start logic; needed because of Jetty upgrade

Added:
    manifoldcf/trunk/connectors/alfresco-webscript/testConfiguration.properties   (with props)
Modified:
    manifoldcf/trunk/connectors/alfresco-webscript/build.xml
    manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java

Modified: manifoldcf/trunk/connectors/alfresco-webscript/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/build.xml?rev=1889546&r1=1889545&r2=1889546&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/build.xml Thu May  6 04:55:04 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/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java?rev=1889546&r1=1889545&r2=1889546&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java Thu May  6 04:55:04 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);
 

Added: manifoldcf/trunk/connectors/alfresco-webscript/testConfiguration.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/testConfiguration.properties?rev=1889546&view=auto
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/testConfiguration.properties (added)
+++ manifoldcf/trunk/connectors/alfresco-webscript/testConfiguration.properties Thu May  6 04:55:04 2021
@@ -0,0 +1,16 @@
+# 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.
+
+dummy.property=

Propchange: manifoldcf/trunk/connectors/alfresco-webscript/testConfiguration.properties
------------------------------------------------------------------------------
    svn:eol-style = native