ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1364410 [2/2] - in /ant/ivy/core/trunk: ./ src/java/org/apache/ivy/plugins/parser/xml/ test/buildlists/ test/buildlists/testAbsolutePathToParent/ test/buildlists/testAbsolutePathToParent/bootstrap-parent/ test/buildlists/testAbsolutePathTo...
Date Sun, 22 Jul 2012 19:45:20 GMT
Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="croatia" revision="${version}">
+    <extends organisation="com.uefa" module="master-parent" revision="${version}" 
+        location="../master-parent/ivy.xml" extendType="configurations" />
+  </info>
+  
+  <configurations>
+    <!-- Check master-parent module for inherited public confs. -->
+  </configurations>
+  
+  <publications />
+  
+  <dependencies>
+    <dependency org="com.uefa" name="master-parent" rev="${version}" conf="default->default" />
+  </dependencies>
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/croatia/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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="germany" default="build" basedir=".">
+  <target name="build" />
+</project>

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="germany" revision="${version}">
+    <extends organisation="com.uefa" module="master-parent" revision="${version}" 
+        location="../master-parent/ivy.xml" />
+  </info>
+  
+  <configurations>
+    <!-- Check master-parent module for inherited public confs. -->
+  </configurations>
+  
+  <publications />
+  
+  <dependencies>
+    <dependency org="com.uefa" name="ireland" rev="${version}" conf="default->default" />
+  </dependencies>
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/germany/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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="ireland" default="build" basedir=".">
+  <target name="build" />
+</project>

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="ireland" revision="${version}">
+    <extends organisation="com.uefa" module="master-parent" revision="${version}" 
+        location="../master-parent/ivy.xml" />
+  </info>
+  
+  <configurations>
+    <!-- Check master-parent module for inherited public confs. -->
+  </configurations>
+  
+  <publications />
+  
+  <dependencies />
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/ireland/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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 default="build" basedir="." name="master-parent">
+  <target name="build" />
+</project>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="master-parent" revision="${version}" />
+  
+  <configurations>
+    <conf name="default" />
+  </configurations>
+  
+  <publications />
+  
+  <dependencies />
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testRelativePathToParent/master-parent/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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="bootstrap-parent" default="build" basedir=".">
+  <target name="build" />
+</project>

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="bootstrap-parent" revision="${version}" />
+  
+  <configurations>
+    <conf name="default" />
+  </configurations>
+  
+  <publications />
+  
+  <dependencies />
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/bootstrap-parent/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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="croatia" default="build" basedir=".">
+  <target name="build" />
+</project>

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="croatia" revision="${version}">
+    <extends organisation="com.uefa" module="master-parent" revision="${version}" 
+        location="../master-parent/ivy.xml" extendType="configurations" />
+  </info>
+  
+  <configurations>
+    <!-- Check master-parent module for inherited public confs. -->
+  </configurations>
+  
+  <publications />
+  
+  <dependencies>
+    <dependency org="com.uefa" name="master-parent" rev="${version}" conf="default->default" />
+  </dependencies>
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/croatia/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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="germany" default="build" basedir=".">
+  <target name="build" />
+</project>

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="germany" revision="${version}">
+    <extends organisation="com.uefa" module="bootstrap-parent" revision="${version}" 
+        location="../bootstrap-parent/ivy.xml" />
+  </info>
+  
+  <configurations>
+    <!-- Check bootstrap-parent module for inherited public confs. -->
+  </configurations>
+  
+  <publications />
+  
+  <dependencies>
+    <dependency org="com.uefa" name="ireland" rev="${version}" conf="default->default" />
+  </dependencies>
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/germany/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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="ireland" default="build" basedir=".">
+  <target name="build" />
+</project>

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="ireland" revision="${version}">
+    <extends organisation="com.uefa" module="bootstrap-parent" revision="${version}" 
+        location="../bootstrap-parent/ivy.xml" />
+  </info>
+  
+  <configurations>
+    <!-- Check bootstrap-parent module for inherited public confs. -->
+  </configurations>
+  
+  <publications />
+  
+  <dependencies>
+    <dependency org="com.uefa" name="bootstrap-parent" rev="${version}" conf="default->default" />
+  </dependencies>
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/ireland/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/build.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/build.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/build.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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 default="build" basedir="." name="master-parent">
+  <target name="build" />
+</project>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/ivy.xml?rev=1364410&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/ivy.xml (added)
+++ ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/ivy.xml Sun Jul 22 19:45:18 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="com.uefa" module="master-parent" revision="${version}" />
+  
+  <configurations>
+    <conf name="default" />
+  </configurations>
+  
+  <publications />
+  
+  <dependencies />
+</ivy-module>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/buildlists/testTwoParents/master-parent/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildListTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildListTest.java?rev=1364410&r1=1364409&r2=1364410&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildListTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyBuildListTest.java Sun Jul 22 19:45:18 2012
@@ -24,579 +24,435 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.apache.ivy.util.FileUtil;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
 
