diff -r 88b85470e72c -r f50545b5e2f1 src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java	Tue Mar 06 16:09:35 2012 -0800
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.ws.transport.http.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.server.BoundEndpoint;
+import com.sun.xml.internal.ws.api.server.Module;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.api.server.WebModule;
+import com.sun.xml.internal.ws.transport.http.HttpAdapter;
+
+import javax.xml.ws.WebServiceException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.logging.Logger;
+
+/**
+ * {@link HttpAdapter} for Endpoint API.
+ *
+ * <p>
+ * This is a thin wrapper around {@link HttpAdapter}
+ * with some description specified in the deployment (in particular those
+ * information are related to how a request is routed to a {@link ServerAdapter}.
+ *
+ * <p>
+ * This class implements {@link BoundEndpoint} and represent the
+ * server-{@link WSEndpoint} association for Endpoint API's transport
+ *
+ * @author Jitendra Kotamraju
+ */
+public final class ServerAdapter extends HttpAdapter implements BoundEndpoint {
+    final String name;
+
+    protected ServerAdapter(String name, String urlPattern, WSEndpoint endpoint, ServerAdapterList owner) {
+        super(endpoint, owner, urlPattern);
+        this.name = name;
+        // registers itself with the container
+        Module module = endpoint.getContainer().getSPI(Module.class);
+        if(module==null)
+            LOGGER.warning("Container "+endpoint.getContainer()+" doesn't support "+Module.class);
+        else {
+            module.getBoundEndpoints().add(this);
+        }
+    }
+
+    /**
+     * Gets the name of the endpoint as given in the <tt>sun-jaxws.xml</tt>
+     * deployment descriptor.
+     */
+    public String getName() {
+        return name;
+    }
+
+
+    @NotNull
+    public URI getAddress() {
+        WebModule webModule = endpoint.getContainer().getSPI(WebModule.class);
+        if(webModule==null)
+            // this is really a bug in the container implementation
+            throw new WebServiceException("Container "+endpoint.getContainer()+" doesn't support "+WebModule.class);
+
+        return getAddress(webModule.getContextPath());
+    }
+
+    public @NotNull URI getAddress(String baseAddress) {
+        String adrs = baseAddress+getValidPath();
+        try {
+            return new URI(adrs);
+        } catch (URISyntaxException e) {
+            // this is really a bug in the container implementation
+            throw new WebServiceException("Unable to compute address for "+endpoint,e);
+        }
+    }
+
+    public void dispose() {
+        endpoint.dispose();
+    }
+
+    public String getUrlPattern() {
+        return urlPattern;
+    }
+
+    public String toString() {
+        return super.toString()+"[name="+name+']';
+    }
+
+    private static final Logger LOGGER = Logger.getLogger(ServerAdapter.class.getName());
+}