Author: jim.ma Date: 2010-04-26 23:06:58 -0400 (Mon, 26 Apr 2010) New Revision: 12118 Modified: framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java Log: [JBWS-2791]:Reverted the EndpointRegistryDeploymentAspect change and registered the endpoints in Pojo bean deployment;check jms endpoint with startWith(jms) instead of uri schema Modified: framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java =================================================================== --- framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2010-04-27 03:03:27 UTC (rev 12117) +++ framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2010-04-27 03:06:58 UTC (rev 12118) @@ -22,18 +22,12 @@ package org.jboss.wsf.framework.deployment; import org.jboss.wsf.common.integration.AbstractDeploymentAspect; -import org.jboss.wsf.common.integration.WSHelper; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.metadata.endpoints.EndpointMetaData; -import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData; -import org.jboss.wsf.spi.metadata.endpoints.jms.JMSAddressMetaData; -import org.jboss.wsf.spi.metadata.endpoints.jms.JMSDestinationMetaData; /** * A deployer that registers the endpoints @@ -49,52 +43,10 @@ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); if (registry == null) registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - - if (WSHelper.hasEndpointsDeployment(dep)) - { - DeploymentModelFactory deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - EndpointsMetaData endpointsMD = WSHelper.getRequiredAttachment(dep, EndpointsMetaData.class); - for(EndpointMetaData endpointMD : endpointsMD.getEndpointsMetaData()) - { - Endpoint endpoint = deploymentModelFactory.newEndpoint(endpointMD.getImplementor()); - endpoint.setShortName(dep.getSimpleName()); - - if (endpointMD.getAddressMetaData() instanceof JMSAddressMetaData) - { - StringBuffer address = new StringBuffer("jms:"); - JMSAddressMetaData jmsAddressMetaData = (JMSAddressMetaData)endpointMD.getAddressMetaData(); - JMSDestinationMetaData request = jmsAddressMetaData.getRequestDestination(); - if (request.getProperty("jndiDestinationName") != null) - { - address.append("jndi:" + request.getProperty("jndiDestinationName")); - } - else if (request.getProperty("jmsDestinationName") != null) - { - address.append("jndi:" + request.getProperty("jmsDestinationName")); - } - - JMSDestinationMetaData reply = jmsAddressMetaData.getReplyDestination(); - if (reply.getProperty("jndiDestinationName") != null) - { - address.append("?replyToName =" + reply.getProperty("jndiReplyDestinationName")); - } - else if (reply.getProperty("jmsDestinationName") != null) - { - address.append("?replyToName =" + reply.getProperty("jmsReplyDestinationName")); - } - - - endpoint.setAddress(address.toString()); - registry.register(endpoint); - } - } - } - for (Endpoint ep : dep.getService().getEndpoints()) { registry.register(ep); } - } public void stop(Deployment dep) @@ -108,4 +60,4 @@ } } -} +} \ No newline at end of file Modified: framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java =================================================================== --- framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java 2010-04-27 03:03:27 UTC (rev 12117) +++ framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java 2010-04-27 03:06:58 UTC (rev 12118) @@ -184,18 +184,12 @@ private String getAddressHtmlTag(final URL requestURL, final Endpoint ep) throws IOException { String address = createAddress(requestURL, ep.getAddress()); - try + + if (address.startsWith("jms")) { - String scheme = new URI(address).getScheme(); - if (scheme.equalsIgnoreCase("jms")) - { - return ep.getAddress(); - } + return ep.getAddress(); } - catch (Exception e) - { - //ignore - } + StringBuilder sb = new StringBuilder("<a href='"); sb.append(address); sb.append("?wsdl'>");