+// CheckStyle:MagicNumber| OFF
+// The test very often use MagicNumber. Using a constant is less expressive.
+
 public class IvyBuildListTest extends TestCase {
 
-    /* 
-     * Those tests use the ivy files A , B , C , D , E in test/buildlist
-     * The dependencies are :
-     * A -> C
-     * B has no dependency
-     * C -> B
-     * D -> A , B
-     * E has no dependency
-     * F -> G
-     * G -> F
-     */
+    private File cache;
 
-    //CheckStyle:MagicNumber| OFF   
-    //The test very often use MagicNumber.  Using a constant is less expressive.
+    private Project project;
 
-    
-    public void testSimple() {
-        Project p = new Project();
+    private IvyBuildList buildlist;
 
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
+    protected void setUp() throws Exception {
+        createCache();
 
-        FileSet fs = new FileSet();
-        fs.setDir(new File("test/buildlist"));
-        fs.setIncludes("**/build.xml");
-        fs.setExcludes("E2/build.xml,F/build.xml,G/build.xml");
-        buildlist.addFileset(fs);
-        buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
+        project = new Project();
+        project.init();
+
+        buildlist = new IvyBuildList();
+        buildlist.setProject(project);
+
+        System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
+    }
+
+    protected void tearDown() throws Exception {
+        cleanCache();
+    }
+
+    private void cleanCache() {
+        FileUtil.forceDelete(cache);
+    }
+
+    private void createCache() {
+        cache = new File("build/cache");
+        cache.mkdirs();
+    }
 
+    private String[] getFiles(IvyBuildList buildlist) {
+        buildlist.setReference("ordered.build.files");
         buildlist.execute();
 
-        Object o = p.getReference("ordered.build.files");
+        Object o = buildlist.getProject().getReference("ordered.build.files");
         assertNotNull(o);
         assertTrue(o instanceof Path);
 
         Path path = (Path) o;
         String[] files = path.list();
         assertNotNull(files);
-        
-        assertEquals(5, files.length);
-
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[3])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/E/build.xml").getAbsolutePath(), new File(files[4])
-                .getAbsolutePath());
+        return files;
     }
 
