incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1073371 [9/28] - in /incubator/easyant/core/trunk: ./ bin/ example/build-configurations/ example/build-configurations/src/main/java/org/apache/easyant/example/ example/build-configurations/src/test/java/org/apache/easyant/example/ example/...
Date Tue, 22 Feb 2011 15:56:09 GMT
Modified: incubator/easyant/core/trunk/src/documentation/ref/features.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/ref/features.html?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/ref/features.html (original)
+++ incubator/easyant/core/trunk/src/documentation/ref/features.html Tue Feb 22 15:55:55 2011
@@ -17,12 +17,12 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
-	<script type="text/javascript" src="../xooki/xooki.js"></script>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+    <script type="text/javascript">var xookiConfig = {level: 1};</script>   
+    <script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
+    <textarea id="xooki-source">
 <h1>Features</h1>
 
 Easyant is a toolbox focusing on easing project build processes.

Modified: incubator/easyant/core/trunk/src/documentation/ref/phases.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/ref/phases.html?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/ref/phases.html (original)
+++ incubator/easyant/core/trunk/src/documentation/ref/phases.html Tue Feb 22 15:55:55 2011
@@ -17,12 +17,12 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 1};</script>	
-	<script type="text/javascript" src="../xooki/xooki.js"></script>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+    <script type="text/javascript">var xookiConfig = {level: 1};</script>   
+    <script type="text/javascript" src="../xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
+    <textarea id="xooki-source">
 <h1>Understanding phases</h1>
 <p>
   a phase is a kind of target with special features:
@@ -42,12 +42,12 @@ module A:
 <target name=":bar" phase="foo" >
   <dobar />
 </target>
-</code>	
+</code> 
 module B:
 <code type="xml">
 <ea:include module="A"/>
 <target name=":another-bar" phase="foo" >
-</code>	
+</code> 
 
 
 By calling to 

Modified: incubator/easyant/core/trunk/src/documentation/ref/plugins/plugins.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/ref/plugins/plugins.html?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/ref/plugins/plugins.html (original)
+++ incubator/easyant/core/trunk/src/documentation/ref/plugins/plugins.html Tue Feb 22 15:55:55 2011
@@ -17,13 +17,13 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 2};</script>	
-	<script type="text/javascript" src="../../xooki/xooki.js"></script>
-	<title>EasyAnt Plugins</title>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+    <script type="text/javascript">var xookiConfig = {level: 2};</script>   
+    <script type="text/javascript" src="../../xooki/xooki.js"></script>
+    <title>EasyAnt Plugins</title>
 </head>
 <body>
-	<textarea id="xooki-source">
+    <textarea id="xooki-source">
 <h1>Plugins</h1>
 
 <p>An EasyAnt plugin defines a single small "task" performed by EasyAnt, for example: run unit tests, generate a build report, or package a jar.  Plugins can then be included into buildtypes or other plugins to define more complicated tasks (like "build a complete web application").  You can also include a plugin directly into your project's Ivy file to customize the way your project is built.</p>

Modified: incubator/easyant/core/trunk/src/documentation/ref/plugins/toc.json
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/ref/plugins/toc.json?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/ref/plugins/toc.json (original)
+++ incubator/easyant/core/trunk/src/documentation/ref/plugins/toc.json Tue Feb 22 15:55:55 2011
@@ -16,6 +16,6 @@
  *
  */
 {
-	"id": "plugins",
-	"children":[]
+    "id": "plugins",
+    "children":[]
 } 

Modified: incubator/easyant/core/trunk/src/documentation/reference.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/reference.html?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/reference.html (original)
+++ incubator/easyant/core/trunk/src/documentation/reference.html Tue Feb 22 15:55:55 2011
@@ -17,12 +17,12 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
-	<script type="text/javascript" src="xooki/xooki.js"></script>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+    <script type="text/javascript">var xookiConfig = {level: 0};</script>   
+    <script type="text/javascript" src="xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
+    <textarea id="xooki-source">
 <h1>Reference</h1>
 
 If you don't know EasyAnt at all, give a glance at its <a href="ref/features.html">features</a>, the <a href="faq.html">FAQ</a> and the <a href="tutorials.html">tutorials</a> before digging into this reference documentation.

Modified: incubator/easyant/core/trunk/src/documentation/style/style.css
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/style/style.css?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/style/style.css (original)
+++ incubator/easyant/core/trunk/src/documentation/style/style.css Tue Feb 22 15:55:55 2011
@@ -21,16 +21,16 @@ http://www.freecsstemplates.org
 Released for free under a Creative Commons Attribution 2.5 License
 */
 body {
-	background: #FFFFFF url(../images/img01.gif) repeat-x;
-	font: normal small Arial, Helvetica, sans-serif;
-	color: #6c6c6c;
-	padding: 0;
-	margin: 0;
+    background: #FFFFFF url(../images/img01.gif) repeat-x;
+    font: normal small Arial, Helvetica, sans-serif;
+    color: #6c6c6c;
+    padding: 0;
+    margin: 0;
 }
 
 h1, h2, h3 {
-	margin: 0;
-	color: #11A6D4;
+    margin: 0;
+    color: #11A6D4;
 }
 
 pre {
@@ -39,300 +39,300 @@ pre {
 }
 
 a {
-	color: #EA672E;
+    color: #EA672E;
 }
 
 a:hover {
-	text-decoration: none;
-	color: #11A6D4;
+    text-decoration: none;
+    color: #11A6D4;
 }
 
 img {
-	border: none;
+    border: none;
 }
 
 thead {
-	background-color: #eeeeee;
-	color: #FFFFFF;
-	
+    background-color: #eeeeee;
+    color: #FFFFFF;
+    
 }
 
 table, sortable {
-	margin-top: 10px;
-	margin-bottom: 10px;
-	border: 1px solid #CCCCCC;
-	background-color: #F7F7F7;
-	 
+    margin-top: 10px;
+    margin-bottom: 10px;
+    border: 1px solid #CCCCCC;
+    background-color: #F7F7F7;
+     
 
 }
 
 #mandatory {
-	background-color: #CCFFFF;
+    background-color: #CCFFFF;
 }
 
 
 /* Header */
 
 #header {
