incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1385043 - in /incubator/easyant/core/trunk: ./ src/main/java/org/apache/easyant/core/ src/main/resources/org/apache/easyant/core/ src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-ant-plu...
Date Sat, 15 Sep 2012 11:24:02 GMT
Author: jlboudart
Date: Sat Sep 15 11:23:58 2012
New Revision: 1385043

URL: http://svn.apache.org/viewvc?rev=1385043&view=rev
Log:
Remove shipped repositoryo
 - remove extra-jar repository (they will be fetched from our online repository)
 - update module.ant to fetch modules from easyant online repository
 - update ivysettings with those changes

Start updating tests with recent plugins version (tests are failing for the moment)

Removed:
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-ant-plugin/0.1/build-std-ant-plugin.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-ant-plugin/0.1/build-std-ant-plugin.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-ant-plugin/0.1/build-std-ant-plugin.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-groovy/0.1/build-std-groovy.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-groovy/0.1/build-std-groovy.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-groovy/0.1/build-std-groovy.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-scala/0.1/build-std-scala.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-std-skeleton/0.1/build-std-skeleton.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/build-webapp-java/0.1/build-webapp-java.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.1/meta-build.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.buildtypes/meta-build/0.2/meta-build.properties
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/abstract-test/0.1/abstract-test.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/antcontrib-activator/0.1/antcontrib-activator.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/build-tools/0.1/build-tools.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/build-tools/0.1/build-tools.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/build-tools/0.2/build-tools.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/build-tools/0.2/build-tools.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/checkstyle/0.1/checkstyle.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/checkstyle/0.1/checkstyle.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/checkstyle/0.1/checkstyle.xml
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/checkstyle/0.1/checkstyle.xsl
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/clean-std/0.1/clean-std.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/clean-std/0.1/clean-std.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-groovy/0.1/compile-groovy.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-groovy/0.1/compile-groovy.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-java/0.1/compile-java.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-java/0.1/compile-java.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-scala/0.1/compile-scala.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-scala/0.1/compile-scala.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-test-groovy/0.1/compile-test-groovy.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-test-groovy/0.1/compile-test-groovy.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-test-java/0.1/compile-test-java.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-test-java/0.1/compile-test-java.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-test-scala/0.1/compile-test-scala.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/compile-test-scala/0.1/compile-test-scala.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/default-version-strategy/0.1/default-version-strategy.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/default-version-strategy/0.1/default-version-strategy.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/deps-lib/0.2/deps-lib.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/deps-lib/0.2/deps-lib.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/distribution/0.1/distribution.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/distribution/0.1/distribution.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/documentation/0.1/documentation.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/documentation/0.1/documentation.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/documentation/0.1/site.xsl
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/documentation/0.1/style.css
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/easyant-plugin-publication/0.1/easyant-plugin-publication.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/easyant-plugin-publication/0.1/easyant-plugin-publication.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-provisioning/0.1/ivy-provisioning.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-provisioning/0.1/ivy-provisioning.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-publication/0.1/ivy-publication.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-publication/0.1/ivy-publication.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-repo-management/0.1/ivy-repo-management.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-repo-management/0.1/ivy-repo-management.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-repo-management/0.1/ivy.xml.tpl
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/ivy-utils/0.1/ivy-utils.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/javadoc/0.1/javadoc.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/manifest/0.1/manifest.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-jar/0.1/package-jar.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/package-war/0.1/package-war.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/phases-std/0.2/phases-std.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/resources-std/0.1/resources-std.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/run-java/0.1/run-java.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/run-java/0.1/run-java.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/scaladoc/0.1/scaladoc.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/scaladoc/0.1/scaladoc.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/scm-svn/0.1/scm-svn.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/scm-svn/0.1/scm-svn.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/skeleton/0.1/ivy.xml.tpl
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/skeleton/0.1/skeleton.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/skeleton/0.1/skeleton.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/skeleton/0.2/skeleton.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/skeleton/0.2/skeleton.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/source-jar/0.1/source-jar.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/source-jar/0.1/source-jar.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/test-junit/0.2/test-junit.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/test-junit/0.2/test-junit.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/test-testng/0.2/test-testng.ant
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.plugins/test-testng/0.2/test-testng.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-ant-plugin/0.1/std-ant-plugin.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-ant-plugin/0.1/std-ant-plugin.jar
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-java-application/0.1/std-java-application.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-java-application/0.1/std-java-application.jar
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-java-webapplication/0.1/std-java-webapplication.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-java-webapplication/0.1/std-java-webapplication.jar
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-skeleton/0.1/std-skeleton.ivy
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/repository/modules/org.apache.easyant.skeletons/std-skeleton/0.1/std-skeleton.jar
Modified:
    incubator/easyant/core/trunk/ivysettings.xml
    incubator/easyant/core/trunk/module.ant
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java
    incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/module.ivy
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-core/module.ivy
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-hello-world/module.ivy
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/parent.ivy
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/propertiesAsAttributes.ivy
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/services/module.ivy
    incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy

Modified: incubator/easyant/core/trunk/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/ivysettings.xml?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/ivysettings.xml (original)
+++ incubator/easyant/core/trunk/ivysettings.xml Sat Sep 15 11:23:58 2012
@@ -16,7 +16,7 @@
 -->
 <ivysettings>
     <include file="${ivy.settings.dir}/repository/third-party-lib/third-party-ivysettings.xml"/>
-    <include url="${easyant.extra.ivysettings.url}"/>
+    <include url="${easyant.default.ivysettings.url}"/>
     <settings defaultResolver="main"/>
     <resolvers>
         <!--define your own easyant modules repository here 
