Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceRefsHandler.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceRefsHandler.java	(revision 39992)
+++ webservices/jsr109-glue/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceRefsHandler.java	(revision )
@@ -1,0 +1,0 @@
Index: packager/metro/pom.xml
===================================================================
--- packager/metro/pom.xml	(revision 47557)
+++ packager/metro/pom.xml	(revision )
@@ -93,6 +93,11 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.webservices</groupId>
+            <artifactId>jsr109-glue</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+        <groupId>org.glassfish.webservices</groupId>
             <artifactId>soap-tcp</artifactId>
             <version>${project.version}</version>
         </dependency>
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceProviderHandler.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceProviderHandler.java	(revision 39992)
+++ webservices/jsr109-glue/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceProviderHandler.java	(revision )
@@ -1,0 +1,0 @@
Index: webservices/jsr109-glue/osgi.bundle
===================================================================
--- webservices/jsr109-glue/osgi.bundle	(revision )
+++ webservices/jsr109-glue/osgi.bundle	(revision )
@@ -0,0 +1,47 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common Development
+# and Distribution License("CDDL") (collectively, the "License").  You
+# may not use this file except in compliance with the License.  You can
+# obtain a copy of the License at
+# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+# or packager/legal/LICENSE.txt.  See the License for the specific
+# language governing permissions and limitations under the License.
+#
+# When distributing the software, include this License Header Notice in each
+# file and include the License file at packager/legal/LICENSE.txt.
+#
+# GPL Classpath Exception:
+# Oracle designates this particular file as subject to the "Classpath"
+# exception as provided by Oracle in the GPL Version 2 section of the License
+# file that accompanied this code.
+#
+# Modifications:
+# If applicable, add the following below the License Header, with the fields
+# enclosed by brackets [] replaced by your own identifying information:
+# "Portions Copyright [year] [name of copyright owner]"
+#
+# Contributor(s):
+# If you wish your version of this file to be governed by only the CDDL or
+# only the GPL Version 2, indicate your decision by adding "[Contributor]
+# elects to include this software in this distribution under the [CDDL or GPL
+# Version 2] license."  If you don't indicate a single choice of license, a
+# recipient has the option to distribute your version of this file under
+# either the CDDL, the GPL Version 2 or to extend the choice of license to
+# its licensees as provided above.  However, if you add GPL Version 2 code
+# and therefore, elected the GPL Version 2 license, then the option applies
+# only if the new code is made subject to such option by the copyright
+# holder.
+#
+
+-exportcontents: \
+                        org.glassfish.webservices; version=${project.osgi.version}
+Import-Package: \
+                       com.sun.enterprise.deployment.*, \
+                       com.sun.enterprise.deployment.annotation.*, \
+                       javax.ejb;resolution:=optional, \
+                       * 
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceHandler.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceHandler.java	(revision 39992)
+++ webservices/jsr109-glue/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceHandler.java	(revision )
@@ -1,0 +1,0 @@
Index: webservices/jsr109-glue/pom.xml
===================================================================
--- webservices/jsr109-glue/pom.xml	(revision )
+++ webservices/jsr109-glue/pom.xml	(revision )
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.glassfish.webservices</groupId>
+        <artifactId>webservices</artifactId>
+        <version>3.1.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jsr109-glue</artifactId>
+    <packaging>hk2-jar</packaging>
+    <name>Connects JSR109 Web Services AnnotationHandlers to the Deployment</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.glassfish.metro</groupId>
+                                    <artifactId>webservices-api-osgi</artifactId>
+                                    <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+                                    <version>${webservices.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.sun.enterprise</groupId>
+                <artifactId>hk2-maven-plugin</artifactId>
+                <configuration>
+                    <compilerArguments>
+                        <!-- also adding the classes.jar in the bootclasspath as rt.jar is not available on Mac -->
+                        <bootclasspath>
+                            ${project.build.directory}/endorsed/webservices-api-osgi-${webservices.version}.jar${path.separator}${java.home}/../Classes/classes.jar${path.separator}${java.home}/lib/rt.jar${path.separator}${java.home}/lib/tools.jar${path.separator}${java.home}/lib/java.util.jar${path.separator}${java.home}/lib/vm.jar${path.separator}${java.home}/lib/logging.jar${path.separator}${java.home}/lib/annotation.jar${path.separator}${java.home}/lib/security.jar${path.separator}${java.home}/lib/xml.jar${path.separator}${java.home}/lib/ibmjgssfw.jar${path.separator}${java.home}/lib/sql.jar${path.separator}${java.home}/lib/beans.jar${path.separator}${java.home}/lib/jndi.jar${path.separator}${java.home}/lib/ibmorbapi.jar
+                        </bootclasspath>
+                    </compilerArguments>
+                    <fork>true</fork>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.glassfish.deployment</groupId>
+            <artifactId>dol</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.metro</groupId>
+            <artifactId>webservices-api-osgi</artifactId>
+        </dependency>
+    </dependencies>
+</project>
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/HandlerChainHandler.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/HandlerChainHandler.java	(revision 43341)
+++ webservices/jsr109-glue/src/main/java/org/glassfish/webservices/annotation/handlers/HandlerChainHandler.java	(revision )
@@ -1,0 +1,0 @@
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceRefHandler.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceRefHandler.java	(revision 43445)
+++ webservices/jsr109-glue/src/main/java/org/glassfish/webservices/annotation/handlers/WebServiceRefHandler.java	(revision )
@@ -1,0 +1,0 @@
Index: webservices/pom.xml
===================================================================
--- webservices/pom.xml	(revision 45945)
+++ webservices/pom.xml	(revision )
@@ -58,6 +58,7 @@
         <module>metro-fragments</module>
         <module>metro-glue</module>
     	<module>connector</module>
+        <module>jsr109-glue</module>
         <module>jsr109-impl</module>
         <module>soap-tcp</module>
         <module>webservices-scripts</module>