incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1071697 [15/42] - in /incubator/easyant: buildtypes/ buildtypes/trunk/ buildtypes/trunk/build-osgi-bundle-java/ buildtypes/trunk/build-osgi-bundle-java/src/ buildtypes/trunk/build-osgi-bundle-java/src/main/ buildtypes/trunk/build-osgi-bund...
Date Thu, 17 Feb 2011 17:01:56 GMT
Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,38 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-test-web" status="integration" revision="1.0">
+		<ea:build mrid="org.apache.easyant.buildtypes#build-webapp-java;0.1">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+			<ea:plugin module="javadoc" revision="0.1" as="javadoc"/>
+		</ea:build>
+	</info>
+	<configurations>
+		<conf name="compile" visibility="public" description="compile-time dependencies"/>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<publications>
+		<artifact type="war"/>
+	</publications>
+	<dependencies defaultconfmapping="default,compile,test->default">
+		<dependency org="org.apache.easyant" name="meta-build-test-core" rev="latest.revision" conf="default"/>
+		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="compile"/>
+	</dependencies>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java Thu Feb 17 17:01:07 2011
@@ -0,0 +1,5 @@
+package org.apache.easyant.test.web;
+
+public class HelloServlet {
+
+}

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/webapp/WEB-INF/web.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/webapp/WEB-INF/web.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<web-app>
+	
+</web-app>
\ No newline at end of file

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,52 @@
+<!--
+	Copyright 2008-2010 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project name="meta-build-test" 
+		xmlns:au="antlib:org.apache.ant.antunit">
+	
+	<dirname file="${ant.file.meta-build-test}" property="test.dir"/>
+	<import file="${test.dir}/../../../common/test-utils.ant"/>
+
+	<target name="clean" description="remove stale build artifacts before / after each test">
+		<delete dir="${basedir}" includeemptydirs="true">
+			<include name="**/target/**"/>
+			<include name="**/lib/**"/>
+		</delete>
+		<delete dir="${test.dir}/test-cache"/>
+		<delete dir="${java.io.tmpdir}/meta-build-test"/>
+	</target>
+	
+	<target name="setUp" depends="clean"/>
+	<target name="tearDown" depends="clean"/>
+
+	<target name="testDeprecation" description="verify that building with old meta-build ends in a deprecation error">
+		
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-web/target"/>
+
+		<!-- execute "easyant meta:verify-all" on the test project, which should fail. -->	
+		<easyant target="meta:verify-all" success="false"/>
+		
+		<au:assertMatches string="${easyant-test.stderr}" 
+			pattern="meta-build 0.1 has been deprecated.\s+Please upgrade your project to meta-build 0.2 or higher."/>
+
+	</target>
+	
+</project>
\ No newline at end of file

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,34 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-test" status="integration" >
+		<description>Tests the features of a meta-build type project.</description>
+		<ea:build mrid="org.apache.easyant.buildtypes#meta-build;0.1">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+		</ea:build>
+	</info>
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<dependencies>
+		<dependency org="junit" name="junit" rev="4.4" conf="test->default" />
+	</dependencies>
+
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,42 @@
+<!--
+   Copyright 2009 the EasyAnt project
+
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<ivysettings>
+	<settings defaultResolver="main"/>
+	<!-- 
+		specify a custom cache to isolate the tests from the user environment,
+		and so that we can test build-scoped caching behavior
+	-->
+	<caches useOrigin="false" defaultCacheDir="${ivy.settings.dir}/test-cache" 
+			artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+	<resolvers>
+		<!-- use non-default local resolver so that we can eventually test publish-all-local target -->
+		<filesystem name="local">
+			<ivy pattern="${ivy.settings.dir}/repository/modules/[organisation]/[module]/[revision]/[module].ivy"/>
+			<artifact pattern="${ivy.settings.dir}/repository/modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+		</filesystem>
+		<ibiblio name="maven" m2compatible="true"/>
+		<chain name="main" returnFirst="true">
+			<resolver ref="local" />
+			<resolver ref="maven" />
+		</chain>
+	</resolvers>
+	<modules>
+        <module organisation="*" name="*" resolver="main" />
+     </modules>
+</ivysettings>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,30 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-test-core" status="integration" revision="1.0">
+		<extends organisation="org.apache.easyant" module="meta-build-2-test" revision="latest.revision" location="../module.ivy"/>
+		<ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+			<ea:plugin module="javadoc" revision="0.1" as="javadoc"/>
+		</ea:build>
+	</info>
+	<publications>
+		<artifact type="jar"/>
+	</publications>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java Thu Feb 17 17:01:07 2011
@@ -0,0 +1,7 @@
+package org.apache.easyant.test;
+
+public class HelloService {
+	public String hello() {
+		return "Hello world, it is " + System.currentTimeMillis();
+	}
+}

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,38 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-test-web" status="integration" revision="1.0">
+		<ea:build mrid="org.apache.easyant.buildtypes#build-webapp-java;0.1">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+			<ea:plugin module="javadoc" revision="0.1" as="javadoc"/>
+		</ea:build>
+	</info>
+	<configurations>
+		<conf name="compile" visibility="public" description="compile-time dependencies"/>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<publications>
+		<artifact type="war"/>
+	</publications>
+	<dependencies defaultconfmapping="default,compile,test->default">
+		<dependency org="org.apache.easyant" name="meta-build-test-core" rev="latest.revision" conf="default"/>
+		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="compile"/>
+	</dependencies>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java Thu Feb 17 17:01:07 2011
@@ -0,0 +1,5 @@
+package org.apache.easyant.test.web;
+
+public class HelloServlet {
+
+}

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/webapp/WEB-INF/web.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/webapp/WEB-INF/web.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<web-app>
+	
+</web-app>
\ No newline at end of file

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,113 @@
+<!--
+	Copyright 2008-2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project name="meta-build-2-test" 
+		xmlns:au="antlib:org.apache.ant.antunit">
+	
+	<dirname file="${ant.file.meta-build-2-test}" property="test.dir"/>
+	<import file="${test.dir}/../../../common/test-utils.ant"/>
+
+	<target name="clean" description="remove stale build artifacts before / after each test">
+		<delete dir="${basedir}" includeemptydirs="true">
+			<include name="**/target/**"/>
+			<include name="**/lib/**"/>
+		</delete>
+		<delete dir="${test.dir}/test-cache"/>
+		<delete dir="${java.io.tmpdir}/meta-build-test"/>
+	</target>
+	
+	<target name="setUp" depends="clean"/>
+	<target name="tearDown" depends="clean"/>
+
+	<target name="testPackageAll" description="test recursive package build">
+		
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-web/target"/>
+
+		<!-- execute "easyant package" on the test project, which should verify all sub-modules -->	
+		<easyant target="package"/>
+
+		<!-- verify that both submodules were built -->
+		<au:assertFileExists message="toplevel war artifact deployed to build repository" 
+							 file="${basedir}/target/repository/org.apache.easyant/meta-build-test-web/1.0/meta-build-test-web.war"/>
+		<au:assertFileExists message="dependency deployed to build repository" 
+							 file="${basedir}/target/repository/org.apache.easyant/meta-build-test-core/1.0/meta-build-test-core.jar"/>
+
+		<!-- verify that the latest build of dependency jar was delivered into the WAR -->
+		<unjar src="${basedir}/target/repository/org.apache.easyant/meta-build-test-web/1.0/meta-build-test-web.war"
+			   dest="${java.io.tmpdir}/meta-build-test" overwrite="true">
+			<patternset includes="WEB-INF/lib/*.jar"/>
+		</unjar>
+
+		<au:assertFileExists message="dependency jar built in module subdirectory" 
+							 file="${basedir}/meta-build-test-core/target/artifacts/meta-build-test-core.jar"/>
+		<au:assertFileExists message="dependency jar found in WAR" 
+							 file="${java.io.tmpdir}/meta-build-test/WEB-INF/lib/meta-build-test-core.jar"/>
+
+		<au:assertFilesMatch message="integration build of jar was delivered into WAR" 
+							 expected="${basedir}/meta-build-test-core/target/artifacts/meta-build-test-core.jar" 
+							 actual="${java.io.tmpdir}/meta-build-test/WEB-INF/lib/meta-build-test-core.jar"/>
+		
+		<au:assertFileDoesntExist message="temporary build artifacts are not delivered into user's cache" 
+								  file="${basedir}/test-cache/org.apache.easyant/meta-build-test-core"/>
+
+	</target>
+	
+	<target name="testCleanAll" description="test recursive clean">
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-web/target"/>
+		
+		<!-- execute "easyant meta:verify-all" on the test project -->	
+		<easyant target="verify"/>
+
+		<!-- verify that both submodules were built -->
+		<au:assertFileExists message="build products generated" file="${basedir}/target"/>
+		<au:assertFileExists message="build products generated" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileExists message="build products generated" file="${basedir}/meta-build-test-web/target"/>
+		
+		<easyant target="clean"/>
+		
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="build repository is clean" file="${basedir}/target"/>
+		<au:assertFileDoesntExist message="java submodule is clean" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileDoesntExist message="web submodule is clean" file="${basedir}/meta-build-test-web/target"/>
+		
+	</target>
+
+	<target name="testStaleCache" description="verify that meta-build ignores old artifacts in the user's cache">
+		<!-- create a fake artifact in the user's cache, to make sure the build ignores it -->
+		<mkdir dir="${basedir}/test-cache/org.apache.easyant/meta-build-test-core/jars"/>
+		<touch file="${basedir}/test-cache/org.apache.easyant/meta-build-test-core/jars/meta-build-test-core-1.0.jar"/>
+		
+		<easyant target="verify"/>
+		
+		<unjar src="${basedir}/target/repository/org.apache.easyant/meta-build-test-web/1.0/meta-build-test-web.war"
+			   dest="${java.io.tmpdir}/meta-build-test" overwrite="true">
+			<patternset includes="WEB-INF/lib/*.jar"/>
+		</unjar>
+		
+		<au:assertFilesMatch message="integration build of jar, not cached jar, was delivered into WAR" 
+							 expected="${basedir}/meta-build-test-core/target/artifacts/meta-build-test-core.jar" 
+							 actual="${java.io.tmpdir}/meta-build-test/WEB-INF/lib/meta-build-test-core.jar"/>
+	</target>
+	
+</project>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,34 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-2-test" status="integration" revision="0.2">
+		<description>Tests the features of a meta-build v2 type project.</description>
+		<ea:build mrid="org.apache.easyant.buildtypes#meta-build;0.2">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+		</ea:build>
+	</info>
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<dependencies>
+		<dependency org="junit" name="junit" rev="4.4" conf="test->default" />
+	</dependencies>
+
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,42 @@
+<!--
+   Copyright 2009 the EasyAnt project
+
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<ivysettings>
+	<settings defaultResolver="main"/>
+	<!-- 
+		specify a custom cache to isolate the tests from the user environment,
+		and so that we can test build-scoped caching behavior
+	-->
+	<caches useOrigin="false" defaultCacheDir="${ivy.settings.dir}/test-cache" 
+			artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+	<resolvers>
+		<!-- use non-default local resolver so that we can eventually test publish-all-local target -->
+		<filesystem name="local">
+			<ivy pattern="${ivy.settings.dir}/repository/modules/[organisation]/[module]/[revision]/[module].ivy"/>
+			<artifact pattern="${ivy.settings.dir}/repository/modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+		</filesystem>
+		<ibiblio name="maven" m2compatible="true"/>
+		<chain name="main" returnFirst="true">
+			<resolver ref="local" />
+			<resolver ref="maven" />
+		</chain>
+	</resolvers>
+	<modules>
+        <module organisation="*" name="*" resolver="main" />
+     </modules>
+</ivysettings>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,30 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-test-core" status="integration" revision="1.0">
+		<extends organisation="org.apache.easyant" module="meta-build-2-test" revision="latest.revision" />
+		<ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+			<ea:plugin module="javadoc" revision="0.1" as="javadoc"/>
+		</ea:build>
+	</info>
+	<publications>
+		<artifact type="jar"/>
+	</publications>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java Thu Feb 17 17:01:07 2011
@@ -0,0 +1,7 @@
+package org.apache.easyant.test;
+
+public class HelloService {
+	public String hello() {
+		return "Hello world, it is " + System.currentTimeMillis();
+	}
+}

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,38 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-test-web" status="integration" revision="1.0">
+		<ea:build mrid="org.apache.easyant.buildtypes#build-webapp-java;0.1">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+			<ea:plugin module="javadoc" revision="0.1" as="javadoc"/>
+		</ea:build>
+	</info>
+	<configurations>
+		<conf name="compile" visibility="public" description="compile-time dependencies"/>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<publications>
+		<artifact type="war"/>
+	</publications>
+	<dependencies defaultconfmapping="default,compile,test->default">
+		<dependency org="org.apache.easyant" name="meta-build-test-core" rev="latest.revision" conf="default"/>
+		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="compile"/>
+	</dependencies>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java Thu Feb 17 17:01:07 2011
@@ -0,0 +1,5 @@
+package org.apache.easyant.test.web;
+
+public class HelloServlet {
+
+}

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/java/org/apache/easyant/test/web/HelloServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/webapp/WEB-INF/web.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/webapp/WEB-INF/web.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<web-app>
+	
+</web-app>
\ No newline at end of file

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test-web/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,113 @@
+<!--
+	Copyright 2008-2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project name="meta-build-2-test" 
+		xmlns:au="antlib:org.apache.ant.antunit">
+	
+	<dirname file="${ant.file.meta-build-2-test}" property="test.dir"/>
+	<import file="${test.dir}/../../../common/test-utils.ant"/>
+
+	<target name="clean" description="remove stale build artifacts before / after each test">
+		<delete dir="${basedir}" includeemptydirs="true">
+			<include name="**/target/**"/>
+			<include name="**/lib/**"/>
+		</delete>
+		<delete dir="${test.dir}/test-cache"/>
+		<delete dir="${java.io.tmpdir}/meta-build-test"/>
+	</target>
+	
+	<target name="setUp" depends="clean"/>
+	<target name="tearDown" depends="clean"/>
+
+	<target name="testPackageAll" description="test recursive package build">
+		
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-web/target"/>
+
+		<!-- execute "easyant package" on the test project, which should verify all sub-modules -->	
+		<easyant target="package"/>
+
+		<!-- verify that both submodules were built -->
+		<au:assertFileExists message="toplevel war artifact deployed to build repository" 
+							 file="${basedir}/target/repository/org.apache.easyant/meta-build-test-web/1.0/meta-build-test-web.war"/>
+		<au:assertFileExists message="dependency deployed to build repository" 
+							 file="${basedir}/target/repository/org.apache.easyant/meta-build-test-core/1.0/meta-build-test-core.jar"/>
+
+		<!-- verify that the latest build of dependency jar was delivered into the WAR -->
+		<unjar src="${basedir}/target/repository/org.apache.easyant/meta-build-test-web/1.0/meta-build-test-web.war"
+			   dest="${java.io.tmpdir}/meta-build-test" overwrite="true">
+			<patternset includes="WEB-INF/lib/*.jar"/>
+		</unjar>
+
+		<au:assertFileExists message="dependency jar built in module subdirectory" 
+							 file="${basedir}/meta-build-test-core/target/artifacts/meta-build-test-core.jar"/>
+		<au:assertFileExists message="dependency jar found in WAR" 
+							 file="${java.io.tmpdir}/meta-build-test/WEB-INF/lib/meta-build-test-core.jar"/>
+
+		<au:assertFilesMatch message="integration build of jar was delivered into WAR" 
+							 expected="${basedir}/meta-build-test-core/target/artifacts/meta-build-test-core.jar" 
+							 actual="${java.io.tmpdir}/meta-build-test/WEB-INF/lib/meta-build-test-core.jar"/>
+		
+		<au:assertFileDoesntExist message="temporary build artifacts are not delivered into user's cache" 
+								  file="${basedir}/test-cache/org.apache.easyant/meta-build-test-core"/>
+
+	</target>
+	
+	<target name="testCleanAll" description="test recursive clean">
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/meta-build-test-web/target"/>
+		
+		<!-- execute "easyant meta:verify-all" on the test project -->	
+		<easyant target="verify"/>
+
+		<!-- verify that both submodules were built -->
+		<au:assertFileExists message="build products generated" file="${basedir}/target"/>
+		<au:assertFileExists message="build products generated" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileExists message="build products generated" file="${basedir}/meta-build-test-web/target"/>
+		
+		<easyant target="clean"/>
+		
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="build repository is clean" file="${basedir}/target"/>
+		<au:assertFileDoesntExist message="java submodule is clean" file="${basedir}/meta-build-test-core/target"/>
+		<au:assertFileDoesntExist message="web submodule is clean" file="${basedir}/meta-build-test-web/target"/>
+		
+	</target>
+
+	<target name="testStaleCache" description="verify that meta-build ignores old artifacts in the user's cache">
+		<!-- create a fake artifact in the user's cache, to make sure the build ignores it -->
+		<mkdir dir="${basedir}/test-cache/org.apache.easyant/meta-build-test-core/jars"/>
+		<touch file="${basedir}/test-cache/org.apache.easyant/meta-build-test-core/jars/meta-build-test-core-1.0.jar"/>
+		
+		<easyant target="verify"/>
+		
+		<unjar src="${basedir}/target/repository/org.apache.easyant/meta-build-test-web/1.0/meta-build-test-web.war"
+			   dest="${java.io.tmpdir}/meta-build-test" overwrite="true">
+			<patternset includes="WEB-INF/lib/*.jar"/>
+		</unjar>
+		
+		<au:assertFilesMatch message="integration build of jar, not cached jar, was delivered into WAR" 
+							 expected="${basedir}/meta-build-test-core/target/artifacts/meta-build-test-core.jar" 
+							 actual="${java.io.tmpdir}/meta-build-test/WEB-INF/lib/meta-build-test-core.jar"/>
+	</target>
+	
+</project>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/meta-build-test.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,26 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-2-test" status="integration" revision="0.2">
+		<description>Tests the features of a meta-build v2 type project.</description>
+		<ea:build mrid="org.apache.easyant.buildtypes#meta-build;0.2">
+			<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+		</ea:build>
+	</info>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/parent.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/parent.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/parent.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/parent.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,31 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="meta-build-2-test" status="integration" revision="0.2">
+		<ea:property name="project.ivy.settings.file" value="${basedir}/ivysettings.xml"/>
+	</info>
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<dependencies>
+		<dependency org="junit" name="junit" rev="4.4" conf="test->default" />
+	</dependencies>
+
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/parent.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/parent.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/parent.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/build-configuration-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/build-configuration-test.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/build-configuration-test.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/build-configuration-test.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,81 @@
+<!--
+	Copyright 2008-2010 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project name="build-configuration-test" 
+		xmlns:au="antlib:org.apache.ant.antunit">
+	
+	<dirname file="${ant.file.build-configuration-test}" property="test.dir"/>
+	<import file="${test.dir}/../../common/test-utils.ant"/>
+
+	<target name="clean" description="remove stale build artifacts before / after each test">
+		<delete dir="${basedir}" includeemptydirs="true">
+			<include name="**/target/**"/>
+			<include name="**/lib/**"/>
+			<include name="test.properties"/>
+		</delete>
+	</target>
+	
+	<target name="setUp" depends="clean"/>
+	<target name="tearDown" depends="clean"/>
+
+	<target name="testDefaultConfiguration" description="test default classpath and property settings">
+
+		<au:assertFileDoesntExist message="clean test environment" file="lib"/>
+		<au:assertFileDoesntExist message="clean test environment" file="test.properties"/>
+		<easyant target="compile" args="-Dretrieve.dependencies=true"/>
+
+		<au:assertFileExists message="custom compile target was run" file="test.properties"/>
+		<property file="test.properties" prefix="default."/>
+		<au:assertEquals message="default property setting was used" expected="foo" actual="${default.prop}"/>
+		
+		<au:assertFileExists message="default dependency retrieved" file="lib/main/hsqldb-1.8.0.7.jar"/>
+		<au:assertFileDoesntExist message="alternate dependency skipped" file="lib/main/junit-4.4.jar"/>
+		
+		<au:assertTrue message="compile path includes default dependency">
+			<and>
+				<contains string="${default.path}" substring="hsqldb-1.8.0.7.jar"/>
+				<not><contains string="${default.path}" substring="junit"/></not>
+			</and>
+		</au:assertTrue>
+		
+	</target>
+	
+	<target name="testAlternateConfiguration" description="test alternate configuration">
+
+		<au:assertFileDoesntExist message="clean test environment" file="lib"/>
+		<au:assertFileDoesntExist message="clean test environment" file="test.properties"/>
+
+		<easyant target="compile" args="-Dretrieve.dependencies=true -C alpha"/>
+		
+		<au:assertFileExists message="custom compile target was run" file="test.properties"/>
+		<property file="test.properties" prefix="alpha."/>
+		<au:assertEquals message="alternate property setting was used" expected="bar" actual="${alpha.prop}"/>
+		
+		<au:assertFileExists message="default dependency retrieved" file="lib/main/hsqldb-1.8.0.7.jar"/>
+		<au:assertFileExists message="alternate dependency also retrieved" file="lib/main/junit-4.4.jar"/>
+		
+		<au:assertTrue message="compile path includes default dependency">
+			<and>
+				<contains string="${alpha.path}" substring="hsqldb-1.8.0.7.jar"/>
+				<contains string="${alpha.path}" substring="junit-4.4.jar"/>
+			</and>
+		</au:assertTrue>
+		
+	</target>
+	
+</project>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/build-configuration-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/build-configuration-test.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/build-configuration-test.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ant?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ant (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ant Thu Feb 17 17:01:07 2011
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<project name="build-configuration-test" default="record-env" xmlns:ea="antlib:org.apache.easyant">
+
+	<!--
+		define a phase compile that extends the default compile phase 
+		(needed 'cause we need to bind record-env target to an compile phase) -->
+	<phase name="compile" depends="org.apache.easyant.plugins#phases-std.compile" />
+	<target name="record-env" phase="compile">
+
+		<property name="conf.cp" refid="compile.main.classpath" />
+
+		<propertyfile file="test.properties">
+			<entry key="path" value="${conf.cp}" />
+			<entry key="prop" value="${conf.setting}" />
+		</propertyfile>
+
+	</target>
+
+</project>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ant
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ant
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ant
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,36 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="build-configuration-test" status="integration" >
+		<description>Tests build configuration settings.</description>
+		<ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2">
+			<ea:property name="conf.setting" value="foo"/>
+			<ea:property name="conf.setting" value="bar" conf="alpha"/>
+		</ea:build>
+	</info>
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="alpha" extends="default" visibility="public" ea:type="profile"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<dependencies>
+		<dependency org="hsqldb" name="hsqldb" rev="1.8.0.7" conf="default"/>
+		<dependency org="junit" name="junit" rev="4.4" conf="alpha->default" />
+	</dependencies>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.core/build-configuration-test/module.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/main/java/org/apache/easyant/plugins/coverage/HelloWorld.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/main/java/org/apache/easyant/plugins/coverage/HelloWorld.java?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/main/java/org/apache/easyant/plugins/coverage/HelloWorld.java (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/main/java/org/apache/easyant/plugins/coverage/HelloWorld.java Thu Feb 17 17:01:07 2011
@@ -0,0 +1,12 @@
+package org.apache.easyant.plugins.coverage;
+
+/**
+ * Dummy application code used to test coverage plugins.
+ */
+public class HelloWorld {
+
+	public String hello() {
+		return "Bonjour, le monde.";
+	}
+	
+}

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/main/java/org/apache/easyant/plugins/coverage/HelloWorld.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/main/java/org/apache/easyant/plugins/coverage/HelloWorld.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/main/java/org/apache/easyant/plugins/coverage/HelloWorld.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/test/java/org/apache/easyant/plugins/coverage/HelloWorldTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/test/java/org/apache/easyant/plugins/coverage/HelloWorldTest.java?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/test/java/org/apache/easyant/plugins/coverage/HelloWorldTest.java (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/test/java/org/apache/easyant/plugins/coverage/HelloWorldTest.java Thu Feb 17 17:01:07 2011
@@ -0,0 +1,18 @@
+package org.apache.easyant.plugins.coverage;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ * Simple jUnit 4 unit test that can be run with a coverage
+ * tool to test code coverage plugins.
+ */
+public class HelloWorldTest {
+
+	@Test
+	public void testHello() {
+		assertEquals("Bonjour, le monde.", new HelloWorld().hello());
+	}
+	
+}
+

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/test/java/org/apache/easyant/plugins/coverage/HelloWorldTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/test/java/org/apache/easyant/plugins/coverage/HelloWorldTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/abstract-coverage/0.1/src/test/java/org/apache/easyant/plugins/coverage/HelloWorldTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura-test.xml?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura-test.xml (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura-test.xml Thu Feb 17 17:01:07 2011
@@ -0,0 +1,52 @@
+<!--
+	Copyright 2008-2010 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project name="coverage-cobertura-test" xmlns:au="antlib:org.apache.ant.antunit">
+	
+	<dirname file="${ant.file.coverage-cobertura-test}" property="test.dir"/>
+	<import file="${test.dir}/../../../common/test-utils.ant"/>
+
+	<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"/>
+	<target name="tearDown" depends="clean"/>
+
+	<target name="testCoverage" description="test generation of coverage reports using emma">
+		
+		<!-- verify test preconditions -->
+		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/target"/>
+
+		<!-- execute run tests and generate reports -->	
+		<easyant target="report"/>
+
+		<!-- verify coverage artifacts created -->
+		<au:assertFileExists message="coverage artifacts created" file="${basedir}/target/report/coverage/cobertura.ser"/>
+		<au:assertFileExists message="coverage artifacts created" file="${basedir}/target/report/coverage/index.html"/>
+		<au:assertFileExists message="coverage artifacts created" file="${basedir}/target/report/coverage/frame-summary.html"/>
+		<au:assertFileExists message="coverage artifacts created" file="${basedir}/target/report/coverage/frame-sourcefiles.html"/>
+		<au:assertFileExists message="coverage artifacts created" file="${basedir}/target/report/coverage/frame-packages.html"/>
+		<au:assertFileExists message="coverage artifacts created" file="${basedir}/target/report/coverage/org.apache.easyant.plugins.coverage.HelloWorld.html"/>
+
+	</target>
+	
+</project>
\ No newline at end of file

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura-test.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/coverage-cobertura-test.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/module.ivy?rev=1071697&view=auto
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/module.ivy (added)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.plugins/coverage-cobertura/0.1/module.ivy Thu Feb 17 17:01:07 2011
@@ -0,0 +1,35 @@
+<!--
+	Copyright 2009 the EasyAnt project
+	
+	See the NOTICE file distributed with this work for additional information 
+	regarding copyright ownership.
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.  
+-->
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
+	<info organisation="org.apache.easyant" module="coverage-cobertura-test" status="integration" >
+		<description>Tests the cobertura coverage report plugin.</description>
+		<ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2">
+			<ea:property name="src.main.java" value="${basedir}/../../abstract-coverage/0.1/src/main/java"/>
+			<ea:property name="src.test.java" value="${basedir}/../../abstract-coverage/0.1/src/test/java"/>
+			<ea:plugin mrid="org.apache.easyant.plugins#coverage-cobertura;0.1" as="cobertura"/>
+		</ea:build>
+	</info>
+	<configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+	</configurations>
+	<dependencies>
+		<dependency org="junit" name="junit" rev="4.4" conf="test->default"/>
+	</dependencies>
+</ivy-module>



Mime
View raw message