-	height: 130px;
-	margin: 0 auto;
-	padding: 0;
-	background: url(../images/img02.jpg) no-repeat;
+    height: 130px;
+    margin: 0 auto;
+    padding: 0;
+    background: url(../images/img02.jpg) no-repeat;
 }
 
 /* Header > Logo */
 
 #logo {
-	float: left;
-	padding: 65px 0 0 0;
+    float: left;
+    padding: 65px 0 0 0;
 }
 
 #logo h1 {
-	text-transform: uppercase;
-	font-size: 2em;
+    text-transform: uppercase;
+    font-size: 2em;
 }
 
 #logo h2 {
-	margin: 0;
-	text-transform: uppercase;
-	font-size: 1.2em;
+    margin: 0;
+    text-transform: uppercase;
+    font-size: 1.2em;
 }
 
 #logo a {
-	text-decoration: none;
-	color: #FFFFFF;
+    text-decoration: none;
+    color: #FFFFFF;
 }
 
 /* Header > Top Menu */
 
 #topmenu {
-	float: right;
+    float: right;
 }
 
 #topmenu ul {
-	margin: 0;
-	padding: 100px 15px 0 0;
-	list-style: none;
-	line-height: normal;
+    margin: 0;
+    padding: 100px 15px 0 0;
+    list-style: none;
+    line-height: normal;
 }
 
 #topmenu li {
-	display: inline
+    display: inline
 }
 
 #topmenu a {
-	display: block;
-	float: left;
-	margin: 0 0 0 20px;
-	padding: 0 0 0 15px;
-	text-transform: uppercase;
-	text-decoration: none;
-	font-size: x-small;
-	font-weight: bold;
-	color: #FFFFFF;
+    display: block;
+    float: left;
+    margin: 0 0 0 20px;
+    padding: 0 0 0 15px;
+    text-transform: uppercase;
+    text-decoration: none;
+    font-size: x-small;
+    font-weight: bold;
+    color: #FFFFFF;
 }
 
 #topmenu a:hover {
-	text-decoration: underline
+    text-decoration: underline
 }
 
 #topmenu1 {
-	background: url(../images/img03.gif) no-repeat left center;
+    background: url(../images/img03.gif) no-repeat left center;
 }
 
 #topmenu2 {
-	background: url(../images/img04.gif) no-repeat left center;
+    background: url(../images/img04.gif) no-repeat left center;
 }
 
 #topmenu3 {
-	background: url(../images/img05.gif) no-repeat left center;
+    background: url(../images/img05.gif) no-repeat left center;
 }
 
 /* Menu */
 
 #menu {
-	
-	height: 40px;
-	margin: 0 auto;
+    
+    height: 40px;
+    margin: 0 auto;
 }
 
 #menu ul {
-	margin: 0;
-	list-style: none;
-	line-height: normal;
+    margin: 0;
+    list-style: none;
+    line-height: normal;
 }
 
 #menu li {
-	display: inline;
+    display: inline;
 }
 
 #menu a {
-	display: block;
-	float: left;
-	height: 26px;
-	padding: 14px 18px 0 20px;
-	background: url(../images/img06.gif) no-repeat;
-	text-transform: uppercase;
-	text-decoration: none;
-	font-weight: bold;
+    display: block;
+    float: left;
+    height: 26px;
+    padding: 14px 18px 0 20px;
+    background: url(../images/img06.gif) no-repeat;
+    text-transform: uppercase;
+    text-decoration: none;
+    font-weight: bold;
 }
 
 #menu a:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 
 #menu .first a {
-	padding-left: 0;
-	background: none;
+    padding-left: 0;
+    background: none;
 }
 
 /* Content */
 
 #content {
-	margin: 0 auto;
-	width: 95%;
-	padding: 20px 20px;
+    margin: 0 auto;
+    width: 95%;
+    padding: 20px 20px;
 }
 
 /* Footer */
 
 #footer {
-	clear: both;
-	width: 95%;
-	margin: 0 auto 2em auto;
-	background: #F7F7F7 url(../images/img07.gif) repeat-x;
-	border: 1px solid #CCCCCC;
+    clear: both;
+    width: 95%;
+    margin: 0 auto 2em auto;
+    background: #F7F7F7 url(../images/img07.gif) repeat-x;
+    border: 1px solid #CCCCCC;
 }
 
 /* Footer > Legal */
 
 #legal {
