Author: kwright
Date: Mon Sep 8 00:37:38 2014
New Revision: 1623250
URL: http://svn.apache.org/r1623250
Log:
Pull up fix for CONNECTORS-1023 from trunk.
Added:
manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
- copied unchanged from r1623249,
manifoldcf/trunk/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
Removed:
manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/connectors/alfresco/build.xml
manifoldcf/branches/dev_1x/framework/build.xml
manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1623249
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1623250&r1=1623249&r2=1623250&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Mon Sep 8 00:37:38 2014
@@ -3,6 +3,10 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1023: Fix Alfresco tests. They don't yet succeed, but
+at least they run, and the connector can communicate with Alfresco.
+(Karl Wright)
+
CONNECTORS-1021: Add more metadata for Jira connector.
(Daniel Aschaeur)
Modified: manifoldcf/branches/dev_1x/connectors/alfresco/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/alfresco/build.xml?rev=1623250&r1=1623249&r2=1623250&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/alfresco/build.xml (original)
+++ manifoldcf/branches/dev_1x/connectors/alfresco/build.xml Mon Sep 8
00:37:38 2014
@@ -56,9 +56,7 @@
<path refid="mcf-connector-build.connector-classpath"/>
<fileset dir="lib-proprietary" includes="*.jar"/>
<fileset dir="../../lib">
- <include name="jaxrpc*.jar"/>
- <include name="opensaml*.jar"/>
- <include name="xmlsec*.jar"/>
+ <!-- include name="jaxrpc*.jar"/ -->
</fileset>
</path>
@@ -72,9 +70,7 @@
<mkdir dir="dist/lib"/>
<copy todir="dist/lib">
<fileset dir="../../lib">
- <include name="jaxrpc*.jar"/>
- <include name="opensaml*.jar"/>
- <include name="xmlsec*.jar"/>
+ <!-- include name="jaxrpc*.jar"/ -->
</fileset>
</copy>
<mkdir dir="dist/lib-proprietary-only"/>
@@ -106,7 +102,7 @@
<target name="run-IT-derby" depends="compile-tests,pretest-check"
if="canTest">
<mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="128m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
+ <junit fork="true" maxmemory="1024m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
<jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
<jvmarg
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
Modified: manifoldcf/branches/dev_1x/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/build.xml?rev=1623250&r1=1623249&r2=1623250&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/build.xml (original)
+++ manifoldcf/branches/dev_1x/framework/build.xml Mon Sep 8 00:37:38 2014
@@ -39,6 +39,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -332,6 +334,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -382,6 +386,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -437,6 +443,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -488,6 +496,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -544,6 +554,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -603,6 +615,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -669,6 +683,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -730,6 +746,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -860,6 +878,8 @@
<include name="wss4j*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
<fileset dir="../lib">
@@ -1034,6 +1054,8 @@
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="wss4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="xmlsec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="opensaml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
@@ -1077,6 +1099,8 @@
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="wss4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="xmlsec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="opensaml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
@@ -1120,6 +1144,8 @@
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="wss4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="xmlsec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="opensaml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
<antcall target="general-add-lib-classpath"><param name="lib-jar"
value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
@@ -1415,8 +1441,10 @@
<property name="manifest-cp-71" value="${manifest-cp-70}
../lib/saaj-impl.jar"/>
<property name="manifest-cp-72" value="${manifest-cp-71}
../lib/activation.jar"/>
<property name="manifest-cp-73" value="${manifest-cp-72}
../lib/wss4j.jar"/>
+ <property name="manifest-cp-74" value="${manifest-cp-73}
../lib/xmlsec.jar"/>
+ <property name="manifest-cp-75" value="${manifest-cp-74}
../lib/opensaml.jar"/>
- <property name="manifest-cp" value="${manifest-cp-73}"/>
+ <property name="manifest-cp" value="${manifest-cp-75}"/>
<mkdir dir="build/example"/>
<manifest file="build/example/manifest">
<attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1520,8 +1548,10 @@
<property name="manifest-cp-proprietary-73"
value="${manifest-cp-proprietary-72} ../lib/saaj-impl.jar"/>
<property name="manifest-cp-proprietary-74"
value="${manifest-cp-proprietary-73} ../lib/activation.jar"/>
<property name="manifest-cp-proprietary-75"
value="${manifest-cp-proprietary-74} ../lib/wss4j.jar"/>
+ <property name="manifest-cp-proprietary-76"
value="${manifest-cp-proprietary-75} ../lib/xmlsec.jar"/>
+ <property name="manifest-cp-proprietary-77"
value="${manifest-cp-proprietary-76} ../lib/opensaml.jar"/>
- <property name="manifest-cp-proprietary"
value="${manifest-cp-proprietary-75}"/>
+ <property name="manifest-cp-proprietary"
value="${manifest-cp-proprietary-77}"/>
<mkdir dir="build/example-proprietary"/>
<manifest file="build/example-proprietary/manifest">
<attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
Modified: manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml?rev=1623250&r1=1623249&r2=1623250&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml
(original)
+++ manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml Mon Sep
8 00:37:38 2014
@@ -144,6 +144,9 @@
<include name="axis*.jar"/>
<include name="saaj*.jar"/>
<include name="wsdl4j*.jar"/>
+ <include name="wss4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
<include name="commons-discovery*.jar"/>
<include name="activation*.jar"/>
<include name="castor*.jar"/>
