--- a/test/java/module/service/src/cliserv/service/FooService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/cliserv/service/FooService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module cliserv.service;
 package cliserv.service;
 
 import java.util.Service;

--- a/test/java/module/service/src/cliserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/cliserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,12 +21,14 @@
  * have any questions.
  */
 
+module cliserv.service;
 package cliserv.service;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of FooService
+ * FIXME: Fails if this is a module-private class.
  */
 @ServiceProvider
 public class FooServiceDefaultProvider extends FooService {

--- a/test/java/module/service/src/cpserv/client/Main.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/cpserv/client/Main.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module cpserv.client;
 package cpserv.client;
 
 import java.module.ModuleDefinition;

--- a/test/java/module/service/src/cpserv/service/FooService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/cpserv/service/FooService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module cpserv.service;
 package cpserv.service;
 
 import java.util.Iterator;

--- a/test/java/module/service/src/cpserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/cpserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,12 +21,16 @@
  * have any questions.
  */
 
+module cpserv.service;
 package cpserv.service;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of FooService
+ * It is a module private class.
+ *
+ * FIXME: Fails if this is a module-private class.
  */
 @ServiceProvider
 public class FooServiceDefaultProvider extends FooService {

--- a/test/java/module/service/src/defserv/client/Main.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/defserv/client/Main.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module defserv.client;
 package defserv.client;
 
 import java.module.ModuleDefinition;

--- a/test/java/module/service/src/defserv/provider/BarService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/defserv/provider/BarService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module defserv.provider;
 package defserv.provider;
 
 import java.util.Iterator;

--- a/test/java/module/service/src/defserv/provider/BarServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/defserv/provider/BarServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,15 +21,17 @@
  * have any questions.
  */
 
+module defserv.provider;
 package defserv.provider;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of BarService
+ * FIXME: May fail if this is a module-private class.
  */
 @ServiceProvider
-public class BarServiceDefaultProvider extends BarService {
+module class BarServiceDefaultProvider extends BarService {
 
     public BarServiceDefaultProvider() {
     }

--- a/test/java/module/service/src/defserv/provider/FooService2Provider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/defserv/provider/FooService2Provider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module defserv.provider;
 package defserv.provider;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/defserv/service/FooService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/defserv/service/FooService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module defserv.service;
 package defserv.service;
 
 import java.util.Iterator;

--- a/test/java/module/service/src/defserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/defserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,12 +21,14 @@
  * have any questions.
  */
 
+module defserv.service;
 package defserv.service;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of FooService
+ * FIXME: Fails if this is a module private class.
  */
 @ServiceProvider
 public class FooServiceDefaultProvider extends FooService {

--- a/test/java/module/service/src/defserv/service/FooServiceDefaultProvider2.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/defserv/service/FooServiceDefaultProvider2.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,12 +21,14 @@
  * have any questions.
  */
 
+module defserv.service;
 package defserv.service;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of FooService
+ * FIXME: Fails if this is a module private class.
  */
 @ServiceProvider
 public class FooServiceDefaultProvider2 extends FooService {

--- a/test/java/module/service/src/modserv/client/Main.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/modserv/client/Main.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module modserv.client;
 package modserv.client;
 
 import modserv.service.CodecSet;

--- a/test/java/module/service/src/modserv/provider1/AdvancedCodecs.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/modserv/provider1/AdvancedCodecs.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module modserv.provider1;
 package modserv.provider1;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/modserv/provider1/StandardCodecs.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/modserv/provider1/StandardCodecs.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module modserv.provider1;
 package modserv.provider1;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/modserv/provider2/AdvancedCodecs.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/modserv/provider2/AdvancedCodecs.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module modserv.provider2;
 package modserv.provider2;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/modserv/provider3/ImplCodecs.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/modserv/provider3/ImplCodecs.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module modserv.provider3;
 package modserv.provider3;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/modserv/service/CodecSet.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/modserv/service/CodecSet.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module modserv.service;
 package modserv.service;
 
 import java.util.Service;

--- a/test/java/module/service/src/modserv/service/Encoder.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/modserv/service/Encoder.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module modserv.service;
 package modserv.service;
 
 /**

--- a/test/java/module/service/src/reposerv/client/Main.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/reposerv/client/Main.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module reposerv.client;
 package reposerv.client;
 
 import java.module.*;

--- a/test/java/module/service/src/reposerv/provider/BarService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/reposerv/provider/BarService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module reposerv.provider;
 package reposerv.provider;
 
 import java.util.Iterator;

--- a/test/java/module/service/src/reposerv/provider/BarServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/reposerv/provider/BarServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,15 +21,17 @@
  * have any questions.
  */
 
+module reposerv.provider;
 package reposerv.provider;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of BarService
+ * FIXME: May fail if this is a module private class.
  */
 @ServiceProvider
-public class BarServiceDefaultProvider extends BarService {
+module class BarServiceDefaultProvider extends BarService {
 
     public BarServiceDefaultProvider() {
     }

--- a/test/java/module/service/src/reposerv/provider/FooService2Provider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/reposerv/provider/FooService2Provider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module reposerv.provider;
 package reposerv.provider;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/reposerv/service/FooService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/reposerv/service/FooService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module reposerv.service;
 package reposerv.service;
 
 import java.io.File;

--- a/test/java/module/service/src/reposerv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/reposerv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,12 +21,14 @@
  * have any questions.
  */
 
+module reposerv.service;
 package reposerv.service;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of FooService
+ * FIXME: Fails if this is a module private class.
  */
 @ServiceProvider
 public class FooServiceDefaultProvider extends FooService {

--- a/test/java/module/service/src/rxpserv/client/Main.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/rxpserv/client/Main.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module rxpserv.client;
 package rxpserv.client;
 
 import java.module.ModuleDefinition;

--- a/test/java/module/service/src/rxpserv/provider/FooServiceProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/rxpserv/provider/FooServiceProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module rxpserv.provider;
 package rxpserv.provider;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/rxpserv/service/FooService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/rxpserv/service/FooService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module rxpserv.service;
 package rxpserv.service;
 
 import java.util.Iterator;

--- a/test/java/module/service/src/verserv/client/Main.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/verserv/client/Main.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module verserv.client;
 package verserv.client;
 
 import java.module.ModuleDefinition;

--- a/test/java/module/service/src/verserv/provider/BarService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/verserv/provider/BarService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module verserv.provider;
 package verserv.provider;
 
 import java.util.Iterator;

--- a/test/java/module/service/src/verserv/provider/BarServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/verserv/provider/BarServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,15 +21,17 @@
  * have any questions.
  */
 
+module verserv.provider;
 package verserv.provider;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of BarService
+ * FIXME: May fail if this is a module private class.
  */
 @ServiceProvider
-public class BarServiceDefaultProvider extends BarService {
+module class BarServiceDefaultProvider extends BarService {
 
     public BarServiceDefaultProvider() {
     }

--- a/test/java/module/service/src/verserv/provider/FooService2Provider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/verserv/provider/FooService2Provider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module verserv.provider;
 package verserv.provider;
 
 import java.util.ServiceProvider;

--- a/test/java/module/service/src/verserv/service/FooService.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/verserv/service/FooService.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,6 +21,7 @@
  * have any questions.
  */
 
+module verserv.service;
 package verserv.service;
 
 import java.module.Repository;

--- a/test/java/module/service/src/verserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:40:27 2008 -0700
+++ b/test/java/module/service/src/verserv/service/FooServiceDefaultProvider.java	Wed Aug 06 15:42:11 2008 -0700
@@ -21,12 +21,14 @@
  * have any questions.
  */
 
+module verserv.service;
 package verserv.service;
 
 import java.util.ServiceProvider;
 
 /**
  * The default implementation of FooService
+ * FIXME: It fails if this is a module private class.
  */
 @ServiceProvider
 public class FooServiceDefaultProvider extends FooService {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/cliserv/service/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Services({"cliserv.service.FooService"})
+@ServiceProviders({
+    @ServiceProvider(service="cliserv.service.FooService",
+        providerClass="cliserv.service.FooServiceDefaultProvider")
+})
+@ImportModules({
+    @ImportModule(name="java.se.core")
+})
+module cliserv.service;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/cpserv/client/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="java.classpath"),
+    @ImportModule(name="cpserv.service")
+})
+@MainClass("cpserv.client.Main")
+module cpserv.client;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/cpserv/service/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Services({"cpserv.service.FooService"})
+@ServiceProviders({
+    @ServiceProvider(service="cpserv.service.FooService",
+        providerClass="cpserv.service.FooServiceDefaultProvider")
+})
+@ImportModules({
+    @ImportModule(name="java.se.core")
+})
+module cpserv.service;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/defserv/client/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="defserv.service")
+})
+@MainClass("defserv.client.Main")
+module defserv.client;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/defserv/provider/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ServiceProviders({
+    @ServiceProvider(service="defserv.service.FooService",
+        providerClass="defserv.provider.FooService2Provider"),
+    @ServiceProvider(service="defserv.service.BarService",
+        providerClass="defserv.provider.BarServiceDefaultProvider")
+})
+@Services("BarProvider")
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="defserv.service") // Import service module defining Foo
+})
+module defserv.provider;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/defserv/service/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Services({"defserv.service.FooService"})
+@ServiceProviders({
+    @ServiceProvider(service="defserv.service.FooService",
+        providerClass="defserv.service.FooServiceDefaultProvider"),
+    @ServiceProvider(service="defserv.service.FooService",
+        providerClass="defserv.service.FooServiceDefaultProvider2")
+})
+@ImportModules({
+    @ImportModule(name="java.se.core")
+})
+module defserv.service;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/modserv/client/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@MainClass("modserv.client.Main")
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="modserv.service", version="[2.0, 3.0)")
+})
+module modserv.client;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/modserv/provider1/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ServiceProviders({
+    @ServiceProvider(service="modserv.service.CodecSet",
+        providerClass="modserv.provider1.StandardCodecs"),
+    @ServiceProvider(service="modserv.service.CodecSet",
+        providerClass="modserv.provider1.AdvancedCodecs")
+})
+@Version("1.3")
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="modserv.service", version="[2.0, 3.0)")
+})
+module modserv.provider1;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/modserv/provider2/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ServiceProviders({
+    @ServiceProvider(service="modserv.service.CodecSet",
+        providerClass="modserv.provider2.AdvancedCodecs")
+})
+@Version("2.0")
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="modserv.service", version="[2.5, 3.0)")
+})
+module modserv.provider2;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/modserv/provider3/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ServiceProviders({
+    @ServiceProvider(service="modserv.service.CodecSet",
+        providerClass="modserv.provider3.ImplCodecs")
+})
+
+// Since the service is defined as version 2.7, attempting to load this module
+// will generate a warning (eventually to be a log message).
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="modserv.service", version="[1.0, 2.0)")
+})
+module modserv.provider3;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/modserv/service/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Version("2.7")
+@Services({"modserv.service.CodecSet"})
+@ImportModules({
+    @ImportModule(name="java.se.core")
+})
+module modserv.service;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/reposerv/client/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@MainClass("reposerv.client.Main")
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="reposerv.service", version="[1.0, 2.0)")
+})
+module reposerv.client;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/reposerv/provider/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Version("1.0")
+@ServiceProviders({
+    @ServiceProvider(service="reposerv.service.FooService",
+        providerClass="reposerv.provider.FooService2Provider"),
+    @ServiceProvider(service="reposerv.service.BarService",
+        providerClass="reposerv.provider.BarServiceDefaultProvider")
+})
+@Services("BarProvider")
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="reposerv.service", version="[1.0, 2.0)")
+})
+module reposerv.provider;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/reposerv/service/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Version("1.0")
+@Services({"reposerv.service.FooService"})
+@ServiceProviders({
+    @ServiceProvider(service="reposerv.service.FooService",
+        providerClass="reposerv.service.FooServiceDefaultProvider")
+})
+@ImportModules({
+    @ImportModule(name="java.se.core")
+})
+module reposerv.service;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/rxpserv/client/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="rxpserv.service", version="1.0")
+})
+@MainClass("rxpserv.client.Main")
+module rxpserv.client;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/rxpserv/extra/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * A module that just imports and reexports another module, but of a certain
+ * version.
+ */
+@ImportModules({
+    @ImportModule(name="rxpserv.provider", version="2.0")
+})
+module rxpserv.extra;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/rxpserv/provider/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@ServiceProviders({
+    @ServiceProvider(service="rxpserv.service.FooService",
+        providerClass="rxpserv.provider.FooServiceProvider")
+})
+// It is important that this be on a single line; see ServiceTest.redefineAnnotations
+@ImportModules({ @ImportModule(name="rxpserv.transitive"), @ImportModule(name="rxpserv.extra") })
+@Version("1.0")
+module rxpserv.provider;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/rxpserv/service/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Services({"rxpserv.service.FooService"})
+@ImportModules({
+    @ImportModule(name="java.se.core")
+})
+@Version("1.0")
+module rxpserv.service;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/rxpserv/transitive/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * A module that just imports and reexports another module, but of a certain
+ * version.
+ */
+@ImportModules({
+    @ImportModule(name="rxpserv.service", version="1.0", reexport=true)
+})
+module rxpserv.transitive;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/verserv/client/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@MainClass("verserv.client.Main")
+@ImportModules({
+    @ImportModule(name="java.se.core"),
+    @ImportModule(name="verserv.service", version="[1.0, 2.0)")
+})
+module verserv.client;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/verserv/provider/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Version("1.0")
+@ServiceProviders({
+    @ServiceProvider(service="verserv.service.FooService",
+        providerClass="verserv.provider.FooService2Provider"),
+    @ServiceProvider(service="verserv.service.BarService",
+        providerClass="verserv.provider.BarServiceDefaultProvider")
+})
+@Services("BarProvider")
+// It is important that this be on a single line; see ServiceTest.redefineAnnotations
+@ImportModules({ @ImportModule(name="java.se.core"), @ImportModule(name="verserv.service", version="[1.0, 2.0)") })
+module verserv.provider;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/module/service/src/verserv/service/module-info.java	Wed Aug 06 15:42:11 2008 -0700
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+@Version("1.0")
+@Services({"verserv.service.FooService"})
+@ServiceProviders({
+    @ServiceProvider(service="verserv.service.FooService",
+        providerClass="verserv.service.FooServiceDefaultProvider")
+})
+@ImportModules({
+    @ImportModule(name="java.se.core")
+})
+module verserv.service;