-	margin: 0;
-	padding: 8px;
-	text-align: center;
-	color: #FFFFFF;
+    margin: 0;
+    padding: 8px;
+    text-align: center;
+    color: #FFFFFF;
 }
 
 #legal a {
-	font-weight: bold;
-	color: #FFFFFF;
+    font-weight: bold;
+    color: #FFFFFF;
 }
 
 /* Boxed Style */
 
 .boxed {
-	margin-bottom: 1em;
-	background: #F7F7F7 url(../images/img07.gif) repeat-x;
-	border: 1px solid #CCCCCC;
+    margin-bottom: 1em;
+    background: #F7F7F7 url(../images/img07.gif) repeat-x;
+    border: 1px solid #CCCCCC;
 }
 
 .boxed .title {
-	height: 29px;
-	padding: 11px 0 0 27px;
-	background: url(../images/img08.gif) no-repeat 10px 50%;
-	text-transform: uppercase;
-	font-size: 1.2em;
-	color: #FFFFFF;
+    height: 29px;
+    padding: 11px 0 0 27px;
+    background: url(../images/img08.gif) no-repeat 10px 50%;
+    text-transform: uppercase;
+    font-size: 1.2em;
+    color: #FFFFFF;
 }
 
 .boxed .content {
-	padding: 10px;
+    padding: 10px;
 }
 
 /* Posts */
 
 #posts {
-	float: left;
-	width: 75%;
+    float: left;
+    width: 75%;
 }
 
 /* Links */
 
 #links {
-	
-	padding-left: 10px;
-	background-repeat: no-repeat; 
-	/* background: url(../images/img05.gif) repeat-y;*/
+    
+    padding-left: 10px;
+    background-repeat: no-repeat; 
+    /* background: url(../images/img05.gif) repeat-y;*/
 }
 
 #links ul {
-	margin: 0;
-	padding: 0;
-	background-repeat: no-repeat; 
-	list-style: none; 
+    margin: 0;
+    padding: 0;
+    background-repeat: no-repeat; 
+    list-style: none; 
 }
 
 #links li {
-	background-repeat: no-repeat; 
+    background-repeat: no-repeat; 
 }
 
 #links li a {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 #links li a:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 
 #links li i {
-	font-style: normal;
-	font-size: 14px;
+    font-style: normal;
+    font-size: 14px;
 }
 
 #links li h2 {
-	font-size: 14px;
+    font-size: 14px;
 }
 
 
 /* Content > Sidebar */
 
 #sidebar {
-	float: right;
-	width: 23%;
+    float: right;
+    width: 23%;
 }
 
 td.spacer {
-	border-top: none;
-	background-color: #f5f5f5;
+    border-top: none;
+    background-color: #f5f5f5;
 }
 
 header-row, thead  {
-	font-weight: bold;
-	color: #EA672E;
+    font-weight: bold;
+    color: #EA672E;
 }
 
 .odd {background-color:#f6f7f8;}
 .even {background-color: #fff;}
 
 .phase-name {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 span.bold {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 span.defaultValue, span.buildTypeValue {
-	font-style: italic;
+    font-style: italic;
 
 }
 
 
 #buildtype-phases, td.phase-row {
-	vertical-align:top;
-	border-spacing:0px;
-	border-top: 1px solid black;
+    vertical-align:top;
+    border-spacing:0px;
+    border-top: 1px solid black;
 }
 
 #note {
-	background-image: url('../images/info.gif');
-	background-repeat: no-repeat;
-	background-color: #eeeeee;
-	min-height:48px; 
-	margin-top: 5px;
-	margin-bottom: 5px;
-	padding-left: 50px;
-	padding-top : 12px;
-	border: 1px solid #dddddd;
+    background-image: url('../images/info.gif');
+    background-repeat: no-repeat;
+    background-color: #eeeeee;
+    min-height:48px; 
+    margin-top: 5px;
+    margin-bottom: 5px;
+    padding-left: 50px;
+    padding-top : 12px;
+    border: 1px solid #dddddd;
 
 }

Modified: incubator/easyant/core/trunk/src/documentation/style/tree.css
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/style/tree.css?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/style/tree.css (original)
+++ incubator/easyant/core/trunk/src/documentation/style/tree.css Tue Feb 22 15:55:55 2011
@@ -44,4 +44,4 @@ display: none; 
 
 .treeview .submenu ul li{
 cursor: default;
-}
\ No newline at end of file
+}

Modified: incubator/easyant/core/trunk/src/documentation/template.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/template.html?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/template.html (original)
+++ incubator/easyant/core/trunk/src/documentation/template.html Tue Feb 22 15:55:55 2011
@@ -28,40 +28,40 @@
 </head>
 <body>
 <div id="header">
-	<div id="topmenu">
-		<ul>
-			<li><a href="index.html" id="topmenu1" accesskey="1" title="">Home</a></li>
-			<li><a href="contact.html" id="topmenu2" accesskey="2" title="">Contact</a></li>
-		</ul>
-	</div>
+    <div id="topmenu">
+        <ul>
+            <li><a href="index.html" id="topmenu1" accesskey="1" title="">Home</a></li>
+            <li><a href="contact.html" id="topmenu2" accesskey="2" title="">Contact</a></li>
+        </ul>
+    </div>
 </div>
 <!-- end #header -->
 <div id="menu">
-	<ul>
-		<li class="first"><a href="index.html" accesskey="1" title="">Home</a></li>
-		<li><a href="#" title="">License</a></li>
-		<li><a href="tutorials.html" title="">Tutorials</a></li>
-		<li><a href="reference.html" title="">References</a></li>
-	</ul>
+    <ul>
+        <li class="first"><a href="index.html" accesskey="1" title="">Home</a></li>
+        <li><a href="#" title="">License</a></li>
+        <li><a href="tutorials.html" title="">Tutorials</a></li>
+        <li><a href="reference.html" title="">References</a></li>
+    </ul>
 </div>
 <!-- end #menu -->
 <div id="content">
-	<div id="posts">
-		${body}
-	</div>
-	<!-- end #posts -->
-	<div id="sidebar" class="boxed">
-		<h2 class="title">EasyAnt Menu</h2>
-		<div id="links">
-				${menu}
-		</div>
-	</div>
-	<!-- end #links -->
-	<div style="clear: both;">&nbsp;</div>
+    <div id="posts">
+        ${body}
+    </div>
+    <!-- end #posts -->
+    <div id="sidebar" class="boxed">
+        <h2 class="title">EasyAnt Menu</h2>
+        <div id="links">
+                ${menu}
+        </div>
+    </div>
+    <!-- end #links -->
+    <div style="clear: both;">&nbsp;</div>
 </div>
 <!-- end #content -->
 <div id="footer">
-	<p id="legal">Copyright &copy; 2008-2010 EasyAnt project. Designed by <a href="http://www.freecsstemplates.org/">Free CSS Templates</a></p>
+    <p id="legal">Copyright &copy; 2008-2010 EasyAnt project. Designed by <a href="http://www.freecsstemplates.org/">Free CSS Templates</a></p>
 </div>
 <!-- end #footer -->
 </body>

Modified: incubator/easyant/core/trunk/src/documentation/toc.json
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/toc.json?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/toc.json (original)
+++ incubator/easyant/core/trunk/src/documentation/toc.json Tue Feb 22 15:55:55 2011
@@ -299,4 +299,4 @@
           ]
       }
     ]
