vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-23 06:27:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move app.properties definition

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2023-11-22 20:46:38 -08:00
parent 12b0bb4866
commit cd3d21f106
5 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wise-webapp/src/main/resources/spring/wisemapping-common.xml
View File

@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd"> http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<!-- <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">--> <context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
<!-- <property name="defaultEncoding" value="UTF-8"/>-->
<!-- <property name="basenames">-->
<!-- <list>-->
<!-- <value>messages</value>-->
<!-- </list>-->
<!-- </property>-->
<!-- </bean>-->
<import resource="wisemapping-datasource.xml"/> <import resource="wisemapping-datasource.xml"/>
<import resource="wisemapping-dao.xml"/> <import resource="wisemapping-dao.xml"/>

7
wise-webapp/src/main/resources/spring/wisemapping-datasource.xml
View File

@ -17,11 +17,4 @@
<property name="maxWaitMillis" value="10000"/> <property name="maxWaitMillis" value="10000"/>
<property name="validationQuery" value="${database.validation.query:SELECT 1}"/> <property name="validationQuery" value="${database.validation.query:SELECT 1}"/>
</bean> </bean>
<!-- Optional configuration for external connexion pool -->
<!-- <bean id="wiseDataSource" class="org.springframework.jndi.JndiObjectFactoryBean" >-->
<!-- <property name="jndiName">-->
<!-- <value>java:comp/env/jdbc/wisemapping</value>-->
<!-- </property>-->
<!-- </bean>-->
</beans> </beans>

2
wise-webapp/src/main/resources/spring/wisemapping-rest.xml
View File

@ -58,6 +58,4 @@
</list> </list>
</property> </property>
</bean> </bean>
<!-- Configuration Bean -->
<context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
</beans> </beans>

6
wise-webapp/src/main/resources/spring/wisemapping-service.xml
View File

@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/beans/spring-beans.xsd">
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
<context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl"> <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="host" value="${mail.smtp.host}"/> <property name="host" value="${mail.smtp.host}"/>

1
wise-webapp/src/main/resources/spring/wisemapping-servlet.xml
View File

@ -12,7 +12,6 @@
http://www.springframework.org/schema/mvc/spring-mvc.xsd"> http://www.springframework.org/schema/mvc/spring-mvc.xsd">
<context:component-scan base-package="com.wisemapping"/> <context:component-scan base-package="com.wisemapping"/>
<context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
<!-- Interceptors Registration --> <!-- Interceptors Registration -->
<mvc:interceptors> <mvc:interceptors>