You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/08/14 22:07:47 UTC
svn commit: r1373139 - in /incubator/easyant/plugins/trunk/offline/src:
main/resources/offline.ant test/antunit/offline-test.xml
Author: jlboudart
Date: Tue Aug 14 22:07:47 2012
New Revision: 1373139
URL: http://svn.apache.org/viewvc?rev=1373139&view=rev
Log:
Offline plugin can now install plugin dependencies
Modified:
incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant
incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml
Modified: incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant?rev=1373139&r1=1373138&r2=1373139&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant (original)
+++ incubator/easyant/plugins/trunk/offline/src/main/resources/offline.ant Tue Aug 14 22:07:47 2012
@@ -29,8 +29,8 @@
<macrodef name="configure-build-repository">
<attribute name="dictator" default="true"/>
<sequential>
- <ea:configure-build-scoped-repository dictator="@{dictator}" name="${project.buildscope.resolver}" settingsRef="${project.ivy.instance}"/>
- <ea:configure-build-scoped-repository dictator="@{dictator}" name="${easyant.buildscope.resolver}" settingsRef="easyant.ivy.instance"/>
+ <ea:configure-build-scoped-repository generateWrapperResoler="false" dictator="@{dictator}" name="${project.buildscope.resolver}" settingsRef="${project.ivy.instance}"/>
+ <ea:configure-build-scoped-repository generateWrapperResoler="false" dictator="@{dictator}" name="${easyant.buildscope.resolver}" settingsRef="easyant.ivy.instance"/>
</sequential>
</macrodef>
<ac:if>
Modified: incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml?rev=1373139&r1=1373138&r2=1373139&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml (original)
+++ incubator/easyant/plugins/trunk/offline/src/test/antunit/offline-test.xml Tue Aug 14 22:07:47 2012
@@ -28,12 +28,10 @@
<!-- Defines a setUp / tearDown (before each test) that cleans the environnement -->
<target name="clean" description="remove stale build artifacts before / after each test">
-<!--
<delete dir="${basedir}" includeemptydirs="true">
<include name="**/target/**"/>
<include name="**/lib/**"/>
</delete>
--->
</target>
<target name="setUp" depends="clean">
@@ -52,14 +50,11 @@
<target name="test-offline:offline:go-offline" depends="offline:go-offline">
- <!--TODO: check if buildscope repository are registered -->
<au:assertLogContains text=":: installing junit#junit;4.4 ::" />
<au:assertLogContains text=":: installing in project.buildscope.repository ::" />
<au:assertLogContains text=":: installing in easyant.buildscope.repository ::" />
<au:assertLogContains text=":: installing org.apache.easyant.plugins#rat;0.9 ::" />
-<!--
<au:assertLogContains text=":: installing org.apache.rat#apache-rat-tasks;0.7 ::" />
--->
<property name="ea.repo" value="${target}/repository/easyant.buildscope.repository"/>
<property name="project.repo" value="${target}/repository/project.buildscope.repository"/>
@@ -71,12 +66,20 @@
<au:assertFileExists file="${project.repo}"/>
<au:assertFileExists file="${ea.repo}/org.apache.easyant.plugins/rat/0.9/rat.ant"/>
<au:assertFileExists file="${ea.repo}/org.apache.easyant.plugins/rat/0.9/rat.ivy"/>
-<!--
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/rat.jar"/>
- <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/rat.ivy"/>
--->
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks.jar"/>
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks-javadoc.jar"/>
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks-sources.jar"/>
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-tasks/0.7/apache-rat-tasks.ivy"/>
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core.jar"/>
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core-javadoc.jar"/>
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core-sources.jar"/>
+ <au:assertFileExists file="${ea.repo}/org.apache.rat/apache-rat-core/0.7/apache-rat-core.ivy"/>
+
+
<au:assertFileExists file="${project.repo}/junit/junit/4.4/junit.ivy"/>
<au:assertFileExists file="${project.repo}/junit/junit/4.4/junit.jar"/>
+ <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-javadoc.jar"/>
+ <au:assertFileExists file="${project.repo}/junit/junit/4.4/junit-sources.jar"/>
</target>