-}
\ No newline at end of file
+}

Modified: incubator/easyant/core/trunk/src/documentation/tutorials.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/tutorials.html?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/tutorials.html (original)
+++ incubator/easyant/core/trunk/src/documentation/tutorials.html Tue Feb 22 15:55:55 2011
@@ -17,12 +17,12 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: 0};</script>	
-	<script type="text/javascript" src="xooki/xooki.js"></script>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+    <script type="text/javascript">var xookiConfig = {level: 0};</script>   
+    <script type="text/javascript" src="xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
+    <textarea id="xooki-source">
 <h1>Tutorial</h1>
 The best way to learn is to practice! That's what the tutorials will help you to do, to discover some of the great EasyAnt features.
 
@@ -30,8 +30,8 @@ The best way to learn is to practice! Th
 The only thing you need to do to use easyant is to set the EASYANT_HOME property.
 You should first set up in your environment the EASYANT_HOME variable :
 <ul>
-    <li>for windows users : set EASYANT_HOME=path\to\easyant</li>
-    <li>for unix users : export EASYANT_HOME=path/to/easyant</li>
+    <li>for windows users : set EASYANT_HOME=c:\path\to\easyant</li>
+    <li>for unix users : export EASYANT_HOME=/path/to/easyant</li>
 </ul>
 You may also add EASYANT_HOME to your path :
 <ul>

Modified: incubator/easyant/core/trunk/src/documentation/xooki/antlib.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/xooki/antlib.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/xooki/antlib.xml (original)
+++ incubator/easyant/core/trunk/src/documentation/xooki/antlib.xml Tue Feb 22 15:55:55 2011
@@ -22,7 +22,7 @@
         <attribute name="checkUpToDate"/>
         <attribute name="printerFriendly"/>
         <![CDATA[
-			print('Target Dir: ' + attributes.get("destdir"));
+            print('Target Dir: ' + attributes.get("destdir"));
             importClass(java.io.File);
 
             fs = elements.get("fileset").get(0);
@@ -111,4 +111,4 @@
           }
         ]]>
     </scriptdef>
-</antlib>
\ No newline at end of file
+</antlib>

Modified: incubator/easyant/core/trunk/src/documentation/xooki/blankPageTpl.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/xooki/blankPageTpl.html?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/xooki/blankPageTpl.html (original)
+++ incubator/easyant/core/trunk/src/documentation/xooki/blankPageTpl.html Tue Feb 22 15:55:55 2011
@@ -17,13 +17,13 @@
 -->
 <html>
 <head>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-	<script type="text/javascript">var xookiConfig = {level: ${level}};</script>	
-	<script type="text/javascript" src="${relroot}xooki/xooki.js"></script>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
+    <script type="text/javascript">var xookiConfig = {level: ${level}};</script>    
+    <script type="text/javascript" src="${relroot}xooki/xooki.js"></script>
 </head>
 <body>
-	<textarea id="xooki-source">
-	</textarea>
+    <textarea id="xooki-source">
+    </textarea>
 <script type="text/javascript">xooki.postProcess();</script>
 </body>
 </html>

