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 2014/11/17 16:09:27 UTC
svn commit: r1640169 - in /manifoldcf/trunk/framework: ./ connector-common/src/main/resources/ connector-common/src/main/resources/org/ connector-common/src/main/resources/org/apache/ connector-common/src/main/resources/org/apache/manifoldcf/ connector...

Author: kwright
Date: Mon Nov 17 15:09:26 2014
New Revision: 1640169

URL: http://svn.apache.org/r1640169
Log:
Fix problems related to CONNECTORS-1085.

Added:
    manifoldcf/trunk/framework/connector-common/src/main/resources/
    manifoldcf/trunk/framework/connector-common/src/main/resources/org/
    manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/
    manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/
    manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/
    manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/
    manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd
      - copied, changed from r1640168, manifoldcf/trunk/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd
Removed:
    manifoldcf/trunk/framework/core/src/main/resources/
Modified:
    manifoldcf/trunk/framework/build.xml

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1640169&r1=1640168&r2=1640169&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Mon Nov 17 15:09:26 2014
@@ -152,9 +152,6 @@
     
     <target name="compile-core">
         <mkdir dir="build/core/classes"/>
-        <copy todir="build/core/classes">
-            <fileset dir="core/src/main/resources"/>
-        </copy>
         <javac srcdir="core/src/main/java" destdir="build/core/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>
@@ -185,6 +182,9 @@
 
     <target name="compile-connector-common" depends="compile-core,compile-agents,compile-ui-core">
         <mkdir dir="build/connector-common/classes"/>
+        <copy todir="build/connector-common/classes">
+            <fileset dir="connector-common/src/main/resources"/>
+        </copy>
         <javac srcdir="connector-common/src/main/java" destdir="build/connector-common/classes" deprecation="true" target="1.7" source="1.7" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
             <classpath>
                 <path refid="framework-classpath"/>

Copied: manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd (from r1640168, manifoldcf/trunk/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd?p2=manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd&p1=manifoldcf/trunk/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd&r1=1640168&r2=1640169&rev=1640169&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/resources/org/apache/manifoldcf/core/common/client-config.wsdd (original)
+++ manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd Mon Nov 17 15:09:26 2014
@@ -20,7 +20,7 @@
   <globalConfiguration> 
     <parameter name="disablePrettyXML" value="true"/> 
   </globalConfiguration> 
-  <transport name="http" pivot="java:org.apache.manifoldcf.core.common.CommonsHTTPSender"> 
+  <transport name="http" pivot="java:org.apache.manifoldcf.connectorcommon.common.CommonsHTTPSender"> 
     <parameter name="SO_TIMEOUT" locked="false">60000</parameter>
   </transport>
   <!-- transport name="http" pivot="java:org.apache.axis.transport.http.HTTPSender"/ -->