fix cefdigital to digital-building-blocks

pom.xml

@@ -52,7 +52,7 @@
     </properties>
 
     <scm>
-        <developerConnection>scm:git:https://ec.europa.eu/cefdigital/code/scm/edelivery/smp.git</developerConnection>
+        <developerConnection>scm:git:https://ec.europa.eu/digital-building-blocks/code/scm/edelivery/smp.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
 

smp-docker/compose/weblogic-oracle/docker-compose.yml

 version: "3.0"
 services:
   database:
-    image: oracle/database:11.2.0.2-xe
+    image: smp-oradb-${ORA_VERSION}-${ORA_EDITION}:${SMP_VERSION}
     container_name: smp_oracle_db
     volumes:
       - ./properties/db-scripts:/u01/app/oracle/scripts/setup  # init script.
@@ -13,8 +13,8 @@ services:
     depends_on:
       - database
 #    command: [bash, -c, "for i in `seq 10`; do timeout 1  bash -c '</dev/tcp/database/1521'; if [ $$? -eq 0 ] ; then break;fi;sleep 1;  done;"]
-    command: [bash, -c, "for i in `seq 150`; do timeout 1  bash -c 'echo \" $$(ls /u01/status/)\"'; if [ -f '/u01/status/database.log' ] && [ \"$$( cat /u01/status/database.log )\" == 'DATABASE IS READY TO USE!' ] ; then break;fi; echo \"$$i. Wait for database!\"; sleep 2;  done;   /u01/oracle/startAdminServer.sh"]
-    image:  weblogic_smp
+    command: [bash, -c, "for i in `seq 150`; do timeout 1  bash -c 'echo \" $$(ls /u01/status/)\"'; if [ -f '/u01/status/database.status' ] && [ \"$$( cat /u01/status/database.status )\" == 'DATABASE IS READY TO USE!' ] ; then break;fi; echo \"$$i. Wait for database!\"; sleep 10;  done;   /u01/oracle/startAdminServer.sh"]
+    image:  smp-weblogic-122:${SMP_VERSION}
     container_name: wls-smp   
     hostname: wlsadmin
     volumes:

smp-docker/compose/weblogic-oracle/runCompose.sh

@@ -2,27 +2,37 @@
 
 WORKING_DIR="$(dirname $0)"
 SMP_INIT_DATABASE="../../../smp-webapp/src/main/smp-setup/database-scripts/oracle10g.ddl"
-SMP_INIT_DATABASE_DATA="../../../smp-webapp/src/main/smp-setup/database-scripts/oracle10g-data.sql"
+#SMP_INIT_DATABASE_DATA="../../../smp-webapp/src/main/smp-setup/database-scripts/oracle10g-data.sql"
+SMP_INIT_DATABASE_DATA="../../../smp-soapui-tests/groovy/oracle-4.1_integration_test_data.sql"
+
 # soap ui data
 PREFIX="smp-wls-orcl"
+# TODO sync with build script
+ORA_VERSION="11.2.0.2"
+ORA_EDITION="xe"
+ORA_SERVICE="xe"
 
 
-
+SMP_VERSION=
 echo "Working Directory: ${WORKING_DIR}"
 cd "$WORKING_DIR"
 # clear volume and containers - to run  restart from strach 
 
 
 # READ argumnets 
-while getopts i: option
+while getopts i:v: option
 do
   case "${option}"
   in
     i) SMP_INIT_DATABASE_DATA=${OPTARG};;
+    v) SMP_VERSION=${OPTARG};;
   esac
 done
 
-
+export SMP_VERSION
+export ORA_VERSION
+export ORA_EDITION
+export ORA_SERVICE
 # create  database init script from 
 echo "CONNECT smp/test@//localhost:1521/xe;" > ./properties/db-scripts/02_oracle10g.sql
 cat  "${SMP_INIT_DATABASE}" >> ./properties/db-scripts/02_oracle10g.sql

smp-docker/images/oracle/oracle-db-11.2.0.2/runOracle.sh

