diff --git a/vips-backend-single-server.sh b/vips-backend-single-server.sh
index 7efdcddfb03948008a8f326300e4f9d06d53957f..b635dfd0a67cca86df519c09afcfd65ac6ec9490 100755
--- a/vips-backend-single-server.sh
+++ b/vips-backend-single-server.sh
@@ -80,6 +80,9 @@ printf "\nWe also need to create a user for compiling and running the code\n"
adduser $CODE_USER
# Clone VIPSCommon and VIPSLogic from GitLab
+# For some reason we have to add this even though done manually before running the script
+echo $(echo -n | openssl s_client -showcerts -connect gitlab.nibio.no:443 2>/dev/null | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p') >> /etc/ssl/certs/ca-certificates.crt
+# Cloning
sudo -H -u $CODE_USER bash -c "git clone --single-branch --branch master https://$vipslogic_deploy_token:$vipslogic_deploy_password@gitlab.nibio.no/VIPS/VIPSLogic.git ~/VIPSLogic"
sudo -H -u $CODE_USER bash -c "git clone --single-branch --branch master https://$vipscommon_deploy_token:$vipscommon_deploy_password@gitlab.nibio.no/VIPS/VIPSCommon.git ~/VIPSCommon"
@@ -93,6 +96,12 @@ sudo -H -u $CODE_USER bash -c "mvn install -DskipTests"
# Download and unzip Wildfly 16
cd ..
WILDFLY_VERSION=16.0.0.Final
+echo "################## TRYING TO REMOVE WILDFLY"
+echo $(pwd)
+echo "rm -rf wildfly-$WILDFLY_VERSION"
+sudo -H -u $CODE_USER bash -c "rm -rf wildfly-$WILDFLY_VERSION"
+echo "################## TRied TO REMOVE WILDFLY"
+#exit 0
sudo -H -u $CODE_USER bash -c "wget https://download.jboss.org/wildfly/$WILDFLY_VERSION/wildfly-$WILDFLY_VERSION.tar.gz"
sudo -H -u $CODE_USER bash -c "tar xzf wildfly-$WILDFLY_VERSION.tar.gz"
sudo -H -u $CODE_USER bash -c "rm wildfly-$WILDFLY_VERSION.tar.gz"
@@ -119,6 +128,9 @@ sudo -H -u $CODE_USER bash -c "python3 init_standalone_xml.py --smtpserver $smtp
# etc
# All modules needed to run VIPSLogic AND VIPSCore are added
sudo -H -u $CODE_USER bash -c "cp -r modules/* $WILDFLY_HOME/modules"
+# Need to add the newly built VIPSCommon to modules
+sudo -H -u $CODE_USER bash -c "cp ~/VIPSCommon/target/VIPSCommon-1.0-SNAPSHOT.jar $WILDFLY_HOME/modules/no/nibio/vips/VIPSCommon/main/"
+
# Set up WildFly as a systemd service
mkdir /etc/wildfly
@@ -138,6 +150,7 @@ sudo -H -u $CODE_USER bash -c "ln -s /home/$CODE_USER/VIPSLogic/target/VIPSLogic
echo "TESTING THE WILDFLY APPLICATION SERVER. Please wait"
# Start WildFly
sudo -H -u $CODE_USER bash -c "$WILDFLY_HOME/bin/standalone.sh > /dev/null &"
+#sudo -H -u $CODE_USER bash -c "$WILDFLY_HOME/bin/standalone.sh &"
# Periodically test a database dependant endpoint
sleep 10s
response=400
@@ -238,14 +251,14 @@ sudo -H -u $CODE_USER bash -c "git clone --single-branch --branch master https:/
sudo -H -u $CODE_USER bash -c "git clone --single-branch --branch master https://$vipscoremanager_deploy_token:$vipscoremanager_deploy_password@gitlab.nibio.no/VIPS/VIPSCoreManager.git ~/VIPSCoreManager"
# Build the components
-cd ../VIPSCore
+cd /home/$CODE_USER/VIPSCore
sudo -H -u $CODE_USER bash -c "mvn install -DskipTests"
cd ../VIPSCoreManager
sudo -H -u $CODE_USER bash -c "mvn install -DskipTests"
# Link the components to the WildFly deployments folder
sudo -H -u $CODE_USER bash -c "ln -s /home/$CODE_USER/VIPSCore/target/VIPSCore-1.0-SNAPSHOT.war $WILDFLY_HOME/standalone/deployments/"
-sudo -H -u $CODE_USER bash -c "ln -s /home/$CODE_USER/VIPSCore/target/VIPSCoreManager-1.0-SNAPSHOT.war $WILDFLY_HOME/standalone/deployments/"
+sudo -H -u $CODE_USER bash -c "ln -s /home/$CODE_USER/VIPSCoreManager/target/VIPSCoreManager-1.0-SNAPSHOT.war $WILDFLY_HOME/standalone/deployments/"
# Initializing the database for vipscoremanager
printf "\nDATABASE USER INFORMATION for vipscoremanager\n"
@@ -255,6 +268,7 @@ do
read -sp "Password for vipscoremanager [*]: " vipscoremanager_password
done
+cd $INITIAL_DIRECTORY
sudo -H -u postgres bash -c "psql -v vipscoremanager_password=\"'$vipscoremanager_password'\" -f db/vipscoremanager_init_1.sql"
# Edit standalone.xml, the Wildfly config file, for VIPSCoreManager
@@ -267,10 +281,6 @@ while [ "$md5salt_2" == "" ]
do
read -p "MD5 salt (to make the one-way encryption much harder to break. Type 10-20 random characters) [*]: " md5salt_2
done
-while [ "$corebatch_username" == "" ]
-do
- read -p "Core batch username (Allowing VIPSLogic to run models in VIPSCore) " corebatch_username
-done
while [ "$corebatch_password" == "" ]
do
read -p "Core batch password (Allowing VIPSLogic to run models in VIPSCore) " corebatch_password
@@ -278,11 +288,8 @@ done
cd $INITIAL_DIRECTORY/wildfly_config
-sudo -H -u $CODE_USER bash -c "python3 init_standalone_xml_for_vipscoremanager_and_vipscore.py --md5salt $md5salt_2 --dbpassword $vipscoremanager_password --corebatch_username $corebatch_username --corebatch_password $corebatch_password --path $WILDFLY_CONFIG_PATH"
+sudo -H -u $CODE_USER bash -c "python3 init_standalone_xml_for_vipscoremanager_and_vipscore.py --md5salt $md5salt_2 --dbpassword $vipscoremanager_password --corebatch_username VIPSLogic --corebatch_password $corebatch_password --path $WILDFLY_CONFIG_PATH"
-passwordhash_2=$(./md5pass.py $corebatch_password $md5salt_2)
-
-PGPASSWORD=$vipscoremanager_password psql -U vipscoremanager -d vipscoremanager -h localhost -c "BEGIN;INSERT INTO public.organization(organization_id,organization_name,parent_organization_id) VALUES(1,'$organization_name',NULL); INSERT INTO vips_core_user (vips_core_user_id, first_name, last_name, organization_id) VALUES (-10, '', 'VIPSLogic', 1); INSERT INTO vips_core_credentials (id, username, password, vips_core_user_id) VALUES (1, 'vipsbatch', '$passwordhash_2', -10);COMMIT;"
# Testing Wildfly/VIPSCore/VIPSCoreManager
# Run and test WildFly with VIPSLogic deployed
@@ -290,6 +297,7 @@ PGPASSWORD=$vipscoremanager_password psql -U vipscoremanager -d vipscoremanager
echo "TESTING deployment of VIPSCore and VIPSCoreManager on WildFly. Please wait"
# Start WildFly
sudo -H -u $CODE_USER bash -c "$WILDFLY_HOME/bin/standalone.sh > /dev/null &"
+#sudo -H -u $CODE_USER bash -c "$WILDFLY_HOME/bin/standalone.sh &"
# Periodically test a database dependant endpoint
sleep 10s
response=400
@@ -308,6 +316,14 @@ do
echo "HTTP response from server: $response"
done
+echo "VIPSCore and VIPSCoreManager successfully deployed to WildFly. Shutting down Wildfly"
+sudo pkill --newest java
+sleep 5s
+
+# Adding organization info (after first Flyway init of VIPSCoreManager)
+passwordhash_2=$(./md5pass.py $corebatch_password $md5salt_2)
+PGPASSWORD=$vipscoremanager_password psql -U vipscoremanager -d vipscoremanager -h localhost -c "BEGIN;INSERT INTO public.organization(organization_id,organization_name,parent_organization_id) VALUES(1,'$organization_name',NULL); INSERT INTO vips_core_user (vips_core_user_id, first_name, last_name, organization_id) VALUES (-10, '', 'VIPSLogic', 1); INSERT INTO vips_core_credentials (id, username, password, vips_core_user_id) VALUES (1, 'vipsbatch', '$passwordhash_2', -10);COMMIT;"
+
diff --git a/wildfly_config/modules/no/nibio/vips/VIPSCommon/main/VIPSCommon-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/VIPSCommon/main/VIPSCommon-1.0-SNAPSHOT.jar
deleted file mode 120000
index 27ea0f52b91f8edd08f4afc7841242f1f54537f2..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/VIPSCommon/main/VIPSCommon-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/VIPSCommon/target/VIPSCommon-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/VIPSCommon/main/module.xml~ b/wildfly_config/modules/no/nibio/vips/VIPSCommon/main/module.xml~
deleted file mode 100755
index 8bf117f5e73d2dae756c4fac7d703d8089865045..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/VIPSCommon/main/module.xml~
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- © 2014 Bioforsk
- Author: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
- -->
-
-<module xmlns="urn:jboss:module:1.1" name="no.bioforsk.vips.VIPSCommon">
- <resources>
- <!--resource-root path="."/-->
- <resource-root path="VIPSCommon-1.0-SNAPSHOT.jar"/>
-
- <!-- Insert resources here -->
- </resources>
- <dependencies>
- <module name="com.fasterxml.jackson.core.jackson-core" export="false"/>
- <module name="com.fasterxml.jackson.core.jackson-databind" export="false"/>
- <module name="javax.ws.rs.api" export="false"/>
- <module name="javax.servlet.api" export="false"/>
- </dependencies>
-
-</module>
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/AppleScabModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/AppleScabModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 6ed936863baa23ef0ca641152c67c9749104ca08..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/AppleScabModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/AppleScabModel/target/AppleScabModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/BarleyNetBlotchModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/BarleyNetBlotchModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 25136d97f7d0d087be863ff358e04e2648c18fe2..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/BarleyNetBlotchModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/BarleyNetBlotchModel/target/BarleyNetBlotchModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/BremiaLactucaeModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/BremiaLactucaeModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 7ab71df0b35c260c13e0f3ed67a36dc951a6a706..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/BremiaLactucaeModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/BremiaLactucaeModel/target/BremiaLactucaeModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/CydiaPomonellaModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/CydiaPomonellaModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 3a22480a6ecf7a0a9c32edf3d214b3cf5dd9888d..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/CydiaPomonellaModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/CydiaPomonellaModel/target/CydiaPomonellaModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DOWNCASTModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DOWNCASTModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 3f1729538b168f3ac9a586f8f0fd72c61a441e34..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DOWNCASTModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/DOWNCASTModel/target/DOWNCASTModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DeliaRadicumFloralisObservationModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DeliaRadicumFloralisObservationModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 3569ce1942b6cab46ec333e2487299ebf7250ccf..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DeliaRadicumFloralisObservationModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumFloralisObservationModel/target/DeliaRadicumFloralisObservationModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DeliaRadicumModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DeliaRadicumModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 15b5ec3c115f9e7630c983d5fb9d431e9cd65895..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/DeliaRadicumModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel/target/DeliaRadicumModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/FallArmywormModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/FallArmywormModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 0eb0f058c59162f2e06cfae6d14703964348edc4..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/FallArmywormModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/FallArmywormModel/target/FallArmywormModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/FinnCerealModels-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/FinnCerealModels-1.0-SNAPSHOT.jar
deleted file mode 120000
index 142568e94c0ce033374f1d5ce707078f8c6256ca..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/FinnCerealModels-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/Model_FINNCEREAL/target/FinnCerealModels-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/GrassDryingModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/GrassDryingModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index be4ca8d660bc5d51dec41064bd8bbb791ad69514..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/GrassDryingModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/GrassDryingModel/target/GrassDryingModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/HoplocampaFlavaModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/HoplocampaFlavaModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 67b916ebb9bda0bb583ee3f50a5cfe1bd16c645e..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/HoplocampaFlavaModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/HoplocampaFlavaModel/target/HoplocampaFlavaModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/LeafBlotchModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/LeafBlotchModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 9d578148d8f919248f4bdf3f43bed2f89ac3d6a9..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/LeafBlotchModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/LeafBlotchModel/target/LeafBlotchModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/LygusRugulipennisModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/LygusRugulipennisModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 8df2fd85e69b877422a22065211c699f373c8c4f..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/LygusRugulipennisModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/LygusRugulipennisModel/target/LygusRugulipennisModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/MamestraBrassicaeModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/MamestraBrassicaeModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index cbb7a43f28dfcd85b5b396cf073c35a4270a6702..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/MamestraBrassicaeModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/MamestraBrassicaeModel/target/MamestraBrassicaeModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/NaerstadModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/NaerstadModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 15fd08a287b2675b95b7fd23661e582ee525a817..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/NaerstadModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/NaerstadModel/target/NaerstadModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/NegativePrognosisModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/NegativePrognosisModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 58471ff376e8273aa5ac5e78e680f522142b7cd3..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/NegativePrognosisModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/NegativePrognosisModel/target/NegativePrognosisModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/OatFloweringModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/OatFloweringModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 6e3bcf9465f919ff7efefcda7d2096df2d1dc89a..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/OatFloweringModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/OatFloweringModel/target/OatFloweringModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PlasmoparaViticolaModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PlasmoparaViticolaModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 81c393cfbb3743f604af0870a1a327ba9c7cfcfb..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PlasmoparaViticolaModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/PlasmoparaViticolaModel/target/PlasmoparaViticolaModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PsilaRosaeObservationModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PsilaRosaeObservationModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 84fea6d50eb44888111fee6792195d09322febc2..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PsilaRosaeObservationModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/PsilaRosaeObservationModel/target/PsilaRosaeObservationModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PsilaRosaeTempModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PsilaRosaeTempModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index b2e92519dbbe9cb0d92c8c5087516e57620aa4fa..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PsilaRosaeTempModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/PsilaRosaeTempModel/target/PsilaRosaeTempModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PyreModel.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PyreModel.jar
deleted file mode 120000
index 740024838b7221828f447176b785512ec8a05517..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/PyreModel.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Testing/PyreModel/dist/PyreModel.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/RoughageNutritionModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/RoughageNutritionModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 200c296a2d2308d7d7b7d2c687bc376e626babe1..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/RoughageNutritionModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/RoughageNutritionModel/target/RoughageNutritionModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/SeptoriaApiicolaModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/SeptoriaApiicolaModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 978733e550fe63e96fd9b2f1d4fc282f429115b1..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/SeptoriaApiicolaModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/SeptoriaApiicolaModel/target/SeptoriaApiicolaModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/SeptoriaHumidityModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/SeptoriaHumidityModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 54ea2147d7e35cb04a50f3fffb1c39bcd4c24ea7..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/SeptoriaHumidityModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/SeptoriaHumidityModel/target/SeptoriaHumidityModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/ZymoseptoriaSimpleRiskGridModel-1.0-SNAPSHOT.jar b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/ZymoseptoriaSimpleRiskGridModel-1.0-SNAPSHOT.jar
deleted file mode 120000
index 688312b0e5b9fc42740585d8bc5a31a606a97740..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/ZymoseptoriaSimpleRiskGridModel-1.0-SNAPSHOT.jar
+++ /dev/null
@@ -1 +0,0 @@
-/home/treinar/prosjekter/vips/Sourcecode/ZymoseptoriaSimpleRiskGridModel/target/ZymoseptoriaSimpleRiskGridModel-1.0-SNAPSHOT.jar
\ No newline at end of file
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/module.xml b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/module.xml
index 7c8f4b9e584f5c815da41dda955429b1b7f562f0..01d8ae4e38719e6f2f2e9e408a420019c9efd07a 100755
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/module.xml
+++ b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/module.xml
@@ -9,31 +9,6 @@
<resources>
<!--resource-root path="."/-->
<!--resource-root path="GenericPathogenPlantInfectionModel-1.0-SNAPSHOT.jar"/-->
- <resource-root path="AppleScabModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="GrassDryingModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="NaerstadModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="OatFloweringModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="PlasmoparaViticolaModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="DeliaRadicumModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="HoplocampaFlavaModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="BarleyNetBlotchModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="CydiaPomonellaModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="RoughageNutritionModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="LygusRugulipennisModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="PsilaRosaeTempModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="PsilaRosaeObservationModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="MamestraBrassicaeModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="DeliaRadicumFloralisObservationModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="NegativePrognosisModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="SeptoriaApiicolaModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="BremiaLactucaeModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="DOWNCASTModel-1.0-SNAPSHOT.jar"/>
- <!--resource-root path="JythonFungusPilasusPlovisModel.jar"/-->
- <resource-root path="ZymoseptoriaSimpleRiskGridModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="FinnCerealModels-1.0-SNAPSHOT.jar"/>
- <resource-root path="SeptoriaHumidityModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="LeafBlotchModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="FallArmywormModel-1.0-SNAPSHOT.jar"/>
<!-- Insert resources here -->
</resources>
<dependencies>
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/module.xml~ b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/module.xml~
deleted file mode 100755
index 50d645db7fd644481bbda256e68961acaa024bc7..0000000000000000000000000000000000000000
--- a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/module.xml~
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- © 2013 Bioforsk
- Author: Tor-Einar Skog <tor-einar.skog@nibio.no>
- -->
-
-<module xmlns="urn:jboss:module:1.1" name="no.nibio.vips.modelcontainer">
- <resources>
- <!--resource-root path="."/-->
- <resource-root path="GenericPathogenPlantInfectionModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="AppleScabModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="GrassDryingModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="NaerstadModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="OatFloweringModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="PlasmoparaViticolaModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="DeliaRadicumModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="HoplocampaFlavaModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="BarleyNetBlotchModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="CydiaPomonellaModel-1.0-SNAPSHOT.jar"/>
- <resource-root path="RoughageNutritionModel-1.0-SNAPSHOT.jar"/>
-
- <!-- Insert resources here -->
- </resources>
- <dependencies>
- <module name="no.nibio.vips.VIPSCommon" export="false"/>
- <!--module name="org.apache.commons.math" export="false"/-->
- <module name="com.fasterxml.jackson.core.jackson-core" export="false"/>
- <module name="com.fasterxml.jackson.core.jackson-databind" export="false"/>
- </dependencies>
-
-</module>
diff --git a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/moduleJars.tgz b/wildfly_config/modules/no/nibio/vips/modelcontainer/main/moduleJars.tgz
deleted file mode 100644
index bca2f4f85ba4c8d5f4c1f7a2c210d4a4ac2e35eb..0000000000000000000000000000000000000000
Binary files a/wildfly_config/modules/no/nibio/vips/modelcontainer/main/moduleJars.tgz and /dev/null differ
diff --git a/wildfly_config/vipscoremanager_datasource.xml b/wildfly_config/vipscoremanager_datasource.xml
index f4cbc0c591904100c7f46e8978d5e713a42906af..41cf3a655b3ed640f85c3c44a151f5650f88c3b0 100644
--- a/wildfly_config/vipscoremanager_datasource.xml
+++ b/wildfly_config/vipscoremanager_datasource.xml
@@ -8,7 +8,7 @@
<prefill>true</prefill>
</pool>
<security>
- <user-name>coremanager</user-name>
+ <user-name>vipscoremanager</user-name>
<password>XXXXXXXXXX</password>
</security>