[jbossws-commits] JBossWS SVN: r3020 - in trunk: jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client and 11 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 13:10:57 -0400 (Wed, 09 May 2007) New Revision: 3020 Added: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java Removed: trunk/jbossws-core/src/java/org/jboss/ws/core/server/legacy/ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-tests/.classpath trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java Log: Fix test regression Added: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java (rev 0) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.deployment; + +//$Id$ + +import org.jboss.ws.extensions.eventing.EventingConstants; +import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; +import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; +import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory; +import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; + +/** + * A deployer that creates event sources and register them with the + * subscripion manager when a service endpoint is created. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class EventingDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + ServerEndpointMetaData sepMetaData = ep.getMetaData(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING); + if (ext != null) + { + // Currently several endpoints may belong to an event source deployment. + // Therefore we have to avoid duplicate registrations + // Actually there should be a 1:n mapping of event source NS to endpoints. + // See also http://jira.jboss.org/jira/browse/JBWS-770 + + // create pending incomplete event source + EventingEndpointDeployment desc = new EventingEndpointDeployment(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS()); + desc.setEndpointAddress(sepMetaData.getEndpointAddress()); + desc.setPortName(sepMetaData.getPortName()); + + SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance(); + SubscriptionManagerMBean manager = factory.getSubscriptionManager(); + manager.registerEventSource(desc); + } + } + } + + @Override + public void destroy(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + ServerEndpointMetaData sepMetaData = ep.getMetaData(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING); + if (ext != null) + { + SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance(); + SubscriptionManagerMBean manager = factory.getSubscriptionManager(); + manager.removeEventSource(ext.getEventSourceURI()); + } + } + } +} \ No newline at end of file Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EventingDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -52,15 +52,16 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.client.ServiceObjectFactory; -import org.jboss.ws.core.server.legacy.ServiceEndpoint; -import org.jboss.ws.core.server.legacy.ServiceEndpointManager; -import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.management.EndpointRegistry; +import org.jboss.ws.integration.management.EndpointRegistryFactory; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; @@ -181,13 +182,13 @@ String endpointAddress = null; try { - ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); - ServiceEndpointManager epManager = factory.getServiceEndpointManager(); - ServiceEndpoint serviceEndpoint = epManager.resolvePortComponentLink(pcLink); - if (serviceEndpoint == null) + EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink); + if (endpoint == null) throw new WSException("Cannot resolve port-component-link: " + pcLink); - endpointAddress = serviceEndpoint.getServiceEndpointInfo().getServerEndpointMetaData().getEndpointAddress(); + ServerEndpointMetaData sepMetaData = endpoint.getMetaData(ServerEndpointMetaData.class); + endpointAddress = sepMetaData.getEndpointAddress(); } catch (Throwable ex) { Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -36,8 +36,6 @@ import javax.naming.StringRefAddr; import org.jboss.logging.Logger; -import org.jboss.ws.core.server.legacy.ServiceEndpointManager; -import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory; import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.integration.management.ServerConfig; import org.jboss.ws.integration.management.ServerConfigFactory; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -43,8 +43,6 @@ import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; import org.jboss.ws.core.server.HttpContext; import org.jboss.ws.core.server.HttpServer; -import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory; -import org.jboss.ws.integration.management.ServerConfig; import org.jboss.ws.integration.management.ServerConfigFactory; import org.w3c.dom.Element; Added: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java (rev 0) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -0,0 +1,175 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.server; + +// $Id$ + +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URL; +import java.util.Set; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.logging.Logger; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.management.EndpointRegistry; +import org.jboss.ws.integration.management.EndpointRegistryFactory; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; + +/** + * The servlet that that is associated with context /jbossws + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Mar-2005 + */ +public class ContextServlet extends HttpServlet +{ + // provide logging + protected final Logger log = Logger.getLogger(ContextServlet.class); + + protected EndpointRegistry epRegistry; + + public void init(ServletConfig config) throws ServletException + { + super.init(config); + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + } + + /** Process GET requests. + */ + public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + PrintWriter writer = res.getWriter(); + res.setContentType("text/html"); + + writer.print("<html>"); + setupHTMLResponseHeader(writer); + + URL requestURL = new URL(req.getRequestURL().toString()); + + writer.print("<body>"); + + writer.print("<div class='pageHeader'>JBossWS/Services</div>"); + writer.print("<div class='pageSection'>"); + writer.print("<fieldset>"); + writer.print("<legend><b>Registered Service Endpoints</b></legend>"); + writer.print("<table>"); + + // begin iteration + Set<ObjectName> endpoints = epRegistry.getEndpoints(); + + if (endpoints.isEmpty()) + { + writer.print("<tr>"); + writer.print(" <td><h3>There are currently no endpoints deployed</h3></td>"); + writer.print("</tr>"); + } + + for (ObjectName oname : endpoints) + { + Endpoint ep = epRegistry.getEndpoint(oname); + ServerEndpointMetaData sepMetaData = ep.getMetaData(ServerEndpointMetaData.class); + + writer.print("<tr>"); + writer.print(" <td>ServiceEndpointID</td>"); + writer.print(" <td>" + ep.getName() + "</td>"); + writer.print("</tr>"); + writer.print("<tr>"); + writer.print(" <td>ServiceEndpointAddress</td>"); + writer.print(" <td><a href='" + sepMetaData.getEndpointAddress() + "?wsdl'>" + sepMetaData.getEndpointAddress() + "?wsdl</a></td>"); + writer.print("</tr>"); + writer.print("<tr>"); + writer.print(" <td colspan=2>"); + writer.print(" "); + writer.print(""); + /* + writer.print("<table class='metrics'>"); + writer.print("<tr>"); + writer.print(" <td>StartTime</td>"); + writer.print(" <td>StopTime</td>"); + writer.print(" <td></td>"); + writer.print("</tr>"); + writer.print("<tr>"); + writer.print(" <td>" + ep.getSeMetrics().getStartTime() + "</td>"); + + String stopTime = ep.getSeMetrics().getStopTime() != null ? ep.getSeMetrics().getStopTime().toString() : ""; + writer.print(" <td>" + stopTime + "</td>"); + writer.print(" <td></td>"); + writer.print("</tr>"); + writer.print("<tr>"); + + writer.print(" <td>RequestCount</td>"); + writer.print(" <td>ResponseCount</td>"); + writer.print(" <td>FaultCount</td>"); + writer.print("</tr>"); + writer.print("<tr>"); + writer.print(" <td>" + ep.getSeMetrics().getRequestCount() + "</td>"); + writer.print(" <td>" + ep.getSeMetrics().getResponseCount() + "</td>"); + writer.print(" <td>" + ep.getSeMetrics().getFaultCount() + "</td>"); + writer.print("</tr>"); + writer.print("<tr>"); + writer.print(" <td>MinProcessingTime</td>"); + writer.print(" <td>MaxProcessingTime</td>"); + writer.print(" <td>AvgProcessingTime</td>"); + writer.print("</tr>"); + writer.print("<tr>"); + writer.print(" <td>" + ep.getSeMetrics().getMinProcessingTime() + "</td>"); + writer.print(" <td>" + ep.getSeMetrics().getMaxProcessingTime() + "</td>"); + writer.print(" <td>" + ep.getSeMetrics().getAverageProcessingTime() + "</td>"); + writer.print("</tr>"); + writer.print(""); + writer.print(""); + writer.print("</table>"); + */ + writer.print(""); + writer.print(" </td>"); + writer.print("</tr>"); + + writer.print("<tr><td colspan='3'>&nbsp;</td></tr>"); + } + // end iteration + writer.print("</table>"); + writer.print(""); + writer.print("</fieldset>"); + writer.print("</div>"); + + writer.print("</body>"); + writer.print("</html>"); + writer.close(); + } + + private void setupHTMLResponseHeader(PrintWriter writer) + { + Package wsPackage = Package.getPackage("org.jboss.ws"); + writer.println("<head>"); + writer.println("<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>"); + writer.println("<title>JBossWS / " + wsPackage.getImplementationVersion() + "</title>"); + writer.println("<link rel='stylesheet' href='./styles.css'>"); + writer.println("</head>"); + } +} Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ContextServlet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ManagedEndpointRegistry.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -27,9 +27,12 @@ import javax.management.MBeanServer; import javax.management.MBeanServerFactory; +import javax.management.ObjectName; import org.jboss.logging.Logger; +import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.management.BasicEndpointRegistry; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** @@ -48,6 +51,44 @@ return UnifiedMetaData.getImplementationVersion(); } + /** Resolve a port-component-link, like: + * + * [deployment.war]#PortComponentName + * [deployment.jar]#PortComponentName + * + */ + public Endpoint resolvePortComponentLink(String pcLink) + { + String pcName = pcLink; + int hashIndex = pcLink.indexOf("#"); + if (hashIndex > 0) + { + pcName = pcLink.substring(hashIndex + 1); + } + + Endpoint endpoint = null; + for (ObjectName sepID : getEndpoints()) + { + Endpoint auxEndpoint = getEndpoint(sepID); + ServerEndpointMetaData sepMetaData = auxEndpoint.getMetaData(ServerEndpointMetaData.class); + if (pcName.equals(sepMetaData.getPortComponentName())) + { + if (endpoint != null) + { + log.warn("Multiple service endoints found for: " + pcLink); + endpoint = null; + break; + } + endpoint = auxEndpoint; + } + } + + if (endpoint == null) + log.warn("No ServiceEndpoint found for pcLink: " + pcLink); + + return endpoint; + } + public void create() throws Exception { log.info(UnifiedMetaData.getImplementationVersion()); Copied: trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/core/server/legacy/PortComponentLinkServlet.java) =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java (rev 0) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.server; + +// $Id$ + +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.management.EndpointRegistry; +import org.jboss.ws.integration.management.EndpointRegistryFactory; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; + +/** + * A servlet that reports the serviceURL for a given service ID. + * <p/> + * When the web service client ENC is setup, it may contain port-component-link + * entries that point to service endpoints in the same top level deployment. + * The final serviceURL of those endpoints will become available after the + * reference to the javax.xml.rpc.Service is bound to JNDI. + * <p/> + * When the client does a lookup of the javax.xml.rpc.Service from JNDI the ObjectFactory + * will contact this servlet for the final serviceURL. It is acceptable that the client + * wsdl does not contain the correct serviceURL if the client is using the port-component-link element. + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-May-2004 + */ +public class PortComponentLinkServlet extends HttpServlet +{ + // provide logging + private static final Logger log = Logger.getLogger(PortComponentLinkServlet.class); + + protected EndpointRegistry epRegistry; + + public void init(ServletConfig config) throws ServletException + { + super.init(config); + epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + } + + /** + * Get the serviceURL as string for a given serviceID. + */ + public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String pcLink = req.getParameter("pcLink"); + if (pcLink == null) + throw new IllegalArgumentException("Cannot obtain request parameter 'pcLink'"); + + Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink); + if (endpoint == null) + throw new WSException("Cannot resolve port-component-link: " + pcLink); + + res.setContentType("text/plain"); + PrintWriter out = res.getWriter(); + + ServerEndpointMetaData sepMetaData = endpoint.getMetaData(ServerEndpointMetaData.class); + String endpointAddress = sepMetaData.getEndpointAddress(); + out.println(endpointAddress); + + log.debug("Resolved " + pcLink + " to: " + endpointAddress); + out.close(); + } +} Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -179,7 +179,7 @@ return createMessage(mimeHeaders, ins, false); } - public SOAPMessage createMessage(MimeHeaders mimeHeaders, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException + public SOAPMessage createMessage(MimeHeaders mimeHeaders, InputStream inputStream, boolean ignoreParseError) throws IOException, SOAPException { if (mimeHeaders == null) { @@ -196,63 +196,65 @@ } ContentType contentType = getContentType(mimeHeaders); - if (log.isDebugEnabled()) - log.debug("createMessage: [contentType=" + contentType + "]"); + log.debug("createMessage: [contentType=" + contentType + "]"); - // Debug the incoming message - if (log.isTraceEnabled()) + SOAPMessageImpl soapMessage = new SOAPMessageImpl(); + if (inputStream != null) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); - IOUtils.copyStream(baos, ins); - byte[] bytes = baos.toByteArray(); + // Debug the incoming message + if (log.isTraceEnabled()) + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); + IOUtils.copyStream(baos, inputStream); + byte[] bytes = baos.toByteArray(); - log.trace("createMessage\n" + new String(bytes)); - ins = new ByteArrayInputStream(bytes); - } + log.trace("createMessage\n" + new String(bytes)); + inputStream = new ByteArrayInputStream(bytes); + } - Collection<AttachmentPart> attachments = null; - if (isMultipartRelatedContent(contentType)) - { - MultipartRelatedDecoder decoder; - try + Collection<AttachmentPart> attachments = null; + if (isMultipartRelatedContent(contentType)) { - decoder = new MultipartRelatedDecoder(contentType); - decoder.decodeMultipartRelatedMessage(ins); + MultipartRelatedDecoder decoder; + try + { + decoder = new MultipartRelatedDecoder(contentType); + decoder.decodeMultipartRelatedMessage(inputStream); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (IOException ex) + { + throw ex; + } + catch (Exception ex) + { + throw new SOAPException("Cannot decode multipart related message", ex); + } + + inputStream = decoder.getRootPart().getDataHandler().getInputStream(); + attachments = decoder.getRelatedParts(); } - catch (RuntimeException rte) + else if (isSoapContent(contentType) == false) { - throw rte; + throw new SOAPException("Unsupported content type: " + contentType); } - catch (IOException ex) - { - throw ex; - } - catch (Exception ex) - { - throw new SOAPException("Cannot decode multipart related message", ex); - } - ins = decoder.getRootPart().getDataHandler().getInputStream(); - attachments = decoder.getRelatedParts(); - } - else if (isSoapContent(contentType) == false) - { - throw new SOAPException("Unsupported content type: " + contentType); - } + if (mimeHeaders != null) + soapMessage.setMimeHeaders(mimeHeaders); - SOAPMessageImpl soapMessage = new SOAPMessageImpl(); - if (mimeHeaders != null) - soapMessage.setMimeHeaders(mimeHeaders); + if (attachments != null) + soapMessage.setAttachments(attachments); - if (attachments != null) - soapMessage.setAttachments(attachments); + // Get the SOAPEnvelope builder + EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(getStyle()); - // Get the SOAPEnvelope builder - EnvelopeBuilder envBuilder = new EnvelopeBuilderDOM(getStyle()); + // Build the payload + envBuilder.build(soapMessage, inputStream, ignoreParseError); + } - // Build the payload - envBuilder.build(soapMessage, ins, ignoreParseError); - return soapMessage; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -60,9 +60,7 @@ public Object read(InputStream inputStream, Map metadata) throws IOException, ClassNotFoundException { if (log.isTraceEnabled()) - { log.trace("Read input stream with metadata=" + metadata); - } try { @@ -73,6 +71,7 @@ MimeHeaders mimeHeaders = getMimeHeaders(metadata); SOAPMessage soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true); + return soapMsg; } catch (SOAPException e) Deleted: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpoint.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -1,70 +0,0 @@ -package org.jboss.ws.extensions.eventing.deployment; - -import org.jboss.ws.WSException; -import org.jboss.ws.core.server.legacy.ServiceEndpoint; -import org.jboss.ws.core.server.legacy.ServiceEndpointInfo; -import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; -import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory; -import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; - -/** - * EventingEndpointLifecycle is responsible to create event sources - * and register them with the subscripion manager when a service endpoint is created. - * - * @author Heiko Braun, <heiko(a)openj.net&gt; - * @since 22-Mar-2006 - */ -public class EventingEndpoint extends ServiceEndpoint -{ - // encupsulates access to subscription manager - private SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance(); - - public EventingEndpoint(ServiceEndpointInfo seInfo) - { - super(seInfo); - } - - /** - * Register event source with subscription manager. - */ - public void create() throws Exception - { - super.create(); - - ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); - EventingEpMetaExt ext = (EventingEpMetaExt)epMetaData.getExtension(EventingConstants.NS_EVENTING); - if (null == ext) - throw new WSException("Cannot obtain eventing meta data"); - - // Currently several endpoints may belong to an event source deployment. - // Therefore we have to avoid duplicate registrations - // Actually there should be a 1:n mapping of event source NS to endpoints. - // See also http://jira.jboss.org/jira/browse/JBWS-770 - - // create pending incomplete event source - EventingEndpointDI desc = new EventingEndpointDI(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS()); - desc.setEndpointAddress(epMetaData.getEndpointAddress()); - desc.setPortName(epMetaData.getPortName()); - - SubscriptionManagerMBean manager = factory.getSubscriptionManager(); - manager.registerEventSource(desc); - } - - /** - * Unregister event source with subscription manager. - */ - public void destroy() - { - ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); - EventingEpMetaExt ext = (EventingEpMetaExt)epMetaData.getExtension(EventingConstants.NS_EVENTING); - if (null == ext) - throw new WSException("Cannot obtain eventing meta data"); - - SubscriptionManagerMBean manager = factory.getSubscriptionManager(); - manager.removeEventSource(ext.getEventSourceURI()); - - super.destroy(); - } -} Deleted: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -1,64 +0,0 @@ -package org.jboss.ws.extensions.eventing.deployment; - -import javax.xml.namespace.QName; - -/** - * Eventsource endpoint deployment info. - * - * @author Heiko Braun, <heiko(a)openj.net&gt; - * @since 18-Jan-2006 - */ -public class EventingEndpointDI { - - /* event source URI */ - private String name; - - private QName portName; - - // event source endpoint address - private String endpointAddress; - - /* notification schema */ - private String[] schema; - - private String notificationRootElementNS; - - public EventingEndpointDI(String name, String[] schema, String notificationRootElementNS) { - this.name = name; - this.schema = schema; - this.notificationRootElementNS = notificationRootElementNS; - } - - public QName getPortName() { - return portName; - } - - public void setPortName(QName portName) { - this.portName = portName; - } - - public String getName() { - return name; - } - - public String[] getSchema() { - return schema; - } - - public String getEndpointAddress() { - return endpointAddress; - } - - public void setEndpointAddress(String endpointAddress) { - this.endpointAddress = endpointAddress; - } - - public String getNotificationRootElementNS() { - return notificationRootElementNS; - } - - public void setNotificationRootElementNS(String notificationRootElementNS) { - this.notificationRootElementNS = notificationRootElementNS; - } - -} Copied: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java (from rev 3007, trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDI.java) =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java (rev 0) +++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/deployment/EventingEndpointDeployment.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -0,0 +1,73 @@ +package org.jboss.ws.extensions.eventing.deployment; + +import javax.xml.namespace.QName; + +/** + * Eventsource endpoint deployment info. + * + * @author Heiko Braun, <heiko(a)openj.net&gt; + * @since 18-Jan-2006 + */ +public class EventingEndpointDeployment +{ + /* event source URI */ + private String name; + + private QName portName; + + // event source endpoint address + private String endpointAddress; + + /* notification schema */ + private String[] schema; + + private String notificationRootElementNS; + + public EventingEndpointDeployment(String name, String[] schema, String notificationRootElementNS) + { + this.name = name; + this.schema = schema; + this.notificationRootElementNS = notificationRootElementNS; + } + + public QName getPortName() + { + return portName; + } + + public void setPortName(QName portName) + { + this.portName = portName; + } + + public String getName() + { + return name; + } + + public String[] getSchema() + { + return schema; + } + + public String getEndpointAddress() + { + return endpointAddress; + } + + public void setEndpointAddress(String endpointAddress) + { + this.endpointAddress = endpointAddress; + } + + public String getNotificationRootElementNS() + { + return notificationRootElementNS; + } + + public void setNotificationRootElementNS(String notificationRootElementNS) + { + this.notificationRootElementNS = notificationRootElementNS; + } + +} Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/EventingBuilder.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -5,7 +5,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI; +import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; /** * @author Heiko Braun, <heiko(a)openj.net&gt; @@ -20,7 +20,7 @@ return new EventingBuilder(); } - public EventSource newEventSource(EventingEndpointDI desc) { + public EventSource newEventSource(EventingEndpointDeployment desc) { URI eventSourceNS = newEventSourceURI(desc.getName()); EventSource eventSource = new EventSource(desc.getName(), eventSourceNS, desc.getSchema(), desc.getNotificationRootElementNS()); eventSource.getSupportedFilterDialects().add(EventingConstants.getDefaultFilterDialect()); Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -57,7 +57,7 @@ import org.jboss.ws.core.utils.DOMWriter; import org.jboss.ws.core.utils.UUIDGenerator; import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI; +import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; import org.jboss.ws.extensions.eventing.jaxws.ReferenceParametersType; @@ -97,8 +97,6 @@ private static final Logger log = Logger.getLogger(SubscriptionManager.class); - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=SubscriptionManager,module=eventing"); - /** * Maps event source namespaces to event source instances. */ @@ -214,7 +212,7 @@ /** * A two phase deployment process. */ - public void registerEventSource(EventingEndpointDI deploymentInfo) + public void registerEventSource(EventingEndpointDeployment deploymentInfo) { // workaround for JBWS-1006 lazyBindEventDispatcher(); @@ -263,7 +261,7 @@ * @param deploymentInfo * @param eventSource */ - private static void updateManagerAddress(EventingEndpointDI deploymentInfo, EventSource eventSource) + private static void updateManagerAddress(EventingEndpointDeployment deploymentInfo, EventSource eventSource) { String addr = null; if(deploymentInfo.getPortName().getLocalPart().equals("SubscriptionManagerPort")) Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -27,8 +27,11 @@ import java.util.Date; import java.util.List; -import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI; +import javax.management.ObjectName; + +import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; +import org.jboss.ws.integration.ObjectNameFactory; import org.w3c.dom.Element; /** @@ -37,8 +40,10 @@ */ public interface SubscriptionManagerMBean { - public static final String BEAN_NAME = "SubscriptionManager"; + static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=SubscriptionManager,module=eventing"); + static final String BEAN_NAME = "WSSubscriptionManager"; + /** * Returns the core number of threads. * @@ -92,7 +97,7 @@ // notification API void dispatch(URI eventSourceNS, Element payload); - void registerEventSource(EventingEndpointDI deploymentInfo); + void registerEventSource(EventingEndpointDeployment deploymentInfo); void removeEventSource(URI eventSourceNS); Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -48,17 +48,14 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.deployment.UnifiedDeploymentInfo; import org.jboss.ws.core.jaxrpc.Use; -import org.jboss.ws.core.server.legacy.ServiceEndpointManager; -import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory; -import org.jboss.ws.integration.ObjectNameFactory; -import org.jboss.ws.integration.management.ServerConfig; -import org.jboss.ws.integration.management.ServerConfigFactory; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.EventingUtils; -import org.jboss.ws.extensions.eventing.deployment.EventingEndpoint; import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; +import org.jboss.ws.integration.ObjectNameFactory; +import org.jboss.ws.integration.management.ServerConfig; +import org.jboss.ws.integration.management.ServerConfigFactory; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; @@ -161,10 +158,10 @@ String wsContextRoot = applMetaData.getWebServiceContextRoot(); if (wsContextRoot != null) contextRoot = wsContextRoot; - + String ejbClass = beanMetaData.getEjbClass(); String ejbClassName = WSDLUtils.getJustClassName(ejbClass); - + UnifiedEjbPortComponentMetaData ejbpcMetaData = beanMetaData.getPortComponent(); if (ejbpcMetaData != null && ejbpcMetaData.getPortComponentURI() != null) { @@ -182,7 +179,7 @@ } } } - + if (contextRoot == null) contextRoot = ejbClassName + "Service"; if (urlPattern == null) @@ -493,9 +490,7 @@ ext.setEventSourceNS(eventSourceNS); ext.setNotificationSchema(notificationSchema); ext.setNotificationRootElementNS(notificationRootElementNS); - sepMetaData.addExtension(ext); - sepMetaData.setManagedEndpointBean(EventingEndpoint.class.getName()); } } } Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -63,8 +63,6 @@ private String transportGuarantee; // The optional secure wsdl access private boolean secureWSDLAccess; - // The bean that registers with the ServiceEndpointManager - private String managedEndpointBean = "org.jboss.ws.core.server.ServiceEndpoint"; public ServerEndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type) { @@ -173,16 +171,6 @@ this.secureWSDLAccess = secureWSDLAccess; } - public String getManagedEndpointBean() - { - return managedEndpointBean; - } - - public void setManagedEndpointBean(String managedEndpointBean) - { - this.managedEndpointBean = managedEndpointBean; - } - public String toString() { StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:"); Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -30,7 +30,7 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; -import org.jboss.ws.core.server.legacy.ServiceEndpointManager; +import org.jboss.ws.core.server.ManagedEndpointRegistry; import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; @@ -186,7 +186,8 @@ { if (eagerInitialized == false) { - if(log.isDebugEnabled()) log.debug("Eagerly initialize the meta data model"); + if (log.isDebugEnabled()) + log.debug("Eagerly initialize the meta data model"); for (ServiceMetaData service : services) { service.eagerInitialize(); @@ -199,7 +200,7 @@ { if (implementationVersion == null) { - implementationVersion = ServiceEndpointManager.class.getPackage().getImplementationVersion(); + implementationVersion = ManagedEndpointRegistry.class.getPackage().getImplementationVersion(); if (implementationVersion != null) isFinalRelease = new StringTokenizer(implementationVersion).nextToken().endsWith(".GA"); } Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-tests/.classpath 2007-05-09 17:10:57 UTC (rev 3020) @@ -38,5 +38,7 @@ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbws-jboss42"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbws-jboss50"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -30,13 +30,14 @@ import org.jboss.test.ws.JBossWSTestSetup; /** - * Test case to test that the call can be made when the client - * was deployed with an issolated classloader. + * Client security configuration not loaded when client deployed with issolated classloader * * If the client has not picked up the config it will send the * message without security headers which will cause the call * to fail. * + * http://jira.jboss.org/jira/browse/JBWS-1121 + * * @author darran.lofthouse(a)jboss.com * @since 03-August-2006 */ Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -35,6 +35,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.CallImpl; +import org.jboss.ws.core.server.ManagedServerConfigMBean; /** * [JBWS-1178] Multiple virtual host and soap:address problem @@ -54,7 +55,7 @@ public void setUp() throws Exception { - ObjectName objectName = new ObjectName("jboss.ws:service=ServiceEndpointManager"); + ObjectName objectName = ManagedServerConfigMBean.OBJECT_NAME; webServiceHost = (String)getServer().getAttribute(objectName, "WebServiceHost"); // Setting the WebServiceHost to an empty string, causes the request host to be used getServer().setAttribute(objectName, new Attribute("WebServiceHost", "")); @@ -62,7 +63,7 @@ public void tearDown() throws Exception { - ObjectName objectName = new ObjectName("jboss.ws:service=ServiceEndpointManager"); + ObjectName objectName = ManagedServerConfigMBean.OBJECT_NAME; getServer().setAttribute(objectName, new Attribute("WebServiceHost", webServiceHost)); } Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-09 17:09:16 UTC (rev 3019) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/wseventing/SubscriptionManagerTestCase.java 2007-05-09 17:10:57 UTC (rev 3020) @@ -31,7 +31,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI; +import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment; import org.jboss.ws.extensions.eventing.jaxws.AttributedURIType; import org.jboss.ws.extensions.eventing.jaxws.EndpointReferenceType; import org.jboss.ws.extensions.eventing.mgmt.Filter; @@ -82,7 +82,7 @@ { try { - EventingEndpointDI deploymentInfo = new EventingEndpointDI("http://schemas.xmlsoap.org/ws/2004/08/eventing/W...;, null, null); + EventingEndpointDeployment deploymentInfo = new EventingEndpointDeployment("http://schemas.xmlsoap.org/ws/2004/08/ev...;, null, null); deploymentInfo.setEndpointAddress("http://localhost:8080/jaxws-wseventing/manage"); deploymentInfo.setPortName(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing","Su...);