Commit 20d19b95 authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

split core and webapp. Core modules are installed in BaseX repo. Upgrade to basex 12.

parent bd8a9a83

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ 
/dist

/xq

tests-output.xml

WEB-INF/

Makefile

+11 −3
Original line number Diff line number Diff line 
BASEX_ARCHIVE_URL=https://files.basex.org/releases/11.7/BaseX117.zip

#BASEX_ARCHIVE_URL=https://files.basex.org/releases/11.7/BaseX117.zip

BASEX_ARCHIVE_URL=https://files.basex.org/releases/12.2/BaseX122.zip



SRC_DIR=${CURDIR}/src



DEV_WEBAPP_DIR=${SRC_DIR}/main/webapp

install-basex: # BaseX & dépendances: Téléchargement, installation et définition du mot de passe admin

	@if [ -d '.max/basex' ]; then\

		echo 'Installation de BaseX : OK.';\
@@ -27,7 +28,14 @@ install: install-basex ## Installation de MaX 
	@if [ -d '.max/basex/webapp/max' ]; then\

		echo 'Installation de MaX : OK.';\

	else\

		ln -s $(SRC_DIR)/main/ .max/basex/webapp/max;\

		#ln -s $(SRC_DIR)/main/ .max/basex/webapp/max;\

		echo 'Mise à jour du répertoire WEBPATH';\

		sed -i -E "s#^[[:space:]]*(WEBPATH)[[:space:]]*=.*#\1=${DEV_WEBAPP_DIR}#" .max/basex/.basex;\

		echo 'Installation des modules dans le REPO BaseX';\

		mkdir .max/basex/repo/max;\

		ln -s $(SRC_DIR)/main/core .max/basex/repo/max/max;\

		ln -s $(SRC_DIR)/resources/expath-pkg.xml .max/basex/repo/max/expath-pkg.xml;\

		echo 'Symlink resources & fixtures';\

		ln -s $(SRC_DIR)/resources .max/resources;\

		ln -s ../fixtures .max/fixtures;\

		echo 'Installation de MaX effectuée.';\

fixtures/xq/document.xq

+1 −1
Original line number Diff line number Diff line 
xquery version "3.0";



import module namespace database = 'https://certic.unicaen.fr/max/database' at '../.max/basex/webapp/max/core/database.xqm';

import module namespace database = 'https://certic.unicaen.fr/max/database';



declare variable $lang external;

declare variable $doc external;

src/main/max/core/conf.xqm→src/main/core/conf.xqm

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ xquery version "3.0"; 
:)

module namespace conf = 'https://certic.unicaen.fr/max/conf';



import module namespace utils = 'https://certic.unicaen.fr/max/utils' at 'utils.xqm';

import module namespace utils = 'https://certic.unicaen.fr/max/utils';



declare namespace max="http://certic.unicaen.fr/max/ns/1.0";

declare namespace expath="http://expath.org/ns/pkg";