src/build.xml
changeset 30503 ee2cadcd63f1
parent 24988 78440a0c23d0
child 30507 73015cd0c0fa
equal deleted inserted replaced
30502:699255554d73 30503:ee2cadcd63f1
    11  * "AS IS" basis, WITHOUT WARRANTY OF  ANY KIND, either express or 
    11  * "AS IS" basis, WITHOUT WARRANTY OF  ANY KIND, either express or 
    12  * implied. See the License for the specific language governing rights 
    12  * implied. See the License for the specific language governing rights 
    13  * and  limitations under the License. 
    13  * and  limitations under the License. 
    14  * The Original Code is Openbravo ERP. 
    14  * The Original Code is Openbravo ERP. 
    15  * The Initial Developer of the Original Code is Openbravo SLU 
    15  * The Initial Developer of the Original Code is Openbravo SLU 
    16  * All portions are Copyright (C) 2005-2014 Openbravo SLU 
    16  * All portions are Copyright (C) 2005-2016 Openbravo SLU 
    17  * All Rights Reserved. 
    17  * All Rights Reserved. 
    18  * Contributor(s): Openbravo S.L.U.
    18  * Contributor(s): Openbravo S.L.U.
    19  ************************************************************************
    19  ************************************************************************
    20 -->
    20 -->
    21 
    21 
    71 
    71 
    72   <property name="base.translate.structure" value="org/openbravo/erpWindows" />
    72   <property name="base.translate.structure" value="org/openbravo/erpWindows" />
    73   <property name="extension" value="html" />
    73   <property name="extension" value="html" />
    74   <property name="src" value="." />
    74   <property name="src" value="." />
    75   <property name="tr" value="yes" />
    75   <property name="tr" value="yes" />
       
    76 
       
    77   <condition property="exclude.cdi">
       
    78     <equals arg1="wildfly" arg2="${application.server}" />
       
    79   </condition>
       
    80 
    76   <condition property="translation">
    81   <condition property="translation">
    77     <not>
    82     <not>
    78       <equals arg1="no" arg2="${tr}" />
    83       <equals arg1="no" arg2="${tr}" />
    79     </not>
    84     </not>
    80   </condition>
    85   </condition>
   509     </copy>
   514     </copy>
   510 
   515 
   511     <copy todir="${base.context}/WEB-INF/lib" encoding="UTF-8">
   516     <copy todir="${base.context}/WEB-INF/lib" encoding="UTF-8">
   512       <fileset dir="${base.modules}">
   517       <fileset dir="${base.modules}">
   513         <include name="*/lib/runtime/**" />
   518         <include name="*/lib/runtime/**" />
       
   519         <exclude if="exclude.cdi" name="org.openbravo.base.weld/lib/runtime/weld*"/>
       
   520         <exclude if="exclude.cdi" name="org.openbravo.base.weld/lib/runtime/*api*"/>
       
   521         <exclude if="exclude.cdi" name="org.openbravo.base.weld/lib/runtime/javax*"/>
   514       </fileset>
   522       </fileset>
   515       <mapper type="regexp" from="(.*\${file.separator}lib\${file.separator}runtime)(.*)" to="\2" />
   523       <mapper type="regexp" from="(.*\${file.separator}lib\${file.separator}runtime)(.*)" to="\2" />
   516     </copy>
   524     </copy>
   517     <antcall target="build.web.folder" inheritAll="true" inheritrefs="true" />
   525     <antcall target="build.web.folder" inheritAll="true" inheritrefs="true" />
   518   </target>
   526   </target>