manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1308815 - in /incubator/lcf/branches/CONNECTORS-443: build.xml framework/build.xml
Date Tue, 03 Apr 2012 10:56:57 GMT
Author: kwright
Date: Tue Apr  3 10:56:57 2012
New Revision: 1308815

URL: http://svn.apache.org/viewvc?rev=1308815&view=rev
Log:
More dependencies from maven

Modified:
    incubator/lcf/branches/CONNECTORS-443/build.xml
    incubator/lcf/branches/CONNECTORS-443/framework/build.xml

Modified: incubator/lcf/branches/CONNECTORS-443/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/build.xml?rev=1308815&r1=1308814&r2=1308815&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/build.xml Tue Apr  3 10:56:57 2012
@@ -3090,39 +3090,31 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-h2">
         <mkdir dir="lib"/>
-        <antcall target="download-via-svn"><param name="target" value="lib"/>
-            <param name="project-desc" value="h2"/>
-            <param name="artifact-version" value="1.3.158"/>
-            <param name="artifact-name" value="h2"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
+        <!-- Alfresco dependency, so download from there -->
+        <get src="http://repo2.maven.org/maven2/com/h2database/h2/1.3.158/h2-1.3.158.jar"
dest="lib/h2.jar"/>
     </target>
     
     <target name="download-h2-support">
         <mkdir dir="lib"/>
-        <antcall target="download-via-svn"><param name="target" value="lib"/>
-            <param name="project-desc" value="h2-support"/>
-            <param name="artifact-version" value="1.1"/>
-            <param name="artifact-name" value="h2-support"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
+        <!-- Alfresco dependency, so download from there -->
+        <get src="http://clojars.org/repo/it/sk/alfresco/h2-support/1.1/h2-support-1.1.jar"
dest="lib/h2-support.jar"/>
     </target>
     
     <target name="download-tomcat">
         <mkdir dir="lib"/>
-        <property name="tomcat-version" value="6.0.24"/>
+        <property name="tomcat-version" value="6.0.35"/>
         <property name="tomcat-package" value="org/apache/tomcat"/>
-        <property name="tomcat-description" value="tomcat"/>
-        <antcall target="download-via-svn"><param name="project-desc" value="${tomcat-description}"/><param
name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat-version}"/><param
name="target" value="lib"/>
+        
+        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param
name="artifact-version" value="${tomcat-version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jasper"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-svn"><param name="project-desc" value="${tomcat-description}"/><param
name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat-version}"/><param
name="target" value="lib"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param
name="artifact-version" value="${tomcat-version}"/><param name="target" value="lib"/>
             <param name="artifact-name" value="jasper-el"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-svn"><param name="project-desc" value="${tomcat-description}"/><param
name="project-path" value="${tomcat-package}"/><param name="artifact-version" value="${tomcat-version}"/><param
name="target" value="lib"/>
-            <param name="artifact-name" value="tomcat-juli"/>
+        <antcall target="download-via-maven"><param name="project-path" value="${tomcat-package}"/><param
name="artifact-version" value="${tomcat-version}"/><param name="target" value="lib"/>
+            <param name="artifact-name" value="juli"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>

Modified: incubator/lcf/branches/CONNECTORS-443/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/framework/build.xml?rev=1308815&r1=1308814&r2=1308815&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/framework/build.xml Tue Apr  3 10:56:57 2012
@@ -53,7 +53,7 @@
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
             <include name="servlet-api*.jar"/>
-            <include name="tomcat-juli*.jar"/>
+            <include name="juli*.jar"/>
             <include name="xalan*.jar"/>
             <include name="xercesImpl*.jar"/>
             <include name="xml-apis*.jar"/>
@@ -683,7 +683,7 @@
                 <include name="servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
-                <include name="tomcat-juli*.jar"/>
+                <include name="juli*.jar"/>
                 <include name="jsp-api*.jar"/>
             </fileset>
         </copy>
@@ -724,7 +724,7 @@
                 <include name="servlet-api*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
-                <include name="tomcat-juli*.jar"/>
+                <include name="juli*.jar"/>
                 <include name="jsp-api*.jar"/>
             </fileset>
         </copy>
@@ -784,7 +784,7 @@
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="servlet-api*.jar"/>
-                <include name="tomcat-juli*.jar"/>
+                <include name="juli*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
@@ -861,7 +861,7 @@
         <property name="manifest-cp-40" value="${manifest-cp-39} lib/postgresql.jar"/>
         <property name="manifest-cp-42" value="${manifest-cp-39} lib/serializer.jar"/>
         <property name="manifest-cp-43" value="${manifest-cp-42} lib/servlet-api.jar"/>
-        <property name="manifest-cp-44" value="${manifest-cp-43} lib/tomcat-juli.jar"/>
+        <property name="manifest-cp-44" value="${manifest-cp-43} lib/juli.jar"/>
         <property name="manifest-cp-45" value="${manifest-cp-44} lib/xalan.jar"/>
         <property name="manifest-cp-46" value="${manifest-cp-45} lib/xercesImpl.jar"/>
         <property name="manifest-cp-47" value="${manifest-cp-46} lib/xml-apis.jar"/>
@@ -903,7 +903,7 @@
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="servlet-api*.jar"/>
-                <include name="tomcat-juli*.jar"/>
+                <include name="juli*.jar"/>
                 <include name="xalan*.jar"/>
                 <include name="xercesImpl*.jar"/>
                 <include name="xml-apis*.jar"/>
@@ -986,7 +986,7 @@
         <property name="manifest-cp-proprietary-41" value="${manifest-cp-proprietary-40}
lib/mysql-connector-java.jar"/>
         <property name="manifest-cp-proprietary-42" value="${manifest-cp-proprietary-41}
lib/serializer.jar"/>
         <property name="manifest-cp-proprietary-43" value="${manifest-cp-proprietary-42}
lib/servlet-api.jar"/>
-        <property name="manifest-cp-proprietary-44" value="${manifest-cp-proprietary-43}
lib/tomcat-juli.jar"/>
+        <property name="manifest-cp-proprietary-44" value="${manifest-cp-proprietary-43}
lib/juli.jar"/>
         <property name="manifest-cp-proprietary-45" value="${manifest-cp-proprietary-44}
lib/xalan.jar"/>
         <property name="manifest-cp-proprietary-46" value="${manifest-cp-proprietary-45}
lib/xercesImpl.jar"/>
         <property name="manifest-cp-proprietary-47" value="${manifest-cp-proprietary-46}
lib/xml-apis.jar"/>



Mime
View raw message