manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1852213 - in /manifoldcf/branches/CONNECTORS-1566: build.xml connectors/alfresco-webscript/build.xml connectors/cmis/build.xml connectors/csws/build.xml connectors/csws/pom.xml framework/build.xml framework/buildfiles/connector-build.xml
Date Sat, 26 Jan 2019 10:33:35 GMT
Author: kwright
Date: Sat Jan 26 10:33:35 2019
New Revision: 1852213

URL: http://svn.apache.org/viewvc?rev=1852213&view=rev
Log:
Undo previous commit

Removed:
    manifoldcf/branches/CONNECTORS-1566/connectors/csws/pom.xml
Modified:
    manifoldcf/branches/CONNECTORS-1566/build.xml
    manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml
    manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml
    manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml
    manifoldcf/branches/CONNECTORS-1566/framework/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=1852213&r1=1852212&r2=1852213&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/build.xml Sat Jan 26 10:33:35 2019
@@ -1550,12 +1550,6 @@ 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"/>
@@ -2321,18 +2315,6 @@ 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/alfresco-webscript/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml?rev=1852213&r1=1852212&r2=1852213&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/alfresco-webscript/build.xml Sat Jan 26
10:33:35 2019
@@ -45,6 +45,7 @@
             <include name="chemistry*.jar"/>
             <include name="stax*.jar"/>
             <include name="streambuffer*.jar"/>
+            <include name="jaxws*.jar"/>
             <include name="woodstox-core-asl*.jar"/>
             <include name="mimepull*.jar"/>
             <include name="resolver*.jar"/>

Modified: manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml?rev=1852213&r1=1852212&r2=1852213&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/cmis/build.xml Sat Jan 26 10:33:35 2019
@@ -60,12 +60,13 @@
             <include name="chemistry*.jar"/>
             <include name="stax*.jar"/>
             <include name="streambuffer*.jar"/>
+            <include name="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"/>
+        	  <include name="joda*.jar"/>
         </fileset>
     </path>
 
@@ -76,6 +77,7 @@
                 <include name="chemistry*.jar"/>
                 <include name="stax*.jar"/>
                 <include name="streambuffer*.jar"/>
+                <include name="jaxws*.jar"/>
                 <include name="woodstox-core-asl*.jar"/>
                 <include name="mimepull*.jar"/>
                 <include name="resolver*.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=1852213&r1=1852212&r2=1852213&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/connectors/csws/build.xml Sat Jan 26 10:33:35 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-cxf">
+        <antcall target="classcreate-wsdl">
             <param name="wsdlname" value="wsdls/DocumentManagement.wsdl"/>
         </antcall>
-        <antcall target="classcreate-wsdl-cxf">
+        <antcall target="classcreate-wsdl">
             <param name="wsdlname" value="wsdls/Authentication.wsdl"/>
         </antcall>
-        <antcall target="classcreate-wsdl-cxf">
+        <antcall target="classcreate-wsdl">
             <param name="wsdlname" value="wsdls/ContentService.wsdl"/>
         </antcall>
-        <antcall target="classcreate-wsdl-cxf">
+        <antcall target="classcreate-wsdl">
             <param name="wsdlname" value="wsdls/MemberService.wsdl"/>
         </antcall>
     </target>

Modified: manifoldcf/branches/CONNECTORS-1566/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1566/framework/build.xml?rev=1852213&r1=1852212&r2=1852213&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1566/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1566/framework/build.xml Sat Jan 26 10:33:35 2019
@@ -175,7 +175,6 @@
             <include name="parso*.jar"/>
             <include name="dec*.jar"/>
             <include name="cxf-*.jar"/>
-            <include name="jaxws*.jar"/>
             <include name="neethi*.jar"/>
             <include name="xmlschema-core*.jar"/>
             <include name="javax.annotation-api*.jar"/>
@@ -1617,7 +1616,6 @@
                 <include name="parso*.jar"/>
                 <include name="dec*.jar"/>
                 <include name="cxf-*.jar"/>
-                <include name="jaxws*.jar"/>
                 <include name="neethi*.jar"/>
                 <include name="xmlschema-core*.jar"/>
                 <include name="javax.annotation-api*.jar"/>

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=1852213&r1=1852212&r2=1852213&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:33:35 2019
@@ -219,7 +219,6 @@
             <include name="cxf-rt-frontend-jaxrs*.jar"/>
             <include name="cxf-rt-transports-http*.jar"/>
             <include name="cxf-rt-rs-client*.jar"/>
-            <include name="jaxws*.jar"/>
             <include name="xmlschema-core*.jar"/>
             <include name="javax.annotation-api*.jar"/>
             <include name="javax.ws.rs-api*.jar"/>
@@ -408,28 +407,6 @@
             </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"/>
@@ -451,8 +428,6 @@
             <arg value="--timeout"/>
             <arg value="0"/>
             <arg value="--noImports"/>
-            <arg value="-v"/>
-	  <arg value="-a"/>
             <arg value="-o"/>
             <arg value="build/wsdljava"/>
             <arg value="${wsdlname}"/>



Mime
View raw message