mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
9
pom.xml
9
pom.xml
@@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.tomcat.path>/alfresco</maven.tomcat.path>
|
<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.port>${tomcat.default.alfresco.port}</maven.tomcat.port>
|
||||||
<maven.tomcat.httpsPort>${tomcat.default.alfresco.ssl.port}</maven.tomcat.httpsPort>
|
<maven.tomcat.httpsPort>${tomcat.default.alfresco.ssl.port}</maven.tomcat.httpsPort>
|
||||||
</properties>
|
</properties>
|
||||||
@@ -226,7 +227,7 @@
|
|||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<!-- ACE-2318 Bring alfresco-jmxrmi.* from repository -->
|
<!-- ACE-2318 Bring alfresco-jmxrmi.* from repository -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>fetch-jmxrmi-properties</id>
|
<id>fetch-jmxrmi-properties</id>
|
||||||
@@ -319,7 +320,7 @@
|
|||||||
<asWebapp>true</asWebapp>
|
<asWebapp>true</asWebapp>
|
||||||
<contextFile>${runtime.tomcat.conf.folder}/solr-context.xml</contextFile>
|
<contextFile>${runtime.tomcat.conf.folder}/solr-context.xml</contextFile>
|
||||||
</webapp>
|
</webapp>
|
||||||
</webapps>
|
</webapps>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
@@ -339,8 +340,8 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
Reference in New Issue
Block a user