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:12:12 UTC
svn commit: r1640170 - in /manifoldcf/branches/CONNECTORS-1104: ./
framework/build.xml framework/connector-common/src/main/resources/
framework/core/src/main/resources/
Author: kwright
Date: Mon Nov 17 15:12:11 2014
New Revision: 1640170
URL: http://svn.apache.org/r1640170
Log:
Pull up another CONNECTORS-1085-related fix from trunk, so we can work
Added:
manifoldcf/branches/CONNECTORS-1104/framework/connector-common/src/main/resources/
- copied from r1640169, manifoldcf/trunk/framework/connector-common/src/main/resources/
Removed:
manifoldcf/branches/CONNECTORS-1104/framework/core/src/main/resources/
Modified:
manifoldcf/branches/CONNECTORS-1104/ (props changed)
manifoldcf/branches/CONNECTORS-1104/framework/build.xml
Propchange: manifoldcf/branches/CONNECTORS-1104/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1640169
Modified: manifoldcf/branches/CONNECTORS-1104/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/framework/build.xml?rev=1640170&r1=1640169&r2=1640170&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1104/framework/build.xml Mon Nov 17 15:12:11 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"/>