Modified: incubator/easyant/core/trunk/src/documentation/xooki/messages.json
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/xooki/messages.json?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/xooki/messages.json (original)
+++ incubator/easyant/core/trunk/src/documentation/xooki/messages.json Tue Feb 22 15:55:55 2011
@@ -16,5 +16,6 @@
  *
  */
 {
-        	"Impossible to save changes to ${0}": "Impossible to save changes to ${0}.\n This could be because your browser doesn't support saving (instead, use FireFox if you can), or because the pathname to your Xooki file contains illegal characters"
+            "Impossible to save changes to ${0}": "Impossible to save changes to ${0}.
+ This could be because your browser doesn't support saving (instead, use FireFox if you can), or because the pathname to your Xooki file contains illegal characters"
 }

Modified: incubator/easyant/core/trunk/src/documentation/xooki/tiddly/util.js
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/xooki/tiddly/util.js?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/xooki/tiddly/util.js (original)
+++ incubator/easyant/core/trunk/src/documentation/xooki/tiddly/util.js Tue Feb 22 15:55:55 2011
@@ -36,139 +36,147 @@ if (typeof xooki.io == "undefined") {
 }
 
 xooki.io.saveFile = function (fileUrl, content) {
-	var r = null;
-	if((r == null) || (r == false))
-		r = mozillaSaveFile(fileUrl, content);
-	if((r == null) || (r == false))
-		r = ieSaveFile(fileUrl, content);
-	return(r);
+    var r = null;
+    if((r == null) || (r == false))
+        r = mozillaSaveFile(fileUrl, content);
+    if((r == null) || (r == false))
+        r = ieSaveFile(fileUrl, content);
+    return(r);
 }
 
 xooki.io.loadFile = function (fileUrl) {
-	var r = null;
-	if((r == null) || (r == false))
-		r = mozillaLoadFile(fileUrl);
-	if((r == null) || (r == false))
-		r = ieLoadFile(fileUrl);
-	return(r);
+    var r = null;
+    if((r == null) || (r == false))
+        r = mozillaLoadFile(fileUrl);
+    if((r == null) || (r == false))
+        r = ieLoadFile(fileUrl);
+    return(r);
 }
 
 xooki.io.getLocalPath = function (originalPath) {
-	// Remove any location or query part of the URL
-	var argPos = originalPath.indexOf("?");
-	if(argPos != -1)
-		originalPath = originalPath.substr(0,argPos);
-	var hashPos = originalPath.indexOf("#");
-	if(hashPos != -1)
-		originalPath = originalPath.substr(0,hashPos);
-	// Convert file://localhost/ to file:///
-	if(originalPath.indexOf("file://localhost/") == 0)
-		originalPath = "file://" + originalPath.substr(16);
-	// Convert to a native file format assuming
-	// "file:///x:/path/path/path..." - pc local file --> "x:\path\path\path..."
-	// "file://///server/share/path/path/path..." - FireFox pc network file --> "\\server\share\path\path\path..."
-	// "file:///path/path/path..." - mac/unix local file --> "/path/path/path..."
-	// "file://server/share/path/path/path..." - pc network file --> "\\server\share\path\path\path..."
-	var localPath;
-	if(originalPath.charAt(9) == ":") // pc local file
-		localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\\");
-	else if(originalPath.indexOf("file://///") == 0) // FireFox pc network file
-		localPath = "\\\\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\\");
-	else if(originalPath.indexOf("file:///") == 0) // mac/unix local file
-		localPath = unescape(originalPath.substr(7));
-	else if(originalPath.indexOf("file:/") == 0) // mac/unix local file
-		localPath = unescape(originalPath.substr(5));
-	else // pc network file
-		localPath = "\\\\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\\");
-	return localPath;
+    // Remove any location or query part of the URL
+    var argPos = originalPath.indexOf("?");
+    if(argPos != -1)
+        originalPath = originalPath.substr(0,argPos);
+    var hashPos = originalPath.indexOf("#");
+    if(hashPos != -1)
+        originalPath = originalPath.substr(0,hashPos);
+    // Convert file://localhost/ to file:///
+    if(originalPath.indexOf("file://localhost/") == 0)
+        originalPath = "file://" + originalPath.substr(16);
+    // Convert to a native file format assuming
+    // "file:///x:/path/path/path..." - pc local file --> "x:\path\path\path..."
+    // "file://///server/share/path/path/path..." - FireFox pc network file --> "\server\share\path\path\path..."
+    // "file:///path/path/path..." - mac/unix local file --> "/path/path/path..."
+    // "file://server/share/path/path/path..." - pc network file --> "\server\share\path\path\path..."
+    var localPath;
+    if(originalPath.charAt(9) == ":") // pc local file
+        localPath = unescape(originalPath.substr(8)).replace(new RegExp("/","g"),"\");
+    else if(originalPath.indexOf("file://///") == 0) // FireFox pc network file
+        localPath = "\" + unescape(originalPath.substr(10)).replace(new RegExp("/","g"),"\");
+    else if(originalPath.indexOf("file:///") == 0) // mac/unix local file
+        localPath = unescape(originalPath.substr(7));
+    else if(originalPath.indexOf("file:/") == 0) // mac/unix local file
+        localPath = unescape(originalPath.substr(5));
+    else // pc network file
+        localPath = "\" + unescape(originalPath.substr(7)).replace(new RegExp("/","g"),"\");
+    return localPath;
 }
 
 
 // Returns null if it can't do it, false if there's an error, true if it saved OK
 function ieSaveFile(filePath, content)
 {
-	try
-		{
-		var fso = new ActiveXObject("Scripting.FileSystemObject");
-		}
-	catch(e)
-		{
-		//alert("Exception while attempting to save\n\n" + e.toString());
-		return(null);
-		}
-	var file = fso.OpenTextFile(filePath,2,-1,0);
-	file.Write(content);
-	file.Close();
-	return(true);
+    try
+        {
+        var fso = new ActiveXObject("Scripting.FileSystemObject");
+        }
+    catch(e)
+        {
+        //alert("Exception while attempting to save
+
+" + e.toString());
+        return(null);
+        }
+    var file = fso.OpenTextFile(filePath,2,-1,0);
+    file.Write(content);
+    file.Close();
+    return(true);
 }
 
 // Returns null if it can't do it, false if there's an error, or a string of the content if successful
 function ieLoadFile(filePath)
 {
-	try
-		{
-		var fso = new ActiveXObject("Scripting.FileSystemObject");
-		var file = fso.OpenTextFile(filePath,1);
-		var content = file.ReadAll();
-		file.Close();
-		}
-	catch(e)
-		{
-		//alert("Exception while attempting to load\n\n" + e.toString());
-		return(null);
-		}
-	return(content);
+    try
+        {
+        var fso = new ActiveXObject("Scripting.FileSystemObject");
+        var file = fso.OpenTextFile(filePath,1);
+        var content = file.ReadAll();
+        file.Close();
+        }
+    catch(e)
+        {
+        //alert("Exception while attempting to load
+
+" + e.toString());
+        return(null);
+        }
+    return(content);
 }
 
 // Returns null if it can't do it, false if there's an error, true if it saved OK
 function mozillaSaveFile(filePath, content)
 {
-	if(window.Components)
-		try
-			{
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-			file.initWithPath(filePath);
-			if (!file.exists())
-				file.create(0, 0664);
-			var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
-			out.init(file, 0x20 | 0x02, 00004,null);
-			out.write(content, content.length);
-			out.flush();
-			out.close();
-			return(true);
-			}
-		catch(e)
-			{
-			//alert("Exception while attempting to save\n\n" + e);
-			return(false);
-			}
-	return(null);
+    if(window.Components)
+        try
+            {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+            file.initWithPath(filePath);
+            if (!file.exists())
+                file.create(0, 0664);
+            var out = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+            out.init(file, 0x20 | 0x02, 00004,null);
+            out.write(content, content.length);
+            out.flush();
+            out.close();
+            return(true);
+            }
+        catch(e)
+            {
+            //alert("Exception while attempting to save
+
+" + e);
+            return(false);
+            }
+    return(null);
 }
 
 // Returns null if it can't do it, false if there's an error, or a string of the content if successful
 function mozillaLoadFile(filePath)
 {
-	if(window.Components)
-		try
-			{
-			netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-			file.initWithPath(filePath);
-			if (!file.exists())
-				return(null);
-			var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
-			inputStream.init(file, 0x01, 00004, null);
-			var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
-			sInputStream.init(inputStream);
-			return(sInputStream.read(sInputStream.available()));
-			}
-		catch(e)
-			{
-			//alert("Exception while attempting to load\n\n" + e);
-			return(false);
-			}
-	return(null);
+    if(window.Components)
+        try
+            {
+            netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+            var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
+            file.initWithPath(filePath);
+            if (!file.exists())
+                return(null);
+            var inputStream = Components.classes["@mozilla.org/network/file-input-stream;1"].createInstance(Components.interfaces.nsIFileInputStream);
+            inputStream.init(file, 0x01, 00004, null);
+            var sInputStream = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+            sInputStream.init(inputStream);
+            return(sInputStream.read(sInputStream.available()));
+            }
+        catch(e)
+            {
+            //alert("Exception while attempting to load
+
+" + e);
+            return(false);
+            }
+    return(null);
 }
 
 // end tiddly wiki borrowed code

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/common/test-utils.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/common/test-utils.ant?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/common/test-utils.ant (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/common/test-utils.ant Tue Feb 22 15:55:55 2011
@@ -17,7 +17,7 @@
 -->
 <project name="easyant-integration-test-utils">
 
-	<description>Macros and targets to assist in writing integration test cases for EasyAnt</description>
+    <description>Macros and targets to assist in writing integration test cases for EasyAnt</description>
 
     <dirname file="${ant.file.easyant-integration-test-utils}" property="easyant.integ.common.dir"/>
     <property name="easyant.project.dir" location="${easyant.integ.common.dir}/../../../.."/>
@@ -62,4 +62,4 @@
         </sequential>
     </macrodef>
 
-</project>
\ No newline at end of file
+</project>

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/examples/examples-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/examples/examples-test.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/examples/examples-test.xml (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/examples/examples-test.xml Tue Feb 22 15:55:55 2011
@@ -15,9 +15,9 @@
    limitations under the License.
 -->
 <project name="examples-test"
-		 xmlns:au="antlib:org.apache.ant.antunit">
+         xmlns:au="antlib:org.apache.ant.antunit">
 
-	<dirname file="${ant.file.examples-test}" property="test.dir"/>
+    <dirname file="${ant.file.examples-test}" property="test.dir"/>
     <import file="${test.dir}/../common/test-utils.ant"/>
 
     <path id="examples.dirs">
@@ -38,19 +38,19 @@
         </sequential>
     </macrodef>
 
-	<target name="clean" depends="ac:init" description="remove stale build artifacts before / after each test">
+    <target name="clean" depends="ac:init" description="remove stale build artifacts before / after each test">
         <for param="example">
             <path refid="examples.dirs"/>
             <sequential>
                 <clean-example dir="@{example}"/>
             </sequential>
         </for>
-	</target>
+    </target>
 
     <target name="setUp" depends="clean"/>
     <target name="tearDown" depends="clean"/>
 
-	<target name="testExamples" description="verifies that default target works for each example">
+    <target name="testExamples" description="verifies that default target works for each example">
 
         <for param="example">
             <path refid="examples.dirs"/>
@@ -60,6 +60,6 @@
             </sequential>
         </for>
 
-	</target>
+    </target>
 
 </project>

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java-test.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java-test.xml (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/build-std-java-test.xml Tue Feb 22 15:55:55 2011
@@ -15,49 +15,49 @@
    limitations under the License.
 -->
 <project name="build-std-java-test" 
-		xmlns:au="antlib:org.apache.ant.antunit">
-	
-	<dirname file="${ant.file.build-std-java-test}" property="test.dir"/>
-	<import file="${test.dir}/../../../common/test-utils.ant"/>
+        xmlns:au="antlib:org.apache.ant.antunit">
+    
+    <dirname file="${ant.file.build-std-java-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="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="testExecutableJar" description="test the ability to generate an executable jar file.">
-		
-		<!-- verify test preconditions -->
-		<au:assertFileDoesntExist message="test environment is clean" file="${basedir}/executable/target"/>
+    <target name="testExecutableJar" description="test the ability to generate an executable jar file.">
+        
+        <!-- verify test preconditions -->
+        <au:assertFileDoesntExist message="test environment is clean" file="${basedir}/executable/target"/>
 
-		<easyant dir="${basedir}/executable"/>
-		
-		<au:assertFileExists message="jar has been built" file="${basedir}/executable/target/artifacts/build-std-java-test.jar"/>
-		<au:assertFileExists message="dependencies delivered to target area" file="${basedir}/executable/target/artifacts/lib/junit-4.4.jar"/>
-		
-		<!-- verify the format of the class-path and main-class attributes -->
-		<loadfile property="manifest.content" srcFile="${basedir}/executable/target/MANIFEST.MF"/>
-		<au:assertMatches message="Main-Class included in manifest" 
-			pattern="Main-Class:\s+org\.apache\.easyant\.test\.Main" 
-			string="${manifest.content}"/>
-		<au:assertMatches message="Class-Path included in manifest" 
-			pattern="Class-Path:\s+lib${file.separator}junit-4\.4\.jar" 
-			string="${manifest.content}"/>
+        <easyant dir="${basedir}/executable"/>
+        
+        <au:assertFileExists message="jar has been built" file="${basedir}/executable/target/artifacts/build-std-java-test.jar"/>
+        <au:assertFileExists message="dependencies delivered to target area" file="${basedir}/executable/target/artifacts/lib/junit-4.4.jar"/>
+        
+        <!-- verify the format of the class-path and main-class attributes -->
+        <loadfile property="manifest.content" srcFile="${basedir}/executable/target/MANIFEST.MF"/>
+        <au:assertMatches message="Main-Class included in manifest" 
+            pattern="Main-Class:\s+org\.apache\.easyant\.test\.Main" 
+            string="${manifest.content}"/>
+        <au:assertMatches message="Class-Path included in manifest" 
+            pattern="Class-Path:\s+lib${file.separator}junit-4\.4\.jar" 
+            string="${manifest.content}"/>
 
-		<!-- verify that the generated Jar can be executed -->
-		<java jar="${basedir}/executable/target/artifacts/build-std-java-test.jar" 
-			dir="${basedir}/executable/target/artifacts"
-			fork="yes" outputproperty="test.output"/>
-			  
-		<au:assertEquals message="Jar executed successfully"
-			expected="Successfully loaded: org.junit.Assert"
-			actual="${test.output}"/>
+        <!-- verify that the generated Jar can be executed -->
+        <java jar="${basedir}/executable/target/artifacts/build-std-java-test.jar" 
+            dir="${basedir}/executable/target/artifacts"
+            fork="yes" outputproperty="test.output"/>
+              
+        <au:assertEquals message="Jar executed successfully"
+            expected="Successfully loaded: org.junit.Assert"
+            actual="${test.output}"/>
 
-	</target>
-	
-</project>
\ No newline at end of file
+    </target>
+    
+</project>

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/module.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/module.ivy (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,21 +15,21 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
-	<info organisation="org.apache.easyant" module="build-std-java-test" status="integration" revision="1.0">
-		<ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2">
-			<ea:property name="manifest.main.classname" value="org.apache.easyant.test.Main"/>
-			<ea:property name="retrieve.dependencies" value="true"/>
-			<ea:property name="lib.main" value="target/artifacts/lib"/>
-		</ea:build>
-	</info>
-	<configurations>
-		<conf name="default"/>
-		<conf name="test"/>
-	</configurations>
-	<publications>
-		<artifact type="jar"/>
-	</publications>
-	<dependencies>
-		<dependency org="junit" name="junit" rev="4.4" conf="default"/>
-	</dependencies>
+    <info organisation="org.apache.easyant" module="build-std-java-test" status="integration" revision="1.0">
+        <ea:build mrid="org.apache.easyant.buildtypes#build-std-java;0.2">
+            <ea:property name="manifest.main.classname" value="org.apache.easyant.test.Main"/>
+            <ea:property name="retrieve.dependencies" value="true"/>
+            <ea:property name="lib.main" value="target/artifacts/lib"/>
+        </ea:build>
+    </info>
+    <configurations>
+        <conf name="default"/>
+        <conf name="test"/>
+    </configurations>
+    <publications>
+        <artifact type="jar"/>
+    </publications>
+    <dependencies>
+        <dependency org="junit" name="junit" rev="4.4" conf="default"/>
+    </dependencies>
 </ivy-module>

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/src/main/java/org/apache/easyant/test/Main.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/src/main/java/org/apache/easyant/test/Main.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/src/main/java/org/apache/easyant/test/Main.java (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/build-std-java/0.2/executable/src/main/java/org/apache/easyant/test/Main.java Tue Feb 22 15:55:55 2011
@@ -18,14 +18,14 @@
 package org.apache.easyant.test;
 
 public class Main {
-	
-	/**
-	 * Prints out the fully qualified name of jUnit's Assert utility classes.
-	 * This tests the presence of Assert on our classpath, which should be defined
-	 * in our manifest Class-Path attribute.
-	 */
-	public static void main(String[] argv) {
-		System.out.print("Successfully loaded: " + org.junit.Assert.class.getName());
-	}
-	
-}
\ No newline at end of file
+    
+    /**
+     * Prints out the fully qualified name of jUnit's Assert utility classes.
+     * This tests the presence of Assert on our classpath, which should be defined
+     * in our manifest Class-Path attribute.
+     */
+    public static void main(String[] argv) {
+        System.out.print("Successfully loaded: " + org.junit.Assert.class.getName());
+    }
+    
+}

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/ivysettings.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/ivysettings.xml (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/ivysettings.xml Tue Feb 22 15:55:55 2011
@@ -15,26 +15,26 @@
    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>
+    <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>

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/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.1/meta-build-test-core/module.ivy?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-core/module.ivy (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-core/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,14 +15,14 @@
    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-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>
+    <info organisation="org.apache.easyant" module="meta-build-test-core" status="integration" revision="1.0">
+        <extends organisation="org.apache.easyant" module="meta-build-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>

Modified: incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/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.1/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-core/src/main/java/org/apache/easyant/test/HelloService.java Tue Feb 22 15:55:55 2011
@@ -18,7 +18,7 @@
 package org.apache.easyant.test;
 
 public class HelloService {
-	public String hello() {
-		return "Hello world, it is " + System.currentTimeMillis();
-	}
+    public String hello() {
+        return "Hello world, it is " + System.currentTimeMillis();
+    }
 }

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test-web/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,22 +15,22 @@
    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>
+    <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>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- 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 (original)
+++ 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 Tue Feb 22 15:55:55 2011
@@ -16,5 +16,5 @@
    limitations under the License.
 -->
 <web-app>
-	
-</web-app>
\ No newline at end of file
+    
+</web-app>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/meta-build-test.xml Tue Feb 22 15:55:55 2011
@@ -15,36 +15,36 @@
    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"/>
+        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="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"/>
+    <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."/>
+        <!-- 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
+    </target>
+    
+</project>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.1/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,18 +15,18 @@
    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>
+    <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>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/ivysettings.xml Tue Feb 22 15:55:55 2011
@@ -15,26 +15,26 @@
    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>
+    <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>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- 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 (original)
+++ 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 Tue Feb 22 15:55:55 2011
@@ -15,14 +15,14 @@
    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>
+    <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>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- 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 (original)
+++ 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 Tue Feb 22 15:55:55 2011
@@ -18,7 +18,7 @@
 package org.apache.easyant.test;
 
 public class HelloService {
-	public String hello() {
-		return "Hello world, it is " + System.currentTimeMillis();
-	}
+    public String hello() {
+        return "Hello world, it is " + System.currentTimeMillis();
+    }
 }

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- 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 (original)
+++ 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 Tue Feb 22 15:55:55 2011
@@ -15,22 +15,22 @@
    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>
+    <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>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- 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 (original)
+++ 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 Tue Feb 22 15:55:55 2011
@@ -16,5 +16,5 @@
    limitations under the License.
 -->
 <web-app>
-	
-</web-app>
\ No newline at end of file
+    
+</web-app>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/meta-build-test.xml Tue Feb 22 15:55:55 2011
@@ -15,97 +15,97 @@
    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>
-	
+        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>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2-using-orchestrator-as-parent/module.ivy Tue Feb 22 15:55:55 2011
@@ -15,18 +15,18 @@
    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>
+    <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>

Modified: 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=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml (original)
+++ incubator/easyant/core/trunk/src/integration-test/antunit/org.apache.easyant.buildtypes/meta-build/0.2/ivysettings.xml Tue Feb 22 15:55:55 2011
@@ -15,26 +15,26 @@
    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>
+    <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>



Mime
View raw message