10:07 p.m.
Author: jim.ma
Date: 2010-05-19 23:07:44 -0400 (Wed, 19 May 2010)
New Revision: 12282
Added:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/JMSEndpointsParserDeployer.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-2791]:Add the JMSEndpointParserDeployer to parse the jbossws-cxf.xml;create
DeploymentModuleBuilder for JMS endpoints; Change the WSDeploymentAspectDeployer to add
the special inputs for JMSEndpoints DA
Added:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/JMSEndpointsParserDeployer.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/JMSEndpointsParserDeployer.java
(rev 0)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/JMSEndpointsParserDeployer.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.webservices.integration.deployers;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.vfs.VFSInputSource;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsFactory;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.xml.sax.InputSource;
+
+/**
+ * jbsssws-cxf.xml Parser
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JMSEndpointsParserDeployer extends
ObjectModelFactoryDeployer<JMSEndpointsMetaData>
+{
+
+ /**
+ * Constructor.
+ */
+ public JMSEndpointsParserDeployer()
+ {
+ super(JMSEndpointsMetaData.class);
+ }
+
+ @Override
+ public void deploy(DeploymentUnit unit) throws DeploymentException
+ {
+ //Only parse in jar file
+ if (ASHelper.getOptionalAttachment(unit, JBossWebMetaData.class) == null)
+ {
+ super.deploy(unit);
+ }
+
+ }
+
+
+ @Override
+ protected JMSEndpointsMetaData parse(VFSDeploymentUnit unit, VirtualFile file,
JMSEndpointsMetaData root) throws Exception
+ {
+ InputSource source = new VFSInputSource(file);
+ ObjectModelFactory jmsEndpointsFactory = new JMSEndpointsFactory(file.toURL());
+ return getHelper().parse(source, root, jmsEndpointsFactory);
+ }
+
+
+ /**
+ * Model factory generator.
+ *
+ * @param root object tree root
+ * @return object model factory
+ */
+ @Override
+ protected ObjectModelFactory getObjectModelFactory(final JMSEndpointsMetaData root)
+ {
+ this.log.debug("Creating endpoints descrptor factory");
+ return new JMSEndpointsFactory(null);
+ }
+
+}
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -23,11 +23,13 @@
import java.util.Set;
+import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.integration.JMSDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -56,15 +58,28 @@
WSDeploymentAspectDeployer(final DeploymentAspect aspect)
{
super();
-
- // inputs
- this.addInput(JBossWebMetaData.class);
- this.addInput(Deployment.class);
- if (aspect.isLast())
+ if (aspect instanceof JMSDeploymentAspect)
{
- this.addInput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ this.addInput(org.jboss.system.metadata.ServiceDeployment.class);
+ this.addInput(org.jboss.system.metadata.ServiceMetaData.class);
}
+ else
+ {
+ // inputs
+ this.addInput(JBossWebMetaData.class);
+ this.addInput(Deployment.class);
+ if (aspect.isLast())
+ {
+ this.addInput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ }
+ // outputs
+ this.addOutput(JBossWebMetaData.class);
+ if (!aspect.isLast())
+ {
+ this.addOutput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ }
+ }
// propagate DA requirements and map them to deployer inputs
final Set<String> inputs = aspect.getRequiresAsSet();
for (String input : inputs)
@@ -72,20 +87,13 @@
this.addInput(WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + input);
}
- // outputs
- this.addOutput(JBossWebMetaData.class);
- if (!aspect.isLast())
- {
- this.addOutput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
- }
-
// propagate DA provides and map them to deployer outputs
final Set<String> outputs = aspect.getProvidesAsSet();
for (String output : outputs)
{
this.addOutput(WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + output);
}
-
+
this.setRelativeOrder(aspect.getRelativeOrder());
this.aspect = aspect;
}
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -29,6 +29,7 @@
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
@@ -85,6 +86,11 @@
this.log.debug("Detected JAXRPC EJB21 deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21);
}
+ else if (this.isJaxwsJMSDeployment(unit))
+ {
+ this.log.debug("Dectected JAXWS JMS deployment");
+ unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JMS);
+ }
}
/**
@@ -155,5 +161,13 @@
return false;
}
+ /**
+ * Check if this deployment contains JMS endpoint
+ * @param unit depoyment unit
+ * @return true if contains jms transport endpoint, false other wise
+ */
+ private boolean isJaxwsJMSDeployment(final DeploymentUnit unit) {
+ return ASHelper.hasAttachment(unit, JMSEndpointsMetaData.class);
+ }
}
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -76,14 +76,14 @@
protected abstract void build(Deployment dep, DeploymentUnit unit);
/**
- * Creates new Web Service endpoint.
+ * Creates new Http Web Service endpoint.
*
* @param endpointClass endpoint class name
* @param endpointName endpoint name
* @param dep deployment
* @return WS endpoint
*/
- protected final Endpoint newEndpoint(final String endpointClass, final String
endpointName, final Deployment dep)
+ protected final Endpoint newHttpEndpoint(final String endpointClass, final String
endpointName, final Deployment dep)
{
if (endpointName == null)
{
@@ -95,7 +95,7 @@
throw new NullPointerException("Null endpoint class");
}
- final Endpoint endpoint = this.deploymentModelFactory.newEndpoint(endpointClass);
+ final Endpoint endpoint =
this.deploymentModelFactory.newHttpEndpoint(endpointClass);
endpoint.setShortName(endpointName);
dep.getService().addEndpoint(endpoint);
@@ -103,6 +103,33 @@
}
/**
+ * Creates new JMS Web Service endpoint.
+ *
+ * @param endpointClass endpoint class name
+ * @param endpointName endpoint name
+ * @param dep deployment
+ * @return WS endpoint
+ */
+ protected final Endpoint newJMSEndpoint(final String endpointClass, final String
endpointName, final Deployment dep)
+ {
+ if (endpointName == null)
+ {
+ throw new NullPointerException("Null endpoint name");
+ }
+
+ if (endpointClass == null)
+ {
+ throw new NullPointerException("Null endpoint class");
+ }
+
+ final Endpoint endpoint =
this.deploymentModelFactory.newJMSEndpoint(endpointClass);
+ endpoint.setShortName(endpointName);
+ dep.getService().addEndpoint(endpoint);
+
+ return endpoint;
+ }
+
+ /**
* Creates new Web Service deployment.
*
* @param unit deployment unit
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -49,7 +49,7 @@
final String ejbClass = beanMetaData.getEjbClass();
this.log.debug("EJB21 class: " + ejbClass);
- this.newEndpoint(ejbClass, ejbName, dep);
+ this.newHttpEndpoint(ejbClass, ejbName, dep);
}
}
}
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -48,7 +48,7 @@
final String servletClass = ASHelper.getEndpointName(servletMD);
this.log.debug("JSE class: " + servletClass);
- this.newEndpoint(servletClass, servletName, dep);
+ this.newHttpEndpoint(servletClass, servletName, dep);
}
}
}
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -44,7 +44,7 @@
final String ejbClass = container.getComponentClassName();
this.log.debug("EJB3 class: " + ejbClass);
- final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep);
+ final Endpoint ep = this.newHttpEndpoint(ejbClass, ejbName, dep);
ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName());
}
}
Added:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
(rev 0)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.webservices.integration.deployers.deployment;
+
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointMetaData;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+
+/**
+ * Create JAXWS SPI Deployment for JAXWS_JMS type deployment
+ * @author <a herf="ema(a)redhat.com>Jim Ma</a>
+ *
+ */
+public class DeploymentModelBuilderJAXWS_JMS extends AbstractDeploymentModelBuilder
+{
+
+ /**
+ * Constructor.
+ */
+ DeploymentModelBuilderJAXWS_JMS()
+ {
+ super();
+ }
+
+ /**
+ * Creates new JAXWS JMS deployment and registers it with deployment unit.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ @Override
+ protected void build(final Deployment dep, final DeploymentUnit unit)
+ {
+ this.getAndPropagateAttachment(JMSEndpointsMetaData.class, unit, dep);
+ JMSEndpointsMetaData jmsEndpointsMD =
dep.getAttachment(JMSEndpointsMetaData.class);
+ for (JMSEndpointMetaData endpoint : jmsEndpointsMD.getEndpointsMetaData())
+ {
+ if (endpoint.getName() == null)
+ {
+ endpoint.setName(endpoint.getImplementor());
+ }
+ this.newJMSEndpoint(endpoint.getImplementor(), endpoint.getName(), dep);
+ }
+ }
+
+ }
\ No newline at end of file
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -44,7 +44,7 @@
final String servletClass = ASHelper.getEndpointName(servlet);
this.log.debug("JSE class: " + servletClass);
- this.newEndpoint(servletClass, servletName, dep);
+ this.newHttpEndpoint(servletClass, servletName, dep);
}
}
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -48,6 +48,7 @@
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new
DeploymentModelBuilderJAXRPC_JSE());
WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new
DeploymentModelBuilderJAXWS_EJB3());
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new
DeploymentModelBuilderJAXRPC_EJB21());
+ WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JMS, new
DeploymentModelBuilderJAXWS_JMS());
}
/**
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -21,11 +21,11 @@
*/
package org.jboss.webservices.integration.metadata;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* An aspect that builds container independent meta data.
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -21,9 +21,9 @@
*/
package org.jboss.webservices.integration.tomcat;
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
/**
* A deployment aspect that generates web app meta data for EJB endpoints.
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-05-20
03:07:44 UTC (rev 12282)
@@ -36,6 +36,7 @@
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.HttpEndpoint;
/**
* Creator of web app meta data for EJB endpoints.
@@ -185,7 +186,7 @@
for (final Endpoint ep : dep.getService().getEndpoints())
{
final String endpointName = ep.getShortName();
- final List<String> urlPatterns =
WebMetaDataHelper.getUrlPatterns(ep.getURLPattern());
+ final List<String> urlPatterns =
WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern());
this.log.debug("Servlet name: " + endpointName + ", URL patterns:
" + urlPatterns);
WebMetaDataHelper.newServletMapping(endpointName, urlPatterns,
servletMappings);
@@ -241,7 +242,7 @@
final WebResourceCollectionsMetaData webResourceCollections =
WebMetaDataHelper
.getWebResourceCollections(securityConstraint);
final String endpointName = ejbEndpoint.getShortName();
- final String urlPattern = ejbEndpoint.getURLPattern();
+ final String urlPattern = ((HttpEndpoint)ejbEndpoint).getURLPattern();
this.log.debug("Creating web resource collection for endpoint: " +
endpointName + ", URL pattern: "
+ urlPattern);
WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern,
secureWsdlAccess,
Modified:
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
---
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-05-20
03:04:27 UTC (rev 12281)
+++
container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-05-20
03:07:44 UTC (rev 12282)
@@ -55,6 +55,11 @@
<property name="name">webservices.xml</property>
<property name="useSchemaValidation">true</property>
</bean>
+
+ <bean name="JMSEndpointsParserDeployer"
class="org.jboss.webservices.integration.deployers.JMSEndpointsParserDeployer">
+ <property name="name">jbossws-cxf.xml</property>
+ <property name="useSchemaValidation">false</property>
+ </bean>
<bean name="WSEJBAdapterDeployer"
class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/>