--- a/test/java/module/service/src/charserv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package charserv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="java.classpath")
-})
-@MainClass("charserv.client.Main")
-class module_info {
-}

--- a/test/java/module/service/src/charserv/provider/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package charserv.provider;
-
-import java.module.annotation.*;
-import java.lang.ModuleInfo.*;
-
-@ServiceProviders({
-    @ServiceProvider(service="java.nio.charset.spi.CharsetProvider",
-        providerClass="charserv.provider.CharsetServiceProvider")
-})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-class module_info {
-    // Export service provider type
-    exports charserv$provider$CharsetServiceProvider;
-}

--- a/test/java/module/service/src/cliserv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package cliserv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="cliserv.service")
-})
-@MainClass("cliserv.client.Main")
-class module_info {
-}

--- a/test/java/module/service/src/cliserv/provider/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package cliserv.provider;
-
-import java.module.annotation.*;
-import java.lang.ModuleInfo.*;
-
-@ServiceProviders({
-    @ServiceProvider(service="cliserv.service.FooService",
-        providerClass="cliserv.provider.FooService2Provider"),
-    @ServiceProvider(service="cliserv.service.BarService",
-        providerClass="cliserv.provider.BarServiceProvider")
-})
-@Services("BarProvider")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="cliserv.service") // Import service module defining Foo
-})
-class module_info {
-    // Export service provider type
-    exports cliserv$provider$FooService2Provider;
-
-    // Export service provider type
-    exports cliserv$provider$BarServiceProvider;
-}

