fix weblogic-oracle image

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

 version: "3.0"
 services:
   database:
-    image: smp-oradb-19.3.0-se2:${SMP_VERSION}
+    image: smp-oradb-${ORA_VERSION}-${ORA_EDITION}:${SMP_VERSION}
     container_name: smp_oracle_db
+    hostname: wlsadmin
     environment:
       - ORACLE_CHARACTERSET=AL32UTF8 # set database encoding
       - NLS_LANG=.AL32UTF8  # set sqlplus encoding for stating up scripts

smp-docker/compose/weblogic-oracle/properties/db-scripts/01_create_user.sql

 
-ALTER SESSION SET CONTAINER=ORCLPDB1;
 CREATE USER smp IDENTIFIED BY "test" DEFAULT TABLESPACE users QUOTA UNLIMITED ON users; 
 GRANT CREATE SESSION TO smp;
 GRANT CREATE TABLE TO smp;

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

@@ -2,16 +2,20 @@
 
 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"
 SMP_VERSION=
 
 
-ORA_VERSION="19.3.0"
-ORA_EDITION="se2"
-ORA_SERVICE="ORCLPDB1"
-ORACLE_PDB="ORCLPDB1"
+#ORA_VERSION="19.3.0"
+#ORA_EDITION="se2"
+#ORA_SERVICE="ORCLPDB1"
+#ORACLE_PDB="ORCLPDB1"
+ORA_VERSION="11.2.0.2"
+ORA_EDITION="xe"
+ORA_SERVICE="xe"
 
 SMP_DB_USERNAME=smp;
 SMP_DB_PASSWORD=test;
@@ -101,7 +105,10 @@ fi
 echo "Database starting" > ./status-folder/database.status
 clearOldContainers
 # start 
-export SMP_VERSION="${SMP_VERSION}"
+export SMP_VERSION
+export ORA_VERSION
+export ORA_EDITION
+
 docker-compose -p ${PREFIX} up -d --force-recreate
 
 

smp-docker/compose/weblogic-oracle/status-folder/database.status

-Database stopped
+DATABASE IS READY TO USE!

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

-dsname=cipaeDeliveryDs
+dsname=eDeliverySmpDs
 dsdbname=default;create=true
-dsjndiname=jdbc/cipaeDeliveryDs
+dsjndiname=jdbc/eDeliverySmpDs
 dsdriver=oracle.jdbc.OracleDriver
-dsurl=jdbc:oracle:thin:@//database:1521/ORCLPDB1
+dsurl=jdbc:oracle:thin:@//database:1521/xe
 dsusername=smp
 dspassword=test
 dstestquery=SQL ISVALID

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 "datasource.jndi=jdbc/cipaeDeliveryDs" >> "$DOMAIN_HOME/classes/smp.config.properties"
+echo "datasource.jndi=jdbc/eDeliverySmpDs" >> "$DOMAIN_HOME/classes/smp.config.properties"
 echo "authentication.blueCoat.enabled=true" >> "$DOMAIN_HOME/classes/smp.config.properties"
 echo "smp.truststore.password={DEC}{test123}" >> "$DOMAIN_HOME/classes/smp.config.properties"
 echo "smp.keystore.password={DEC}{test123}" >> "$DOMAIN_HOME/classes/smp.config.properties"

smp-soapui-tests/pom.xml

@@ -112,11 +112,22 @@
                             </execution>
                         </executions>
                     </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+        <!-- soap ui -->
+        <profile>
+            <id>dump-code-coverage</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
                     <!-- dump jacoco report from remote agent and generate report  -->
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
                         <version>${jacoco.maven.plugin.version}</version>
+
                         <configuration>
                             <classDumpDir>${project.build.outputDirectory}../target/</classDumpDir>
                         </configuration>