change datasources

MWUI/Dockerfile

@@ -20,6 +20,6 @@ USER root
 
 COPY --chown=1001:0 src/main/liberty/config/server.xml /config/
 RUN features.sh
-COPY --chown=1001:0 target/*.war /config/apps
+COPY --chown=1001:0 target/MWUI-1.0.war /config/apps
 RUN configure.sh
 USER 1001

MWUI/src/main/liberty/config/server.xml

@@ -10,8 +10,8 @@
 
     <variable name="http.port" defaultValue="9080" />
     <variable name="https.port" defaultValue="9443" />
-    <variable name="serverdb.name" defaultValue="localhost" />
-    <variable name="serverdb.port" defaultValue="5000" />
+    <variable name="serverdb.name" defaultValue="10.10.10.36" />
+    <variable name="serverdb.port" defaultValue="50000" />
     <variable name="db.user" defaultValue="db2inst1" />
     <variable name="db.pwd" defaultValue="mdw4dm1n" />
 
@@ -19,7 +19,7 @@
         <fileset dir="lib" includes="db2jcc4.jar" />
     </library>
 
-    <dataSource id="mwtemp_mwui_ds" jndiName="jdbc/db2/mwtemp_mwui_ds">
+    <dataSource id="MWTEMP_DS" jndiName="jdbc/db2/mwtemp_mwui_ds">
         <jdbcDriver libraryRef="DB2Library" />
         <properties.db2.jcc
             serverName="${serverdb.name}"
@@ -30,7 +30,7 @@
             password="${db.pwd}" />
     </dataSource>
 
-    <dataSource id="mwrecon_mwui_ds" jndiName="jdbc/db2/mwrecon_mwui_ds">
+    <dataSource id="MWRECON_DS" jndiName="jdbc/db2/mwrecon_mwui_ds">
         <jdbcDriver libraryRef="DB2Library" />
         <properties.db2.jcc
             serverName="${serverdb.name}"
@@ -41,7 +41,7 @@
             password="${db.pwd}" />
     </dataSource>
 
-    <dataSource id="mwlog_mwui_ds" jndiName="jdbc/db2/mwlog_mwui_ds">
+    <dataSource id="MWLOG_DS" jndiName="jdbc/db2/mwlog_mwui_ds">
         <jdbcDriver libraryRef="DB2Library" />
         <properties.db2.jcc
             serverName="${serverdb.name}"
@@ -52,7 +52,7 @@
             password="${db.pwd}" />
     </dataSource>
 
-    <dataSource id="mwapp_mwui_ds" jndiName="jdbc/db2/mwapp_mwui_ds">
+    <dataSource id="MWAPP_DS" jndiName="jdbc/db2/mwapp_mwui_ds">
         <jdbcDriver libraryRef="DB2Library" />
         <properties.db2.jcc
             serverName="${serverdb.name}"
@@ -63,7 +63,7 @@
             password="${db.pwd}" />
     </dataSource>
 
-    <dataSource id="mwbp_mwui_ds" jndiName="jdbc/db2/mwbp_mwui_ds">
+    <dataSource id="MWBP_DS" jndiName="jdbc/db2/mwbp_mwui_ds">
         <jdbcDriver libraryRef="DB2Library" />
         <properties.db2.jcc
             serverName="${serverdb.name}"
@@ -74,7 +74,18 @@
             password="${db.pwd}" />
     </dataSource>
 
-    <dataSource id="mwconfig_mwui_ds" jndiName="jdbc/db2/mwconfig_mwui_ds">
+    <dataSource id="MWCONFIG_DS" jndiName="jdbc/db2/mwconfig_mwui_ds">
+        <jdbcDriver libraryRef="DB2Library" />
+        <properties.db2.jcc
+            serverName="${serverdb.name}"
+            portNumber="${serverdb.port}"
+            currentSchema="MWCONFIG"
+            databaseName="MWAPP"
+            user="${db.user}"
+            password="${db.pwd}" />
+    </dataSource>
+
+    <dataSource id="MWCONFIG_DS" jndiName="jdbc/db2/mwconfig_mwconfig_ds">
         <jdbcDriver libraryRef="DB2Library" />
         <properties.db2.jcc
             serverName="${serverdb.name}"