You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2019/01/26 10:43:45 UTC
svn commit: r1852214 - in /manifoldcf/branches/CONNECTORS-1566: build.xml
connectors/csws/build.xml connectors/csws/pom.xml
framework/buildfiles/connector-build.xml
Author: kwright
Date: Sat Jan 26 10:43:45 2019
New Revision: 1852214
URL: http://svn.apache.org/viewvc?rev=1852214&view=rev
Log:
Reinstate commit for cxf, not including some changes
Added:
manifoldcf/branches/CONNECTORS-1566/connectors/csws/pom.xml
- copied unchanged from r1852212, manifoldcf/branches/CONNECTORS-1566/connectors/csws/pom.xml
Modified:
manifoldcf/branches/CONNECTORS-1566/build.xml
manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml
manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml
Modified: manifoldcf/branches/CONNECTORS-1566/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/build.xml?rev=1852214&r1=1852213&r2=1852214&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/build.xml Sat Jan 26 10:43:45 2019
@@ -1550,6 +1550,12 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="com/sun/xml/bind"/>
+ <param name="artifact-version" value="${jaxb-impl.version}"/>
+ <param name="artifact-name" value="jaxb-xjc"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/glassfish/jaxb"/>
<param name="artifact-version" value="${jaxb-glassfish.version}"/>
<param name="artifact-name" value="jaxb-core"/>
@@ -2315,6 +2321,18 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-cxf" depends="download-xml-resolver,download-asm,download-jaxb">
<antcall target="download-via-maven"><param name="target" value="lib"/>
<param name="project-path" value="org/apache/cxf"/>
+ <param name="artifact-name" value="cxf-tools-wsdlto-core"/>
+ <param name="artifact-version" value="${cxf.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/cxf"/>
+ <param name="artifact-name" value="cxf-tools-common"/>
+ <param name="artifact-version" value="${cxf.version}"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/cxf"/>
<param name="artifact-name" value="cxf-core"/>
<param name="artifact-version" value="${cxf.version}"/>
<param name="artifact-type" value="jar"/>
Modified: manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml?rev=1852214&r1=1852213&r2=1852214&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml Sat Jan 26 10:43:45 2019
@@ -31,16 +31,16 @@
<import file="${mcf-dist}/connector-build.xml"/>
<target name="classcreate-wsdls" depends="precompile-check" if="canBuild">
- <antcall target="classcreate-wsdl">
+ <antcall target="classcreate-wsdl-cxf">
<param name="wsdlname" value="wsdls/DocumentManagement.wsdl"/>
</antcall>
- <antcall target="classcreate-wsdl">
+ <antcall target="classcreate-wsdl-cxf">
<param name="wsdlname" value="wsdls/Authentication.wsdl"/>
</antcall>
- <antcall target="classcreate-wsdl">
+ <antcall target="classcreate-wsdl-cxf">
<param name="wsdlname" value="wsdls/ContentService.wsdl"/>
</antcall>
- <antcall target="classcreate-wsdl">
+ <antcall target="classcreate-wsdl-cxf">
<param name="wsdlname" value="wsdls/MemberService.wsdl"/>
</antcall>
</target>
Modified: manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml?rev=1852214&r1=1852213&r2=1852214&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/framework/buildfiles/connector-build.xml Sat Jan 26 10:43:45 2019
@@ -407,7 +407,30 @@
</and>
</condition>
</target>
-
+
+
+ <target name="classcreate-wsdl-cxf">
+ <mkdir dir="build/wsdljava"/>
+ <java classname="org.apache.cxf.tools.wsdlto.WSDLToJava" fork="true">
+ <classpath>
+ <fileset dir="${mcf-dist}/connector-common-lib">
+ <include name="cxf*.jar"/>
+ <include name="jaxws*.jar"/>
+ <include name="jaxb-impl*.java"/>
+ <include name="jaxb-xjc*.java"/>
+ <include name="wsdl4j*.java"/>
+ <include name="woodstox*.java"/>
+ </fileset>
+ </classpath>
+ <jvmarg value="-Dorg.apache.cxf.stax.allowInsecureParser=1"/>
+ <jvmarg value="-Dfile.encoding=UTF-8"/>
+ <arg value="-client"/>
+ <arg value="-d"/>
+ <arg value="build/wsdljava"/>
+ <arg value="${wsdlname}"/>
+ </java>
+ </target>
+
<target name="classcreate-wsdl">
<mkdir dir="build/wsdljava"/>
<java classname="org.apache.axis.wsdl.WSDL2Java" fork="true">