manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1600700 - in /manifoldcf/trunk: build.xml connectors/alfresco/build.xml connectors/alfresco/pom.xml framework/build.xml framework/core/pom.xml
Date Thu, 05 Jun 2014 17:08:18 GMT
Author: kwright
Date: Thu Jun  5 17:08:18 2014
New Revision: 1600700

URL: http://svn.apache.org/r1600700
Log:
Fix for CONNECTORS-957.

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/alfresco/build.xml
    manifoldcf/trunk/connectors/alfresco/pom.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/core/pom.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1600700&r1=1600699&r2=1600700&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Thu Jun  5 17:08:18 2014
@@ -1321,8 +1321,13 @@ Use Apache Forrest version forrest-0.9-d
     </target>
     
     <target name="download-wss4j">
-        <!-- This dependency is for alfresco, so download their patched jar from their
svn -->
-        <get src="https://maven.alfresco.com/nexus/content/groups/public/org/apache/ws/security/wss4j/1.5.4-patched/wss4j-1.5.4-patched.jar"
dest="lib/wss4j.jar"/>
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/apache/ws/security"/>
+            <param name="artifact-version" value="1.5.12"/>
+            <param name="artifact-name" value="wss4j"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
     
     <target name="download-xmlgraphics-commons">

Modified: manifoldcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/build.xml?rev=1600700&r1=1600699&r2=1600700&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/build.xml Thu Jun  5 17:08:18 2014
@@ -58,7 +58,6 @@
         <fileset dir="../../lib">
             <include name="jaxrpc*.jar"/>
             <include name="opensaml*.jar"/>
-            <include name="wss4j*.jar"/>
             <include name="xmlsec*.jar"/>
         </fileset>
     </path>
@@ -75,7 +74,6 @@
             <fileset dir="../../lib">
                 <include name="jaxrpc*.jar"/>
                 <include name="opensaml*.jar"/>
-                <include name="wss4j*.jar"/>
                 <include name="xmlsec*.jar"/>
             </fileset>
         </copy>

Modified: manifoldcf/trunk/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/pom.xml?rev=1600700&r1=1600699&r2=1600700&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/pom.xml Thu Jun  5 17:08:18 2014
@@ -275,11 +275,6 @@
       <version>1.6.2</version>
     </dependency>
     <dependency>
-      <groupId>wss4j</groupId>
-      <artifactId>wss4j</artifactId>
-      <version>1.5.1</version>
-    </dependency>
-    <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
       <version>2.7.0</version>

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1600700&r1=1600699&r2=1600700&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Thu Jun  5 17:08:18 2014
@@ -36,6 +36,7 @@
             <include name="geronimo-javamail_1.4_spec*.jar"/>
             <include name="commons-discovery*.jar"/>
             <include name="axis*.jar"/>
+            <include name="wss4j*.jar"/>
             <include name="saaj*.jar"/>
             <include name="wsdl4j*.jar"/>
             <include name="activation*.jar"/>
@@ -326,6 +327,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -375,6 +377,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -429,6 +432,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -479,6 +483,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -534,6 +539,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -592,6 +598,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -657,6 +664,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -717,6 +725,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -846,6 +855,7 @@
                 <include name="geronimo-javamail_1.4_spec*.jar"/>
                 <include name="commons-discovery*.jar"/>
                 <include name="axis*.jar"/>
+                <include name="wss4j*.jar"/>
                 <include name="saaj*.jar"/>
                 <include name="wsdl4j*.jar"/>
                 <include name="activation*.jar"/>
@@ -1021,6 +1031,7 @@
         <antcall target="general-jetty-add-lib-classpath"><param name="lib-jar"
value="commons-discovery.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <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="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>
@@ -1063,6 +1074,7 @@
         <antcall target="general-combined-add-lib-classpath"><param name="lib-jar"
value="commons-discovery.jar"/><param name="processes-dir" value="${processes-dir}"/></antcall>
         <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="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>
@@ -1105,6 +1117,7 @@
         <antcall target="general-add-lib-classpath"><param name="lib-jar" value="commons-discovery.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
         <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="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>
@@ -1399,8 +1412,9 @@
         <property name="manifest-cp-70" value="${manifest-cp-69} ../lib/saaj-api.jar"/>
         <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" value="${manifest-cp-72}"/>
+        <property name="manifest-cp" value="${manifest-cp-73}"/>
         <mkdir dir="build/example"/>
         <manifest file="build/example/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
@@ -1503,8 +1517,9 @@
         <property name="manifest-cp-proprietary-72" value="${manifest-cp-proprietary-71}
../lib/saaj-api.jar"/>
         <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" value="${manifest-cp-proprietary-74}"/>
+        <property name="manifest-cp-proprietary" value="${manifest-cp-proprietary-75}"/>
         <mkdir dir="build/example-proprietary"/>
         <manifest file="build/example-proprietary/manifest">
             <attribute name="Main-Class" value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>

Modified: manifoldcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1600700&r1=1600699&r2=1600700&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/pom.xml (original)
+++ manifoldcf/trunk/framework/core/pom.xml Thu Jun  5 17:08:18 2014
@@ -120,6 +120,11 @@
       <version>${axis.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.ws.security</groupId>
+      <artifactId>wss4j</artifactId>
+      <version>1.5.12</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis-jaxrpc</artifactId>
       <version>${axis.version}</version>



Mime
View raw message