You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/04/01 15:52:40 UTC
svn commit: r1308118 - in /incubator/lcf/branches/CONNECTORS-437: build.xml
framework/build.xml
Author: kwright
Date: Sun Apr 1 13:52:40 2012
New Revision: 1308118
URL: http://svn.apache.org/viewvc?rev=1308118&view=rev
Log:
A minor change - get jstl from maven not svn.
Modified:
incubator/lcf/branches/CONNECTORS-437/build.xml
incubator/lcf/branches/CONNECTORS-437/framework/build.xml
Modified: incubator/lcf/branches/CONNECTORS-437/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/build.xml?rev=1308118&r1=1308117&r2=1308118&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/build.xml Sun Apr 1 13:52:40 2012
@@ -3344,14 +3344,10 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-jstl">
<mkdir dir="lib"/>
- <property name="jstl-description" value="jstl"/>
+ <property name="jstl-package" value="jstl"/>
<property name="jstl-version" value="1.2"/>
- <antcall target="download-via-svn"><param name="target" value="lib"/><param name="project-desc" value="${jstl-description}"/><param name="artifact-version" value="${jstl-version}"/>
- <param name="artifact-name" value="jstl-api"/>
- <param name="artifact-type" value="jar"/>
- </antcall>
- <antcall target="download-via-svn"><param name="target" value="lib"/><param name="project-desc" value="${jstl-description}"/><param name="artifact-version" value="${jstl-version}"/>
- <param name="artifact-name" value="jstl-impl"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/><param name="project-path" value="${jstl-package}"/><param name="artifact-version" value="${jstl-version}"/>
+ <param name="artifact-name" value="jstl"/>
<param name="artifact-type" value="jar"/>
</antcall>
</target>
Modified: incubator/lcf/branches/CONNECTORS-437/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-437/framework/build.xml?rev=1308118&r1=1308117&r2=1308118&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-437/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-437/framework/build.xml Sun Apr 1 13:52:40 2012
@@ -201,8 +201,7 @@
<pathelement location="build/agents/classes"/>
<pathelement location="build/pull-agent/classes"/>
<fileset dir="../lib">
- <include name="jstl-api*.jar"/>
- <include name="jstl-impl*.jar"/>
+ <include name="jstl*.jar"/>
</fileset>
</classpath>
@@ -411,8 +410,7 @@
<mkdir dir="build/webapp/crawler-ui/WEB-INF/lib"/>
<copy todir="build/webapp/crawler-ui/WEB-INF/lib">
<fileset dir="../lib">
- <include name="jstl-api*.jar"/>
- <include name="jstl-impl*.jar"/>
+ <include name="jstl*.jar"/>
</fileset>
<fileset dir="../build/jar">
<include name="json.jar"/>
@@ -461,8 +459,7 @@
<mkdir dir="build/webapp/crawler-ui-proprietary/WEB-INF/lib"/>
<copy todir="build/webapp/crawler-ui-proprietary/WEB-INF/lib">
<fileset dir="../lib">
- <include name="jstl-api*.jar"/>
- <include name="jstl-impl*.jar"/>
+ <include name="jstl*.jar"/>
</fileset>
<fileset dir="../build/jar">
<include name="json.jar"/>