Helyi kornyezeti modositasok

diff --git a/server/-configuration/build-mediacube-modules.launch b/server/-configuration/build-mediacube-modules.launch
index 19baa3faa2958477fe499625403496a04b755b5f..f8c615a9da4d0916341eecf42df6573937c8a0b2 100644 (file)
--- a/server/-configuration/build-mediacube-modules.launch
+++ b/server/-configuration/build-mediacube-modules.launch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
+    <intAttribute key="M2_COLORS" value="0"/>\r
     <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
     <stringAttribute key="M2_GOALS" value="clean install"/>\r
     <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
@@ -13,6 +13,7 @@
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
     <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>\r
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
     </listAttribute>\r

diff --git a/server/-configuration/test-deploy-bkup-mediacube-plugins.launch b/server/-configuration/test-deploy-bkup-mediacube-plugins.launch
index d4f131bd65436798ab20f4add7c0d6df1d1fcb5e..bfe54cbc41e68b0987916c54ae0c63121b99b1b6 100644 (file)
--- a/server/-configuration/test-deploy-bkup-mediacube-plugins.launch
+++ b/server/-configuration/test-deploy-bkup-mediacube-plugins.launch
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
-       <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-       <stringAttribute key="M2_GOALS" value="clean deploy -Dremote.address=scp://root:password@10.10.1.29 -Dremote.location=/opt/test-mediacube -P plugins"/>\r
-       <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
-       <booleanAttribute key="M2_OFFLINE" value="false"/>\r
-       <stringAttribute key="M2_PROFILES" value=""/>\r
-       <listAttribute key="M2_PROPERTIES"/>\r
-       <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
-       <booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
-       <intAttribute key="M2_THREADS" value="1"/>\r
-       <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
-       <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
-       <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
-       <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-               <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
-       </listAttribute>\r
-       <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/-modules"/>\r
+    <intAttribute key="M2_COLORS" value="0"/>\r
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+    <stringAttribute key="M2_GOALS" value="clean deploy -Dremote.address=scp://root:password@10.10.1.29 -Dremote.location=/opt/test-mediacube -P plugins"/>\r
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
+    <booleanAttribute key="M2_OFFLINE" value="false"/>\r
+    <stringAttribute key="M2_PROFILES" value=""/>\r
+    <listAttribute key="M2_PROPERTIES"/>\r
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
+    <intAttribute key="M2_THREADS" value="1"/>\r
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>\r
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+    </listAttribute>\r
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/-modules"/>\r
 </launchConfiguration>\r

diff --git a/server/-product/production/LOCAL/settings/application.yaml b/server/-product/production/LOCAL/settings/application.yaml
index 36d9dcda2f0ab6c9dfab1722b0cf5dcb3de76841..22633291b032022b443b914448dc4832bd01b732 100644 (file)
--- a/server/-product/production/LOCAL/settings/application.yaml
+++ b/server/-product/production/LOCAL/settings/application.yaml
@@ -1,6 +1,6 @@
 datasource:\r
   mediacube:\r
-    url: jdbc:db2://localvm:50000/mc\r
+    url: jdbc:db2://localhost:50000/testmc\r
     user: db2admin\r
     password: password\r
     external-indexer: true\r
@@ -8,7 +8,7 @@ datasource:
     login-timeout: 5\r
     pool-size: 10\r
   mediacube-nosql:\r
-    url: jdbc:db2://localvm:50000/mc\r
+    url: jdbc:db2://localhost:50000/testmc\r
     user: db2admin\r
     password: password\r
     schema: test\r

diff --git a/server/user.jobengine.osgi.db/migrations/environments/development.properties b/server/user.jobengine.osgi.db/migrations/environments/development.properties
index 0113161c14a604ed2bf4d5c18f2d9e2068e4e508..18913111f8b58ff724ef9a8323dcb93f643f9151 100644 (file)
--- a/server/user.jobengine.osgi.db/migrations/environments/development.properties
+++ b/server/user.jobengine.osgi.db/migrations/environments/development.properties
@@ -22,8 +22,8 @@ time_zone=GMT+0:00
 
 ## JDBC connection properties.
 driver=com.ibm.db2.jcc.DB2Driver
-url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;
-username=db2admin
+url=jdbc:db2://localhost:50000/testmc:retrieveMessagesFromServerOnGetMessage=true;
+username=db2inst1
 password=password
 
 #