Author: kwright
Date: Thu Aug 13 10:56:41 2015
New Revision: 1695675
URL: http://svn.apache.org/r1695675
Log:
Merge CONNECTORS-1161 work into trunk.
Added:
manifoldcf/trunk/connectors/confluence/ (props changed)
- copied from r1695671,
manifoldcf/branches/CONNECTORS-1161/connectors/confluence/
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/connectors/pom.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 13 10:56:41 2015
@@ -50,6 +50,7 @@
/manifoldcf/branches/CONNECTORS-1131:1688002-1689229
/manifoldcf/branches/CONNECTORS-1134:1649449-1649604
/manifoldcf/branches/CONNECTORS-1160:1663182-1666294
+/manifoldcf/branches/CONNECTORS-1161:1695534-1695671
/manifoldcf/branches/CONNECTORS-1168:1666253-1668311
/manifoldcf/branches/CONNECTORS-1177:1670213-1670613
/manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451
Propchange: manifoldcf/trunk/connectors/confluence/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 13 10:56:41 2015
@@ -0,0 +1,10 @@
+build
+dist
+doc
+target
+test-output
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output
Modified: manifoldcf/trunk/connectors/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1695675&r1=1695674&r2=1695675&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Thu Aug 13 10:56:41 2015
@@ -65,6 +65,7 @@
<module>tika</module>
<module>documentfilter</module>
<module>searchblox</module>
+ <module>confluence</module>
</modules>
</project>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1695675&r1=1695674&r2=1695675&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Thu Aug 13
10:56:41 2015
@@ -194,6 +194,9 @@
<include name="castor*.jar"/>
<include name="geronimo-javamail_1.4_spec*.jar"/>
</fileset>
+ <fileset dir="${mcf-dist}/connector-lib">
+ <include name="guava*.jar"/>
+ </fileset>
<pathelement location="build/stubclasses"/>
<pathelement location="build/wsdlclasses"/>
<pathelement location="build/xsdclasses"/>
