Author: kwright
Date: Fri Sep 6 20:35:08 2019
New Revision: 1866532
URL: http://svn.apache.org/viewvc?rev=1866532&view=rev
Log:
Merge CONNECTORS-1566 branch
Added:
manifoldcf/trunk/connectors/csws/
- copied from r1866531,
manifoldcf/branches/CONNECTORS-1566/connectors/csws/
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/alfresco-webscript/build.xml
manifoldcf/trunk/connectors/cmis/build.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/interfaces/IKeystoreManager.java
manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/keystore/KeystoreManager.java
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 6 20:35:08 2019
@@ -82,6 +82,7 @@
/manifoldcf/branches/CONNECTORS-1490:1837603-1837874
/manifoldcf/branches/CONNECTORS-1498:1857776-1858065
/manifoldcf/branches/CONNECTORS-1500:1827007-1827087
+/manifoldcf/branches/CONNECTORS-1566:1850692-1866531
/manifoldcf/branches/CONNECTORS-1618:1865236-1865272
/manifoldcf/branches/CONNECTORS-470:1349741-1360750,1360808
/manifoldcf/branches/CONNECTORS-474:1349741-1353803
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1866532&r1=1866531&r2=1866532&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Sep 6 20:35:08 2019
@@ -2372,6 +2372,42 @@ 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-rt-transports-http-hc"/>
+ <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-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-validator"/>
+ <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-wsdlto-frontend-jaxws"/>
+ <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-wsdlto-databinding-jaxb"/>
+ <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/trunk/connectors/alfresco-webscript/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/build.xml?rev=1866532&r1=1866531&r2=1866532&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/build.xml Fri Sep 6
20:35:08 2019
@@ -45,12 +45,12 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws*.jar"/>
+ <include name="jaxws-api*.jar"/>
+ <include name="cxf-rt-frontend-jaxws*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
<include name="org.osgi.core*.jar"/>
- <!-- include name="commons-lang*.jar"/ -->
<include name="joda*.jar"/>
</fileset>
</path>
Modified: manifoldcf/trunk/connectors/cmis/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/build.xml?rev=1866532&r1=1866531&r2=1866532&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/build.xml (original)
+++ manifoldcf/trunk/connectors/cmis/build.xml Fri Sep 6 20:35:08 2019
@@ -60,12 +60,11 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws*.jar"/>
+ <include name="jaxws-api*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
<include name="org.osgi.core*.jar"/>
- <!-- include name="commons-lang*.jar"/ -->
<include name="joda*.jar"/>
</fileset>
</path>
@@ -77,7 +76,7 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws*.jar"/>
+ <include name="jaxws-api*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1866532&r1=1866531&r2=1866532&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Fri Sep 6 20:35:08 2019
@@ -176,6 +176,7 @@
<include name="dec*.jar"/>
<include name="cxf-*.jar"/>
<include name="neethi*.jar"/>
+ <include name="xml-resolver*.jar"/>
<include name="xmlschema-core*.jar"/>
<include name="javax.annotation-api*.jar"/>
<include name="javax.ws.rs-api*.jar"/>
@@ -1623,6 +1624,7 @@
<include name="dec*.jar"/>
<include name="cxf-*.jar"/>
<include name="neethi*.jar"/>
+ <include name="xml-resolver*.jar"/>
<include name="xmlschema-core*.jar"/>
<include name="javax.annotation-api*.jar"/>
<include name="javax.ws.rs-api*.jar"/>