--- a/test/java/module/service/src/cliserv/service/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package cliserv.service;
-
-import java.module.annotation.*;
-import java.lang.ModuleInfo.*;
-
-@Services({"cliserv.service.FooService"})
-@ServiceProviders({
-    @ServiceProvider(service="cliserv.service.FooService",
-        providerClass="cliserv.service.FooServiceDefaultProvider")
-})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-class module_info {
-    // Export service type
-    exports cliserv$service$FooService;
-
-    // Note that the default service provider is *not* exported.
-}

--- a/test/java/module/service/src/cpserv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package cpserv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="java.classpath"),
-    @ImportModule(name="cpserv.service")
-})
-@MainClass("cpserv.client.Main")
-class module_info {
-}

--- a/test/java/module/service/src/cpserv/service/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package cpserv.service;
-
-import java.module.annotation.*;
-import java.lang.ModuleInfo.*;
-
-@Services({"cpserv.service.FooService"})
-@ServiceProviders({
-    @ServiceProvider(service="cpserv.service.FooService",
-        providerClass="cpserv.service.FooServiceDefaultProvider")
-})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-class module_info {
-    // Export service type
-    exports cpserv$service$FooService;
-
-    // Note that the default service providers are *not* exported.
-}

--- a/test/java/module/service/src/defserv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package defserv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="defserv.service")
-})
-@MainClass("defserv.client.Main")
-class module_info {
-}

