JBossWS SVN: r11090 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-05 05:01:10 -0500 (Thu, 05 Nov 2009)
New Revision: 11090
Modified:
framework/trunk/pom.xml
Log:
switch
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2009-11-05 09:55:00 UTC (rev 11089)
+++ framework/trunk/pom.xml 2009-11-05 10:01:10 UTC (rev 11090)
@@ -6,7 +6,7 @@
<artifactId>jbossws-framework</artifactId>
<packaging>jar</packaging>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
14 years, 5 months
JBossWS SVN: r11089 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-05 04:55:00 -0500 (Thu, 05 Nov 2009)
New Revision: 11089
Modified:
common/trunk/pom.xml
Log:
switch
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2009-11-05 09:51:42 UTC (rev 11088)
+++ common/trunk/pom.xml 2009-11-05 09:55:00 UTC (rev 11089)
@@ -8,7 +8,7 @@
<artifactId>jbossws-common</artifactId>
<packaging>jar</packaging>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
14 years, 5 months
JBossWS SVN: r11088 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-05 04:51:42 -0500 (Thu, 05 Nov 2009)
New Revision: 11088
Modified:
spi/trunk/pom.xml
Log:
switch
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2009-11-05 02:38:14 UTC (rev 11087)
+++ spi/trunk/pom.xml 2009-11-05 09:51:42 UTC (rev 11088)
@@ -6,7 +6,7 @@
<artifactId>jbossws-spi</artifactId>
<packaging>jar</packaging>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
14 years, 5 months
JBossWS SVN: r11087 - in stack/cxf/trunk/modules: server/src/main/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-11-04 21:38:14 -0500 (Wed, 04 Nov 2009)
New Revision: 11087
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml
Log:
[JBWS-2791]:Add JMSEndpointAdressDA and correct the jms address in CXFServletExt
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-11-02 06:39:40 UTC (rev 11086)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-11-05 02:38:14 UTC (rev 11087)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.URL;
@@ -38,9 +39,15 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerImpl;
+import org.apache.cxf.endpoint.ServerRegistry;
+import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
+import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.management.counters.CounterRepository;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.transport.jms.AddressType;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.apache.cxf.transport.servlet.ServletController;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
@@ -71,8 +78,9 @@
public class CXFServletExt extends CXFServlet
{
public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url";
- public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management";
-
+ public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management";
+ public static final String JMS_NS = "http://cxf.apache.org/transports/jms";
+
private static Logger log = Logger.getLogger(CXFServletExt.class);
protected Endpoint endpoint;
@@ -118,7 +126,8 @@
initEndpoint(servletConfig);
//Load additional configurations
- loadAdditionalConfigExt(appCtx, servletConfig);
+ loadAdditionalConfigExt(appCtx, servletConfig);
+ correctJmsEndpointAddress(endpoint, bus);
}
private void initEndpoint(ServletConfig servletConfig)
@@ -247,4 +256,37 @@
throw new ServletException(e);
}
}
+
+ private void correctJmsEndpointAddress(Endpoint endpoint, Bus bus) throws ServletException {
+ for (Server server : bus.getExtension(ServerRegistry.class).getServers()) {
+ if (server.getEndpoint() instanceof JaxWsEndpointImpl) {
+ JaxWsEndpointImpl endpointImpl = (JaxWsEndpointImpl)server.getEndpoint();
+ try
+ {
+ Field field = JaxWsEndpointImpl.class.getDeclaredField("implInfo");
+ field.setAccessible(true);
+ Object object = field.get(endpointImpl);
+ if (object != null) {
+ JaxWsImplementorInfo implementInfo = (JaxWsImplementorInfo)object;
+ Class endpointClass = implementInfo.getImplementorClass();
+ if (endpoint.getTargetBeanClass().getName().equals(endpointClass.getName())
+ && JMS_NS.equals(server.getEndpoint().getEndpointInfo().getTransportId())) {
+ //server.getDestination().getAddress()
+ AddressType address = server.getEndpoint().getEndpointInfo().getExtensor(AddressType.class);
+ String jmsURL = "jms://" + address.getJndiDestinationName();
+ if (address.getJndiReplyDestinationName() != null) {
+ jmsURL = jmsURL +"?replyToName=" +address.getJndiReplyDestinationName();
+ endpoint.setAddress(jmsURL);
+ }
+ }
+
+ }
+ }
+ catch (Exception e)
+ {
+ throw new ServletException(e);
+ }
+ }
+ }
+ }
}
Added: 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 (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JMSEndpointAddressDeploymentAspect.java 2009-11-05 02:38:14 UTC (rev 11087)
@@ -0,0 +1,77 @@
+/*
+ * 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@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.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-11-02 06:39:40 UTC (rev 11086)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-11-05 02:38:14 UTC (rev 11087)
@@ -46,6 +46,11 @@
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
+ <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
+ <property name="requires">ContextProperties</property>
+ <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">StackEndpointHandler</property>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml 2009-11-02 06:39:40 UTC (rev 11086)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml 2009-11-05 02:38:14 UTC (rev 11087)
@@ -8,13 +8,23 @@
<servlet>
<servlet-name>OrganizationService</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationHttpEndpoint</servlet-class>
- <load-on-startup>1</load-on-startup>
</servlet>
+ <servlet>
+ <servlet-name>OrganizationJmsService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationJmsEndpoint</servlet-class>
+ </servlet>
+
+
<servlet-mapping>
<servlet-name>OrganizationService</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>OrganizationJmsService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
14 years, 5 months
JBossWS SVN: r11086 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-11-02 01:39:40 -0500 (Mon, 02 Nov 2009)
New Revision: 11086
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
Log:
fixing test
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-10-30 15:56:54 UTC (rev 11085)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-11-02 06:39:40 UTC (rev 11086)
@@ -76,7 +76,7 @@
public void testJMSEndpointPort() throws Exception
{
- URL wsdlURL = getResourceURL("jaxws/samples/jmstransport/jmsservice.wsdl");
+ URL wsdlURL = getResourceURL("jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl");
QName serviceName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationJMSEndpointService");
QName portName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationJMSEndpointPort");
@@ -89,7 +89,7 @@
public void testHTTPEndpointPort() throws Exception
{
- URL wsdlURL = getResourceURL("jaxws/samples/jmstransport/jmsservice.wsdl");
+ URL wsdlURL = getResourceURL("jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl");
QName serviceName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationJMSEndpointService");
QName portName = new QName("http://org.jboss.ws/samples/jmstransport", "HTTPEndpointPort");
14 years, 5 months