cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1050114 - in /cxf/branches/2.3.x-fixes: ./ tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
Date Thu, 16 Dec 2010 19:31:55 GMT
Author: dkulp
Date: Thu Dec 16 19:31:54 2010
New Revision: 1050114

URL: http://svn.apache.org/viewvc?rev=1050114&view=rev
Log:
Merged revisions 1050113 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1050113 | dkulp | 2010-12-16 14:30:38 -0500 (Thu, 16 Dec 2010) | 1 line
  
  [CXF-3196] Add endorsed things to generated build.xml
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 16 19:31:54 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102,1050113

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm?rev=1050114&r1=1050113&r2=1050114&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm
Thu Dec 16 19:31:54 2010
@@ -88,10 +88,24 @@
 
     <property name="cxf.etc.dir" location="${cxf.home}/etc"/>
 
+    <condition property="cxf.endorsed.dir" value="${cxf.home}/lib/endorsed">
+        <available file="${cxf.home}/lib/endorsed" type="dir" property=""/>
+    </condition>
+    <condition property="cxf.endorsed.flag" value="-Djava.endorsed.dirs=${cxf.endorsed.dir}">
+        <available file="${cxf.home}/lib/endorsed" type="dir" property=""/>
+    </condition>
+    <property name="cxf.endorsed.dir" location="${cxf.home}"/>
+    <property name="cxf.endorsed.flag" value="-Dnone=none"/>
+
+
+
     <path id="cxf.classpath">
         <pathelement location="${home.dir}" /> 
         <pathelement location="${build.classes.dir}"/>
         <pathelement location="${cxf-manifest.jar.file}"/>
+        <fileset dir="${cxf.endorsed.dir}">
+            <include name="*.jar"/>
+        </fileset>
     </path>
 
 #foreach ($targetName in $clientClassNamesMap.keySet())
@@ -115,7 +129,8 @@
 
     <target name="compile">
         <mkdir dir="${build.classes.dir}"/>
-        <javac srcdir="${build.src.dir}" destdir="${build.classes.dir}" debug="true">
+        <javac srcdir="${build.src.dir}" destdir="${build.classes.dir}" debug="true" fork="true">
+            <compilerarg line="-J${cxf.endorsed.flag}"/>
             <classpath refid="cxf.classpath" />
         </javac>
     </target>
@@ -159,6 +174,7 @@
                 <arg value="@{param3}"/>
                 <arg value="@{param4}"/>
                 <arg value="@{param5}"/>
+                <jvmarg value="${cxf.endorsed.flag}"/>
                 <jvmarg value="@{jvmarg1}"/>
                 <jvmarg value="@{jvmarg2}"/>
                 <jvmarg value="@{jvmarg3}"/>



Mime
View raw message