--- a/test/java/module/service/src/defserv/provider/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package defserv.provider;
-
-import java.module.annotation.*;
-import java.lang.ModuleInfo.*;
-
-@ServiceProviders({
-    @ServiceProvider(service="defserv.service.FooService",
-        providerClass="defserv.provider.FooService2Provider"),
-    @ServiceProvider(service="defserv.service.BarService",
-        providerClass="defserv.provider.BarServiceDefaultProvider")
-})
-@Services("BarProvider")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="defserv.service") // Import service module defining Foo
-})
-class module_info {
-    // Export service type
-     exports defserv$provider$BarService;
-
-    // Export service provider type
-    exports defserv$provider$FooService2Provider;
-
-    // Note that the default service provider is *not* exported.
-}

--- a/test/java/module/service/src/defserv/service/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package defserv.service;
-
-import java.module.annotation.*;
-import java.lang.ModuleInfo.*;
-
-@Services({"defserv.service.FooService"})
-@ServiceProviders({
-    @ServiceProvider(service="defserv.service.FooService",
-        providerClass="defserv.service.FooServiceDefaultProvider"),
-    @ServiceProvider(service="defserv.service.FooService",
-        providerClass="defserv.service.FooServiceDefaultProvider2")
-})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-class module_info {
-    // Export service type
-    exports defserv$service$FooService;
-
-    // Note that the default service providers are *not* exported.
-}

