zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Apache Proxy configuration property.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-04 18:17:32 -03:00
parent 5cb2289cbc
commit 37b4298579
14 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@@ -14,9 +14,7 @@
<context:component-scan base-package="com.wisemapping.ncontroller"/>
<context:annotation-config/>
<mvc:annotation-driven/>
<context:property-placeholder
location="/WEB-INF/app.properties"
/>
<context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
<!-- Interceptors Registration -->
<mvc:interceptors>
@@ -38,18 +36,8 @@
</set>
</property>
</bean>
<bean id="userLocaleInterceptor" class="com.wisemapping.filter.UserLocaleInterceptor">
</bean>
<bean id="requestInterceptor" class="com.wisemapping.filter.RequestPropertiesInterceptor">
<property name="attributes">
<map>
<entry key="google.analytics.enabled" value="${google.analytics.enabled}"/>
<entry key="google.analytics.account" value="${google.analytics.account}"/>
<entry key="google.ads.enabled" value="${google.ads.enabled}"/>
<entry key="site.homepage" value="${site.homepage}"/>
</map>
</property>
</bean>
<bean id="userLocaleInterceptor" class="com.wisemapping.filter.UserLocaleInterceptor"/>
<bean id="requestInterceptor" class="com.wisemapping.filter.RequestPropertiesInterceptor"/>
</mvc:interceptors>
@@ -110,10 +98,4 @@
</list>
</property>
</bean>
<beans profile="heroku">
<context:property-placeholder
location="/WEB-INF/heroku.properties"
/>
</beans>
</beans>