-    public void testReverse() {
-        Project p = new Project();
+    private void assertListOfFiles(String prefix, String[] expected, String[] actual) {
+        for (int i = 0; i < expected.length; i++) {
+            assertEquals(new File(prefix + expected[i] + "/build.xml").getAbsolutePath(), new File(
+                    actual[i]).getAbsolutePath());
+        }
+    }
 
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setReverse(true);
+    /*
+     * Those tests use the ivy files A , B , C , D , E in test/buildlist The dependencies are : A ->
+     * C B has no dependency C -> B D -> A , B E has no dependency F -> G G -> F
+     */
 
+    public void testSimple() {
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/build.xml,F/build.xml,G/build.xml");
+
         buildlist.addFileset(fs);
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("reverse.ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("reverse.ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
         assertEquals(5, files.length);
 
-        assertEquals(new File("test/buildlist/E/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[3])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[4])
-                .getAbsolutePath());
-        
+        assertListOfFiles("test/buildlist/", new String[] {"B", "C", "A", "D", "E"}, files);
     }
 
-    public void testWithRoot() {
-        Project p = new Project();
+    public void testReverse() {
+        FileSet fs = new FileSet();
+        fs.setDir(new File("test/buildlist"));
+        fs.setIncludes("**/build.xml");
+        fs.setExcludes("E2/build.xml,F/build.xml,G/build.xml");
 
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setRoot("C");
+        buildlist.addFileset(fs);
+        buildlist.setReverse(true);
+        buildlist.setOnMissingDescriptor("skip");
+
+        String[] files = getFiles(buildlist);
 
+        assertEquals(5, files.length);
+
+        assertListOfFiles("test/buildlist/", new String[] {"E", "D", "A", "C", "B"}, files);
+    }
+
+    public void testWithRoot() {
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
+        buildlist.setRoot("C");
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
-
-        buildlist.execute();
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
+        String[] files = getFiles(buildlist);
 
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
         assertEquals(2, files.length); // A and D should be filtered out
 
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"B", "C"}, files);
     }
 
     public void testWithRootCircular() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setRoot("F");
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
+
         buildlist.addFileset(fs);
+        buildlist.setRoot("F");
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
         assertEquals(2, files.length); // F and G should be in the list
     }
 
     public void testWithTwoRoots() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setRoot("C,E");
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
+        buildlist.setRoot("C,E");
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
         assertEquals(3, files.length); // A and D should be filtered out
-        
 
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/E/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"B", "C", "E"}, files);
     }
 
     public void testWithRootExclude() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setRoot("C");
-        buildlist.setExcludeRoot(true);
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
+        buildlist.setRoot("C");
+        buildlist.setExcludeRoot(true);
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
         assertEquals(1, files.length); // A, D and C should be filtered out
 
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"B"}, files);
     }
 
-    
     public void testWithRootAndOnlyDirectDep() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setRoot("A");
-        buildlist.setOnlydirectdep(true);
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
+        buildlist.setRoot("A");
+        buildlist.setOnlydirectdep(true);
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
         assertEquals(2, files.length); // We should have only A and C
 
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"C", "A"}, files);
     }
 
-    
     public void testWithLeaf() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setLeaf("C");
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
+        buildlist.setLeaf("C");
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
         assertEquals(3, files.length); // B should be filtered out
-        
 
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"C", "A", "D"}, files);
     }
 
     public void testWithLeafCircular() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setLeaf("F");
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
+
         buildlist.addFileset(fs);
+        buildlist.setLeaf("F");
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
-
-        buildlist.execute();
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
+        String[] files = getFiles(buildlist);
 
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
-        assertEquals(2, files.length); 
+        assertEquals(2, files.length);
     }
 
     public void testWithTwoLeafs() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setLeaf("C,E");
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
+        buildlist.setLeaf("C,E");
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
-
-        buildlist.execute();
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
+        String[] files = getFiles(buildlist);
 
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
         assertEquals(4, files.length); // B should be filtered out
 
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/E/build.xml").getAbsolutePath(), new File(files[3])
-                .getAbsolutePath());
-        
+        assertListOfFiles("test/buildlist/", new String[] {"C", "A", "D", "E"}, files);
     }
 
     public void testWithLeafExclude() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setLeaf("C");
-        buildlist.setExcludeLeaf(true);
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
+        buildlist.setLeaf("C");
+        buildlist.setExcludeLeaf(true);
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
         assertEquals(2, files.length); // B and C should be filtered out
 
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"A", "D"}, files);
     }
 
-    
     public void testWithLeafAndOnlyDirectDep() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setLeaf("C");