--- a/test/java/module/service/src/modserv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package modserv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@MainClass("modserv.client.Main")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="modserv.service", version="[2.0, 3.0)")
-})
-class module_info {
-}

--- a/test/java/module/service/src/modserv/provider1/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package modserv.provider1;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ServiceProviders({
-    @ServiceProvider(service="modserv.service.CodecSet",
-        providerClass="modserv.provider1.StandardCodecs"),
-    @ServiceProvider(service="modserv.service.CodecSet",
-        providerClass="modserv.provider1.AdvancedCodecs")
-})
-@Version("1.3")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="modserv.service", version="[2.0, 3.0)")
-})
-class module_info {
-    // Export multiple service provider classes
-    exports modserv$provider1$StandardCodecs;
-    exports modserv$provider1$AdvancedCodecs;
-}

--- a/test/java/module/service/src/modserv/provider2/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package modserv.provider2;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ServiceProviders({
-    @ServiceProvider(service="modserv.service.CodecSet",
-        providerClass="modserv.provider2.AdvancedCodecs")
-})
-@Version("2.0")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="modserv.service", version="[2.5, 3.0)")
-})
-class module_info {
-    // Export service provider classe
-    exports modserv$provider2$AdvancedCodecs;
-}

--- a/test/java/module/service/src/modserv/provider3/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package modserv.provider3;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ServiceProviders({
-    @ServiceProvider(service="modserv.service.CodecSet",
-        providerClass="modserv.provider3.ImplCodecs")
-})
-
-// Since the service is defined as version 2.7, attempting to load this module
-// will generate a warning (eventually to be a log message).
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="modserv.service", version="[1.0, 2.0)")
-})
-class module_info {
-    // Export service provider classes
-    exports modserv$provider3$ImplCodecs;
-}

--- a/test/java/module/service/src/modserv/service/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package modserv.service;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@Version("2.7")
-@Services({"modserv.service.CodecSet"})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-class module_info {
-    // Export service types
-    exports modserv$service$CodecSet;
-
-    // Export type provided by CodecSet service
-    exports modserv$service$Encoder;
-}

--- a/test/java/module/service/src/reposerv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package reposerv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@MainClass("reposerv.client.Main")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="reposerv.service", version="[1.0, 2.0)")
-})
-class module_info {
-}

--- a/test/java/module/service/src/reposerv/provider/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package reposerv.provider;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@Version("1.0")
-@ServiceProviders({
-    @ServiceProvider(service="reposerv.service.FooService",
-        providerClass="reposerv.provider.FooService2Provider"),
-    @ServiceProvider(service="reposerv.service.BarService",
-        providerClass="reposerv.provider.BarServiceDefaultProvider")
-})
-@Services("BarProvider")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="reposerv.service", version="[1.0, 2.0)")
-})
-class module_info {
-    // Export service type
-     exports reposerv$provider$BarService;
-
-    // Export service provider type
-    exports reposerv$provider$FooService2Provider;
-
-    // Note that the default service provider is *not* exported.
-}

