From a702e4e08b46e3f75d6cb3aa5819c10c65f29b5b Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <Jamal.kaabimofrad@alfresco.com>
Date: Tue, 10 May 2016 10:48:46 +0000
Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)    121471
 jvonka: FileFolder API - add utf8Encoding=UTF-8 for tomcat7-maven-plugin when
 running repo    - as per installer & old dev env (=> tomcat7 server.xml    -
 this fixes "relativePath" for uri encoding of params (for utf-8 encoded
 characters in folder/file name)    RA-755

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 19ed3221e6..9e07736e0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
 
     <properties>
         <maven.tomcat.path>/alfresco</maven.tomcat.path>
+        <maven.tomcat.uriEncoding>UTF-8</maven.tomcat.uriEncoding>
         <maven.tomcat.port>${tomcat.default.alfresco.port}</maven.tomcat.port>
         <maven.tomcat.httpsPort>${tomcat.default.alfresco.ssl.port}</maven.tomcat.httpsPort>
     </properties>
@@ -226,7 +227,7 @@
 
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <executions> 
+                <executions>
                     <!-- ACE-2318 Bring alfresco-jmxrmi.* from repository -->
                     <execution>
                         <id>fetch-jmxrmi-properties</id>
@@ -319,7 +320,7 @@
                             <asWebapp>true</asWebapp>
                             <contextFile>${runtime.tomcat.conf.folder}/solr-context.xml</contextFile>
                         </webapp>
-                    </webapps> 
+                    </webapps>
                 </configuration>
             </plugin>
         </plugins>
@@ -339,8 +340,8 @@
                 <dependency>
                     <groupId>mysql</groupId>
                     <artifactId>mysql-connector-java</artifactId>
-                </dependency>            
+                </dependency>
             </dependencies>
        </profile>
-    </profiles>   
+    </profiles>
 </project>