-        buildlist.setOnlydirectdep(true);
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/**");
+
         buildlist.addFileset(fs);
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
-
-        buildlist.execute();
+        buildlist.setLeaf("C");
+        buildlist.setOnlydirectdep(true);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
+        String[] files = getFiles(buildlist);
 
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
         assertEquals(2, files.length); // We must have only A and C
 
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"C", "A"}, files);
     }
 
-    
     public void testRestartFrom() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-        buildlist.setRestartFrom("C");
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/build.xml,F/build.xml,G/build.xml");
+
         buildlist.addFileset(fs);
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
-
-        buildlist.execute();
+        buildlist.setRestartFrom("C");
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
+        String[] files = getFiles(buildlist);
 
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
         assertEquals(4, files.length);
 
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/E/build.xml").getAbsolutePath(), new File(files[3])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"C", "A", "D", "E"}, files);
     }
-    
-    public void testOnMissingDescriptor() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
 
+    public void testOnMissingDescriptor() {
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("E2/build.xml,F/build.xml,G/build.xml");
+
         buildlist.addFileset(fs);
         buildlist.setOnMissingDescriptor(new String("tail")); // IVY-805: new String instance
-        buildlist.setReference("ordered.build.files");
-        buildlist.execute();
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
+        String[] files = getFiles(buildlist);
 
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
         assertEquals(6, files.length);
 
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[3])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/E/build.xml").getAbsolutePath(), new File(files[4])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/H/build.xml").getAbsolutePath(), new File(files[5])
-                .getAbsolutePath());
-        
+        assertListOfFiles("test/buildlist/", new String[] {"B", "C", "A", "D", "E", "H"}, files);
+    }
+
+    public void testOnMissingDescriptor2() {
+        FileSet fs = new FileSet();
+        fs.setDir(new File("test/buildlist"));
+        fs.setIncludes("**/build.xml");
+        fs.setExcludes("E2/build.xml,F/build.xml,G/build.xml");
+
+        buildlist.addFileset(fs);
         buildlist.setOnMissingDescriptor(new String("skip")); // IVY-805: new String instance
-        buildlist.execute();
 
-        o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
+        String[] files = getFiles(buildlist);
 
-        path = (Path) o;
-        files = path.list();
-        assertNotNull(files);
-        
         assertEquals(5, files.length);
 
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[3])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/E/build.xml").getAbsolutePath(), new File(files[4])
-                .getAbsolutePath());
+        assertListOfFiles("test/buildlist/", new String[] {"B", "C", "A", "D", "E"}, files);
     }
 
     public void testWithModuleWithSameNameAndDifferentOrg() {
-        Project p = new Project();
-
-        IvyBuildList buildlist = new IvyBuildList();
-        buildlist.setProject(p);
-
         FileSet fs = new FileSet();
         fs.setDir(new File("test/buildlist"));
         fs.setIncludes("**/build.xml");
         fs.setExcludes("F/build.xml,G/build.xml");
+
         buildlist.addFileset(fs);
         buildlist.setOnMissingDescriptor("skip");
-        buildlist.setReference("ordered.build.files");
 
-        buildlist.execute();
+        String[] files = getFiles(buildlist);
 
-        Object o = p.getReference("ordered.build.files");
-        assertNotNull(o);
-        assertTrue(o instanceof Path);
-
-        Path path = (Path) o;
-        String[] files = path.list();
-        assertNotNull(files);
-        
         assertEquals(6, files.length);
 
-        assertEquals(new File("test/buildlist/B/build.xml").getAbsolutePath(), new File(files[0])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/C/build.xml").getAbsolutePath(), new File(files[1])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/A/build.xml").getAbsolutePath(), new File(files[2])
-                .getAbsolutePath());
-        assertEquals(new File("test/buildlist/D/build.xml").getAbsolutePath(), new File(files[3])
-                .getAbsolutePath());
-        
+        assertListOfFiles("test/buildlist/", new String[] {"B", "C", "A", "D"}, files);
+
         // the order of E and E2 is undefined
         List other = new ArrayList();
         other.add(new File(files[4]).getAbsoluteFile().toURI());
         other.add(new File(files[5]).getAbsoluteFile().toURI());
         Collections.sort(other);
