inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
118336 slanglois: ACE-4709 Stop relying on system JAVA_OPTS when installing: Tomcat fails to start on some Windows


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-11-23 11:32:04 +00:00
parent 2d1f99eb43
commit 336e09c1b0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/bitrock/tomcat.xml
View File

@@ -531,7 +531,7 @@ export LD_LIBRARY_PATH
<path>${application_server_directory}/bin/setenv.bat</path> <path>${application_server_directory}/bin/setenv.bat</path>
<text>set JAVA_HOME=${java_home_directory.dos} <text>set JAVA_HOME=${java_home_directory.dos}
set JRE_HOME=%JAVA_HOME% set JRE_HOME=%JAVA_HOME%
set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows} %JAVA_OPTS% set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows}
</text> </text>
<ruleList> <ruleList>
<platformTest type="windows"/> <platformTest type="windows"/>
@@ -542,7 +542,7 @@ set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows} %JA
<path>${application_server_directory}/bin/setenv.bat</path> <path>${application_server_directory}/bin/setenv.bat</path>
<text>set JAVA_HOME=${java_home_directory.dos} <text>set JAVA_HOME=${java_home_directory.dos}
set JRE_HOME=%JAVA_HOME%\jre set JRE_HOME=%JAVA_HOME%\jre
set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows} %JAVA_OPTS% set JAVA_OPTS=${tomcat_extra_opts_windows} ${tomcat_memory_settings_windows}
</text> </text>
<ruleList> <ruleList>
<platformTest type="windows"/> <platformTest type="windows"/>

2
src/main/resources/extract-binaries.xml
View File

@@ -47,6 +47,8 @@
<!-- Accommodate poor Cygwin users --> <!-- Accommodate poor Cygwin users -->
<pathconvert property="maven.localrepo" targetos="unix"> <pathconvert property="maven.localrepo" targetos="unix">
<map from="C:" to="/c" /> <map from="C:" to="/c" />
<map from="D:" to="/d" />
<map from="E:" to="/e" />
<path> <path>
<pathelement path="${settings.localRepository}"/> <pathelement path="${settings.localRepository}"/>
</path> </path>