- moved scalap to scala.tools

16 files changed, 24 insertions, 16 deletions

diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl
index 16c7745ce7..f843f102b1 100644
--- a/sources/bin/.scala_wrapper.tmpl
+++ b/sources/bin/.scala_wrapper.tmpl
@@ -495,7 +495,7 @@ case "$SCRIPT" in
     scalarun*  ) exec_interpret scalai.Main "$@";;
     scalaint*  ) exec_interpret scalai.Main -interactive "$@";;
     dtd2scala* ) exec_dtd2scala scala.tools.dtd2scala.Main "$@";;
-    scalap*    ) exec_scalap scalap.Main "$@";;
+    scalap*    ) exec_scalap scala.tools.scalap.Main "$@";;
     scalatest* ) exec_scalatest scala.tools.scalatest.Main "$@";;
     socos*     )
         warning "Deprecated command, use scalac${SCRIPT#socos} instead.";
diff --git a/sources/scala/tools/scalap/AbstractFile.scala b/sources/scala/tools/scalap/AbstractFile.scala
index 75bd001c69..bf959ee2af 100644
--- a/sources/scala/tools/scalap/AbstractFile.scala
+++ b/sources/scala/tools/scalap/AbstractFile.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import scala.collection._;
 import java.io._;
diff --git a/sources/scala/tools/scalap/Arguments.scala b/sources/scala/tools/scalap/Arguments.scala
index f8e0cb29a5..8f069f77ff 100644
--- a/sources/scala/tools/scalap/Arguments.scala
+++ b/sources/scala/tools/scalap/Arguments.scala
@@ -1,4 +1,12 @@
-package scalap;
+/*     ___ ____ ___   __   ___   ___
+**    / _// __// _ | / /  / _ | / _ \    Scala classfile decoder
+**  __\ \/ /__/ __ |/ /__/ __ |/ ___/    (c) 2003, LAMP/EPFL
+** /____/\___/_/ |_/____/_/ |_/_/
+**
+**  $Id$
+*/
+
+package scala.tools.scalap;
 
 import scala.collection._;
 
diff --git a/sources/scala/tools/scalap/ByteArrayReader.scala b/sources/scala/tools/scalap/ByteArrayReader.scala
index 480bcd8950..5eac5a68bf 100644
--- a/sources/scala/tools/scalap/ByteArrayReader.scala
+++ b/sources/scala/tools/scalap/ByteArrayReader.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 
 class ByteArrayReader(content: Array[Byte]) {
diff --git a/sources/scala/tools/scalap/ClassPath.scala b/sources/scala/tools/scalap/ClassPath.scala
index 22681adc90..b6999b97e9 100644
--- a/sources/scala/tools/scalap/ClassPath.scala
+++ b/sources/scala/tools/scalap/ClassPath.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import java.io._;
 import scala.collection._;
diff --git a/sources/scala/tools/scalap/Classfile.scala b/sources/scala/tools/scalap/Classfile.scala
index 26a53a8f53..71b7818eb7 100644
--- a/sources/scala/tools/scalap/Classfile.scala
+++ b/sources/scala/tools/scalap/Classfile.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 
 class Classfile(in: ByteArrayReader) {
diff --git a/sources/scala/tools/scalap/Classfiles.scala b/sources/scala/tools/scalap/Classfiles.scala
index 3aef2679db..20f4f8f72a 100644
--- a/sources/scala/tools/scalap/Classfiles.scala
+++ b/sources/scala/tools/scalap/Classfiles.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 
 object Classfiles {
diff --git a/sources/scala/tools/scalap/CodeWriter.scala b/sources/scala/tools/scalap/CodeWriter.scala
index 759324bd7b..c529678886 100644
--- a/sources/scala/tools/scalap/CodeWriter.scala
+++ b/sources/scala/tools/scalap/CodeWriter.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import java.io._;
 
diff --git a/sources/scala/tools/scalap/Entity.scala b/sources/scala/tools/scalap/Entity.scala
index d26d1acb7c..382668b75a 100644
--- a/sources/scala/tools/scalap/Entity.scala
+++ b/sources/scala/tools/scalap/Entity.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import java.io._;
 import scala.collection.mutable._;
diff --git a/sources/scala/tools/scalap/EntityTable.scala b/sources/scala/tools/scalap/EntityTable.scala
index b686613e2a..a0fd9d1ad0 100644
--- a/sources/scala/tools/scalap/EntityTable.scala
+++ b/sources/scala/tools/scalap/EntityTable.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import scala.collection.mutable._;
 
diff --git a/sources/scala/tools/scalap/FileCache.scala b/sources/scala/tools/scalap/FileCache.scala
index 546aa684ee..b0cd172447 100644
--- a/sources/scala/tools/scalap/FileCache.scala
+++ b/sources/scala/tools/scalap/FileCache.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import scala.collection._;
 import java.io._;
diff --git a/sources/scala/tools/scalap/Flags.scala b/sources/scala/tools/scalap/Flags.scala
index f58aacc356..551ea23b96 100644
--- a/sources/scala/tools/scalap/Flags.scala
+++ b/sources/scala/tools/scalap/Flags.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 
 object Flags {
diff --git a/sources/scala/tools/scalap/Main.scala b/sources/scala/tools/scalap/Main.scala
index f2d6fcf118..9749f30d40 100644
--- a/sources/scala/tools/scalap/Main.scala
+++ b/sources/scala/tools/scalap/Main.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import java.io._;
 import scala.collection._;
diff --git a/sources/scala/tools/scalap/Names.scala b/sources/scala/tools/scalap/Names.scala
index 7d03b8e4b5..bac6268743 100644
--- a/sources/scala/tools/scalap/Names.scala
+++ b/sources/scala/tools/scalap/Names.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 
 object Names {
diff --git a/sources/scala/tools/scalap/ScalaAttribute.scala b/sources/scala/tools/scalap/ScalaAttribute.scala
index 6c2860117f..2e614b9cd5 100644
--- a/sources/scala/tools/scalap/ScalaAttribute.scala
+++ b/sources/scala/tools/scalap/ScalaAttribute.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import scala.collection.mutable._;
 
diff --git a/sources/scala/tools/scalap/ScalaWriter.scala b/sources/scala/tools/scalap/ScalaWriter.scala
index f36a1fe29b..fea7ac1245 100644
--- a/sources/scala/tools/scalap/ScalaWriter.scala
+++ b/sources/scala/tools/scalap/ScalaWriter.scala
@@ -6,7 +6,7 @@
 **  $Id$
 */
 
-package scalap;
+package scala.tools.scalap;
 
 import java.io._;
 import scala.collection.mutable._;