Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

97182: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97112: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97042: MNT-12462: Can no space restriction on Alfresco installation directory be now removed?
            - replaced property commandMap with commandsAndArguments as commandMap does not process spaces and also deprecated


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-02-17 10:02:58 +00:00
parent 5d45c38a06
commit e397049530

View File

@@ -9,10 +9,13 @@
</property> </property>
<property name="checkCommand"> <property name="checkCommand">
<bean class="org.alfresco.util.exec.RuntimeExec"> <bean class="org.alfresco.util.exec.RuntimeExec">
<property name="commandMap"> <property name="commandsAndArguments">
<map> <map>
<entry key=".*"> <entry key=".*">
<value>${swf.exe} -V</value> <list>
<value>${swf.exe}</value>
<value>-V</value>
</list>
</entry> </entry>
</map> </map>
</property> </property>
@@ -23,10 +26,22 @@
</property> </property>
<property name="transformCommand"> <property name="transformCommand">
<bean class="org.alfresco.util.exec.RuntimeExec"> <bean class="org.alfresco.util.exec.RuntimeExec">
<property name="commandMap"> <property name="commandsAndArguments">
<map> <map>
<entry key=".*"> <entry key=".*">
<value>${swf.exe} -T ${flashVersion} ${swf.encoder.params} ${source} -o ${target} -s languagedir=${swf.languagedir} -p ${pageRange}</value> <list>
<value>${swf.exe}</value>
<value>-T</value>
<value>${flashVersion}</value>
<value>${swf.encoder.params}</value>
<value>${source}</value>
<value>-o</value>
<value>${target}</value>
<value>-s</value>
<value>languagedir=${swf.languagedir}</value>
<value>-p</value>
<value>${pageRange}</value>
</list>
</entry> </entry>
</map> </map>
</property> </property>