-        
+
         assertEquals(new File("test/buildlist/E/build.xml").getAbsoluteFile().toURI(), other.get(0));
-        assertEquals(new File("test/buildlist/E2/build.xml").getAbsoluteFile().toURI(), other.get(1));
+        assertEquals(new File("test/buildlist/E2/build.xml").getAbsoluteFile().toURI(),
+            other.get(1));
     }
-    
+
+    public void testNoParents() {
+        FileSet fs = new FileSet();
+        fs.setDir(new File("test/buildlists/testNoParents"));
+        fs.setIncludes("**/build.xml");
+
+        buildlist.addFileset(fs);
+        buildlist.setOnMissingDescriptor("skip");
+        buildlist.setHaltonerror(false);
+
+        String[] files = getFiles(buildlist);
+
+        assertEquals(5, files.length);
+
+        assertListOfFiles("test/buildlists/testNoParents/", new String[] {"bootstrap-parent",
+                "ireland", "germany", "master-parent", "croatia"}, files);
+    }
+
+    public void testOneParent() {
+        FileSet fs = new FileSet();
+        fs.setDir(new File("test/buildlists/testOneParent"));
+        fs.setIncludes("**/build.xml");
+
+        buildlist.addFileset(fs);
+        buildlist.setOnMissingDescriptor("skip");
+        buildlist.setHaltonerror(false);
+
+        String[] files = getFiles(buildlist);
+
+        assertEquals(5, files.length);
+
+        assertListOfFiles("test/buildlists/testOneParent/", new String[] {"bootstrap-parent",
+                "master-parent", "croatia", "ireland", "germany"}, files);
+    }
+
+    public void testTwoParents() {
+        FileSet fs = new FileSet();
+        fs.setDir(new File("test/buildlists/testTwoParents"));
+        fs.setIncludes("**/build.xml");
+
+        buildlist.addFileset(fs);
+        buildlist.setOnMissingDescriptor("skip");
+        buildlist.setHaltonerror(false);
+
+        String[] files = getFiles(buildlist);
+
+        assertEquals(5, files.length);
+
+        assertListOfFiles("test/buildlists/testTwoParents/", new String[] {"bootstrap-parent",
+                "master-parent", "croatia", "ireland", "germany"}, files);
+    }
+
+    public void testRelativePathToParent() {
+        FileSet fs = new FileSet();
+        fs.setDir(new File("test/buildlists/testRelativePathToParent"));
+        fs.setIncludes("**/build.xml");
+
+        buildlist.addFileset(fs);
+        buildlist.setOnMissingDescriptor("skip");
+        buildlist.setHaltonerror(false);
+
+        String[] files = getFiles(buildlist);
+
+        assertEquals(5, files.length);
+
+        assertListOfFiles("test/buildlists/testRelativePathToParent/", new String[] {
+                "bootstrap-parent", "master-parent", "croatia", "ireland", "germany"}, files);
+    }
+
+    public void testAbsolutePathToParent() {
+        project.setProperty("master-parent.dir", new File("test/buildlists/testAbsolutePathToParent/master-parent").getAbsolutePath());
+
+        FileSet fs = new FileSet();
+        fs.setDir(new File("test/buildlists/testAbsolutePathToParent"));
+        fs.setIncludes("**/build.xml");
+
+        buildlist.addFileset(fs);
+        buildlist.setOnMissingDescriptor("skip");
+        buildlist.setHaltonerror(false);
+
+        String[] files = getFiles(buildlist);
+
+        assertEquals(5, files.length);
+
+        assertListOfFiles("test/buildlists/testAbsolutePathToParent/", new String[] {
+                "bootstrap-parent", "master-parent", "croatia", "ireland", "germany"}, files);
+    }
+
 }
-//CheckStyle:MagicNumber| ON
\ No newline at end of file
+// CheckStyle:MagicNumber| ON
\ No newline at end of file



Mime
View raw message