From c1c1836728548387d1be10aef8be5f7ce2f00e3b Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 24 Aug 2006 19:27:51 +0000
Subject: [PATCH] Move a few files around

git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/dotnet/trunk@434477 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/ant/dotnet/antlib.xml                 | 8 ++++----
 .../apache/ant/dotnet/{ => build}/AbstractBuildTask.java  | 5 +++--
 .../org/apache/ant/dotnet/{ => build}/MSBuildTask.java    | 2 +-
 src/main/org/apache/ant/dotnet/{ => build}/NAntTask.java  | 4 ++--
 src/main/org/apache/ant/dotnet/{ => wix}/WixTask.java     | 4 +++-
 .../apache/ant/dotnet/{ => build}/MSBuildTaskTest.java    | 4 ++--
 .../org/apache/ant/dotnet/{ => build}/NAntTaskTest.java   | 4 ++--
 7 files changed, 17 insertions(+), 14 deletions(-)
 rename src/main/org/apache/ant/dotnet/{ => build}/AbstractBuildTask.java (98%)
 rename src/main/org/apache/ant/dotnet/{ => build}/MSBuildTask.java (99%)
 rename src/main/org/apache/ant/dotnet/{ => build}/NAntTask.java (96%)
 rename src/main/org/apache/ant/dotnet/{ => wix}/WixTask.java (98%)
 rename src/testcases/org/apache/ant/dotnet/{ => build}/MSBuildTaskTest.java (94%)
 rename src/testcases/org/apache/ant/dotnet/{ => build}/NAntTaskTest.java (94%)

diff --git a/src/main/org/apache/ant/dotnet/antlib.xml b/src/main/org/apache/ant/dotnet/antlib.xml
index df41eac..1f59441 100644
--- a/src/main/org/apache/ant/dotnet/antlib.xml
+++ b/src/main/org/apache/ant/dotnet/antlib.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright 2003-2005 The Apache Software Foundation
+ Copyright 2003-2006 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,15 +21,15 @@
     />
   <taskdef
     name="msbuild"
-    classname="org.apache.ant.dotnet.MSBuildTask"
+    classname="org.apache.ant.dotnet.build.MSBuildTask"
     />
   <taskdef
     name="nant"
-    classname="org.apache.ant.dotnet.NAntTask"
+    classname="org.apache.ant.dotnet.build.NAntTask"
     />
   <taskdef
     name="wix"
-    classname="org.apache.ant.dotnet.WixTask"
+    classname="org.apache.ant.dotnet.wix.WixTask"
     />
   <taskdef
     name="nunit"
diff --git a/src/main/org/apache/ant/dotnet/AbstractBuildTask.java b/src/main/org/apache/ant/dotnet/build/AbstractBuildTask.java
similarity index 98%
rename from src/main/org/apache/ant/dotnet/AbstractBuildTask.java
rename to src/main/org/apache/ant/dotnet/build/AbstractBuildTask.java
index f2b64a8..78f02fc 100644
--- a/src/main/org/apache/ant/dotnet/AbstractBuildTask.java
+++ b/src/main/org/apache/ant/dotnet/build/AbstractBuildTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@
  *
  */
 
-package org.apache.ant.dotnet;
+package org.apache.ant.dotnet.build;
 
+import org.apache.ant.dotnet.DotNetExecTask;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.util.DOMElementWriter;
diff --git a/src/main/org/apache/ant/dotnet/MSBuildTask.java b/src/main/org/apache/ant/dotnet/build/MSBuildTask.java
similarity index 99%
rename from src/main/org/apache/ant/dotnet/MSBuildTask.java
rename to src/main/org/apache/ant/dotnet/build/MSBuildTask.java
index 0ee6592..00ab53f 100644
--- a/src/main/org/apache/ant/dotnet/MSBuildTask.java
+++ b/src/main/org/apache/ant/dotnet/build/MSBuildTask.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.apache.ant.dotnet;
+package org.apache.ant.dotnet.build;
 
 import java.io.File;
 import java.util.Iterator;
diff --git a/src/main/org/apache/ant/dotnet/NAntTask.java b/src/main/org/apache/ant/dotnet/build/NAntTask.java
similarity index 96%
rename from src/main/org/apache/ant/dotnet/NAntTask.java
rename to src/main/org/apache/ant/dotnet/build/NAntTask.java
index efe7bd6..a079888 100644
--- a/src/main/org/apache/ant/dotnet/NAntTask.java
+++ b/src/main/org/apache/ant/dotnet/build/NAntTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *
  */
 
-package org.apache.ant.dotnet;
+package org.apache.ant.dotnet.build;
 
 import java.io.File;
 import java.util.Iterator;
diff --git a/src/main/org/apache/ant/dotnet/WixTask.java b/src/main/org/apache/ant/dotnet/wix/WixTask.java
similarity index 98%
rename from src/main/org/apache/ant/dotnet/WixTask.java
rename to src/main/org/apache/ant/dotnet/wix/WixTask.java
index c6cc2be..385a2c1 100644
--- a/src/main/org/apache/ant/dotnet/WixTask.java
+++ b/src/main/org/apache/ant/dotnet/wix/WixTask.java
@@ -15,8 +15,10 @@
  *
  */
 
-package org.apache.ant.dotnet;
+package org.apache.ant.dotnet.wix;
 
+import org.apache.ant.dotnet.DotNetExecTask;
+import org.apache.ant.dotnet.build.AbstractBuildTask;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Task;
diff --git a/src/testcases/org/apache/ant/dotnet/MSBuildTaskTest.java b/src/testcases/org/apache/ant/dotnet/build/MSBuildTaskTest.java
similarity index 94%
rename from src/testcases/org/apache/ant/dotnet/MSBuildTaskTest.java
rename to src/testcases/org/apache/ant/dotnet/build/MSBuildTaskTest.java
index 5dc6dff..b4da94c 100644
--- a/src/testcases/org/apache/ant/dotnet/MSBuildTaskTest.java
+++ b/src/testcases/org/apache/ant/dotnet/build/MSBuildTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ant.dotnet;
+package org.apache.ant.dotnet.build;
 
 import org.apache.tools.ant.BuildFileTest;
 
diff --git a/src/testcases/org/apache/ant/dotnet/NAntTaskTest.java b/src/testcases/org/apache/ant/dotnet/build/NAntTaskTest.java
similarity index 94%
rename from src/testcases/org/apache/ant/dotnet/NAntTaskTest.java
rename to src/testcases/org/apache/ant/dotnet/build/NAntTaskTest.java
index 6179803..3f11150 100644
--- a/src/testcases/org/apache/ant/dotnet/NAntTaskTest.java
+++ b/src/testcases/org/apache/ant/dotnet/build/NAntTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 The Apache Software Foundation
+ * Copyright 2003-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ant.dotnet;
+package org.apache.ant.dotnet.build;
 
 import org.apache.tools.ant.BuildFileTest;