# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1364394140 -3600
# Node ID bd8643cea266f44b9c6937684c4e01a04d9c7da3
# Parent  dc9cfb7ec5d03c22fa25d22eb57294a9a5de5ee5
Use ServiceProvider annotation for method substitutions.

diff -r dc9cfb7ec5d0 -r bd8643cea266 graal/com.oracle.graal.replacements/src/META-INF/services/com.oracle.graal.replacements.ReplacementsProvider
--- a/graal/com.oracle.graal.replacements/src/META-INF/services/com.oracle.graal.replacements.ReplacementsProvider	Wed Mar 27 15:22:18 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-com.oracle.graal.replacements.GraalMethodSubstitutions
diff -r dc9cfb7ec5d0 -r bd8643cea266 graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java	Wed Mar 27 15:22:18 2013 +0100
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraalMethodSubstitutions.java	Wed Mar 27 15:22:20 2013 +0100
@@ -22,11 +22,13 @@
  */
 package com.oracle.graal.replacements;
 
+import com.oracle.graal.api.runtime.*;
 import com.oracle.graal.phases.*;
 
 /**
  * Method substitutions that are VM-independent.
  */
+@ServiceProvider(ReplacementsProvider.class)
 public class GraalMethodSubstitutions implements ReplacementsProvider {
 
     public void installReplacements(ReplacementsInstaller installer) {
diff -r dc9cfb7ec5d0 -r bd8643cea266 make/build-graal.xml
--- a/make/build-graal.xml	Wed Mar 27 15:22:18 2013 +0100
+++ b/make/build-graal.xml	Wed Mar 27 15:22:20 2013 +0100
@@ -49,8 +49,8 @@
       <src path="${src.dir}/com.oracle.graal.bytecode"/>
       <src path="${src.dir}/com.oracle.graal.java"/>
       <src path="${src.dir}/com.oracle.graal.word"/>
+      <src path="${src.dir}/com.oracle.graal.api.runtime"/>
       <src path="${src.dir}/com.oracle.graal.replacements"/>
-      <src path="${src.dir}/com.oracle.graal.api.runtime"/>
       <src path="${src.dir}/com.oracle.graal.printer"/>
       <src path="${src.dir}/com.oracle.graal.hotspot"/>
       <src path="${src.dir}/com.oracle.graal.amd64"/>
diff -r dc9cfb7ec5d0 -r bd8643cea266 mx/projects
--- a/mx/projects	Wed Mar 27 15:22:18 2013 +0100
+++ b/mx/projects	Wed Mar 27 15:22:20 2013 +0100
@@ -96,7 +96,7 @@
 # graal.hotspot
 project@com.oracle.graal.hotspot@subDir=graal
 project@com.oracle.graal.hotspot@sourceDirs=src
-project@com.oracle.graal.hotspot@dependencies=com.oracle.graal.replacements,com.oracle.graal.api.runtime,com.oracle.graal.printer
+project@com.oracle.graal.hotspot@dependencies=com.oracle.graal.replacements,com.oracle.graal.printer
 project@com.oracle.graal.hotspot@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.hotspot@annotationProcessors=com.oracle.graal.replacements.verifier
 project@com.oracle.graal.hotspot@javaCompliance=1.7
@@ -200,10 +200,10 @@
 # graal.replacements
 project@com.oracle.graal.replacements@subDir=graal
 project@com.oracle.graal.replacements@sourceDirs=src
-project@com.oracle.graal.replacements@dependencies=com.oracle.graal.compiler,com.oracle.graal.java,com.oracle.graal.word
+project@com.oracle.graal.replacements@dependencies=com.oracle.graal.compiler,com.oracle.graal.java,com.oracle.graal.word,com.oracle.graal.api.runtime
 project@com.oracle.graal.replacements@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.replacements@javaCompliance=1.7
-project@com.oracle.graal.replacements@annotationProcessors=com.oracle.graal.replacements.verifier
+project@com.oracle.graal.replacements@annotationProcessors=com.oracle.graal.replacements.verifier,com.oracle.graal.service.processor
 
 # graal.replacements.amd64
 project@com.oracle.graal.replacements.amd64@subDir=graal