7:54 p.m.
Author: jim.ma
Date: 2014-06-23 20:54:06 -0400 (Mon, 23 Jun 2014)
New Revision: 18761
Removed:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/ResourceResolverDeploymentAspect.java
Modified:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml
Log:
[JBWS-3804]:Remove ResourceResolverDeploymentAspect
Deleted:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/ResourceResolverDeploymentAspect.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/ResourceResolverDeploymentAspect.java 2014-06-23
12:34:05 UTC (rev 18760)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/ResourceResolverDeploymentAspect.java 2014-06-24
00:54:06 UTC (rev 18761)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.wsf.stack.cxf.deployment.aspect;
-
-import org.jboss.ws.common.integration.AbstractDeploymentAspect;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.ResourceResolver;
-import org.jboss.wsf.stack.cxf.resolver.JBossWSResourceResolver;
-
-/**
- * A deployment aspect for attaching a custom JBoss resources resolver to the endpoint;
- * CXF requires a ResourceResolver for getting wsdl, xsd, etc. correctly when
they're
- * not reachable using the context classloader (for instance if they're out of
- * WEB-INF/classes in a war deployed on AS 5 or greater - see. JBAS-5151)
- *
- * @author alessio.soldano(a)jboss.com
- * @since 19-Nov-2009
- */
-public class ResourceResolverDeploymentAspect extends AbstractDeploymentAspect
-{
- @Override
- public void start(Deployment dep)
- {
- if (dep instanceof ArchiveDeployment)
- {
- ResourceResolver resolver = ((ArchiveDeployment)dep).getResourceResolver();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ep.addAttachment(org.apache.cxf.resource.ResourceResolver.class, new
JBossWSResourceResolver(resolver));
- }
- }
- }
-
- @Override
- public void stop(Deployment dep)
- {
- if (dep instanceof ArchiveDeployment)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ep.removeAttachment(org.apache.cxf.resource.ResourceResolver.class);
- }
- }
- }
-}
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml
===================================================================
---
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml 2014-06-23
12:34:05 UTC (rev 18760)
+++
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml 2014-06-24
00:54:06 UTC (rev 18761)
@@ -41,10 +41,6 @@
<property name="provides"
class="java.lang.String">StackDescriptor</property>
</deploymentAspect>
- <deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <property name="provides"
class="java.lang.String">ResourceResolver</property>
- </deploymentAspect>
-
<deploymentAspect
class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
<property name="requires"
class="java.lang.String">ContainerMetaData</property>
<property name="provides"
class="java.lang.String">StackEndpointHandler</property>
@@ -61,7 +57,7 @@
<deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
<property name="provides"
class="java.lang.String">BusHolder</property>
- <property name="requires"
class="java.lang.String">ResourceResolver,StackDescriptor</property>
+ <property name="requires"
class="java.lang.String">StackDescriptor</property>
</deploymentAspect>
</deploymentAspects>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml
===================================================================
---
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml 2014-06-23
12:34:05 UTC (rev 18760)
+++
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml 2014-06-24
00:54:06 UTC (rev 18761)
@@ -41,10 +41,6 @@
<property name="provides"
class="java.lang.String">StackDescriptor</property>
</deploymentAspect>
- <deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <property name="provides"
class="java.lang.String">ResourceResolver</property>
- </deploymentAspect>
-
<deploymentAspect
class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
<property name="requires"
class="java.lang.String">ContainerMetaData</property>
<property name="provides"
class="java.lang.String">StackEndpointHandler</property>
@@ -61,7 +57,7 @@
<deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
<property name="provides"
class="java.lang.String">BusHolder</property>
- <property name="requires"
class="java.lang.String">ResourceResolver,StackDescriptor</property>
+ <property name="requires"
class="java.lang.String">StackDescriptor</property>
</deploymentAspect>
</deploymentAspects>