Update the set of data with which a user will start when testing

Silverpeas.
Now the H2 database is no more accessed directly through its database
file but through a database server that will be launched before
Silverpeas.

Author: mmoqui

Dockerfile

@@ -97,12 +97,10 @@ RUN wget -nc https://www.silverpeas.org/files/silverpeas-${SILVERPEAS_VERSION}-w
 # the Silverpeas Nexus Repository
 COPY src/repository /root/.m2/repository
 COPY src/settings.xml /root/.m2/
-COPY src/config.properties /opt/silverpeas/configuration/
-COPY src/CustomerSettings.xml /opt/silverpeas/configuration/silverpeas/
-COPY src/99-confAuroraLooks.groovy /opt/silverpeas/configuration/silverpeas/
 COPY src/h2 /opt/silverpeas/h2
+COPY src/configuration /opt/silverpeas/configuration
 COPY src/data /opt/silverpeas/data
-COPY src/silverpeas.gradle /opt/silverpeas/bin/
+COPY src/bin /opt/silverpeas/bin
 
 RUN sed -i -e "s/APP_VER/${SILVERPEAS_VERSION}/g" /opt/silverpeas/bin/silverpeas.gradle
 
@@ -111,7 +109,6 @@ WORKDIR ${SILVERPEAS_HOME}/bin
 
 # Copy this container init script that will be run each time the container is ran
 COPY src/run.sh /opt/
-COPY src/setup.sh ${SILVERPEAS_HOME}/bin
 
 # Assemble Silverpeas
 RUN ./setup.sh ${SILVERPEAS_VERSION}

README.md

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+H2_JAR=`ls ${JBOSS_HOME}/modules/system/layers/base/com/h2database/h2/main/h2-*.jar`
+
+print_help() {
+    echo "$0 start|stop"
+    echo "requires SILVERPEAS_HOME and JBOSS_HOME to be set"
+}
+
+case "$1" in
+    start)
+        echo "Start H2 database..."
+        exec java -classpath "$H2_JAR" org.h2.tools.Server -tcp -baseDir "$SILVERPEAS_HOME/h2" &
+        ;;
+    stop)
+        echo "Stop H2 database..."
+        exec java -classpath "$H2_JAR" org.h2.tools.Server -tcpShutdown tcp://localhost:9092
+        ;;
+    -h)
+        print_help
+        ;;
+    *)
+        print_help
+        exit 1
+esac

src/bin/h2database

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+echo "Installation of Silverpeas $1"
+./h2database start
+./silverpeas clean install
+ret=$?
+if [ $ret -eq 0 ]; then
+   rm ../log/build-*
+   touch .install
+else
+  echo "An error has occurred :-("
+  echo
+  for f in ../log/build-*; do
+    cat "$f"
+  done
+fi
+./h2database stop
+exit $ret

src/bin/setup.sh

@@ -0,0 +1,27 @@
+# Copyright (C) 2000 - 2022 Silverpeas
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# As a special exception to the terms and conditions of version 3.0 of
+# the GPL, you may redistribute this Program in connection withWriter Free/Libre
+# Open Source Software ("FLOSS") applications as described in Silverpeas's
+# FLOSS exception.  You should have recieved a copy of the text describing
+# the FLOSS exception, and it is also available here:
+# "http://www.silverpeas.org/legal/licensing"
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+DB_SERVERTYPE=H2
+DB_SERVER=localhost
+DB_USER=silverpeas
+DB_PASSWORD=silverpeas
+DB_NAME=Silverpeas

src/silverpeas.gradle renamed to src/bin/silverpeas.gradle