@@ -202,7 +202,7 @@ fi;
 $ORACLE_BASE/$CHECK_DB_FILE
 if [ $? -eq 0 ]; then
   echo "#########################"
-  echo "DATABASE IS READY TO USE!" |& tee /u01/status/database.log 
+  echo "DATABASE IS READY TO USE!" |& tee /u01/status/database.status
   echo "#########################"
 
   # Execute custom provided startup scripts
@@ -211,7 +211,7 @@ if [ $? -eq 0 ]; then
 else
   echo "#####################################"
   echo "########### E R R O R ###############"
-  echo "DATABASE SETUP WAS NOT SUCCESSFUL!"  |& tee /u01/status/database.log
+  echo "DATABASE SETUP WAS NOT SUCCESSFUL!"  |& tee /u01/status/database.status
   echo "Please check output for further info!"
   echo "########### E R R O R ###############"
   echo "#####################################"

smp-docker/images/weblogic-12.2.1.3-smp/container-scripts/datasource.properties.oracle

-dsname=cipaeDeliveryDs
+dsname=smpDatasource
 dsdbname=default;create=true
-dsjndiname=jdbc/cipaeDeliveryDs
+dsjndiname=jdbc/smpDatasource
 dsdriver=oracle.jdbc.OracleDriver
 dsurl=jdbc:oracle:thin:@//database:1521/xe
 dsusername=smp

smp-docker/images/weblogic-12.2.1.3-smp/container-scripts/deploySMPToDomain.sh

@@ -10,7 +10,7 @@ fi
 
 # create smp property file
 echo "hibernate.dialect=org.hibernate.dialect.Oracle10gDialect" > "$DOMAIN_HOME/classes/smp.config.properties"
-echo "\ndatasource.jndi=jdbc/cipaeDeliveryDs" >> "$DOMAIN_HOME/classes/smp.config.properties"
+echo "\ndatasource.jndi=jdbc/smpDatasource" >> "$DOMAIN_HOME/classes/smp.config.properties"
 echo "\nauthentication.blueCoat.enabled=true" >> "$DOMAIN_HOME/classes/smp.config.properties"
 echo "\nsmp.truststore.password={DEC}{test123}" >> "$DOMAIN_HOME/classes/smp.config.properties"
 echo "\nsmp.keystore.password={DEC}{test123}" >> "$DOMAIN_HOME/classes/smp.config.properties"

smp-parent-pom/pom.xml

@@ -34,11 +34,11 @@
     <distributionManagement>
         <repository>
             <id>cefdigital-releases</id>
-            <url>https://ec.europa.eu/cefdigital/artifact/content/repositories/eDelivery/</url>
+            <url>https://ec.europa.eu/digital-building-blocks/artifact/content/repositories/eDelivery/</url>
         </repository>
         <snapshotRepository>
             <id>cefdigital-snapshots</id>
-            <url>https://ec.europa.eu/cefdigital/artifact/content/repositories/eDelivery-snapshots/</url>
+            <url>https://ec.europa.eu/digital-building-blocks/artifact/content/repositories/eDelivery-snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 
@@ -139,7 +139,7 @@
     <repositories>
         <repository>
             <id>cefdigital-releases</id>
-            <url>https://ec.europa.eu/cefdigital/artifact/content/repositories/eDelivery/</url>
+            <url>https://ec.europa.eu/digital-building-blocks/artifact/content/repositories/eDelivery/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -149,7 +149,7 @@
         </repository>
         <repository>
             <id>cefdigital-snapshots</id>
-            <url>https://ec.europa.eu/cefdigital/artifact/content/repositories/eDelivery-snapshots/</url>
+            <url>https://ec.europa.eu/digital-building-blocks/artifact/content/repositories/eDelivery-snapshots/</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -159,7 +159,7 @@
         </repository>
         <repository>
             <id>cefdigital-thirdparty</id>
-            <url>https://ec.europa.eu/cefdigital/artifact/content/repositories/eDelivery-third-party/</url>
+            <url>https://ec.europa.eu/digital-building-blocks/artifact/content/repositories/eDelivery-third-party/</url>
         </repository>
         <repository>
             <id>webgate-digit</id>