[jbossws-commits] JBossWS SVN: r14514 - in stack/cxf/branches/JBWS-3125/modules: server/src/main/java/org/jboss/wsf/stack/cxf/metadata and 1 other directory.
Author: alessio.soldano(a)jboss.com
Date: 2011-06-10 12:09:02 -0400 (Fri, 10 Jun 2011)
New Revision: 14514
Modified:
stack/cxf/branches/JBWS-3125/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
stack/cxf/branches/JBWS-3125/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3125] Setting cxf invoker on http endpoint only and adding stax module dependency to
jbossws-common AS7 module
Modified:
stack/cxf/branches/JBWS-3125/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
===================================================================
---
stack/cxf/branches/JBWS-3125/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-06-10
16:01:51 UTC (rev 14513)
+++
stack/cxf/branches/JBWS-3125/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-06-10
16:09:02 UTC (rev 14514)
@@ -31,6 +31,7 @@
<dependencies>
<module name="javax.api"/>
<module name="javax.annotation.api"/>
+ <module name="javax.xml.stream.api"/>
<module name="javax.ejb.api"/>
<module name="javax.jws.api"/>
<module name="javax.servlet.api"/>
Modified:
stack/cxf/branches/JBWS-3125/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
---
stack/cxf/branches/JBWS-3125/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-06-10
16:01:51 UTC (rev 14513)
+++
stack/cxf/branches/JBWS-3125/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-06-10
16:09:02 UTC (rev 14514)
@@ -39,6 +39,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.HttpEndpoint;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
@@ -73,16 +74,19 @@
{
DDEndpoint ddep = createDDEndpoint(ep.getTargetBeanClass(),
(ArchiveDeployment)dep, ep);
- if (depType == DeploymentType.JAXWS_EJB3)
+ if (ep instanceof HttpEndpoint)
{
- ddep.setInvoker(invokerEJB3);
+ if (depType == DeploymentType.JAXWS_EJB3)
+ {
+ ddep.setInvoker(invokerEJB3);
+ }
+
+ if (depType == DeploymentType.JAXWS_JSE)
+ {
+ ddep.setInvoker(invokerJSE);
+ }
}
- if (depType == DeploymentType.JAXWS_JSE)
- {
- ddep.setInvoker(invokerJSE);
- }
-
processWSDDContribution(ddep, (ArchiveDeployment)dep);
log.info("Add " + ddep);