manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1625449 - in /manifoldcf/branches/release-1.7-branch: ./ connectors/alfresco/ connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/ framework/ framework/buildfiles/
Date Wed, 17 Sep 2014 01:21:04 GMT
Author: kwright
Date: Wed Sep 17 01:21:04 2014
New Revision: 1625449

URL: http://svn.apache.org/r1625449
Log:
Pull up fix for CONNECTORS-1023 from dev_1x branch

Added:
    manifoldcf/branches/release-1.7-branch/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
      - copied unchanged from r1623250, manifoldcf/branches/dev_1x/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
Removed:
    manifoldcf/branches/release-1.7-branch/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java
Modified:
    manifoldcf/branches/release-1.7-branch/   (props changed)
    manifoldcf/branches/release-1.7-branch/CHANGES.txt
    manifoldcf/branches/release-1.7-branch/connectors/alfresco/build.xml
    manifoldcf/branches/release-1.7-branch/framework/build.xml
    manifoldcf/branches/release-1.7-branch/framework/buildfiles/connector-build.xml

Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/dev_1x:r1623250,1623315
  Merged /manifoldcf/trunk:r1623249,1623314

Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1625449&r1=1625448&r2=1625449&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Wed Sep 17 01:21:04 2014
@@ -4,6 +4,10 @@ $Id$
 
 ======================= Release 1.7.1 =====================
 
+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-1031: Fix Zookeeper synchronization to be resilient
 against short tick time settings.
 (Karl Wright)

Modified: manifoldcf/branches/release-1.7-branch/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/connectors/alfresco/build.xml?rev=1625449&r1=1625448&r2=1625449&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/connectors/alfresco/build.xml (original)
+++ manifoldcf/branches/release-1.7-branch/connectors/alfresco/build.xml Wed Sep 17 01:21:04
2014
@@ -57,8 +57,6 @@
         <fileset dir="lib-proprietary" includes="*.jar"/>
         <fileset dir="../../lib">
             <include name="jaxrpc*.jar"/>
-            <include name="opensaml*.jar"/>
-            <include name="xmlsec*.jar"/>
         </fileset>
     </path>
 
@@ -73,8 +71,6 @@
         <copy todir="dist/lib">
             <fileset dir="../../lib">
                 <include name="jaxrpc*.jar"/>
-                <include name="opensaml*.jar"/>
-                <include name="xmlsec*.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/release-1.7-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/framework/build.xml?rev=1625449&r1=1625448&r2=1625449&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-1.7-branch/framework/build.xml Wed Sep 17 01:21:04 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/release-1.7-branch/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/framework/buildfiles/connector-build.xml?rev=1625449&r1=1625448&r2=1625449&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/release-1.7-branch/framework/buildfiles/connector-build.xml Wed Sep
17 01:21:04 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"/>



Mime
View raw message