Index: web-naming/osgi.bundle
===================================================================
--- web-naming/osgi.bundle	(revision 22461)
+++ web-naming/osgi.bundle	(working copy)
@@ -5,3 +5,5 @@
                         org.apache.naming.resources, \
                         org.apache.naming.resources.jndi
 
+Bundle-Activator: org.apache.naming.resources.DirContextURLStreamHandlerService
+
Index: web-naming/pom.xml
===================================================================
--- web-naming/pom.xml	(revision 22461)
+++ web-naming/pom.xml	(working copy)
@@ -86,5 +86,12 @@
             <artifactId>javax.mail</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <!-- Needed to register URLStreamHandler -->
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi_R4_core</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
Index: web-glue/osgi.bundle
===================================================================
--- web-glue/osgi.bundle	(revision 22461)
+++ web-glue/osgi.bundle	(working copy)
@@ -26,4 +26,3 @@
                         org.glassfish.web, \
                         org.glassfish.web.loader.util
 
-Bundle-Activator: org.glassfish.web.DirContextURLStreamHandlerService
Index: web-glue/pom.xml
===================================================================
--- web-glue/pom.xml	(revision 22461)
+++ web-glue/pom.xml	(working copy)
@@ -150,11 +150,6 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.web</groupId>
-            <artifactId>web-naming</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.web</groupId>
             <artifactId>web-core</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -250,13 +245,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <!-- Needed to register URLStreamHandler -->
-          <groupId>org.osgi</groupId>
-          <artifactId>osgi_R4_core</artifactId>
-          <version>1.0</version>
-          <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.glassfish.web</groupId>
             <artifactId>web-gui-plugin-common</artifactId>
             <version>${project.version}</version>