11_15_vds

JavaOPs · JavaOPs · commit b617ff2e9a50 · 2026-04-23T15:21:27.000+03:00
diff --git a/config/db.properties b/config/db.properties
@@ -0,0 +1,8 @@
+database.url=jdbc:postgresql://localhost:5432/topjava
+database.username=user
+database.password=password
+database.init=false
+jdbc.initLocation=classpath:db/initDB.sql
+jpa.showSql=false
+hibernate.format_sql=false
+hibernate.use_sql_comments=false
diff --git a/src/main/resources/spring/spring-db.xml b/src/main/resources/spring/spring-db.xml
@@ -34,7 +34,16 @@
               p:password="${database.password}"/>
     </beans>
 
+    <beans profile="postgres">
+        <context:property-placeholder location="classpath:db/postgres.properties" system-properties-mode="OVERRIDE"/>
+    </beans>
+
+    <beans profile="vds">
+        <context:property-placeholder location="file:///#{systemEnvironment[TOPJAVA_ROOT]}/config/db.properties" system-properties-mode="OVERRIDE"/>
+    </beans>
+
     <beans profile="postgres,vds">
+
         <!--
             For postgres driver logging
             It uses java.util.logging and logged via jul-to-slf4j bridge
@@ -44,8 +53,6 @@
             <property name="staticMethod" value="org.slf4j.bridge.SLF4JBridgeHandler.install"/>
         </bean>
 
-        <context:property-placeholder location="classpath:db/postgres.properties" system-properties-mode="OVERRIDE"/>
-
         <bean id="dataSource"
               class="org.apache.tomcat.jdbc.pool.DataSource"
               p:driverClassName="org.postgresql.Driver"
