# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1366283799 -7200
# Node ID fb676e23ba51d93c333627b33c0de2351ca0cad1
# Parent  cd2600a2336efadcd9efed2be44f136da00be0e6
Rename BasicConfiguration to BasicCompilerConfiguration.

diff -r cd2600a2336e -r fb676e23ba51 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java	Thu Apr 18 13:16:39 2013 +0200
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.compiler.phases;
+
+import com.oracle.graal.api.runtime.*;
+import com.oracle.graal.phases.*;
+import com.oracle.graal.phases.tiers.*;
+
+@ServiceProvider(CompilerConfiguration.class)
+public class BasicCompilerConfiguration implements CompilerConfiguration {
+
+    public PhaseSuite<HighTierContext> createHighTier() {
+        return new HighTier();
+    }
+
+    public PhaseSuite<MidTierContext> createMidTier() {
+        return new MidTier();
+    }
+}
diff -r cd2600a2336e -r fb676e23ba51 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicConfiguration.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicConfiguration.java	Thu Apr 18 10:30:59 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.compiler.phases;
-
-import com.oracle.graal.api.runtime.*;
-import com.oracle.graal.phases.*;
-import com.oracle.graal.phases.tiers.*;
-
-@ServiceProvider(CompilerConfiguration.class)
-public class BasicConfiguration implements CompilerConfiguration {
-
-    public PhaseSuite<HighTierContext> createHighTier() {
-        return new HighTier();
-    }
-
-    public PhaseSuite<MidTierContext> createMidTier() {
-        return new MidTier();
-    }
-}
diff -r cd2600a2336e -r fb676e23ba51 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java	Thu Apr 18 10:30:59 2013 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java	Thu Apr 18 13:16:39 2013 +0200
@@ -48,8 +48,8 @@
         configurations = new HashMap<>();
         for (CompilerConfiguration config : ServiceLoader.loadInstalled(CompilerConfiguration.class)) {
             String name = config.getClass().getSimpleName();
-            if (name.endsWith("Configuration")) {
-                name = name.substring(0, name.length() - "Configuration".length());
+            if (name.endsWith("CompilerConfiguration")) {
+                name = name.substring(0, name.length() - "CompilerConfiguration".length());
             }
             configurations.put(name.toLowerCase(), config);
         }
diff -r cd2600a2336e -r fb676e23ba51 make/build-graal.xml
--- a/make/build-graal.xml	Thu Apr 18 10:30:59 2013 +0200
+++ b/make/build-graal.xml	Thu Apr 18 13:16:39 2013 +0200
@@ -81,7 +81,7 @@
         <provider classname="com.oracle.graal.replacements.GraalMethodSubstitutions"/>
       </service>
       <service type="com.oracle.graal.phases.tiers.CompilerConfiguration">
-        <provider classname="com.oracle.graal.compiler.phases.BasicConfiguration"/>
+        <provider classname="com.oracle.graal.compiler.phases.BasicCompilerConfiguration"/>
       </service>
     </jar>
   </target>