Pull up alfresco test fix from trunk
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-2.19-branch@1889547 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connectors/alfresco-webscript/build.xml b/connectors/alfresco-webscript/build.xml
index 78c5cd5..7391c20 100644
--- a/connectors/alfresco-webscript/build.xml
+++ b/connectors/alfresco-webscript/build.xml
@@ -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"/>
diff --git a/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java b/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
index d4b8e64..e79959b 100644
--- a/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
+++ b/connectors/alfresco-webscript/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/tests/BaseITHSQLDB.java
@@ -58,16 +58,19 @@
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);
diff --git a/connectors/alfresco-webscript/testConfiguration.properties b/connectors/alfresco-webscript/testConfiguration.properties
new file mode 100644
index 0000000..be236e1
--- /dev/null
+++ b/connectors/alfresco-webscript/testConfiguration.properties
@@ -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=
