Dedicated test fix

Author: mikadamczyk

.github/init_solr.sh

@@ -6,11 +6,12 @@ SOLR_VERSION=${SOLR_VERSION:-'9.8.1'}
 
 if [[ "${SOLR_VERSION}" =~ ^9\. ]]; then
     default_config_files[1]="${SCRIPT_DIR}/../src/lib/Resources/config/solr/managed-schema.xml"
+    default_config_files[2]="${SCRIPT_DIR}/../src/lib/Resources/config/solr/custom-fields-types-solr9.xml"
 else
     default_config_files[1]="${SCRIPT_DIR}/../src/lib/Resources/config/solr/schema.xml"
+    default_config_files[2]="${SCRIPT_DIR}/../src/lib/Resources/config/solr/custom-fields-types.xml"
 fi
 
-default_config_files[2]="${SCRIPT_DIR}/../src/lib/Resources/config/solr/custom-fields-types.xml"
 default_config_files[3]="${SCRIPT_DIR}/../src/lib/Resources/config/solr/language-fieldtypes.xml"
 
 default_cores[0]='core0'
@@ -154,7 +155,11 @@ solr_run() {
     echo "Running with version ${SOLR_VERSION} in standalone mode"
     echo "Starting solr on port ${SOLR_PORT}..."
 
-    ./${SOLR_INSTALL_DIR}/bin/solr start --host 0.0.0.0 -p ${SOLR_PORT} -s ${SOLR_HOME} -Dsolr.jetty.host=0.0.0.0 -Dsolr.disable.allowUrls=true -Dsolr.disable.shardsWhitelist=true || exit_on_error "Can't start Solr"
+    if [[ "${SOLR_VERSION}" =~ ^9\. ]]; then
+        ./${SOLR_INSTALL_DIR}/bin/solr start -p ${SOLR_PORT} -s ${SOLR_HOME} || exit_on_error "Can't start Solr"
+    else
+        ./${SOLR_INSTALL_DIR}/bin/solr -p ${SOLR_PORT} -s ${SOLR_HOME} -Dsolr.disable.shardsWhitelist=true || exit_on_error "Can't start Solr"
+    fi
 
     echo "Started"
 
@@ -179,11 +184,7 @@ solr_create_core() {
     core_name=$1
     config_dir=$2
 
-    if [[ "$SOLR_VERSION" =~ ^9\. ]]; then
-        solr_port_flag="--solr-url http://localhost:${SOLR_PORT}/solr"
-    else
-        solr_port_flag="-p ${SOLR_PORT}"
-    fi
+    solr_port_flag="-p ${SOLR_PORT}"
 
     abs_conf_dir="$(pwd)/${config_dir}"
 
@@ -316,6 +317,20 @@ if [ "$SOLR_CLOUD" = "no" ]; then
         TEMPLATE_CONF="template"
     fi
 
+    echo "Generating Solr configuration in ${SOLR_INSTALL_DIR}/server/${SOLR_HOME}/${TEMPLATE_CONF}"
+
+    if [[ "${CORES_SETUP:-}" == "dedicated" || "${SOLR_CLOUD:-}" == "no" ]]; then
+        # dedicated mode: point at the local core path
+        ALLOW_URLS="localhost:${SOLR_PORT}/solr"
+    elif [[ "${SOLR_CLOUD:-}" == "yes" && ${#default_nodes[@]} -gt 0 ]]; then
+        # SolrCloud mode: join all nodes host:port
+        ALLOW_URLS=$(IFS=,; echo "${default_nodes[*]}")
+    else
+        # fallback: single node without core-path
+        ALLOW_URLS="localhost:${SOLR_PORT}"
+    fi
+    export ALLOW_URLS
+
     $SCRIPT_DIR/../bin/generate-solr-config.sh \
             --solr-install-dir="${SOLR_INSTALL_DIR}" \
             --solr-version="${SOLR_VERSION}" \

bin/generate-solr-config.sh

@@ -7,6 +7,7 @@ DESTINATION_DIR=.platform/configsets/solr8/conf
 SOLR_VERSION=8.11.1
 FORCE=false
 SOLR_INSTALL_DIR=""
+ALLOW_URLS_CLI=""
 
 show_help() {
     cat << EOF
@@ -65,6 +66,9 @@ for i in "$@"; do
             SOLR_INSTALL_DIR="${i#*=}"
             SOLR_INSTALL_DIR="${SOLR_INSTALL_DIR/#\~/$HOME}"
             ;;
+        --allow-urls)
+            ALLOW_URLS_CLI="$2"; shift 2
+            ;;
         -h|--help)
             show_help
             exit 0
@@ -76,6 +80,7 @@ for i in "$@"; do
     esac
 done
 
+: "${ALLOW_URLS_CLI:=${ALLOW_URLS:-}}"
 
 if [ `whoami` == "root" ]; then
     echo "Error : Do not run this script as root"
@@ -112,8 +117,30 @@ cp -a ${EZ_BUNDLE_PATH}/src/lib/Resources/config/solr/* $DESTINATION_DIR
 cp ${SOLR_INSTALL_DIR}/server/solr/configsets/_default/conf/{solrconfig.xml,stopwords.txt,synonyms.txt} $DESTINATION_DIR
 
 if [[ ! $DESTINATION_DIR =~ ^\.platform ]]; then
-    # If we are not targeting .platform(.sh) config, we also output default solr.xml
-    cp -f ${SOLR_INSTALL_DIR}/server/solr/solr.xml $DESTINATION_DIR/..
+
+    if [[ "${SOLR_VERSION}" =~ ^9\. ]]; then
+        cp -f ${SOLR_INSTALL_DIR}/server/solr/solr.xml $DESTINATION_DIR/../..
+
+        URL_LIST="${ALLOW_URLS_CLI//,/ }"
+        SOLR_XML_PATH="${DESTINATION_DIR}/../../solr.xml"
+
+        if [[ -f "$SOLR_XML_PATH" ]]; then
+            # backup original
+            cp "$SOLR_XML_PATH" "${SOLR_XML_PATH}.bak"
+            # replace inner text of the allowUrls element
+            sed -i \
+              -e "s|\(<str name=\"allowUrls\">\)[^<]*\(<\/str>\)|\1${URL_LIST}\2|" \
+              "$SOLR_XML_PATH"
+            echo "NOTE: Updated <str name=\"allowUrls\"> to: ${URL_LIST}"
+        else
+            echo "WARNING: solr.xml not found at '$SOLR_XML_PATH'; skipping allowUrls patch"
+        fi
+    else
+        # If we are not targeting .platform(.sh) config, we also output default solr.xml
+        echo "Copying ${SOLR_INSTALL_DIR}/server/solr/solr.xml to $DESTINATION_DIR/.."
+
+        cp -f ${SOLR_INSTALL_DIR}/server/solr/solr.xml $DESTINATION_DIR/..
+    fi
 else
     echo "NOTE: Skipped copying ${SOLR_INSTALL_DIR}/server/solr/solr.xml given destination dir is a '.platform/' config folder"
 fi

src/lib/Resources/config/solr/custom-fields-types-solr9.xml

@@ -0,0 +1,18 @@
+    <!--
+      This is additional custom example fields. You can come up with similar
+      fields on your own, if you require custom indexing / query rules.
+
+      Instead of using the type "text" you might even want to define a custom
+      type. In the custom type you can define your dedicated index and query
+      rules. You can copy any existing fields into the custom field as seen
+      below.
+
+      In this case we copy the full user name and index it as a text field.
+    -->
+    <field name="custom_field" type="text" indexed="true" stored="false" required="false" multiValued="true" />
+    <copyField source="user_first_name_value_s" dest="custom_field" />
+    <copyField source="user_last_name_value_s" dest="custom_field" />
+
+    <field name="custom_geolocation_field" type="location" indexed="true" stored="false" required="false" />
+
+    <copyField source="testtype_maplocation_value_location_gl" dest="custom_geolocation_field" />

src/lib/Resources/config/solr/custom-fields-types.xml

@@ -13,6 +13,7 @@
     <copyField source="user_first_name_value_s" dest="custom_field" />
     <copyField source="user_last_name_value_s" dest="custom_field" />
 
-    <field name="custom_geolocation_field" type="location" indexed="true" stored="false" docValues="true" required="false" />
-
+    <field name="custom_geolocation_field" type="location" indexed="true" stored="false" required="false" />
+    <field name="custom_geolocation_field_0_coordinate" type="double" indexed="true" stored="false"/>
+    <field name="custom_geolocation_field_1_coordinate" type="double" indexed="true" stored="false"/>
     <copyField source="testtype_maplocation_value_location_gl" dest="custom_geolocation_field" />