@@ -31,8 +31,6 @@
             <resolver ref="easyant-shared-modules"/>
             <!-- easyant public repository -->
             <resolver ref="apache-easyant-plugins"/>
-            <!-- extra modules provided by easyant full distribution -->
-            <resolver ref="easyant-extra-modules" />
             <resolver ref="third-party-lib" />
             <resolver ref="public-maven" />
         </chain>

Modified: incubator/easyant/core/trunk/module.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ant?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ant (original)
+++ incubator/easyant/core/trunk/module.ant Sat Sep 15 11:23:58 2012
@@ -14,58 +14,49 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant#easyant-core"
-         xmlns:ea="antlib:org.apache.easyant"
-         xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="org.apache.easyant#easyant-core" xmlns:ea="antlib:org.apache.easyant" xmlns:ivy="antlib:org.apache.ivy.ant">
 
-    <!-- Force compatibility to java 1.5 -->
-    <property name="compile.java.target.version" value="1.5" />
-    <property name="compile.java.source.version" value="1.5" />
+	<!-- Force compatibility to java 1.5 -->
+	<property name="compile.java.target.version" value="1.5" />
+	<property name="compile.java.source.version" value="1.5" />
 
-    <property name="target.documentation.dir" value="${basedir}/target/documentation" />
-    <property name="xooki.temp.dir" value="${basedir}/target/temp-doc" />
-    <property name="xooki.resources.include.pattern" value="style/**,images/**,sortable.js"/>
-    <property name="eadoc.documentation.dir" value="${xooki.temp.dir}" />
-    
+	<property name="target.documentation.dir" value="${basedir}/target/documentation" />
+	<property name="xooki.temp.dir" value="${basedir}/target/temp-doc" />
+	<property name="xooki.resources.include.pattern" value="style/**,images/**,sortable.js" />
+	<property name="eadoc.documentation.dir" value="${xooki.temp.dir}" />
 
-    <property name="project.ivy.instance" value="easyant.ivy.instance" />
-    <property name="release.resolver" value="easyant-shared-modules"/>
-    <property name="shared.resolver" value="easyant-shared-modules"/>
 
-    <property name="retrieve.dependencies" value="true"/>
+	<property name="project.ivy.instance" value="easyant.ivy.instance" />
+	<property name="release.resolver" value="easyant-shared-modules" />
+	<property name="shared.resolver" value="easyant-shared-modules" />
 
-    <property name="test.run.excludes.pattern" value="**/EasyAntBaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
+	<property name="retrieve.dependencies" value="true" />
 
-    <!-- override main artifact retrieve pattern -->
-    <property name="retrieve.pattern.lib.main" value="${basedir}/lib/main/[artifact].[ext]" />
+	<property name="test.run.excludes.pattern" value="**/EasyAntBaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
 
+	<!-- override main artifact retrieve pattern -->
+	<property name="retrieve.pattern.lib.main" value="${basedir}/lib/main/[artifact].[ext]" />
 
-    <!-- Load external properties 
+
+	<!-- Load external properties 
         /!\ This file will contains svn credentials so it should not be commited /!\
     -->
-    <property file="module.properties" />
+	<property file="module.properties" />
+
+	<!--Loading build type -->
+	<ea:build module="build-std-java" rev="0.9" />
 
-    <!--Loading build type -->
-    <ea:build module="build-std-java" rev="0.9" />
+	<!-- Loading plugins -->
+	<ea:plugin module="xooki" rev="0.9" as="xooki" />
+	<ea:plugin module="scm-svn" rev="0.9" as="svn" />
+	<ea:plugin module="javadoc" rev="0.9" as="javadoc" />
+	<ea:plugin module="distribution" rev="0.9" as="distribution" />
 
-    <!-- Loading plugins -->
-    <ea:plugin module="xooki" rev="0.9" as="xooki" />
-    <ea:plugin module="scm-svn" rev="0.9" as="svn" />
-    <ea:plugin module="javadoc" rev="0.9" as="javadoc" />
-    <ea:plugin module="distribution" rev="0.9" as="distribution" />
-
-    <extension-point name="distribution" description="create a distribution package" depends="package-jar:jar" />
-    <property name="target.dist" value="${target}/dist" />
-
-    <target name="package-extra-modules" description="package easyant extra modules">
-        <jar file="${target.artifacts}/easyant-extra-modules.jar">
-            <zipfileset dir="repository/extra-modules" prefix="org/apache/easyant/repository/extra-modules" />
-        </jar>
-    </target>
-
-    <target name="test-setup" 
-            description="add extra information to classpath for unit tests">
-        <!--
+	<extension-point name="distribution" description="create a distribution package" depends="package-jar:jar" />
+	<property name="target.dist" value="${target}/dist" />
+
+	<target name="test-setup" description="add extra information to classpath for unit tests">
+		<!--
            our unit test requires the JDK tools.jar to run, which cannot be defined normally
            in module.ivy dependencies.
 
@@ -73,123 +64,176 @@
            this points to JDK, and sometimes to JRE.
            See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4200300
         -->
