Author: jim.ma Date: 2011-09-07 22:41:47 -0400 (Wed, 07 Sep 2011) New Revision: 14949 Modified: common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java Log: [JBWS-3346]:More fix for jaxrpc endpoint Modified: common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java =================================================================== --- common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2011-09-08 02:37:01 UTC (rev 14948) +++ common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/deployment/URLPatternDeploymentAspect.java 2011-09-08 02:41:47 UTC (rev 14949) @@ -79,7 +79,7 @@ // #1 For JSE lookup the url-pattern from the servlet mappings JSEArchiveMetaData webMetaData = dep.getAttachment(JSEArchiveMetaData.class); - if (webMetaData != null && ep.getType() == EndpointType.JAXWS_JSE || ep.getType() == EndpointType.JAXRPC_JSE) + if (webMetaData != null && (ep.getType() == EndpointType.JAXWS_JSE || ep.getType() == EndpointType.JAXRPC_JSE)) { String epName = ep.getShortName(); urlPattern = webMetaData.getServletMappings().get(epName); @@ -90,15 +90,13 @@ // #2 Use the explicit urlPattern from port-component/port-component-uri EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); //TODO: look at EndpointType.JAXRPC_EJB21 - if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null && ep.getType() == EndpointType.JAXWS_EJB3) + if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null && (ep.getType() == EndpointType.JAXWS_EJB3 || ep.getType() == EndpointType.JAXRPC_EJB21)) { EJBMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); urlPattern = bmd.getPortComponentURI(); if (urlPattern != null) { - //TODO:set contextRoot to eache endpoint - //String contextRoot = dep.getService().getContextRoot(); - String contextRoot = null; + String contextRoot =dep.getService().getContextRoot(); if (urlPattern.startsWith("/") == false) urlPattern = "/" + urlPattern; Modified: common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java =================================================================== --- common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2011-09-08 02:37:01 UTC (rev 14948) +++ common/branches/JBWS-3343/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2011-09-08 02:41:47 UTC (rev 14949) @@ -167,7 +167,7 @@ } catch (WSFException e) { - log.warn(BundleUtils.getMessage(bundle, "COULD_NOT_GET_WEBSERVERINFO"), e); + log.warn(BundleUtils.getMessage(bundle, "COULD_NOT_GET_WEBSERVERINFO")); } if (localPort <= 0) {