Merge branch 'master' into db-purge

Conflicts:
	wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties

wise-webapp/src/main/webapp/WEB-INF/app.properties

@@ -80,8 +80,10 @@ google.recaptcha.publicKey =  6LeQ4tISAAAAALzCGKNgRv8UqsDx7Cb0vq4wbJBr
 # etc.
 admin.user = admin@wisemapping.org
 
-# Site URL. This url will be used during sharing emails and public views.
-site.baseurl = http://localhost:8080/wisemapping
+# Base URL where WiseMapping is deployed. By default, It will be automatically inferred.
+# If you are planning to put wisemapping behind an Apache using an Apache Proxy setup, you must enable this property.
+# site.baseurl = http:///example.com:8080/wisemapping
+
 
 # Site Homepage URL. This will be used as URL for homepage location.
 site.homepage = c/home

wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties

@@ -4,7 +4,8 @@ log4j.logger.com.wisemapping=WARN,stdout,R
 log4j.logger.org.springframework=WARN,stdout,R
 log4j.logger.org.codehaus.jackson=WARN,stdout,R
 log4j.logger.org.hibernate=WARN,stdout,R
-log4j.logger.org.hibernate.SQL=true
+log4j.logger.org.hibernate.engine.StatefulPersistenceContext=ERROR,stdout,R
+#log4j.logger.org.hibernate.SQL=WARN,stdout,R
 
 
 # Stdout logger <20>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml

@@ -7,9 +7,6 @@
 		http://www.springframework.org/schema/context
 		http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
-    <context:property-placeholder location="/WEB-INF/app.properties"/>
-
-
     <bean id="wiseDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
         <property name="driverClassName" value="${database.driver}"/>
         <property name="url" value="${database.url}"/>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml

@@ -11,8 +11,6 @@
           http://www.springframework.org/schema/context
           http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <context:property-placeholder location="/WEB-INF/app.properties"/>
-
     <bean id="encoder"
           class="com.wisemapping.security.CustomPasswordEncoder"/>
 
@@ -72,9 +70,4 @@
         <property name="userService" ref="userService"/>
         <property name="adminUser" value="${admin.user}"/>
     </bean>
-
-    <beans profile="heroku">
-        <context:property-placeholder location="/WEB-INF/heroku.properties"/>
-    </beans>
-
 </beans>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        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
-		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+
+    <context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
 
     <bean id="mailer" class="com.wisemapping.mail.Mailer" scope ="singleton">
         <constructor-arg index="0" value="${mail.serverSendEmail}"/>

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

@@ -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>