--- a/test/java/module/service/src/reposerv/service/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package reposerv.service;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@Version("1.0")
-@Services({"reposerv.service.FooService"})
-@ServiceProviders({
-    @ServiceProvider(service="reposerv.service.FooService",
-        providerClass="reposerv.service.FooServiceDefaultProvider")
-})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-class module_info {
-    // Export service type
-    exports reposerv$service$FooService;
-
-    // Note that the default service provider is *not* exported.
-}

--- a/test/java/module/service/src/rxpserv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package rxpserv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="rxpserv.service", version="1.0")
-})
-@MainClass("rxpserv.client.Main")
-class module_info {
-}

--- a/test/java/module/service/src/rxpserv/extra/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package rxpserv.extra;
-
-import java.module.annotation.*;
-
-/**
- * A module that just imports and reexports another module, but of a certain
- * version.
- */
-@ImportModules({
-    @ImportModule(name="rxpserv.provider", version="2.0")
-})
-class module_info {
-}

--- a/test/java/module/service/src/rxpserv/provider/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package rxpserv.provider;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@ServiceProviders({
-    @ServiceProvider(service="rxpserv.service.FooService",
-        providerClass="rxpserv.provider.FooServiceProvider")
-})
-// It is important that this be on a single line; see ServiceTest.redefineAnnotations
-@ImportModules({ @ImportModule(name="rxpserv.transitive"), @ImportModule(name="rxpserv.extra") })
-@Version("1.0")
-class module_info {
-    // Export service provider type
-    exports rxpserv$provider$FooServiceProvider;
-}

--- a/test/java/module/service/src/rxpserv/service/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package rxpserv.service;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@Services({"rxpserv.service.FooService"})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-@Version("1.0")
-class module_info {
-    // Export service type
-    exports rxpserv$service$FooService;
-}

--- a/test/java/module/service/src/rxpserv/transitive/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package rxpserv.transitive;
-
-import java.module.annotation.*;
-
-/**
- * A module that just imports and reexports another module, but of a certain
- * version.
- */
-@ImportModules({
-    @ImportModule(name="rxpserv.service", version="1.0", reexport=true)
-})
-class module_info {
-}

--- a/test/java/module/service/src/verserv/client/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 MERCHANTABbILITY 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package verserv.client;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@MainClass("verserv.client.Main")
-@ImportModules({
-    @ImportModule(name="java.se.core"),
-    @ImportModule(name="verserv.service", version="[1.0, 2.0)")
-})
-class module_info {
-}

--- a/test/java/module/service/src/verserv/provider/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package verserv.provider;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@Version("1.0")
-@ServiceProviders({
-    @ServiceProvider(service="verserv.service.FooService",
-        providerClass="verserv.provider.FooService2Provider"),
-    @ServiceProvider(service="verserv.service.BarService",
-        providerClass="verserv.provider.BarServiceDefaultProvider")
-})
-@Services("BarProvider")
-// It is important that this be on a single line; see ServiceTest.redefineAnnotations
-@ImportModules({ @ImportModule(name="java.se.core"), @ImportModule(name="verserv.service", version="[1.0, 2.0)") })
-class module_info {
-    // Export service type
-     exports verserv$provider$BarService;
-
-    // Export service provider type
-    exports verserv$provider$FooService2Provider;
-
-    // Note that the default service provider is *not* exported.
-}

--- a/test/java/module/service/src/verserv/service/module_info.java	Wed Aug 06 15:40:27 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package verserv.service;
-
-import java.lang.ModuleInfo.*;
-import java.module.annotation.*;
-
-@Version("1.0")
-@Services({"verserv.service.FooService"})
-@ServiceProviders({
-    @ServiceProvider(service="verserv.service.FooService",
-        providerClass="verserv.service.FooServiceDefaultProvider")
-})
-@ImportModules({
-    @ImportModule(name="java.se.core")
-})
-class module_info {
-    // Export service type
-    exports verserv$service$FooService;
-
-    // Note that the default service provider is *not* exported.
-}