[jbossws-commits] JBossWS SVN: r11284 - in stack/cxf/trunk/modules/server/src/main: resources and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Dec 14 10:49:38 EST 2009
Author: jim.ma
Date: 2009-12-14 10:49:37 -0500 (Mon, 14 Dec 2009)
New Revision: 11284
Removed:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java
Modified:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
Log:
[JBWS-2791]:revert the change
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java 2009-12-13 18:40:51 UTC (rev 11283)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java 2009-12-14 15:49:37 UTC (rev 11284)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.integration.WSConstants;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-/**
- * A deployer to correct the jms endpoint address to unknown address.<br>
- * The final jms address will be set when servlet is initilized
- * @author <a herf="mailto:ema at redhat.com>Jim Ma</a>
- */
-public class JMSEndpointAddressDeploymentAspect extends DeploymentAspect
-{
- private static final String JMS_NS = "http://cxf.apache.org/transports/jms";
- private static final String UNKOWN_ADDRESS = "unkwon address";
- @SuppressWarnings("unchecked")
- @Override
- public void start(Deployment dep)
- {
- //get EndpointRegistry
- Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
- String url = contextParams.get(CXFServletExt.PARAM_CXF_BEANS_URL);
- try
- {
- Document document = DOMUtils.getDocumentBuilder().parse(url);
- List<Element> elements = DOMUtils.getChildElementsAsList(document.getDocumentElement(), new QName("http://cxf.apache.org/jaxws","endpoint"));
- //TODO: parse the jms address from jbossws-cxf.xml and set endpoint address (java first)
- for(Element element: elements) {
- String transportId = DOMUtils.getAttributeValue(element, "transportId");
- if (JMS_NS.equals(transportId)) {
- String implementor = DOMUtils.getAttributeValue(element, "implementor");
- if (implementor != null) {
- for (Endpoint endpoint : dep.getService().getEndpoints()) {
- if (implementor.equals(endpoint.getTargetBeanClass().getName())) {
- endpoint.setAddress(UNKOWN_ADDRESS);
- }
- }
- }
- }
- }
-
- }
- catch (Exception e)
- {
- log.warn("Failed to parse jbossws-cxf.xml", e);
- }
- }
-}
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2009-12-13 18:40:51 UTC (rev 11283)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2009-12-14 15:49:37 UTC (rev 11284)
@@ -46,12 +46,6 @@
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
- <property name="requires">StackDescriptor</property>
- <property name="provides">JmsEndpointAddress</property>
- <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
<bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
<property name="requires">JmsEndpointAddress</property>
<property name="provides">ResourceResolver</property>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2009-12-13 18:40:51 UTC (rev 11283)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2009-12-14 15:49:37 UTC (rev 11284)
@@ -44,11 +44,6 @@
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
</bean>
- <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
- <property name="requires">StackDescriptor</property>
- <property name="provides">JmsEndpointAddress</property>
- </bean>
-
<bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
<property name="requires">JmsEndpointAddress</property>
<property name="provides">ResourceResolver</property>
More information about the jbossws-commits
mailing list