@@ -17,15 +17,15 @@ def auroraProps = [
     'home.events.appId': 'almnanach5',
     'home.faq.appId': 'questionReply7',
     'zoom.componentId': 'kmelia4',
-    'Shortcut.home.1.Url': '/silverpeas/Component/kmelia4',
-    'Shortcut.home.2.Url': '/silverpeas/Component/gallery9',
+    'Shortcut.home.1.Url': 'http://localhost:8000/silverpeas/Component/kmelia4',
+    'Shortcut.home.2.Url': 'http://localhost:8000/silverpeas/Component/gallery9',
     'Shortcut.home.2.AltText': 'Médiathèque',
-    'Shortcut.home.3.Url': '/silverpeas/Rdirectory/jsp/Main?Sort=NEWEST',
-    'Shortcut.home.4.Url': '/silverpeas/Space/WA3',
+    'Shortcut.home.3.Url': 'http://localhost:8000/silverpeas/Rdirectory/jsp/Main?Sort=NEWEST',
+    'Shortcut.home.4.Url': 'http://localhost:8000/silverpeas/Space/WA3',
     'Shortcut.home.4.AltText': 'Demandes en ligne',
-    'Shortcut.home.5.Url': '/silverpeas/Component/forums11',
+    'Shortcut.home.5.Url': 'http://localhost:8000/silverpeas/Component/forums11',
     'Shortcut.home.5.AltText': 'Forums',
-    'Shortcut.home.6.Url': '/silverpeas/Component/suggestionBox12',
+    'Shortcut.home.6.Url': 'http://localhost:8000/silverpeas/Component/suggestionBox12',
     'Shortcut.home.6.AltText': 'Vos idées',
 ]
 service.updateProperties(

src/config.properties

@@ -59,6 +59,11 @@
       <parameter key="attachment.data.fromMetadata">true</parameter>
     </configfile>
 
+    <!-- H2 doesn't support the COUNT() OVER() windowing function -->
+    <configfile name="general.properties">
+      <parameter key="jdbc.pagination.method.countOver">false</parameter>
+    </configfile>
+
   </fileset>
 
 </silverpeas-settings>

src/configuration/config.properties

@@ -1,4 +1,4 @@
-#Thu Feb 08 16:05:12 CET 2018
+#Thu Dec 03 18:44:52 CET 2020
 http\://www.jcp.org/jcr/1.0=1570322
 http\://www.jcp.org/jcr/mix/1.0=14361695
 internal=16762557

src/99-confAuroraLooks.groovy renamed to src/configuration/silverpeas/99-confAuroraLooks.groovy

@@ -1,4 +1,4 @@
-#Thu Feb 08 16:05:12 CET 2018
+#Thu Dec 03 18:44:52 CET 2020
 fn_old=http\://www.w3.org/2004/10/xpath-functions
 xs=http\://www.w3.org/2001/XMLSchema
 slv=http\://www.silverpeas.com/jcr/1.0

src/CustomerSettings.xml renamed to src/configuration/silverpeas/CustomerSettings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
-    Copyright (C) 2000 - 2018 Silverpeas
+    Copyright (C) 2000 - 2022 Silverpeas
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as

src/data/index/blog10/index/write.lock renamed to src/data/.silverpeas/.gitkeep

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
 <!--
 
-    Copyright (C) 2000 - 2018 Silverpeas
+    Copyright (C) 2000 - 2022 Silverpeas
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as

src/data/index/Components/index/_h.fdt

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
-    Copyright (C) 2000 - 2018 Silverpeas
+    Copyright (C) 2000 - 2022 Silverpeas
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as

src/data/index/Components/index/_h.fdx

@@ -0,0 +1 @@
+This the temporary directory into which uploaded files are put.

src/data/index/Components/index/_h.fnm

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright (C) 2000 - 2018 Silverpeas
+    Copyright (C) 2000 - 2022 Silverpeas
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as

src/data/index/Components/index/_h.nvd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright (C) 2000 - 2018 Silverpeas
+    Copyright (C) 2000 - 2022 Silverpeas
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as

src/data/index/Components/index/_h.nvm

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright (C) 2000 - 2018 Silverpeas
+    Copyright (C) 2000 - 2022 Silverpeas
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as