-        <augment id="run.test.classpath">
-            <path path="${java.class.path}"/>
-        </augment>
-    </target>
-
-    <target name="prepare-distribution">
-
-        <mkdir dir="${target.distributions}" />
-        <mkdir dir="${target.documentation.dir}" />
-
-        <patternset id="easyant-files.patternset">
-            <exclude name="target/**"/>
-            <include name="lib/*.jar"/>
-
-            <include name="repository/**" />
-            <exclude name="repository/extra-modules/**" />
-            <exclude name="repository/bootstrap-cache/**"/>
-
-            <include name="example/**" />
-            <exclude name="example/**/bin/**" />
-            <exclude name="example/**/lib/**" />
-            <exclude name="example/**/target/**" />
-
-            <include name="ivysettings.xml" />
-            <include name="easyant-conf.xml" />
-            <include name="README" />
-            <include name="NOTICE" />
-            <include name="LICENSE" />
-        </patternset>
-
-        <patternset id="easyant-exec.patternset">
-            <include name="bin/**"/>
-        </patternset>
-
-    </target>
-
-    <target name="stage-dist" depends="prepare-distribution, abstract-provisioning:provisioning-finished">
-
-        <mkdir dir="${target.dist}" />
-
-        <copy todir="${target.dist}">
-            <fileset dir="${basedir}">
-                <patternset refid="easyant-files.patternset"/>
-                <patternset refid="easyant-exec.patternset"/>
-            </fileset>
-        </copy>
-
-	<mkdir dir="${target.dist}/lib/"/>
-	<copy todir="${target.dist}/lib">
-		<fileset dir="${basedir}/lib/main"/>
-	</copy>
-	<copy file="${target.main.artifact}" todir="${target.dist}/lib"/>
-
-        <!-- makes easyant scripts executable -->
-        <chmod perm="744" dir="${target.dist}">
-            <patternset refid="easyant-exec.patternset"/>
-        </chmod>
-
-    </target>
-
-	<target name="dist" depends="package-jar:jar, stage-dist, package-extra-modules" description="update the dist directory (used for development)">
-
-        <!-- publish latest easyant artifacts into dist repository -->
-        <ivy:settings id="dist.ivy.settings" file="${target.dist}/repository/third-party-lib/third-party-ivysettings.xml"/>
-        <ivy:publish settingsRef="dist.ivy.settings" resolver="third-party-lib" overwrite="true"
-                     srcivypattern="module.ivy" artifactspattern="${target.artifacts}/[artifact].[ext]"/>
-
-        <!-- declare distribution fileset for use in packaging targets -->
-        <fileset id="easyant-dist.fileset" dir="${target.dist}">
-            <patternset refid="easyant-files.patternset"/>
-            <patternset refid="easyant-exec.patternset"/>
-        </fileset>
-
-    </target>
-
-    <!-- Create a zip for distribution -->
-    <target name="package-distribution" depends="dist" description="package a distribution">
-        <echo message="Packaging standard distribution." />
-        <property name="root.dir" value="${ivy.module}-${ivy.revision}"/>
-        <bundle destfile="${target.distributions}/${ivy.module}-${version}">
-            <zipfileset dir="${target.dist}" prefix="${root.dir}">
-                <patternset refid="easyant-files.patternset"/>
-            </zipfileset>
-            <!-- make scripts executable -->
-            <zipfileset dir="${target.dist}" prefix="${root.dir}" filemode="744">
-                <patternset refid="easyant-exec.patternset"/>
-            </zipfileset>
-            <!-- ship the documentation -->
-            <zipfileset dir="${target.documentation.dir}" prefix="${root.dir}/doc"/>
-        </bundle>
-
-    </target>
-
-    <target name="package-documentation" description="package the documentation"> 
-        <echo message="Packaging documentation distribution." />
-        <bundle destfile="${target.distributions}/${ivy.module}-${version}-docs">
-            <zipfileset dir="${target.documentation.dir}" prefix="${ivy.module}-${ivy.revision}-docs"/>
-        </bundle>
-    </target>
-
-    <!-- Create a zip for full distribution  -->
-    <target name="package-full-distribution" depends="distribution:init,dist" description="package a distribution (including includes sources)">
-        <echo message="Packaging full distribution." />
-        <property name="full.root.dir" value="${ivy.module}-${ivy.revision}-full"/>
-        <bundle destfile="${target.distributions}/${ivy.module}-${version}-full">
-            <zipfileset dir="${target.dist}" prefix="${full.root.dir}">
-                <patternset refid="easyant-files.patternset"/>
-            </zipfileset>
-            <!-- make scripts executable -->
-            <zipfileset dir="${target.dist}" prefix="${full.root.dir}" filemode="744">
-                <patternset refid="easyant-exec.patternset"/>
-            </zipfileset>
-            <!-- ship the documentation -->
-            <zipfileset dir="${target.documentation.dir}" prefix="${full.root.dir}/doc"/>
-            <!-- easyant sources -->
-            <zipfileset dir="${basedir}" includes="src/**,module.ant, module.ivy,repository/extra-modules/**" prefix="${full.root.dir}"/>
-        </bundle>
-    </target>
+		<augment id="run.test.classpath">
+			<path path="${java.class.path}" />
+		</augment>
+	</target>
+
+	<target name="prepare-distribution">
+
+		<mkdir dir="${target.distributions}" />
+		<mkdir dir="${target.documentation.dir}" />
+
+		<patternset id="easyant-files.patternset">
+			<exclude name="target/**" />
+			<include name="lib/*.jar" />
+
+			<include name="repository/**" />
+			<exclude name="repository/extra-modules/**" />
+			<exclude name="repository/bootstrap-cache/**" />
+
+			<include name="example/**" />
+			<exclude name="example/**/bin/**" />
+			<exclude name="example/**/lib/**" />
+			<exclude name="example/**/target/**" />
+
+			<include name="ivysettings.xml" />
+			<include name="easyant-conf.xml" />
+			<include name="README" />
+			<include name="NOTICE" />
+			<include name="LICENSE" />
+		</patternset>
+
+		<patternset id="easyant-exec.patternset">
+			<include name="bin/**" />
+		</patternset>
+
+	</target>
+
+	<target name="stage-dist" depends="prepare-distribution, abstract-provisioning:provisioning-finished">
+
+		<mkdir dir="${target.dist}" />
+
+		<copy todir="${target.dist}">
+			<fileset dir="${basedir}">
+				<patternset refid="easyant-files.patternset" />
+				<patternset refid="easyant-exec.patternset" />
+			</fileset>
+		</copy>
+
+		<mkdir dir="${target.dist}/lib/" />
+		<copy todir="${target.dist}/lib">
+			<fileset dir="${basedir}/lib/main" />
+		</copy>
+		<copy file="${target.main.artifact}" todir="${target.dist}/lib" />
+
+		<!-- makes easyant scripts executable -->
+		<chmod perm="744" dir="${target.dist}">
+			<patternset refid="easyant-exec.patternset" />
+		</chmod>
+
+	</target>
+
+	<target name="dist" depends="package-jar:jar, stage-dist, populate-jar-repo" description="update the dist directory (used for development)">
+
+		<!-- publish latest easyant artifacts into dist repository -->
+		<ivy:settings id="dist.ivy.settings" file="${target.dist}/repository/third-party-lib/third-party-ivysettings.xml" />
+		<ivy:publish settingsRef="dist.ivy.settings" resolver="third-party-lib" overwrite="true" srcivypattern="module.ivy" artifactspattern="${target.artifacts}/[artifact].[ext]" />
+
+		<!-- declare distribution fileset for use in packaging targets -->
+		<fileset id="easyant-dist.fileset" dir="${target.dist}">
+			<patternset refid="easyant-files.patternset" />
+			<patternset refid="easyant-exec.patternset" />
+		</fileset>
+
+	</target>
+
+	<!-- Create a zip for distribution -->
+	<target name="package-distribution" depends="dist" description="package a distribution">
+		<echo message="Packaging standard distribution." />
+		<property name="root.dir" value="${ivy.module}-${ivy.revision}" />
+		<bundle destfile="${target.distributions}/${ivy.module}-${version}">
+			<zipfileset dir="${target.dist}" prefix="${root.dir}">
+				<patternset refid="easyant-files.patternset" />
+			</zipfileset>
+			<!-- make scripts executable -->
+			<zipfileset dir="${target.dist}" prefix="${root.dir}" filemode="744">
+				<patternset refid="easyant-exec.patternset" />
+			</zipfileset>
+			<!-- ship the documentation -->
+			<zipfileset dir="${target.documentation.dir}" prefix="${root.dir}/doc" />
+		</bundle>
+
+	</target>
+
+	<target name="package-documentation" description="package the documentation">
+		<echo message="Packaging documentation distribution." />
+		<bundle destfile="${target.distributions}/${ivy.module}-${version}-docs">
+			<zipfileset dir="${target.documentation.dir}" prefix="${ivy.module}-${ivy.revision}-docs" />
+		</bundle>
+	</target>
+
+	<!-- Create a zip for full distribution  -->
+	<target name="package-full-distribution" depends="distribution:init,dist" description="package a distribution (including includes sources)">
+		<echo message="Packaging full distribution." />
+		<property name="full.root.dir" value="${ivy.module}-${ivy.revision}-full" />
+		<bundle destfile="${target.distributions}/${ivy.module}-${version}-full">
+			<zipfileset dir="${target.dist}" prefix="${full.root.dir}">
+				<patternset refid="easyant-files.patternset" />
+			</zipfileset>
+			<!-- make scripts executable -->
+			<zipfileset dir="${target.dist}" prefix="${full.root.dir}" filemode="744">
+				<patternset refid="easyant-exec.patternset" />
+			</zipfileset>
+			<!-- ship the documentation -->
+			<zipfileset dir="${target.documentation.dir}" prefix="${full.root.dir}/doc" />
+			<!-- easyant sources -->
+			<zipfileset dir="${basedir}" includes="src/**,module.ant, module.ivy,repository/extra-modules/**" prefix="${full.root.dir}" />
+		</bundle>
+	</target>
+
+	<macrodef name="install-buildtype">
+		<attribute name="organisation" default="org.apache.easyant.buildtypes" />
+		<attribute name="module" />
+		<attribute name="revision" />
+		<sequential>
+			<ivy:install matcher="exactOrRegexp" from="apache-easyant-plugins" to="core" organisation="@{organisation}" module="@{module}" revision="@{revision}" settingsRef="easyant.ivy.instance" overwrite="true" />
+		</sequential>
+	</macrodef>
+
+	<macrodef name="install-plugin">
+		<attribute name="organisation" default="org.apache.easyant.plugins" />
+		<attribute name="module" />
+		<attribute name="revision" />
+		<sequential>
+			<ivy:install matcher="exactOrRegexp" from="apache-easyant-plugins" to="core" organisation="@{organisation}" module="@{module}" revision="@{revision}" settingsRef="easyant.ivy.instance" overwrite="true" />
+		</sequential>
+	</macrodef>
+
+	<target name="populate-jar-repo" description="fetch plugins and buildtypes from online repository and prepare them to be shipped within easyant">
+		<ea:configure-build-scoped-repository target="${basedir}/target/main/classes/" generateWrapperResoler="false" name="core" settingsRef="easyant.ivy.instance" />
+		<install-plugin module="abstract-.*" revision="0.9" />
+
+		<install-plugin module="antcontrib-activator" revision="0.9" />
+		<install-plugin module="antunit" revision="0.9" />
+
+		<install-plugin module="build-tools" revision="0.9" />
+
+		<install-plugin module="clean-std" revision="0.9" />
+		<install-plugin module="compile-java" revision="0.9" />
+		<install-plugin module="compile-test-java" revision="0.9" />
+		<install-plugin module="default-version-strategy" revision="0.9" />
+		<install-plugin module="deps-lib" revision="0.9" />
+		<install-plugin module="distribution" revision="0.9" />
+		<install-plugin module="documentation" revision="0.9" />
+		<install-plugin module="easyant-plugin-publication" revision="0.9" />
+		<install-plugin module="ivy-.*" revision="0.9" />
+		<install-plugin module="javadoc" revision="0.9" />
+		<install-plugin module="manifest" revision="0.9" />
+		<install-plugin module="offline" revision="0.9" />
+		<install-plugin module="phases-std" revision="0.9" />
+		<install-plugin module="resources-std" revision="0.9" />
+		<install-plugin module="run-java" revision="0.9" />
+		<install-plugin module="skeleton" revision="0.9" />
+		<install-plugin module="source-jar" revision="0.9" />
+		<install-plugin module="test-junit" revision="0.9" />
+
+
+		<install-buildtype module="build-std-java" revision="0.9" />
+		<install-buildtype module="build-std-ant-plugin" revision="0.9" />
+		<install-buildtype module="build-webapp-java" revision="0.9" />
+		<install-buildtype module="meta-build" revision="0.9" />
+
+	</target>
 
 </project>

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java Sat Sep 15 11:23:58 2012
@@ -104,8 +104,6 @@ public class EasyAntEngine {
         project.setNewProperty(EasyAntMagicNames.EASYANT_DEFAULT_IVYSETTINGS,
                 this.getClass().getResource("/org/apache/easyant/core/default-easyant-ivysettings.xml")
                         .toExternalForm());
-        project.setNewProperty(EasyAntMagicNames.EASYANT_EXTRA_IVYSETTINGS,
-                this.getClass().getResource("/org/apache/easyant/core/extra-easyant-ivysettings.xml").toExternalForm());
 
         project.setNewProperty(EasyAntMagicNames.EASYANT_CORE_JAR_URL, guessEasyantCoreJarUrl().toExternalForm());
 
@@ -450,7 +448,7 @@ public class EasyAntEngine {
             importTask.setMandatory(systemPlugin.isMandatory());
             executeTask(importTask, "configure-system-plugins", project);
         }
-        
+
         locateBuildModuleAndBuildFile(project);
 
         if (configuration.getBuildModule() != null || configuration.getBuildFile() != null) {

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java Sat Sep 15 11:23:58 2012
@@ -98,12 +98,6 @@ public interface EasyAntMagicNames {
     public static final String EASYANT_DEFAULT_IVYSETTINGS = "easyant.default.ivysettings.url";
 
     /**
-     * Name of the property containing the default location of ivysettings file used by easyant ivy instance with extra
-     * modules Value: {@value}
-     */
-    public static final String EASYANT_EXTRA_IVYSETTINGS = "easyant.extra.ivysettings.url";
-
-    /**
      * Name of the property containing the default location of ivysettings file used by project ivy instance Value:
      * {@value}
      */

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml Sat Sep 15 11:23:58 2012
@@ -20,8 +20,8 @@
     <caches defaultCacheDir="${user.home}/.easyant/easyant-cache" useOrigin="true" />
     <resolvers>
         <jar name="easyant-core-modules" url="${easyant.core.jar.url}" descriptor="required">
-            <ivy pattern="org/apache/easyant/core/repository/modules/[organisation]/[module]/[revision]/[module].ivy"/>
-            <artifact pattern="org/apache/easyant/core/repository/modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+            <ivy pattern="repository/core/[organisation]/[module]/[revision]/[module].ivy"/>
+            <artifact pattern="repository/core/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
         </jar>
         <filesystem name="easyant-shared-modules" descriptor="required">
             <ivy pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[module].ivy"/>

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java (original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ModuleInheritanceTest.java Sat Sep 15 11:23:58 2012
@@ -20,32 +20,31 @@ package org.apache.easyant.core;
 import org.apache.tools.ant.Project;
 
 public class ModuleInheritanceTest extends EasyAntBaseTest {
-    
+
     protected void setUp() throws Exception {
-        configureProject(this.getResource("multimodule/myapp-core/module.ivy"),Project.MSG_INFO);
-        
-        //Configure easyant ivy instance
-        conf.setEasyantIvySettingsUrl(this.getClass().getResource("/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+        configureProject(this.getResource("multimodule/myapp-core/module.ivy"), Project.MSG_INFO);
+
+        // Configure easyant ivy instance
+        conf.setEasyantIvySettingsUrl(this.getClass().getResource(
+                "/org/apache/easyant/core/default-easyant-ivysettings.xml"));
 
-        //init project with easyant configuration
+        // init project with easyant configuration
         initProject();
     }
-    
+
     public void clean() throws Exception {
         executeTarget("clean:clean");
     }
-    
+
     public void testInheritablePluginWithScopeChild() throws Exception {
         clean();
         executeTarget("source-jar:init");
     }
-    
+
     public void testNonInheritableElements() throws Exception {
         clean();
         expectBuildException("eadoc:init", "Target \"eadoc:init\" does not exist in the project \"myapp-core\"");
         expectPropertyUnset("validate", "my.property");
     }
-    
-    
-    
+
 }

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java (original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/PropertiesAsAttributesTest.java Sat Sep 15 11:23:58 2012
@@ -22,57 +22,58 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class PropertiesAsAttributesTest extends EasyAntBaseTest {
-    
+
     @Before
     public void setUp() throws Exception {
-        
-        configureProject(this.getResource("propertiesAsAttributes.ivy"),Project.MSG_INFO);
-        
-        //Configure easyant ivy instance
-        conf.setEasyantIvySettingsUrl(this.getClass().getResource("/org/apache/easyant/core/default-easyant-ivysettings.xml"));
 
-        //init project with easyant configuration
+        configureProject(this.getResource("propertiesAsAttributes.ivy"), Project.MSG_INFO);
+
+        // Configure easyant ivy instance
+        conf.setEasyantIvySettingsUrl(this.getClass().getResource(
+                "/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+
+        // init project with easyant configuration
         initProject();
     }
-    
+
     @Test
     public void testClean() throws Exception {
         executeTarget("clean:clean");
     }
-    
+
     @Test
     public void testPropertiesInBuildType() throws Exception {
-        expectPropertySet("validate", "my.property.inbuildtype","true");
+        expectPropertySet("validate", "my.property.inbuildtype", "true");
 
-        //properties loaded by build configuration 
+        // properties loaded by build configuration
         expectPropertyUnset("validate", "my.property.inconf");
     }
-    
+
     @Test
     public void testPropertiesInPlugin() throws Exception {
-        expectPropertySet("validate", "my.property.inplugin","true");
-    
-        //properties loaded by build configuration 
+        expectPropertySet("validate", "my.property.inplugin", "true");
+
+        // properties loaded by build configuration
         expectPropertyUnset("validate", "my.property.inconf");
     }
-    
+
     @Test
     public void testPropertiesInBuildConfiguration() throws Exception {
         conf.getActiveBuildConfigurations().add("myBuild");
 
-        //re-init project with easyant configuration including build types
+        // re-init project with easyant configuration including build types
         initProject();
 
-        expectPropertySet("validate", "my.property.inplugin","true");
-        
-        //properties loaded by build configuration 
-        expectPropertySet("validate", "my.property.inconf","true");
+        expectPropertySet("validate", "my.property.inplugin", "true");
+
+        // properties loaded by build configuration
+        expectPropertySet("validate", "my.property.inconf", "true");
     }
-    
+
     @Test
     public void testVerify() throws Exception {
         testClean();
         executeTarget("verify");
     }
-    
+
 }

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java (original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/StandardJavaProjectTest.java Sat Sep 15 11:23:58 2012
@@ -20,47 +20,47 @@ package org.apache.easyant.core;
 import org.apache.tools.ant.Project;
 
 public class StandardJavaProjectTest extends EasyAntBaseTest {
-    
+
     protected void setUp() throws Exception {
-        configureProject(this.getResource("standardJavaProject.ivy"),Project.MSG_INFO);
-        
-        //Configure easyant ivy instance
-        conf.setEasyantIvySettingsUrl(this.getClass().getResource("/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+        configureProject(this.getResource("standardJavaProject.ivy"), Project.MSG_INFO);
+
+        // Configure easyant ivy instance
+        conf.setEasyantIvySettingsUrl(this.getClass().getResource(
+                "/org/apache/easyant/core/default-easyant-ivysettings.xml"));
 
-        //init project with easyant configuration
+        // init project with easyant configuration
         initProject();
     }
-    
+
     public void testClean() throws Exception {
         executeTarget("clean:clean");
     }
-    
+
     public void testValidate() throws Exception {
         expectPropertySet("validate", "default.build.number", "10");
     }
-    
+
     public void testPackage() throws Exception {
         testClean();
         executeTarget("package");
     }
-    
+
     public void testImportWithoutAsAttribute() throws Exception {
         testClean();
-        //<ea:plugin module="javadoc" revision="0.1"/>
-        //no "as" attribute is specified, easyant should prefix all targets with "module" value by default
+        // <ea:plugin module="javadoc" revision="0.1"/>
+        // no "as" attribute is specified, easyant should prefix all targets with "module" value by default
         executeTarget("javadoc:javadoc");
     }
-    
+
     public void testImportWithAsAttribute() throws Exception {
         testClean();
-        //<ea:plugin module="javadoc" revision="0.1" as="foobar"/>
+        // <ea:plugin module="javadoc" revision="0.1" as="foobar"/>
         executeTarget("foobar:javadoc");
     }
 
-    
     public void testVerify() throws Exception {
         testClean();
         executeTarget("verify");
     }
-    
+
 }

Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java (original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java Sat Sep 15 11:23:58 2012
@@ -50,26 +50,22 @@ public class PluginServiceTest {
     public static void setUp() throws ParseException, IOException {
         // configure the ivyinstance
         Ivy ivy = IvyContext.pushNewContext().getIvy();
-        ivy.setVariable(
-                EasyAntMagicNames.EASYANT_CORE_JAR_URL, EasyAntEngine.guessEasyantCoreJarUrl().toExternalForm());
-        ivy.configure(PluginServiceTest.class
-                .getResource("/org/apache/easyant/core/default-easyant-ivysettings.xml"));
+        ivy.setVariable(EasyAntMagicNames.EASYANT_CORE_JAR_URL, EasyAntEngine.guessEasyantCoreJarUrl().toExternalForm());
+        ivy.configure(PluginServiceTest.class.getResource("/org/apache/easyant/core/default-easyant-ivysettings.xml"));
         pluginService = new DefaultPluginServiceImpl(ivy);
 
     }
 
     @Test
     public void testDefaultResolverSearch() throws Exception {
-        ModuleRevisionId[] mrids = pluginService.search(
-                "org.apache.easyant.buildtypes", "build-std-java");
+        ModuleRevisionId[] mrids = pluginService.search("org.apache.easyant.buildtypes", "build-std-java");
         // the module should be found once in easyant repo default resolver
         Assert.assertEquals(1, mrids.length);
     }
 
     @Test
     public void testSearchAllResolvers() throws Exception {
-        ModuleRevisionId[] mrids = pluginService.search(
-                "org.apache.easyant.buildtypes", "build-std-java", null, null,
+        ModuleRevisionId[] mrids = pluginService.search("org.apache.easyant.buildtypes", "build-std-java", null, null,
                 PatternMatcher.EXACT, "*");
         // the module should be found once each in easyant repo and in chained
         // resolver
@@ -79,17 +75,14 @@ public class PluginServiceTest {
 
     @Test
     public void testSearchModule() throws Exception {
-        String[] mrids = pluginService.searchModule(
-                "org.apache.easyant.buildtypes", "build-std-java");
+        String[] mrids = pluginService.searchModule("org.apache.easyant.buildtypes", "build-std-java");
         // the module should be found once in easyant repo default resolver
         Assert.assertEquals(1, mrids.length);
     }
 
     private EasyAntReport generateReport() throws Exception {
-        File module = new File(this.getClass().getResource("module.ivy")
-                .toURI());
-        File moduleAnt = new File(this.getClass().getResource("module.ant")
-                .toURI());
+        File module = new File(this.getClass().getResource("module.ivy").toURI());
+        File moduleAnt = new File(this.getClass().getResource("module.ant").toURI());
         return pluginService.generateEasyAntReport(module, moduleAnt, null);
     }
 
@@ -101,15 +94,11 @@ public class PluginServiceTest {
         // the report should contain the run-java plugin
         boolean containsBuildType = false;
         boolean containsPlugin = true;
-        for (ImportedModuleReport importedModule : eaReport
-                .getImportedModuleReports()) {
-            if (importedModule.getModuleMrid().equals(
-                    "org.apache.easyant.buildtypes#build-std-java;0.2")) {
+        for (ImportedModuleReport importedModule : eaReport.getImportedModuleReports()) {
+            if (importedModule.getModuleMrid().equals("org.apache.easyant.buildtypes#build-std-java;0.9")) {
                 containsBuildType = true;
             }
-            if (importedModule.getModuleMrid().equals(
-                    "org.apache.easyant.plugins#run;0.1")
-                    && importedModule.getAs().equals("run")) {
+            if (importedModule.getModuleMrid().equals("org.apache.easyant.plugins#run;0.9")) {
                 containsPlugin = true;
             }
         }
@@ -117,16 +106,13 @@ public class PluginServiceTest {
         Assert.assertTrue(containsPlugin);
 
         // be sure that the property exist
-        PropertyDescriptor property = eaReport.getPropertyDescriptors().get(
-                "run.main.classname");
+        PropertyDescriptor property = eaReport.getPropertyDescriptors().get("run.main.classname");
         Assert.assertNotNull(property);
         // check the value of the property
-        Assert.assertEquals("org.apache.easyant.example.Example",
-                property.getValue());
+        Assert.assertEquals("org.apache.easyant.example.Example", property.getValue());
 
         // be sure that the property exist
-        PropertyDescriptor srcMainJava = eaReport.getAvailableProperties().get(
-                "src.main.java");
+        PropertyDescriptor srcMainJava = eaReport.getAvailableProperties().get("src.main.java");
         Assert.assertNotNull(srcMainJava);
         // check the value of the property
         Assert.assertEquals("${basedir}/src/main/java", srcMainJava.getValue());
@@ -137,8 +123,7 @@ public class PluginServiceTest {
         property = eaReport.getAvailableProperties().get("run.main.classname");
         Assert.assertNotNull(property);
         // check the value of the property
-        Assert.assertEquals("org.apache.easyant.example.Example",
-                property.getValue());
+        Assert.assertEquals("org.apache.easyant.example.Example", property.getValue());
 
         // check that package ExtensionPoint exists and that jar:jar target is bound to
         // this phase
@@ -152,14 +137,11 @@ public class PluginServiceTest {
 
         Assert.assertNotNull(packageEP);
         List<TargetReport> targets = packageEP.getTargetReports();
-        Set<String> expectedTargets = new HashSet<String>(Arrays.asList(
-                "jar:jar", "test-jar:jar"));
-        Assert.assertEquals("test and main jars included in package phase",
-                expectedTargets.size(), targets.size());
+        Set<String> expectedTargets = new HashSet<String>(Arrays.asList("jar:jar", "test-jar:jar"));
+        Assert.assertEquals("test and main jars included in package phase", expectedTargets.size(), targets.size());
 
         for (TargetReport target : packageEP.getTargetReports()) {
-            Assert.assertTrue("expected to find " + target.getName(),
-                    expectedTargets.remove(target.getName()));
+            Assert.assertTrue("expected to find " + target.getName(), expectedTargets.remove(target.getName()));
         }
 
     }
@@ -170,8 +152,7 @@ public class PluginServiceTest {
         boolean hasHelloWorldTarget = false;
         for (TargetReport targetReport : eaReport.getAvailableTargets()) {
             if ("hello-world".equals(targetReport.getName())) {
-                Assert.assertTrue("process-sources".equals(targetReport
-                        .getExtensionPoint()));
+                Assert.assertTrue("process-sources".equals(targetReport.getExtensionPoint()));
                 hasHelloWorldTarget = true;
                 break;
             }
@@ -181,10 +162,7 @@ public class PluginServiceTest {
 
     @Test
     public void testGetDescription() throws Exception {
-        String description = pluginService
-                .getPluginDescription("org.apache.easyant.plugins#run-java;0.1");
-        Assert.assertEquals(
-                "This module provides java bytecode execution feature.",
-                description);
+        String description = pluginService.getPluginDescription("org.apache.easyant.plugins#run-java;0.9");
+        Assert.assertEquals("This module provides java bytecode execution feature.", description);
     }
 }

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/module.ivy?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/module.ivy (original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/module.ivy Sat Sep 15 11:23:58 2012
@@ -16,6 +16,6 @@
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
     <info organisation="org.apache.easyant" module="myapp-orchestrator" revision="0.2" status="integration" >
-        <ea:build module="meta-build" revision="0.2"/>
+        <ea:build module="meta-build" revision="0.9"/>
     </info>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-core/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-core/module.ivy?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-core/module.ivy (original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-core/module.ivy Sat Sep 15 11:23:58 2012
@@ -17,6 +17,6 @@
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
     <info organisation="org.apache.easyant" module="myapp-core" revision="0.2" status="integration">
         <extends organisation="org.apache.easyant" module="myapp-parent" revision="latest.revision" location="../parent.ivy"/>
-        <ea:build module="build-std-java" revision="0.2"/>
+        <ea:build module="build-std-java" revision="0.9"/>
     </info>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-hello-world/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-hello-world/module.ivy?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-hello-world/module.ivy (original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/myapp-hello-world/module.ivy Sat Sep 15 11:23:58 2012
@@ -16,7 +16,7 @@
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
     <info organisation="org.apache.easyant" module="myapp-hello-world" revision="0.2" status="integration" >
-        <ea:build module="build-std-java" revision="0.2">
+        <ea:build module="build-std-java" revision="0.9">
             <ea:property name="run.main.classname" value="org.apache.easyant.example.Example"/>
         </ea:build>
 

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/parent.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/parent.ivy?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/parent.ivy (original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/multimodule/parent.ivy Sat Sep 15 11:23:58 2012
@@ -17,8 +17,8 @@
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
     <info organisation="org.apache.easyant" module="myapp-parent" revision="0.2" status="integration" >
         <ea:property name="test" value="zz"/>
-        <ea:plugin module="source-jar" revision="0.1" inherit-scope="child" />
-        <ea:plugin module="eadoc" revision="0.1" inheritable="false" my.property="myvalue"/>
+        <ea:plugin module="source-jar" revision="0.9" inherit-scope="child" />
+        <ea:plugin module="documentation" revision="0.9" inheritable="false" my.property="myvalue"/>
     </info>
     <configurations>
         <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/propertiesAsAttributes.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/propertiesAsAttributes.ivy?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/propertiesAsAttributes.ivy (original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/propertiesAsAttributes.ivy Sat Sep 15 11:23:58 2012
@@ -16,9 +16,9 @@
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
     <info organisation="org.apache.easyant" module="standard-java-app" status="integration" >
-        <ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2" my.property.inbuildtype="true"/>
-        <ea:plugin module="javadoc" revision="0.1" my.property.inplugin="true"/>
-        <ea:plugin module="javadoc" revision="0.1" my-dashes="true" my.property.inconf="true" conf="myBuild"/>
+        <ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.9" my.property.inbuildtype="true"/>
+        <ea:plugin module="javadoc" revision="0.9" my.property.inplugin="true"/>
+        <ea:plugin module="javadoc" revision="0.9" my-dashes="true" my.property.inconf="true" conf="myBuild"/>
         
     </info>
     <configurations>

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/services/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/services/module.ivy?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/services/module.ivy (original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/services/module.ivy Sat Sep 15 11:23:58 2012
@@ -16,9 +16,9 @@
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
     <info organisation="org.apache.easyant" module="standard-java-app" status="integration" >
-        <ea:build module="build-std-java" revision="0.2">
+        <ea:build module="build-std-java" revision="0.9">
             <ea:property name="run.main.classname" value="org.apache.easyant.example.Example"/>
-            <ea:plugin module="run-java" revision="0.1"/>
+            <ea:plugin module="run-java" revision="0.9"/>
         </ea:build>
     </info>
     <configurations>

Modified: incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy?rev=1385043&r1=1385042&r2=1385043&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy (original)
+++ incubator/easyant/core/trunk/src/test/resources/org/apache/easyant/core/standardJavaProject.ivy Sat Sep 15 11:23:58 2012
@@ -16,11 +16,11 @@
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
     <info organisation="org.apache.easyant" module="standard-java-app" status="integration" >
-        <ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2">
+        <ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.9">
             <ea:property name="default.build.number" value="10"/>
         </ea:build>
-        <ea:plugin module="javadoc" revision="0.1"/>
-        <ea:plugin module="javadoc" revision="0.1" as="foobar"/>
+        <ea:plugin module="javadoc" revision="0.9"/>
+        <ea:plugin module="javadoc" revision="0.9" as="foobar"/>
     </info>
     <configurations>
         <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>



Mime
View raw message