Author: asoldano Date: 2013-12-05 05:42:58 -0500 (Thu, 05 Dec 2013) New Revision: 18139 Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointService.java Log: Backport part of [WFLY-2565] to 7.2.0 ASIL (excluding backport the endpoint publisher stuff) Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointService.java =================================================================== --- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointService.java 2013-12-05 10:17:37 UTC (rev 18138) +++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/service/EndpointService.java 2013-12-05 10:42:58 UTC (rev 18139) @@ -30,6 +30,7 @@ import org.jboss.as.security.plugins.SecurityDomainContext; import org.jboss.as.security.service.SecurityDomainService; +import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.webservices.security.SecurityDomainContextAdaptor; import org.jboss.as.webservices.util.WSServices; @@ -230,6 +231,9 @@ builder.addDependency(DependencyType.REQUIRED, WSServices.CONFIG_SERVICE); builder.setInitialMode(Mode.ACTIVE); builder.install(); + //add a dependency on the endpoint service to web deployments, so that the + //endpoint servlet is not started before the endpoint is actually available + unit.addToAttachmentList(Attachments.WEB_DEPENDENCIES, serviceName); } public static void uninstall(final Endpoint endpoint, final DeploymentUnit unit) {