Index: WsUtil.java
===================================================================
--- WsUtil.java	(revision 53498)
+++ WsUtil.java	(working copy)
@@ -737,6 +737,8 @@
         }
         //Verify that all the endpoints are of the same type 
         for (WebServiceEndpoint endpoint : ws.getEndpoints()) {
+            			
+            checkEndpoint(endpoint);
             String implClassName;
             if (endpoint.implementedByEjbComponent()) {
                 implClassName = endpoint.getEjbComponentImpl().getEjbClassName();
@@ -810,7 +812,19 @@
         }
         return jaxwsEndPtFound;
     }
-
+    
+    protected void checkEndpoint(WebServiceEndpoint endpoint) throws IASDeploymentException{
+            if (!endpoint.implementedByEjbComponent() && !endpoint.implementedByWebComponent()){
+            throw new IASDeploymentException("WSCONTAINER2101: Neither servlet-link nor ejb-link is specified for endpoint '"+endpoint.getEndpointName()+"'");
+        }
+        if (endpoint.implementedByEjbComponent() && endpoint.getEjbComponentImpl() == null){
+            throw new IASDeploymentException("WSCONTAINER2102: ejb component is not secified for endpoint '"+ endpoint.getEndpointName()+"'");
+        }
+        if (endpoint.implementedByWebComponent() && endpoint.getWebComponentImpl() == null){
+            throw new IASDeploymentException("WSCONTAINER2103: web component is not specified for endpoint '"+endpoint.getEndpointName()+"'");
+        }
+    }
+    
     public javax.xml.rpc.Service createConfiguredService
         (ServiceReferenceDescriptor desc) throws Exception {