JBossWS SVN: r12284 - in stack/cxf/branches/jms-integration: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 13 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2010-05-20 02:04:26 -0400 (Thu, 20 May 2010)
New Revision: 12284
Added:
stack/cxf/branches/jms-integration/.gitignore
stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java
stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/DelegatingConfigurer.java
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/web.xml
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/index.html
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/styles.css
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/Organization.java
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/OrganizationJmsEndpoint.java
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/hornetq-jms.xml
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/jbossws-cxf.xml
Removed:
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/web.xml
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/index.html
stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/styles.css
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFEndpointsDeployment.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java
Modified:
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
Log:
[JBWS-2791]:Add the JMS endpoint test case
Copied: stack/cxf/branches/jms-integration/.gitignore (from rev 12223, stack/cxf/trunk/.gitignore)
===================================================================
--- stack/cxf/branches/jms-integration/.gitignore (rev 0)
+++ stack/cxf/branches/jms-integration/.gitignore 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,40 @@
+
+# /
+/ant.properties
+/clipboard.*
+/target
+/.settings
+/profiles.xml
+/target.properties
+/transaction.log
+
+# /modules/
+/modules/target
+
+# /modules/client/
+/modules/client/target
+
+# /modules/management/
+/modules/management/target
+
+# /modules/resources/
+/modules/resources/target
+
+# /modules/server/
+/modules/server/target
+
+# /modules/testsuite/
+/modules/testsuite/target
+
+# /modules/testsuite/cxf-tests/
+/modules/testsuite/cxf-tests/target
+
+# /modules/testsuite/framework-tests/
+/modules/testsuite/framework-tests/target
+/modules/testsuite/framework-tests/org
+/modules/testsuite/framework-tests/transaction.log
+
+# /modules/testsuite/framework-tests/src/test/
+/modules/testsuite/framework-tests/src/test/ant-import
+/modules/testsuite/framework-tests/src/test/java
+/modules/testsuite/framework-tests/src/test/resources
Copied: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java (from rev 12223, stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java)
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/ConfigurerInstaller.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,59 @@
+/*
+ * 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.wsf.stack.cxf.client.configuration;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.configuration.Configurer;
+
+
+/**
+ * A simple bean created through cxf-extension-jbossws.xml in order to
+ * install the JBossWS configurer.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 04-May-2010
+ */
+public class ConfigurerInstaller
+{
+ private Bus bus;
+
+ public ConfigurerInstaller()
+ {
+ //NOOP
+ }
+
+ public Bus getBus()
+ {
+ return bus;
+ }
+
+ public void setBus(Bus bus)
+ {
+ this.bus = bus;
+ updateConfigurer();
+ }
+
+ protected void updateConfigurer()
+ {
+ bus.setExtension(new JBossWSCXFConfigurer(bus.getExtension(Configurer.class)), Configurer.class);
+ }
+}
Copied: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/DelegatingConfigurer.java (from rev 12223, stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/DelegatingConfigurer.java)
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/DelegatingConfigurer.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/DelegatingConfigurer.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,72 @@
+/*
+ * 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.wsf.stack.cxf.client.configuration;
+
+import org.apache.cxf.configuration.Configurer;
+
+/**
+ * A CXF configurer that allows for custom configuration before delegating to another configurer;
+ * this is installed by JBossWS' {@see org.jboss.wsf.stack.cxf.client.configuration.ConfigurerInstaller}
+ * (see cxf-extension-jbossws.xml) to allow for custom client side configuration while leaving
+ * Apache CXF the freedom of setting the initial configurer.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 04-May-2010
+ */
+public abstract class DelegatingConfigurer implements Configurer
+{
+ protected Configurer delegate;
+
+ public DelegatingConfigurer(Configurer delegate)
+ {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void configureBean(Object beanInstance)
+ {
+ internalConfigure(beanInstance);
+ if (delegate != null)
+ {
+ delegate.configureBean(beanInstance);
+ }
+ }
+
+ @Override
+ public void configureBean(String name, Object beanInstance)
+ {
+ internalConfigure(beanInstance);
+ if (delegate != null)
+ {
+ delegate.configureBean(name, beanInstance);
+ }
+ }
+
+ /**
+ * Performs custom configurations on the provided bean instance
+ * before delegating to the other configurer.
+ *
+ * @param beanInstance
+ */
+ protected abstract void internalConfigure(Object beanInstance);
+
+}
Copied: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp (from rev 12223, stack/cxf/trunk/modules/management/src/main/pclwebapp)
Copied: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF (from rev 12223, stack/cxf/trunk/modules/management/src/main/pclwebapp/WEB-INF)
Deleted: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml 2010-05-13 08:24:12 UTC (rev 12223)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml 2010-05-20 06:04:26 UTC (rev 12284)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE jboss-web
- PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
-
-<jboss-web>
-
- <!-- A security domain that restricts access
- <security-domain>java:/jaas/JBossWS</security-domain>
- -->
-
- <context-root>jbossws</context-root>
-
-</jboss-web>
Copied: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml (from rev 12223, stack/cxf/trunk/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml)
===================================================================
--- stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml (rev 0)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/jboss-web.xml 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!-- A security domain that restricts access
+ <security-domain>java:/jaas/JBossWS</security-domain>
+ -->
+
+ <context-root>jbossws</context-root>
+
+</jboss-web>
Deleted: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/management/src/main/pclwebapp/WEB-INF/web.xml 2010-05-13 08:24:12 UTC (rev 12223)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/web.xml 2010-05-20 06:04:26 UTC (rev 12284)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>JBossWS</display-name>
-
- <servlet>
- <servlet-name>ContextServlet</servlet-name>
- <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>PortComponentLinkServlet</servlet-name>
- <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class>
- </servlet>
-
- <!-- now the mappings -->
-
- <servlet-mapping>
- <servlet-name>ContextServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>PortComponentLinkServlet</servlet-name>
- <url-pattern>/pclink</url-pattern>
- </servlet-mapping>
-
- <!--
- currently the W3C haven't settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response
- -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
-</web-app>
Copied: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/web.xml (from rev 12223, stack/cxf/trunk/modules/management/src/main/pclwebapp/WEB-INF/web.xml)
===================================================================
--- stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/WEB-INF/web.xml 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossWS</display-name>
+
+ <servlet>
+ <servlet-name>ContextServlet</servlet-name>
+ <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>PortComponentLinkServlet</servlet-name>
+ <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class>
+ </servlet>
+
+ <!-- now the mappings -->
+
+ <servlet-mapping>
+ <servlet-name>ContextServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>PortComponentLinkServlet</servlet-name>
+ <url-pattern>/pclink</url-pattern>
+ </servlet-mapping>
+
+ <!--
+ currently the W3C haven't settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response
+ -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+</web-app>
Deleted: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/index.html
===================================================================
--- stack/cxf/trunk/modules/management/src/main/pclwebapp/index.html 2010-05-13 08:24:12 UTC (rev 12223)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/index.html 2010-05-20 06:04:26 UTC (rev 12284)
@@ -1,75 +0,0 @@
-<html><head>
-<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
-<title>JBossWS (@implementation.version@)</title>
-<link rel='stylesheet' href='./styles.css'>
-</head>
-<body>
-
-<div class='pageHeader'>JBossWS</div>
-
-<div class="pageSection">
-<h2>Welcome to JBoss Web Services</h2>
-JBossWS is a Web Service Framework contributing to the JBoss' JavaEE5 offering. It integrates supported JAX-WS
-compliant web service stacks in JBoss AS while adding simplified management, configuration, tooling, etc.
-</div>
-
-<div class="pageSection">
-<h3>Administration</h3>
-
-<fieldset>
- <legend><b>Runtime information</b></legend>
-<ul>
- <li><b>Version: jbossws-cxf-@version@</b></li>
- <li><b>Build: @buildNumber@</b></li>
- <li><a href="services">View a list of deployed services</a></li>
- <li><a href="/jmx-console/">Access JMX console</a></li>
-</ul>
-</fieldset>
-</div>
-
-<div class="pageSection">
-<h3>Project information</h3>
-
-<fieldset>
- <legend><b>Main resources</b></legend>
-
-<ul>
- <li><a href="http://jboss.org/jbossws">Project home page</a></li>
- <li><a href="http://jboss.org/jbossws/downloads/">Latest download and samples</a></li>
-</ul>
-</fieldset>
-<br/>
-
-<fieldset>
- <legend><b>Documentation</b></legend>
-
-<ul>
- <li><a href="http://www.jboss.org/community/wiki/JBossWS">Documentation home page</a></li>
- <li><a href="http://www.jboss.org/community/wiki/JBossWS-UserGuide">User guide</a></li>
- <li><a href="http://www.jboss.org/community/wiki/JBossWS-FAQ">FAQ</a></li>
- <li><a href="http://www.jboss.org/community/wiki/JBossWS-Recordsmanagement">Records management</a></li>
-</ul>
-</fieldset>
-
-</br>
-<fieldset>
- <legend><b>Community</b></legend>
-<ul>
- <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=276">User forum</a></li>
- <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
- <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-cxf-users">Mailing list</a></li>
-</ul>
-</fieldset>
-
-</br>
-<fieldset>
- <legend><b>Source repository</b></legend>
-<ul>
- <li><a href="http://www.jboss.org/community/wiki/JBossWS-Subversion">Subversion repository</a></li>
- <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li>
-</ul>
-</fieldset>
-</div>
-
-</body>
-</html>
Copied: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/index.html (from rev 12223, stack/cxf/trunk/modules/management/src/main/pclwebapp/index.html)
===================================================================
--- stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/index.html (rev 0)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/index.html 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,75 @@
+<html><head>
+<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
+<title>JBossWS (@implementation.version@)</title>
+<link rel='stylesheet' href='./styles.css'>
+</head>
+<body>
+
+<div class='pageHeader'>JBossWS</div>
+
+<div class="pageSection">
+<h2>Welcome to JBoss Web Services</h2>
+JBossWS is a Web Service Framework contributing to the JBoss' JavaEE5 offering. It integrates supported JAX-WS
+compliant web service stacks in JBoss AS while adding simplified management, configuration, tooling, etc.
+</div>
+
+<div class="pageSection">
+<h3>Administration</h3>
+
+<fieldset>
+ <legend><b>Runtime information</b></legend>
+<ul>
+ <li><b>Version: jbossws-cxf-@version@</b></li>
+ <li><b>Build: @buildNumber@</b></li>
+ <li><a href="services">View a list of deployed services</a></li>
+ <li><a href="/jmx-console/">Access JMX console</a></li>
+</ul>
+</fieldset>
+</div>
+
+<div class="pageSection">
+<h3>Project information</h3>
+
+<fieldset>
+ <legend><b>Main resources</b></legend>
+
+<ul>
+ <li><a href="http://jboss.org/jbossws">Project home page</a></li>
+ <li><a href="http://jboss.org/jbossws/downloads/">Latest download and samples</a></li>
+</ul>
+</fieldset>
+<br/>
+
+<fieldset>
+ <legend><b>Documentation</b></legend>
+
+<ul>
+ <li><a href="http://www.jboss.org/community/wiki/JBossWS">Documentation home page</a></li>
+ <li><a href="http://www.jboss.org/community/wiki/JBossWS-UserGuide">User guide</a></li>
+ <li><a href="http://www.jboss.org/community/wiki/JBossWS-FAQ">FAQ</a></li>
+ <li><a href="http://www.jboss.org/community/wiki/JBossWS-Recordsmanagement">Records management</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Community</b></legend>
+<ul>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=276">User forum</a></li>
+ <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li>
+ <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-cxf-users">Mailing list</a></li>
+</ul>
+</fieldset>
+
+</br>
+<fieldset>
+ <legend><b>Source repository</b></legend>
+<ul>
+ <li><a href="http://www.jboss.org/community/wiki/JBossWS-Subversion">Subversion repository</a></li>
+ <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li>
+</ul>
+</fieldset>
+</div>
+
+</body>
+</html>
Deleted: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/styles.css
===================================================================
--- stack/cxf/trunk/modules/management/src/main/pclwebapp/styles.css 2010-05-13 08:24:12 UTC (rev 12223)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/styles.css 2010-05-20 06:04:26 UTC (rev 12284)
@@ -1,186 +0,0 @@
-
-/* table for list views */
-.table_list {
-}
-
-/* table for detail views */
-.table_form {
-}
-
-.pageHeader {
- font-size: 14pt;
- font-weight: BOLD;
- color: #ffffff;
- border-bottom-width:1px;
- border-bottom-style:solid;
- border-color:#000066;
- margin-bottom:15px;
- padding-left:15px;
- padding-top:5px;
- padding-bottom:5px;
- background-color: #3b4f66;
- max-width: 900px;
-}
-
-.pageSection {
- padding-left:15px;
- margin-bottom: 5px;
- max-width: 900px;
-}
-
-.metrics
-{
- font-size: 6pt;
- background-color: #dddddd;
- width: 100%;
-}
-
-/* table row header */
-.list_tr_head {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- font-weight: 600;
- text-align: center;
- background-color: #3b4f66;
-}
-
-/* table row list view */
-.list_tr {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #ffffff;
-}
-
-/* table row list view odd lines */
-.list_tr_even {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #ffffff;
-}
-
-/* table row list view even lines */
-.list_tr_odd {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #dddddd;
-}
-
-/* form label */
-.form_label {
- font-family: Verdana, sans-serif;
- font-weight: 500;
- font-size: 8pt;
- color: #000066;
- vertical-align: top;
- background-color: #dddddd;
- padding-top: 2px;
- padding-bottom: 2px;
-}
-
-/* form value */
-.form_value {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
- vertical-align: baseline;
-}
-
-/* tiny writing */
-.tiny {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #666666;
-}
-
-/* required input fields */
-.inputmust {
- background-color: #dddddd;
-}
-
-/* error message */
-.error {
- font-family: Courier New;
- color: #990000;
-}
-
-/* error message */
-.error_trace {
- font-family: Courier New;
-}
-
-/* active tree node */
-.tree_active_label {
- font-weight: bold;
-}
-
-body {
- font-family: Verdana,, sans-serif;
- font-size: 8pt;
- color: #000066;
- background-color: #ffffff;
-}
-
-/* title style */
-h1 {
- font-family: Verdana, sans-serif;
- font-size: 14pt;
- font-weight: 600;
- color: #000066;
-}
-
-h2 {
- font-family: Verdana, sans-serif;
- font-size: 12pt;
- font-weight: 600;
- color: #000066;
-}
-
-h3 {
- font-family: Verdana, sans-serif;
- font-size: 10pt;
- font-weight: 600;
- color: #000066;
-}
-
-h4 {
- font-family: Verdana, sans-serif;
- font-size: 10pt;
- font-weight: 500;
- color: #000066;
-}
-
-/* table desk */
-td {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- padding-left: 5px;
- padding-right: 5px;
-}
-
-input, textarea, select, option {
- font-family: Verdana, sans-serif;
- font-size: 8pt;
- color: #000066;
-}
-
-a {
- font-family: Verdana, sans-serif;
- color: #3b4f66;
- text-decoration: none;
-}
-
-a:hover{
- font-family: Verdana, sans-serif;
- color: #cc0000;
- text-decoration: none;
-}
-
-pre {
- background:#dddddd
-}
\ No newline at end of file
Copied: stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/styles.css (from rev 12223, stack/cxf/trunk/modules/management/src/main/pclwebapp/styles.css)
===================================================================
--- stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/styles.css (rev 0)
+++ stack/cxf/branches/jms-integration/modules/management/src/main/pclwebapp/styles.css 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,186 @@
+
+/* table for list views */
+.table_list {
+}
+
+/* table for detail views */
+.table_form {
+}
+
+.pageHeader {
+ font-size: 14pt;
+ font-weight: BOLD;
+ color: #ffffff;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-color:#000066;
+ margin-bottom:15px;
+ padding-left:15px;
+ padding-top:5px;
+ padding-bottom:5px;
+ background-color: #3b4f66;
+ max-width: 900px;
+}
+
+.pageSection {
+ padding-left:15px;
+ margin-bottom: 5px;
+ max-width: 900px;
+}
+
+.metrics
+{
+ font-size: 6pt;
+ background-color: #dddddd;
+ width: 100%;
+}
+
+/* table row header */
+.list_tr_head {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ font-weight: 600;
+ text-align: center;
+ background-color: #3b4f66;
+}
+
+/* table row list view */
+.list_tr {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view odd lines */
+.list_tr_even {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view even lines */
+.list_tr_odd {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+}
+
+/* form label */
+.form_label {
+ font-family: Verdana, sans-serif;
+ font-weight: 500;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+
+/* form value */
+.form_value {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: baseline;
+}
+
+/* tiny writing */
+.tiny {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #666666;
+}
+
+/* required input fields */
+.inputmust {
+ background-color: #dddddd;
+}
+
+/* error message */
+.error {
+ font-family: Courier New;
+ color: #990000;
+}
+
+/* error message */
+.error_trace {
+ font-family: Courier New;
+}
+
+/* active tree node */
+.tree_active_label {
+ font-weight: bold;
+}
+
+body {
+ font-family: Verdana,, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ background-color: #ffffff;
+}
+
+/* title style */
+h1 {
+ font-family: Verdana, sans-serif;
+ font-size: 14pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h2 {
+ font-family: Verdana, sans-serif;
+ font-size: 12pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h3 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h4 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 500;
+ color: #000066;
+}
+
+/* table desk */
+td {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+input, textarea, select, option {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+}
+
+a {
+ font-family: Verdana, sans-serif;
+ color: #3b4f66;
+ text-decoration: none;
+}
+
+a:hover{
+ font-family: Verdana, sans-serif;
+ color: #cc0000;
+ text-decoration: none;
+}
+
+pre {
+ background:#dddddd
+}
\ No newline at end of file
Deleted: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFEndpointsDeployment.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFEndpointsDeployment.java 2010-05-20 03:17:02 UTC (rev 12283)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFEndpointsDeployment.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -1,190 +0,0 @@
-/*
- * 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.wsf.stack.cxf.deployment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.endpoint.ServerRegistry;
-import org.apache.cxf.transport.jms.JMSConfiguration;
-import org.apache.cxf.transport.jms.JMSDestination;
-import org.jboss.wsf.common.integration.WSHelper;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.metadata.endpoints.AbstractEndpointsDeployment;
-import org.jboss.wsf.spi.metadata.endpoints.EndpointMetaData;
-import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData;
-import org.jboss.wsf.spi.metadata.endpoints.jms.JMSAddressMetaData;
-import org.jboss.wsf.spi.metadata.endpoints.jms.JMSDestinationMetaData;
-import org.jboss.wsf.stack.cxf.configuration.BusHolder;
-import org.springframework.jms.connection.SingleConnectionFactory;
-
-/**
- * The pojo bean to deploy the jbossws-endpoints.xml to cxf stack
- *
- * @author <a href="ema(a)redhat.com">Jim Ma</a>
- */
-public class CXFEndpointsDeployment extends AbstractEndpointsDeployment
-{
-
- private EndpointRegistry registry;
-
- private BusHolder busHolder = null;
-
- private List<Endpoint> endpointsList = new ArrayList<Endpoint>();
-
- @Override
- public void start() throws Exception
- {
- log.debug("Deploying jbossws-endpoints.xml in " + this.getDeployment().getSimpleName());
- if (this.getURL() != null)
- {
- ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
- try
- {
- SecurityActions.setContextClassLoader(this.getDeployment().getRuntimeClassLoader());
- busHolder = BusHolder.create(this.getURL());
- }
- catch (Exception e)
- {
- log.error("Failed to create endpoints deployment");
- throw e;
- }
-
- finally
- {
- BusFactory.setDefaultBus(null);
- BusFactory.setThreadDefaultBus(null);
- SecurityActions.setContextClassLoader(origClassLoader);
- }
-
- registerEndpoints();
- }
- }
-
- @Override
- public void stop() throws Exception
- {
- log.debug("Undeploying jbossws-endpoints.xml in " + this.getDeployment().getSimpleName());
- if (busHolder != null & busHolder.getBus() != null)
- {
- //CXF uses WrappedConnectionFactory to create "jmsLietener". DefaultMessageListenerContainer.shutdown() can not colse all the jms connections.
- //We need to explicitly call detroy() to close connection. This should be fixed in CXF side.
- SingleConnectionFactory connectionFactory = null;
- Server jmsServer = null;
- ServerRegistry serRegistry = busHolder.getBus().getExtension(ServerRegistry.class);
- for (Server server : serRegistry.getServers())
- {
- if (server.getDestination() != null && server.getDestination() instanceof JMSDestination)
- {
- JMSDestination jmsDestination = (JMSDestination) server.getDestination();
- JMSConfiguration jmsConfig = jmsDestination.getJmsConfig();
- if (jmsConfig.getWrappedConnectionFactory() != null
- && jmsConfig.getWrappedConnectionFactory() instanceof SingleConnectionFactory)
- {
- connectionFactory = (SingleConnectionFactory) jmsConfig
- .getWrappedConnectionFactory();
- jmsServer = server;
- }
-
- }
-
- }
-
- if (jmsServer != null)
- {
- jmsServer.stop();
- }
-
- if (connectionFactory != null)
- {
- connectionFactory.destroy();
- }
- //TODO:Remove above code after fix CXF-2788
- //close LifecycleListener if exists
- busHolder.getBus().shutdown(false);
- busHolder.close();
- }
- unregisterEndpoints();
- }
-
- private void registerEndpoints()
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- if (registry == null)
- registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- DeploymentModelFactory deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
- EndpointsMetaData endpointsMD = WSHelper.getRequiredAttachment(this.getDeployment(), EndpointsMetaData.class);
- for (EndpointMetaData endpointMD : endpointsMD.getEndpointsMetaData())
- {
- Endpoint endpoint = deploymentModelFactory.newEndpoint(endpointMD.getImplementor());
- endpoint.setShortName(this.getDeployment().getSimpleName());
-
- if (endpointMD.getAddressMetaData() instanceof JMSAddressMetaData)
- {
- StringBuffer address = new StringBuffer("jms:");
- JMSAddressMetaData jmsAddressMetaData = (JMSAddressMetaData) endpointMD.getAddressMetaData();
- JMSDestinationMetaData request = jmsAddressMetaData.getRequestDestination();
- if (request.getProperty("jndiDestinationName") != null)
- {
- address.append("jndi:" + request.getProperty("jndiDestinationName"));
- }
- else if (request.getProperty("jmsDestinationName") != null)
- {
- address.append("jndi:" + request.getProperty("jmsDestinationName"));
- }
-
- JMSDestinationMetaData reply = jmsAddressMetaData.getReplyDestination();
- if (reply.getProperty("jndiDestinationName") != null)
- {
- address.append("?replyToName =" + reply.getProperty("jndiDestinationName"));
- }
- else if (reply.getProperty("jmsDestinationName") != null)
- {
- address.append("?replyToName =" + reply.getProperty("jmsDestinationName"));
- }
-
- endpoint.setAddress(address.toString());
- registry.register(endpoint);
- endpointsList.add(endpoint);
- }
- }
- }
-
- public void unregisterEndpoints()
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- if (registry == null)
- registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- for (Endpoint ep : this.endpointsList)
- {
- registry.unregister(ep);
- }
-
- }
-}
Deleted: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java 2010-05-20 03:17:02 UTC (rev 12283)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/EndpointsDescriptorDeploymentAspect.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -1,111 +0,0 @@
-/*
- * 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.wsf.stack.cxf.deployment.aspect;
-
-import java.net.URL;
-
-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.endpoints.AbstractEndpointsDeployment;
-import org.jboss.wsf.spi.metadata.endpoints.EndpointMetaData;
-import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData;
-import org.jboss.wsf.spi.metadata.endpoints.jms.JMSAddressMetaData;
-import org.jboss.wsf.stack.cxf.deployment.CXFEndpointsDeployment;
-import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
-import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
-import org.jboss.wsf.stack.cxf.metadata.services.DDJmsAddressBean;
-
-/**
- * To convert the EndpointsMetaData to cxf deployment spring style xml
- *
- * @author <a href="ema(a)redhat.com">Jim Ma</a>
- */
-public class EndpointsDescriptorDeploymentAspect extends AbstractDeploymentAspect
-{
-
-
- @Override
- public void start(Deployment dep)
- {
- if (WSHelper.getOptionalAttachment(dep, EndpointsMetaData.class) != null)
- {
- URL url = this.generateCXFDeploymentDescriptor(dep);
- AbstractEndpointsDeployment endpointsDeployment = new CXFEndpointsDeployment();
- endpointsDeployment.setURL(url);
- endpointsDeployment.setDeployment(dep);
- endpointsDeployment.setEndpointsMetaData(WSHelper.getOptionalAttachment(dep, EndpointsMetaData.class));
- dep.addAttachment(AbstractEndpointsDeployment.class, endpointsDeployment);
- }
- }
-
- @Override
- public void stop(Deployment dep)
- {
- dep.removeAttachment(AbstractEndpointsDeployment.class);
- }
-
- @Override
- public boolean canHandle(Deployment dep)
- {
- if (WSHelper.isJaxrpcDeployment(dep))
- {
- return false;
- }
- else
- {
- return WSHelper.getOptionalAttachment(dep, EndpointsMetaData.class) == null ? false : true;
- }
- }
-
- private URL generateCXFDeploymentDescriptor(Deployment dep)
- {
- DDBeans ddBeans = new DDBeans();
- EndpointsMetaData endpoints = WSHelper.getRequiredAttachment(dep, EndpointsMetaData.class);
- for (EndpointMetaData endpointMD : endpoints.getEndpointsMetaData())
- {
- DDEndpoint endpointBean = new DDEndpoint(dep.getSimpleName(), endpointMD.getImplementor());
- ddBeans.addEndpoint(endpointBean);
- if (endpointMD.getAddressMetaData() != null && endpointMD.getAddressMetaData() instanceof JMSAddressMetaData)
- {
- JMSAddressMetaData jmsMD = (JMSAddressMetaData) endpointMD.getAddressMetaData();
- endpointBean.setTransportId("http://cxf.apache.org/transports/jms");
- if (jmsMD.getRequestDestination() != null)
- {
- DDJmsAddressBean addressBean = new DDJmsAddressBean(jmsMD.getPortName(), true, jmsMD
- .getRequestDestination().getProperties());
- ddBeans.addAddress(addressBean);
- }
-
- if (jmsMD.getReplyDestination() != null)
- {
- DDJmsAddressBean addressBean = new DDJmsAddressBean(jmsMD.getPortName(), false, jmsMD
- .getReplyDestination().getProperties());
- ddBeans.addAddress(addressBean);
- }
- }
- }
- URL url = ddBeans.createFileURL();
- return url;
-
- }
-}
Added: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,124 @@
+/*
+ * 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.wsf.stack.cxf.deployment.aspect;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerRegistry;
+import org.apache.cxf.transport.jms.JMSConfiguration;
+import org.apache.cxf.transport.jms.JMSDestination;
+import org.jboss.wsf.common.integration.JMSDeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+import org.springframework.jms.connection.SingleConnectionFactory;
+
+/**
+ * To start the jms endpoints
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JMSEndpointDeploymentAspect extends JMSDeploymentAspect
+{
+ private BusHolder busHolder = null;
+
+ @Override
+ public void start(Deployment dep)
+ {
+ //TODO:handler JAXBIntro
+ if (dep.getAttachment(JMSEndpointsMetaData.class) != null)
+ {
+ JMSEndpointsMetaData jmsEndpoints = dep.getAttachment(JMSEndpointsMetaData.class);
+ URL url = jmsEndpoints.getDescriptorURL();
+
+ ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
+ SpringBusFactory bf = new SpringBusFactory();
+ Bus bus = bf.createBus(url);
+ dep.addAttachment(Bus.class, bus);
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to deploy jms endpoints deployment " + url);
+ throw new RuntimeException(e);
+ }
+
+ finally
+ {
+ BusFactory.setDefaultBus(null);
+ SecurityActions.setContextClassLoader(origClassLoader);
+ }
+ }
+ }
+
+ @Override
+ public void stop(Deployment dep)
+ {
+ log.debug("Undeploying jms endpoints in " + dep.getSimpleName());
+ if (busHolder != null & busHolder.getBus() != null)
+ {
+ //CXF uses WrappedConnectionFactory to create "jmsLietener". DefaultMessageListenerContainer.shutdown() can not colse all the jms connections.
+ //We need to explicitly call detroy() to close connection. This should be fixed in CXF side.
+ SingleConnectionFactory connectionFactory = null;
+ Server jmsServer = null;
+ ServerRegistry serRegistry = busHolder.getBus().getExtension(ServerRegistry.class);
+ for (Server server : serRegistry.getServers())
+ {
+ if (server.getDestination() != null && server.getDestination() instanceof JMSDestination)
+ {
+ JMSDestination jmsDestination = (JMSDestination) server.getDestination();
+ JMSConfiguration jmsConfig = jmsDestination.getJmsConfig();
+ if (jmsConfig.getWrappedConnectionFactory() != null
+ && jmsConfig.getWrappedConnectionFactory() instanceof SingleConnectionFactory)
+ {
+ connectionFactory = (SingleConnectionFactory) jmsConfig
+ .getWrappedConnectionFactory();
+ jmsServer = server;
+ }
+
+ }
+
+ }
+
+ if (jmsServer != null)
+ {
+ jmsServer.stop();
+ }
+
+ if (connectionFactory != null)
+ {
+ connectionFactory.destroy();
+ }
+ //TODO:Remove above code after fix CXF-2788
+ //close LifecycleListener if exists
+ busHolder.getBus().shutdown(false);
+ busHolder.close();
+ }
+ }
+}
+
Added: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,118 @@
+/*
+ * 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.wsf.stack.cxf.deployment.aspect;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerRegistry;
+import org.apache.cxf.frontend.MethodDispatcher;
+import org.apache.cxf.frontend.SimpleMethodDispatcher;
+import org.apache.cxf.transport.Destination;
+import org.apache.cxf.transport.jms.JMSConfiguration;
+import org.apache.cxf.transport.jms.JMSDestination;
+import org.jboss.wsf.common.integration.JMSDeploymentAspect;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.JMSEndpoint;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+/**
+ * The DeploymentAspect to register the jms endpoints
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JMSEndpointRegistryDeploymentAspect extends JMSDeploymentAspect
+{
+ private EndpointRegistry registry = null;
+ @Override
+ public void start(Deployment dep)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ if (registry == null)
+ registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ Bus bus = dep.getAttachment(Bus.class);
+ Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus);
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint;
+ String endpointImplClass = jmsEndpoint.getTargetBeanName();
+ JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass);
+ if (jmsConfig != null)
+ {
+ jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination());
+ jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination());
+ }
+
+ registry.register(jmsEndpoint);
+ }
+ }
+
+ public void stop(Deployment dep)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ if (registry == null)
+ registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ registry.unregister(ep);
+ }
+ }
+
+ private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus)
+ {
+ Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>();
+ ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class);
+ for (Server server : serverRegsitry.getServers())
+ {
+ Destination destination = server.getDestination();
+ if (destination instanceof JMSDestination)
+ {
+ JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig();
+ String implClassName = getEndpointClassName(server);
+ if (implClassName != null)
+ {
+ endpointJmsConfigMap.put(implClassName, jmsConfiguration);
+ }
+ }
+ }
+ return endpointJmsConfigMap;
+ }
+
+ private String getEndpointClassName(Server server)
+ {
+ MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get(
+ MethodDispatcher.class.getName());
+ if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher)
+ {
+ Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface()
+ .getOperations().iterator().next());
+ return method != null ? method.getDeclaringClass().getName() : null;
+ }
+ return null;
+ }
+}
Copied: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java (from rev 12223, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java)
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,258 @@
+/*
+ * 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.wsf.stack.cxf.metadata;
+
+import java.util.Stack;
+import java.util.StringTokenizer;
+
+import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.soap.MTOM;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.JavaUtils;
+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.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
+import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
+
+/**
+ * Builds the DDBeans metadata used for generating the jboss-cxf.xml deployment descriptor
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 15-Apr-2010
+ *
+ */
+public class MetadataBuilder
+{
+ private static final Logger log = Logger.getLogger(MetadataBuilder.class);
+
+ public MetadataBuilder()
+ {
+
+ }
+
+ public DDBeans build(Deployment dep, String invokerEJB3, String invokerJSE)
+ {
+ DeploymentType depType = dep.getType();
+ DDBeans dd = new DDBeans();
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ DDEndpoint ddep = createDDEndpoint(ep.getTargetBeanClass(), (ArchiveDeployment)dep, ep);
+
+ if (depType == DeploymentType.JAXWS_EJB3)
+ {
+ ddep.setInvoker(invokerEJB3);
+ }
+
+ if (depType == DeploymentType.JAXWS_JSE)
+ {
+ ddep.setInvoker(invokerJSE);
+ }
+
+ processWSDDContribution(ddep, (ArchiveDeployment)dep);
+
+ log.info("Add " + ddep);
+ dd.addEndpoint(ddep);
+ }
+ return dd;
+ }
+
+ protected boolean isMtomEnabled(Class<?> beanClass)
+ {
+ BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
+ MTOM mtom = (MTOM)beanClass.getAnnotation(MTOM.class);
+
+ boolean mtomEnabled = mtom != null;
+ if (!mtomEnabled && bindingType != null)
+ {
+ String binding = bindingType.value();
+ mtomEnabled = binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ }
+
+ return mtomEnabled;
+ }
+
+ private void processWSDDContribution(DDEndpoint endpoint, ArchiveDeployment dep)
+ {
+ WebservicesMetaData webservices = WebservicesFactory.loadFromVFSRoot(dep.getRootFile());
+ if (webservices != null)
+ {
+ for (WebserviceDescriptionMetaData wsDesc : webservices.getWebserviceDescriptions())
+ {
+ for (PortComponentMetaData portComp : wsDesc.getPortComponents())
+ {
+ // We match portComp's by SEI first and portQName second
+ // In the first case the portComp may override the portQName that derives from the annotation
+ String portCompSEI = portComp.getServiceEndpointInterface();
+ boolean doesMatch = portCompSEI != null ? portCompSEI.equals(endpoint.getEpClass().getName()) : false;
+ if (!doesMatch)
+ {
+ doesMatch = portComp.getWsdlPort().equals(endpoint.getPortName());
+ }
+
+ if (doesMatch)
+ {
+ // PortQName overrides
+ if (portComp.getWsdlPort() != null)
+ {
+ if (log.isDebugEnabled())
+ log.debug("Override portName " + endpoint.getPortName() + " with " + portComp.getWsdlPort());
+ endpoint.setPortName(portComp.getWsdlPort());
+ }
+ //ServiceQName overrides
+ if (portComp.getWsdlService() != null)
+ {
+ if (log.isDebugEnabled())
+ log.debug("Override serviceName " + endpoint.getServiceName() + " with " + portComp.getWsdlService());
+ endpoint.setServiceName(portComp.getWsdlService());
+ }
+
+ //TODO implement handler chain override
+
+ // MTOM settings
+ if (portComp.isEnableMtom())
+ {
+ log.debug("Enabling MTOM");
+ endpoint.setMtomEnabled(true);
+ }
+
+ //wsdlLocation override
+ String wsdlFile = portComp.getWebserviceDescription().getWsdlFile();
+ if (wsdlFile != null)
+ {
+ if (log.isDebugEnabled())
+ log.debug("Override wsdlFile location with " + wsdlFile);
+ endpoint.setWsdlLocation(wsdlFile);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected DDEndpoint createDDEndpoint(Class<?> sepClass, ArchiveDeployment dep, Endpoint ep)
+ {
+ WebService anWebService = sepClass.getAnnotation(WebService.class);
+ WebServiceProvider anWebServiceProvider = sepClass.getAnnotation(WebServiceProvider.class);
+
+ Class<?> seiClass = null;
+ String seiName;
+
+ String name = (anWebService != null) ? anWebService.name() : "";
+ if (name.length() == 0)
+ name = JavaUtils.getJustClassName(sepClass);
+
+ String serviceName = (anWebService != null) ? anWebService.serviceName() : anWebServiceProvider.serviceName();
+ if (serviceName.length() == 0)
+ serviceName = JavaUtils.getJustClassName(sepClass) + "Service";
+
+ String serviceNS = (anWebService != null) ? anWebService.targetNamespace() : anWebServiceProvider.targetNamespace();
+ if (serviceNS.length() == 0)
+ serviceNS = getTypeNamespace(JavaUtils.getPackageName(sepClass));
+
+ String portName = (anWebService != null) ? anWebService.portName() : anWebServiceProvider.portName();
+ if (portName.length() == 0)
+ portName = name + "Port";
+
+ if (anWebService != null && anWebService.endpointInterface().length() > 0)
+ {
+ seiName = anWebService.endpointInterface();
+ ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader();
+ if(null == runtimeClassLoader)
+ throw new IllegalArgumentException("Runtime loader cannot be null");
+
+ try
+ {
+ seiClass = runtimeClassLoader.loadClass(seiName);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ throw new RuntimeException("Cannot load service endpoint interface class!", cnfe);
+ }
+ WebService seiAnnotation = seiClass.getAnnotation(WebService.class);
+
+ if (seiAnnotation == null)
+ throw new RuntimeException("Interface does not have a @WebService annotation: " + seiName);
+
+ if (seiAnnotation.portName().length() > 0 || seiAnnotation.serviceName().length() > 0 || seiAnnotation.endpointInterface().length() > 0)
+ throw new RuntimeException("@WebService cannot have attribute 'portName', 'serviceName', 'endpointInterface' on: " + seiName);
+
+ }
+
+ DDEndpoint result = new DDEndpoint();
+
+ result.setId(ep.getShortName());
+ result.setAddress(ep.getAddress());
+ result.setImplementor(ep.getTargetBeanName());
+ result.setMtomEnabled(isMtomEnabled(ep.getTargetBeanClass()));
+ result.setEpClass(seiClass != null ? seiClass : sepClass);
+ result.setPortName(new QName(serviceNS, portName));
+ result.setServiceName(new QName(serviceNS, serviceName));
+
+ return result;
+ }
+
+
+
+ /**
+ * Extracts the typeNS given the package name
+ * Algorithm is based on the one specified in JAWS v2.0 spec
+ */
+ private static String getTypeNamespace(String packageName)
+ {
+ StringBuilder sb = new StringBuilder("http://");
+
+ //Generate tokens with '.' as delimiter
+ StringTokenizer st = new StringTokenizer(packageName, ".");
+
+ //Have a LIFO queue for the tokens
+ Stack<String> stk = new Stack<String>();
+ while (st != null && st.hasMoreTokens())
+ {
+ stk.push(st.nextToken());
+ }
+
+ String next;
+ while (!stk.isEmpty() && (next = stk.pop()) != null)
+ {
+ if (sb.toString().equals("http://") == false)
+ sb.append('.');
+ sb.append(next);
+ }
+
+ // trailing slash
+ sb.append('/');
+
+ return sb.toString();
+ }
+
+}
Modified: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-05-20 03:17:02 UTC (rev 12283)
+++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-05-20 06:04:26 UTC (rev 12284)
@@ -16,95 +16,18 @@
<mkdir dir="${tests.output.dir}/test-libs"/>
- <!--jms transport endpoints deployment descriptor sample-->
-
- <!-- jms transport from wsdl for as5 -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-endpointsdd-fromwsdl-as5.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationEndpoint.class"/>
- </fileset>
-
- <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/fromwsdl">
- <include name="wsdl/*"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/fromwsdl/META-INF">
- <include name="jboss-service.xml"/>
- <include name="jbossws-endpoints.xml"/>
- </metainf>
- </jar>
-
- <!-- jms transport from wsdl for as6 -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-endpointsdd-fromwsdl-as6.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationEndpoint.class"/>
- </fileset>
-
- <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/fromwsdl">
- <include name="wsdl/*"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/fromwsdl/META-INF">
- <include name="hornetq-jms.xml"/>
- <include name="jbossws-endpoints.xml"/>
- </metainf>
- </jar>
-
- <!-- jms transport from java for as5 -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-endpointsdd-as5.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationJmsEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/WEB-INF">
- <include name="jboss-service.xml"/>
- <include name="jbossws-endpoints.xml"/>
- </metainf>
- </jar>
-
+ <!-- jms endpoints sample-->
<!-- jms transport from java for as6 -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-endpointsdd-as6.jar">
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmsendpoints-as6.jar">
<fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationJmsEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/Organization.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/OrganizationJmsEndpoint.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/WEB-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmsendpoints/META-INF">
<include name="hornetq-jms.xml"/>
- <include name="jbossws-endpoints.xml"/>
+ <include name="jbossws-cxf.xml"/>
</metainf>
</jar>
-
- <!-- jms transport deployed with http endpoint for as5 -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-jms-as5.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationHttpEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationJmsEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="jboss-service.xml"/>
- <include name="jbossws-endpoints.xml"/>
- </webinf>
- </war>
-
- <!-- jms transport deployed with http endpoint for as6 -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-jms-as6.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationHttpEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/endpointsdd/jmstransport/OrganizationJmsEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/endpointsdd/WEB-INF">
- <include name="jboss-web.xml"/>
- <include name="hornetq-jms.xml"/>
- <include name="jbossws-endpoints.xml"/>
- </webinf>
- </war>
<!-- jaxws-samples-jmstransport -->
<war
Added: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,154 @@
+/*
+ * 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.test.ws.jaxws.samples.jmsendpoints.jmstransport;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * The test for cxf jms transport packaged in a jar file and deployed with jbossws-cxf.xml
+ *
+ * @author <a href=mailto:ema@redhat.com> Jim Ma </a>
+ */
+public class JMSEndpointsTestCase extends JBossWSTest
+{
+ private static boolean waitForResponse;
+
+ public static Test suite() throws Exception
+ {
+ if (isHornetQAvailable()) {
+ return new JBossWSTestSetup(JMSEndpointsTestCase.class, "jaxws-samples-jmsendpoints-as6.jar");
+ } else {
+ return new TestSuite();
+ }
+ }
+
+ public static boolean isHornetQAvailable()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server");
+ String jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber");
+ return JBossWSTestHelper.isTargetJBoss6() && !jbossVersion.contains("M2");
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
+
+ public void testMessagingClient() throws Exception
+ {
+ String reqMessage =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ "<env:Body>" +
+ "<ns1:getContactInfo xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" +
+ "<arg0>mafia</arg0>" +
+ "</ns1:getContactInfo>" +
+ "</env:Body>" +
+ "</env:Envelope>";
+
+ String resMessage =
+ "<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ "<soap:Body>" +
+ "<ns1:getContactInfoResponse xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" +
+ "<return>The 'mafia' boss is currently out of office, please call again.</return>" +
+ "</ns1:getContactInfoResponse>" +
+ "</soap:Body>" +
+ "</soap:Envelope>";
+
+ InitialContext context = new InitialContext();
+ QueueConnectionFactory connectionFactory = (QueueConnectionFactory)context.lookup("ConnectionFactory");
+ Queue reqQueue = (Queue)context.lookup("queue/RequestQueue");
+ Queue resQueue = (Queue)context.lookup("queue/ResponseQueue");
+
+ QueueConnection con = connectionFactory.createQueueConnection();
+ QueueSession session = con.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ QueueReceiver receiver = session.createReceiver(resQueue);
+ ResponseListener responseListener = new ResponseListener();
+ receiver.setMessageListener(responseListener);
+ con.start();
+
+ TextMessage message = session.createTextMessage(reqMessage);
+ message.setJMSReplyTo(resQueue);
+
+ waitForResponse = true;
+
+ QueueSender sender = session.createSender(reqQueue);
+ sender.send(message);
+ sender.close();
+
+ int timeout = 5;
+ while (waitForResponse && timeout > 0)
+ {
+ Thread.sleep(1000);
+ timeout = timeout -1;
+ }
+
+ assertNotNull("Expected response message", responseListener.resMessage);
+ assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage));
+
+ sender.close();
+ receiver.close();
+ con.stop();
+ session.close();
+ con.close();
+ }
+
+ public static class ResponseListener implements MessageListener
+ {
+ public String resMessage;
+
+ public void onMessage(Message msg)
+ {
+ TextMessage textMessage = (TextMessage)msg;
+ try
+ {
+ resMessage = textMessage.getText();
+ waitForResponse = false;
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ }
+ }
+ }
+}
Added: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/Organization.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/Organization.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/Organization.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,32 @@
+/*
+ * 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.test.ws.jaxws.samples.jmsendpoints.jmstransport;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(targetNamespace = "http://org.jboss.ws/samples/jmstransport")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Organization
+{
+ String getContactInfo(String organization);
+}
Added: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/OrganizationJmsEndpoint.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/OrganizationJmsEndpoint.java (rev 0)
+++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/OrganizationJmsEndpoint.java 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,38 @@
+/*
+ * 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.test.ws.jaxws.samples.jmsendpoints.jmstransport;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (serviceName="OrganizationService", portName="JmsPort",targetNamespace = "http://org.jboss.ws/samples/jmstransport", endpointInterface="org.jboss.test.ws.jaxws.samples.jmsendpoints.jmstransport.Organization")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+
+public class OrganizationJmsEndpoint implements Organization
+{
+ @WebMethod
+ public String getContactInfo(String organization)
+ {
+ return "The '" + organization + "' boss is currently out of office, please call again.";
+ }
+}
\ No newline at end of file
Added: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/hornetq-jms.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/hornetq-jms.xml (rev 0)
+++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/hornetq-jms.xml 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+ <queue name="RequestQueue">
+ <entry name="/queue/RequestQueue"/>
+ </queue>
+ <queue name="ResponseQueue">
+ <entry name="/queue/ResponseQueue"/>
+ </queue>
+</configuration>
\ No newline at end of file
Added: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/jmsendpoints/META-INF/jbossws-cxf.xml 2010-05-20 06:04:26 UTC (rev 12284)
@@ -0,0 +1,29 @@
+<beans xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.xsd'>
+
+ <jaxws:endpoint
+ implementor='org.jboss.test.ws.jaxws.samples.jmsendpoints.jmstransport.OrganizationJmsEndpoint'
+ transportId="http://cxf.apache.org/transports/jms">
+ </jaxws:endpoint>
+
+ <jms:destination name="{http://org.jboss.ws/samples/jmstransport}JmsPort.jms-destination">
+ <jms:address destinationStyle="queue"
+ jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="queue/RequestQueue"
+ jndiReplyDestinationName="queue/ResponseQueue">
+ </jms:address>
+ </jms:destination>
+
+ <jms:conduit name="{http://org.jboss.ws/samples/jmstransport}JmsPort.jms-conduit">
+ <jms:address destinationStyle="queue"
+ jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="queue/RequestQueue"
+ jndiReplyDestinationName="queue/ResponseQueue">
+ </jms:address>
+ </jms:conduit>
+</beans>
+
+
15 years, 11 months
JBossWS SVN: r12283 - in stack/cxf/branches/jms-integration: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client and 15 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2010-05-19 23:17:02 -0400 (Wed, 19 May 2010)
New Revision: 12283
Modified:
stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java
stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java
stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java
stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml
stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml
stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml
stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
stack/cxf/branches/jms-integration/modules/management/pom.xml
stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf
stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf
stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf
stack/cxf/branches/jms-integration/modules/server/pom.xml
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java
stack/cxf/branches/jms-integration/modules/testsuite/pom.xml
stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt
stack/cxf/branches/jms-integration/pom.xml
stack/cxf/branches/jms-integration/profiles.xml.example
stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml
stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2791]:Add the JMSEndpointDeploymentDA dnd JMSEndpointDeploymentRegistryDA to deploy and registry the jms endpoints; Synched code with trunk
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -97,7 +97,7 @@
Bus bus;
//Reset bus before constructing Service
- BusFactory.setThreadDefaultBus(null);
+ BusFactory.setDefaultBus(null);
URL cxfConfig = getCXFConfiguration(serviceRef.getVfsRoot());
if (cxfConfig != null)
{
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -185,11 +185,16 @@
{
try
{
- Class serviceClass = loader.loadClass(serviceImplClass);
+ Class<?> serviceClass = loader.loadClass(serviceImplClass);
if (serviceClass.getAnnotation(WebServiceClient.class) != null)
{
WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class);
serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name()));
+ //use the @WebServiceClien(wsdlLocation=...) if the service ref wsdl location returned at this time would be null
+ if (clientDecl.wsdlLocation().length() > 0 && serviceRef.getWsdlLocation() == null)
+ {
+ serviceRef.setWsdlOverride(clientDecl.wsdlLocation());
+ }
}
}
catch (ClassNotFoundException e)
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefStubPropertyConfigurer.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -22,16 +22,24 @@
package org.jboss.wsf.stack.cxf.client;
import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.soap.MTOMFeature;
+
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
/**
- * A CXF configurer that sets the serviceref stub properties in the JaxWsProxyFactoryBean
+ * A CXF configurer that sets the serviceref data in the JaxWsProxyFactoryBean
*
* @author alessio.soldano(a)jboss.com
* @since 21-Jul-2009
@@ -49,10 +57,6 @@
public void configureBean(Object beanInstance)
{
- if (beanInstance instanceof JaxWsProxyFactoryBean)
- {
- configureJaxWsProxyFactoryBean((JaxWsProxyFactoryBean)beanInstance);
- }
if (delegate != null)
{
delegate.configureBean(beanInstance);
@@ -61,9 +65,19 @@
public void configureBean(String name, Object beanInstance)
{
- if (beanInstance instanceof JaxWsProxyFactoryBean)
+ if (name != null && beanInstance instanceof JaxWsProxyFactoryBean)
{
- configureJaxWsProxyFactoryBean((JaxWsProxyFactoryBean)beanInstance);
+ QName portQName = null;
+ try
+ {
+ String portName = name.substring(0, name.indexOf(".jaxws-client.proxyFactory"));
+ portQName = QName.valueOf(portName);
+ }
+ catch (Exception e)
+ {
+ Logger.getLogger(this.getClass()).warn("Unable to retrieve port QName from '" + name + "', trying matching port using endpoint interface name only.");
+ }
+ configureJaxWsProxyFactoryBean(portQName, (JaxWsProxyFactoryBean)beanInstance);
}
if (delegate != null)
{
@@ -71,21 +85,43 @@
}
}
- private synchronized void configureJaxWsProxyFactoryBean(JaxWsProxyFactoryBean proxyFactory)
+ private synchronized void configureJaxWsProxyFactoryBean(QName portQName, JaxWsProxyFactoryBean proxyFactory)
{
- Map<String, Object> properties = new HashMap<String, Object>();
- for (UnifiedPortComponentRefMetaData pcRef : serviceRefMD.getPortComponentRefs())
+ Class<?> clazz = proxyFactory.getServiceClass();
+ UnifiedPortComponentRefMetaData upcmd = serviceRefMD.getPortComponentRef(clazz != null ? clazz.getName() : null, portQName);
+ if (upcmd != null)
{
- String sei = pcRef.getServiceEndpointInterface();
- if (sei != null && sei.equals(proxyFactory.getServiceClass().getName()))
+ setProperties(proxyFactory, upcmd);
+ setMTOM((JaxWsServiceFactoryBean)proxyFactory.getServiceFactory(), upcmd);
+ }
+ }
+
+ private void setMTOM(JaxWsServiceFactoryBean serviceFactoryBean, UnifiedPortComponentRefMetaData upcmd)
+ {
+ if (upcmd.getEnableMTOM())
+ {
+ List<WebServiceFeature> features = new LinkedList<WebServiceFeature>();
+ List<WebServiceFeature> prevFeatures = serviceFactoryBean.getWsFeatures();
+ if (prevFeatures != null)
{
- for (UnifiedStubPropertyMetaData prop : pcRef.getStubProperties())
- {
- properties.put(prop.getPropName(), prop.getPropValue());
- }
+ features.addAll(prevFeatures);
}
+ features.add(new MTOMFeature(true));
+ serviceFactoryBean.setWsFeatures(features);
}
- proxyFactory.setProperties(properties);
}
-
+
+ private void setProperties(JaxWsProxyFactoryBean proxyFactory, UnifiedPortComponentRefMetaData upcmd)
+ {
+ Map<String, Object> properties = proxyFactory.getProperties();
+ if (properties == null)
+ {
+ properties = new HashMap<String, Object>();
+ proxyFactory.setProperties(properties);
+ }
+ for (UnifiedStubPropertyMetaData prop : upcmd.getStubProperties())
+ {
+ properties.put(prop.getPropName(), prop.getPropValue());
+ }
+ }
}
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSCXFConfigurer.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -22,11 +22,13 @@
package org.jboss.wsf.stack.cxf.client.configuration;
import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.transport.http.HTTPConduit;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.binding.JAXBBindingCustomization;
@@ -36,42 +38,22 @@
* @author alessio.soldano(a)jboss.com
* @since 05-Oct-2009
*/
-public class JBossWSCXFConfigurer implements Configurer
+public class JBossWSCXFConfigurer extends DelegatingConfigurer
{
protected BindingCustomization customization;
- private Configurer delegate;
public JBossWSCXFConfigurer(Configurer delegate)
{
- this.delegate = delegate;
+ super(delegate);
}
public JBossWSCXFConfigurer(Configurer delegate, BindingCustomization customization)
{
- this(delegate);
+ super(delegate);
this.customization = customization;
}
@Override
- public void configureBean(Object beanInstance)
- {
- internalConfigure(beanInstance);
- if (delegate != null)
- {
- delegate.configureBean(beanInstance);
- }
- }
-
- @Override
- public void configureBean(String name, Object beanInstance)
- {
- internalConfigure(beanInstance);
- if (delegate != null)
- {
- delegate.configureBean(name, beanInstance);
- }
- }
-
protected void internalConfigure(Object beanInstance)
{
if (beanInstance instanceof AbstractWSDLBasedEndpointFactory)
@@ -82,6 +64,10 @@
{
configureClientProxyFactoryBean((ClientProxyFactoryBean)beanInstance);
}
+ else if (beanInstance instanceof HTTPConduit)
+ {
+ configureHTTPConduit((HTTPConduit)beanInstance);
+ }
//add other beans configuration here below
}
@@ -92,6 +78,26 @@
*/
protected synchronized void configureEndpointFactory(AbstractWSDLBasedEndpointFactory factory)
{
+ //Configure binding customization
+ if (customization != null)
+ {
+ ReflectionServiceFactoryBean serviceFactory = factory.getServiceFactory();
+ //customize default databinding (early pulls in ServiceFactory default databinding and configure it, as it's lazily loaded)
+ serviceFactory.reset();
+ DataBinding serviceFactoryDataBinding = serviceFactory.getDataBinding(true);
+ setBindingCustomization(serviceFactoryDataBinding, customization);
+ serviceFactory.setDataBinding(serviceFactoryDataBinding);
+ //customize user provided databinding (CXF later overrides the ServiceFactory databinding using the user provided one)
+ if (factory.getDataBinding() == null)
+ {
+ //set the endpoint factory's databinding to prevent CXF resetting everything because user did not provide anything
+ factory.setDataBinding(serviceFactoryDataBinding);
+ }
+ else
+ {
+ setBindingCustomization(factory.getDataBinding(), customization);
+ }
+ }
//add other configurations here below
}
@@ -125,6 +131,27 @@
//add other configurations here below
}
+ /**
+ * Configure the HTTPConduit; currently allows for setting disableCNcheck in TLS client parameters according
+ * to the JBoss' org.jboss.security.ignoreHttpsHost system property.
+ *
+ * @param conduit
+ */
+ protected synchronized void configureHTTPConduit(HTTPConduit conduit)
+ {
+ TLSClientParameters parameters = conduit.getTlsClientParameters();
+ if (parameters == null) //don't do anything when user already provided a configuration
+ {
+ parameters = new TLSClientParameters();
+ parameters.setUseHttpsURLConnectionDefaultSslSocketFactory(true);
+ if (Boolean.getBoolean("org.jboss.security.ignoreHttpsHost"))
+ {
+ parameters.setDisableCNCheck(true);
+ }
+ conduit.setTlsClientParameters(parameters);
+ }
+ }
+
@SuppressWarnings("unchecked")
protected static void setBindingCustomization(DataBinding db, BindingCustomization customization)
{
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jbossws.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -1,6 +1,10 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core"
xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+ <bean id="clientConfigurerInstaller" class="org.jboss.wsf.stack.cxf.client.configuration.ConfigurerInstaller">
+ <property name="bus" ref="cxf"/>
+ </bean>
+
<!--
<bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
<bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/extensions.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -19,7 +19,7 @@
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties version="1.0">
+<properties>
<entry key="org.apache.cxf.binding.corba-1">javax.wsdl.Binding=org.apache.cxf.binding.corba.wsdl.BindingType</entry>
<entry key="org.apache.cxf.binding.corba-2">javax.wsdl.BindingOperation=org.apache.cxf.binding.corba.wsdl.OperationType</entry>
<entry key="org.apache.cxf.binding.corba-3">javax.wsdl.Definition=org.apache.cxf.binding.corba.wsdl.TypeMappingType</entry>
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -19,7 +19,7 @@
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties version="1.0">
+<properties>
<entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry>
<entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry>
<entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry>
Modified: stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -19,7 +19,7 @@
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties version="1.0">
+<properties>
<entry key="soap-javax.wsdl.Port">org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin</entry>
<entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry>
<entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry>
Modified: stack/cxf/branches/jms-integration/modules/management/pom.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/management/pom.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/management/pom.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M2</artifactId>
+ <artifactId>jbossws-jboss600M3</artifactId>
<scope>provided</scope>
</dependency>
<!-- [JBWS-2505] -->
@@ -87,14 +87,45 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/webapp</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <executions>
+ <execution>
+ <id>console</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <warName>jbossws-cxf-management</warName>
+ <warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory>
+ <webappDirectory>${project.build.directory}/jbossws-cxf-management</webappDirectory>
+ <webResources>
+ <webResource>
+ <directory>${basedir}/src/main/webapp</directory>
+ <filtering>true</filtering>
+ </webResource>
+ </webResources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pcl</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <configuration>
+ <warName>jbossws-cxf-management-pcl</warName>
+ <warSourceDirectory>${basedir}/src/main/pclwebapp</warSourceDirectory>
+ <webappDirectory>${project.build.directory}/jbossws-cxf-management-pcl</webappDirectory>
+ <webResources>
+ <webResource>
+ <directory>${basedir}/src/main/pclwebapp</directory>
+ <filtering>true</filtering>
+ </webResource>
+ </webResources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/all-deploy.conf 2010-05-20 03:17:02 UTC (rev 12283)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jbossws-native-services.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.ja!
r server/all/deployers/jbossws.deployer/wscommons-policy.jar s!
erver/al
l/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jbossws-native-services.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/!
lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployer!
s/jbossws.deployer/wscommons-policy.jar server/all/deployers/j!
bossws.d
eployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/default-deploy.conf 2010-05-20 03:17:02 UTC (rev 12283)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jbossws-native-factories.jar server/default/deployers/jbossws.deployer/jbossws-native-services.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/!
default/deployers/jbossws.deployer/wscommons-policy.jar server!
/default
/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/!
lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jbossws-native-factories.jar server/default/deployers/jbossws.deployer/jbossws-native-services.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbo!
ssws.deployer/wscommons-policy.jar server/default/deployers/jb!
ossws.de
ployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -231,6 +231,23 @@
</macrodef>
<!-- ================================================================== -->
+ <!-- Deploy JBossWS Console + PortComponentLink servlet -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-jaxrpc-deployment">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <unzip dest="@{targetdir}">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-cxf-management-pcl.war"/>
+ </fileset>
+ </unzip>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
<!-- Deploy Deployers -->
<!-- ================================================================== -->
@@ -273,7 +290,7 @@
<target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration">
<sequential>
<copy todir="${targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}">
+ <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer">
<include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
@@ -308,7 +325,7 @@
<macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-jaxrpc-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-jaxrpc-deployers targetdir="${installserver}/deployers/jbossws-jaxrpc.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
Modified: stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-05-20 03:17:02 UTC (rev 12283)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/l!
ib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.j!
ar server/standard/deployers/jbossws.deployer/policy.jar serve!
r/standa
rd/deployers/jbossws.deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/!
lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/de!
ployers/jbossws.deployer/policy.jar server/standard/deployers/!
jbossws.
deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/cxf/branches/jms-integration/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/pom.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/pom.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -229,17 +229,17 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory>
</artifactItem>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <artifactId>jbossws-jboss600M3</artifactId>
+ <version>${jbossws.jboss600M3.version}</version>
<classifier>resources</classifier>
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
+ <!-- JBWS-2505 -->
+ <!-- START -->
+ <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -49,7 +49,7 @@
import org.springframework.core.io.InputStreamResource;
/**
- * An wrapper of the Bus for performing most of the configurations required on it by JBossWS
+ * A wrapper of the Bus for performing most of the configurations required on it by JBossWS
*
* @author alessio.soldano(a)jboss.com
* @since 25-Mar-2010
@@ -110,7 +110,7 @@
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
* @throws IOException Throws IOException if the jboss-cxf.xml file can't be read
*/
- public void configure(URL jbossCxfXml, SoapTransportFactory soapTransportFactory, ResourceResolver resolver, JBossWSCXFConfigurer configurer) throws IOException
+ public void configure(URL jbossCxfXml, SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer) throws IOException
{
if (configured)
{
@@ -130,17 +130,19 @@
}
/**
- * A convenient method for getting a jbossws cxf configurer delegating to the cxf configurer
- * that's currently installed in the hold bus.
+ * A convenient method for getting a jbossws cxf server configurer delegating to the
+ * cxf configurer that's currently installed in the hold bus.
*
* @param customization The binding customization to set in the configurer, if any
* @param wsdlPublisher The wsdl file publisher to set in the configurer, if any
* @return The new jbossws cxf configurer
*/
- public JBossWSCXFConfigurer createConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher)
+ public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher)
{
- Configurer delegate = bus.getExtension(Configurer.class);
- return new JBossWSServerCXFConfigurer(delegate, customization, wsdlPublisher);
+ //the JBossWSCXFConfigurer should already be set through cxf-extensions-jbossws.xml
+ JBossWSCXFConfigurer delegate = (JBossWSCXFConfigurer)bus.getExtension(Configurer.class);
+ delegate.setBindingCustomization(customization);
+ return new JBossWSServerCXFConfigurer(delegate, wsdlPublisher);
}
/**
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerCXFConfigurer.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -22,21 +22,17 @@
package org.jboss.wsf.stack.cxf.configuration;
import org.apache.cxf.configuration.Configurer;
-import org.apache.cxf.databinding.DataBinding;
-import org.apache.cxf.frontend.AbstractWSDLBasedEndpointFactory;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
-import org.jboss.wsf.spi.binding.BindingCustomization;
-import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
+import org.jboss.wsf.stack.cxf.client.configuration.DelegatingConfigurer;
import org.jboss.wsf.stack.cxf.deployment.EndpointImpl;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
/**
- * A JBossWSCXFConfigured to be used on server side
+ * A JBossWS CXF Configurer to be used on server side
*
* @author alessio.soldano(a)jboss.com
* @since 31-Mar-2010
*/
-public class JBossWSServerCXFConfigurer extends JBossWSCXFConfigurer
+public class JBossWSServerCXFConfigurer extends DelegatingConfigurer
{
private WSDLFilePublisher wsdlPublisher;
@@ -45,48 +41,21 @@
super(delegate);
}
- public JBossWSServerCXFConfigurer(Configurer delegate, BindingCustomization customization, WSDLFilePublisher wsdlPublisher)
+ public JBossWSServerCXFConfigurer(Configurer delegate, WSDLFilePublisher wsdlPublisher)
{
- super(delegate, customization);
+ super(delegate);
this.wsdlPublisher = wsdlPublisher;
}
@Override
protected void internalConfigure(Object beanInstance)
{
- super.internalConfigure(beanInstance);
if (beanInstance instanceof EndpointImpl)
{
configureEndpoint((EndpointImpl)beanInstance);
}
}
- @Override
- protected synchronized void configureEndpointFactory(AbstractWSDLBasedEndpointFactory factory)
- {
- //Configure binding customization
- if (customization != null)
- {
- ReflectionServiceFactoryBean serviceFactory = factory.getServiceFactory();
- //customize default databinding (early pulls in ServiceFactory default databinding and configure it, as it's lazily loaded)
- serviceFactory.reset();
- DataBinding serviceFactoryDataBinding = serviceFactory.getDataBinding(true);
- setBindingCustomization(serviceFactoryDataBinding, customization);
- serviceFactory.setDataBinding(serviceFactoryDataBinding);
- //customize user provided databinding (CXF later overrides the ServiceFactory databinding using the user provided one)
- if (factory.getDataBinding() == null)
- {
- //set the endpoint factory's databinding to prevent CXF resetting everything because user did not provide anything
- factory.setDataBinding(serviceFactoryDataBinding);
- }
- else
- {
- setBindingCustomization(factory.getDataBinding(), customization);
- }
- }
- //add other configurations here below
- }
-
protected synchronized void configureEndpoint(EndpointImpl endpoint)
{
//Configure wsdl file publisher
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -26,6 +26,7 @@
import java.util.Map;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.configuration.Configurer;
import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSConstants;
import org.jboss.wsf.spi.binding.BindingCustomization;
@@ -33,7 +34,6 @@
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.client.configuration.JBossWSCXFConfigurer;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
import org.jboss.wsf.stack.cxf.resolver.JBossWSResourceResolver;
@@ -77,7 +77,7 @@
{
URL jbossCxfXml = deploymentResolver.resolve(contextParams.get(BusHolder.PARAM_CXF_BEANS_URL));
org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
- JBossWSCXFConfigurer configurer = holder.createConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep));
+ Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep));
holder.configure(jbossCxfXml, new SoapTransportFactoryExt(), resolver, configurer);
}
catch (IOException e)
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -26,20 +26,15 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.soap.MTOM;
-import javax.xml.ws.soap.SOAPBinding;
-
import org.jboss.logging.Logger;
import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
import org.jboss.wsf.common.integration.WSConstants;
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.Deployment.DeploymentType;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
-import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
/**
* A deployer that locates or generates cxf.xml
@@ -160,34 +155,9 @@
private URL generateCXFConfigFromDeployment(Deployment dep)
{
// Generate the jbossws-cxf.xml descriptor
- DeploymentType depType = dep.getType();
-
- DDBeans dd = new DDBeans();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- String id = ep.getShortName();
- String address = ep.getAddress();
- String implementor = ep.getTargetBeanName();
+ MetadataBuilder builder = new MetadataBuilder();
+ DDBeans dd = builder.build(dep, invokerEJB3, invokerJSE);
- boolean mtomEnabled = isMtomEnabled(ep.getTargetBeanClass());
-
- DDEndpoint ddep = new DDEndpoint(id, address, implementor, mtomEnabled);
-
- if (depType == DeploymentType.JAXWS_EJB3)
- {
- ddep.setInvoker(invokerEJB3);
- }
-
- if (depType == DeploymentType.JAXWS_JSE)
- {
- ddep.setInvoker(invokerJSE);
- }
-
-
- log.info("Add " + ddep);
- dd.addEndpoint(ddep);
- }
-
URL cxfURL = dd.createFileURL();
log.info("JBossWS-CXF configuration generated: " + cxfURL);
@@ -218,19 +188,4 @@
contextParams.put(BusHolder.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm());
}
- private static boolean isMtomEnabled(Class<?> beanClass)
- {
- BindingType bindingType = (BindingType)beanClass.getAnnotation(BindingType.class);
- MTOM mtom = (MTOM)beanClass.getAnnotation(MTOM.class);
-
- boolean mtomEnabled = mtom != null;
- if (!mtomEnabled && bindingType != null)
- {
- String binding = bindingType.value();
- mtomEnabled = binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
- }
-
- return mtomEnabled;
- }
-
}
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -24,57 +24,148 @@
import java.io.IOException;
import java.io.Writer;
+import javax.xml.namespace.QName;
+
/**
* Metadata model for cxf.xml
*
* @author Thomas.Diesler(a)jboss.org
* @author ropalka(a)redhat.com
+ * @author alessio.soldano(a)jboss.com
*/
public class DDEndpoint
{
+ //fields mapped to jboss-cxf.xml
private String id;
+
private String address;
+
private String implementor;
+
private String invoker;
- private String transportId;
-
+
private boolean mtomEnabled;
- public DDEndpoint(String id, String address, String implementor, boolean mtomEnabled)
+ private String wsdlLocation;
+
+ private QName portName;
+
+ private QName serviceName;
+
+ //additional fields
+ private Class<?> epClass;
+
+ private int counter = 0;
+
+ public QName getPortName()
{
+ return portName;
+ }
+
+ public void setPortName(QName portName)
+ {
+ this.portName = portName;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void setServiceName(QName serviceName)
+ {
+ this.serviceName = serviceName;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public void setId(String id)
+ {
this.id = id;
+ }
+
+ public String getAddress()
+ {
+ return address;
+ }
+
+ public void setAddress(String address)
+ {
this.address = address;
- this.implementor = implementor;
- this.mtomEnabled = mtomEnabled;
}
-
- public DDEndpoint(String id, String implementor)
+
+ public String getImplementor()
{
- this.id = id;
+ return implementor;
+ }
+
+ public void setImplementor(String implementor)
+ {
this.implementor = implementor;
}
+ public String getWsdlLocation()
+ {
+ return wsdlLocation;
+ }
+
+ public void setWsdlLocation(String wsdlLocation)
+ {
+ this.wsdlLocation = wsdlLocation;
+ }
+
+ public Class<?> getEpClass()
+ {
+ return epClass;
+ }
+
+ public void setEpClass(Class<?> epClass)
+ {
+ this.epClass = epClass;
+ }
+
+ public String getInvoker()
+ {
+ return invoker;
+ }
+
+ public boolean isMtomEnabled()
+ {
+ return mtomEnabled;
+ }
+
public void setInvoker(String invoker)
{
this.invoker = invoker;
}
-
+
+ public void setMtomEnabled(boolean mtomEnabled)
+ {
+ this.mtomEnabled = mtomEnabled;
+ }
+
public void writeTo(Writer writer) throws IOException
{
writer.write("<jaxws:endpoint id='" + this.id + "'");
- if (address != null)
+ writer.write(" address='" + this.address + "'");
+ writer.write(" implementor='" + this.implementor + "'");
+ if (this.serviceName != null)
{
- writer.write(" address='" + this.address + "'");
+ this.writeQNameElementTo("serviceName", this.serviceName, writer);
}
- writer.write(" implementor='" + this.implementor + "'");
-
- if (transportId != null)
+ if (this.portName != null)
{
- writer.write(" transportId='" + this.transportId + "'");
+ this.writeQNameElementTo("endpointName", this.portName, writer);
}
-
+ if (this.wsdlLocation != null)
+ {
+ writer.write(" wsdlLocation='" + this.wsdlLocation + "'");
+ }
writer.write(">");
-
+
if (this.mtomEnabled)
{
writer.write("<jaxws:binding>");
@@ -86,16 +177,17 @@
{
writer.write("<jaxws:invoker><bean class='" + this.invoker + "'/></jaxws:invoker>");
}
-
+
writer.write("</jaxws:endpoint>");
}
-
- public void setTransportId(String transportId)
+ private void writeQNameElementTo(String elementName, QName qname, Writer writer) throws IOException
{
- this.transportId = transportId;
+ String prefix = "ns" + counter++;
+ writer.write(" " + elementName + "='" + prefix + ":" + qname.getLocalPart() + "'");
+ writer.write(" xmlns:" + prefix + "='" + qname.getNamespaceURI() + "'");
}
-
+
public String toString()
{
StringBuilder str = new StringBuilder("Service");
@@ -103,8 +195,10 @@
str.append("\n address=" + this.address);
str.append("\n implementor=" + this.implementor);
str.append("\n invoker=" + this.invoker);
+ str.append("\n serviceName=" + this.serviceName);
+ str.append("\n portName=" + this.portName);
+ str.append("\n wsdlLocation=" + this.wsdlLocation);
str.append("\n mtomEnabled=" + this.mtomEnabled);
- str.append("\n transportId=" + this.transportId);
return str.toString();
}
}
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -45,14 +45,6 @@
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
<property name="forJaxRpc">false</property>
</bean>
-
- <bean name="EndpointsDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.EndpointsDescriptorDeploymentAspect">
- <property name="requires">EndpointAddress,JAXBIntros</property>
- <property name="provides">StackDescriptor</property>
- <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
- <property name="forJaxRpc">false</property>
- </bean>
-
<bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
<property name="requires">JmsEndpointAddress</property>
@@ -89,5 +81,18 @@
<property name="requires">ResourceResolver,StackDescriptor</property>
<property name="forJaxRpc">false</property>
</bean>
+
+ <!---JMSEndpoints Deployment Aspect-->
+ <bean name="JMSEndpointDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointDeploymentAspect">
+ <property name="provides">BusHolder</property>
+ <property name="forJaxRpc">false</property>
+ </bean>
+
+ <bean name="JMSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointRegistryDeploymentAspect">
+ <property name="requires">BusHolder</property>
+ <property name="forJaxRpc">false</property>
+ </bean>
+
+
-</deployment>
+</deployment>
\ No newline at end of file
Modified: stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/server/src/main/scripts/antrun-beans-config.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -35,9 +35,14 @@
file="${src.dir}/jbossws-cxf-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
-
+
<copy
file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
+ tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
+
+ <copy
+ file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
tofile="${dest.dir}/jbossws-jaxrpc-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
Modified: stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/JAXBIntroTestCase.java 2010-05-20 03:17:02 UTC (rev 12283)
@@ -54,14 +54,13 @@
private String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-cxf-jaxbintros/EndpointService";
private Bus bus;
- private Configurer originalConfigurer;
+ private JBossWSCXFConfigurer configurer;
public static Test suite()
{
return new JBossWSTestSetup(JAXBIntroTestCase.class, "jaxws-cxf-jaxbintros.jar");
}
- @SuppressWarnings("unchecked")
public void testWSDLAccess() throws Exception
{
URL wsdlURL = new URL(endpointAddress + "?wsdl");
@@ -105,7 +104,7 @@
}
finally
{
- restoreConfigurer();
+ unsetBindingCustomizationOnClientSide();
}
}
@@ -135,22 +134,20 @@
*
* @throws Exception
*/
+ @SuppressWarnings("unchecked")
private void setBindingCustomizationOnClientSide() throws Exception
{
BindingCustomization jaxbCustomizations = new JAXBBindingCustomization();
BindingCustomizationFactory.populateBindingCustomization(getResourceURL("jaxws/cxf/jaxbintros/META-INF/jaxb-intros.xml").openStream(), jaxbCustomizations);
bus = BusFactory.getThreadDefaultBus();
- originalConfigurer = bus.getExtension(Configurer.class);
- JBossWSCXFConfigurer configurer = new JBossWSCXFConfigurer(originalConfigurer);
+ configurer = (JBossWSCXFConfigurer)bus.getExtension(Configurer.class);
configurer.setBindingCustomization(jaxbCustomizations);
- bus.setExtension(configurer, Configurer.class);
-
}
-
- private void restoreConfigurer()
+
+ private void unsetBindingCustomizationOnClientSide()
{
- bus.setExtension(originalConfigurer, Configurer.class);
+ if (configurer != null)
+ configurer.setBindingCustomization(null);
}
-
}
Modified: stack/cxf/branches/jms-integration/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/pom.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/testsuite/pom.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -26,7 +26,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
- <hornetq.version>2.1.0.BETA1</hornetq.version>
+ <hornetq.version>2.1.0.BETA3</hornetq.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
@@ -442,7 +442,7 @@
<profile>
<id>jboss600</id>
<properties>
- <jboss.version>6.0.0.20100216-M2</jboss.version>
+ <jboss.version>6.0.0.20100429-M3</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
@@ -453,14 +453,54 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-security</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ <version>${hornetq.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -553,11 +593,6 @@
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
- <artifactId>hornetq-transports</artifactId>
- <version>${hornetq.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
<artifactId>hornetq-jms-client</artifactId>
<version>${hornetq.version}</version>
</dependency>
Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss501.txt 2010-05-20 03:17:02 UTC (rev 12283)
@@ -57,7 +57,16 @@
# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
+org/jboss/test/ws/jaxws/jbws2991/**
+org/jboss/test/ws/jaxws/jbws3008/**
+org/jboss/test/ws/jaxws/jbws3022/**
+
+# [JBWS-3020] Investigate why HandlerScopeTestCase fails
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+
+# [JBWS-3002] Verify POJO endpoints are shared
+org/jboss/test/ws/jaxws/jbws2486/**
+
Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss510.txt 2010-05-20 03:17:02 UTC (rev 12283)
@@ -57,7 +57,16 @@
# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
+org/jboss/test/ws/jaxws/jbws2991/**
+org/jboss/test/ws/jaxws/jbws3008/**
+org/jboss/test/ws/jaxws/jbws3022/**
+
+# [JBWS-3020] Investigate why HandlerScopeTestCase fails
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+
+# [JBWS-3002] Verify POJO endpoints are shared
+org/jboss/test/ws/jaxws/jbws2486/**
+
Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss600.txt 2010-05-20 03:17:02 UTC (rev 12283)
@@ -45,19 +45,22 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2917] We're using buggy xalan version causing namespaces issues
-org/jboss/test/ws/jaxws/jbws2917/**
+# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
org/jboss/test/ws/jaxws/jbws2937/**
org/jboss/test/ws/jaxws/jbws2942/**
+org/jboss/test/ws/jaxws/jbws2960/**
+org/jboss/test/ws/jaxws/jbws2985/**
+org/jboss/test/ws/jaxws/jbws2991/**
+org/jboss/test/ws/jaxws/jbws3008/**
+org/jboss/test/ws/jaxws/jbws3022/**
org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
-# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3
-org/jboss/test/ws/jaxrpc/**
-
-# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack
-org/jboss/test/ws/jaxws/jbws2960/**
-org/jboss/test/ws/jaxws/jbws2985/**
+# [JBWS-3020] Investigate why HandlerScopeTestCase fails
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+
+# [JBWS-3002] Verify POJO endpoints are shared
+org/jboss/test/ws/jaxws/jbws2486/**
+
Modified: stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/modules/testsuite/test-excludes-jboss601.txt 2010-05-20 03:17:02 UTC (rev 12283)
@@ -23,9 +23,6 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
-# [CXF-2723] Allow configuration of JaxWsClientFactoryBean during port creation
-org/jboss/test/ws/jaxws/cxf/jaxbintros/**
-
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
@@ -50,8 +47,17 @@
org/jboss/test/ws/jaxws/jbws2942/**
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
+org/jboss/test/ws/jaxws/jbws2991/**
+org/jboss/test/ws/jaxws/jbws3008/**
+org/jboss/test/ws/jaxws/jbws3022/**
org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*
+
+# [JBWS-3020] Investigate why HandlerScopeTestCase fails
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
+
+# [JBWS-3002] Verify POJO endpoints are shared
+org/jboss/test/ws/jaxws/jbws2486/**
+
Modified: stack/cxf/branches/jms-integration/pom.xml
===================================================================
--- stack/cxf/branches/jms-integration/pom.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/pom.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -16,6 +16,7 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
<packaging>pom</packaging>
+ <description>JBossWS CXF stack</description>
<version>3.3.0-SNAPSHOT</version>
@@ -23,7 +24,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.4.GA</version>
+ <version>1.0.6.GA</version>
</parent>
<!-- Source Control Management -->
@@ -48,14 +49,14 @@
<jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version>
<jbossws.jboss501.version>3.3.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.3.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600M2.version>3.3.0-SNAPSHOT</jbossws.jboss600M2.version>
+ <jbossws.jboss600M3.version>3.3.0-SNAPSHOT</jbossws.jboss600M3.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <cxf.version>2.2.6</cxf.version>
+ <cxf.version>2.2.8</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -134,13 +135,13 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M2</artifactId>
- <version>${jbossws.jboss600M2.version}</version>
+ <artifactId>jbossws-jboss600M3</artifactId>
+ <version>${jbossws.jboss600M3.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M2</artifactId>
- <version>${jbossws.jboss600M2.version}</version>
+ <artifactId>jbossws-jboss600M3</artifactId>
+ <version>${jbossws.jboss600M3.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -505,24 +506,6 @@
</plugins>
</build>
- <!-- Repositories -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <url>http://snapshots.jboss.org/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<!-- Profiles -->
<profiles>
<!--
Modified: stack/cxf/branches/jms-integration/profiles.xml.example
===================================================================
--- stack/cxf/branches/jms-integration/profiles.xml.example 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/profiles.xml.example 2010-05-20 03:17:02 UTC (rev 12283)
@@ -13,7 +13,7 @@
<properties>
<jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home>
- <jboss600.home>/opt/svn/jbossas/tags/JBoss_6_0_0_20100216-M2/build/target/jboss-6.0.0.20100216-M2</jboss600.home>
+ <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3</jboss600.home>
<jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home>
</properties>
</profile>
Modified: stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/src/main/distro/build-deploy.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -93,7 +93,7 @@
<target name="deploy-structure-jboss600" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf" inheritall="false">
+ <antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
@@ -122,7 +122,7 @@
<target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="true" /><!-- [JBWS-2505][JBWS-2895] -->
+ <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true" removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] -->
</target>
<!-- ================================================================== -->
Modified: stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 03:07:44 UTC (rev 12282)
+++ stack/cxf/branches/jms-integration/src/main/scripts/assembly-deploy-artifacts.xml 2010-05-20 03:17:02 UTC (rev 12283)
@@ -129,7 +129,7 @@
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss600M2:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600M3:jar</include>
</includes>
</dependencySet>
<!-- [JBWS-2505] -->
@@ -172,6 +172,16 @@
<include>jbossws-*/**</include>
</includes>
</fileSet>
+
+ <!-- management console and port component link servlet -->
+ <fileSet>
+ <directory>modules/management/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>jbossws-cxf-management.war</include>
+ <include>jbossws-cxf-management-pcl.war</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
15 years, 11 months
JBossWS SVN: r12282 - in container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main: java/org/jboss/webservices/integration/deployers/deployment and 3 other directories.
by jbossws-commits@lists.jboss.org
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"/>
15 years, 11 months
JBossWS SVN: r12280 - in spi/branches/jms-integration: src/main/java/org/jboss/wsf/spi/deployment and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2010-05-19 22:50:57 -0400 (Wed, 19 May 2010)
New Revision: 12280
Added:
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsFactory.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
Removed:
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/endpoints/
Modified:
spi/branches/jms-integration/pom.xml
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
Log:
[JBWS-2791]:Add HttpEndpoint,JMSEndpoint and JMSEndpointMetaData class;synched code with trunk
Modified: spi/branches/jms-integration/pom.xml
===================================================================
--- spi/branches/jms-integration/pom.xml 2010-05-20 02:24:07 UTC (rev 12279)
+++ spi/branches/jms-integration/pom.xml 2010-05-20 02:50:57 UTC (rev 12280)
@@ -5,6 +5,7 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
<packaging>jar</packaging>
+ <description>JBossWS SPI</description>
<version>1.3.0-SNAPSHOT</version>
@@ -12,7 +13,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.4.GA</version>
+ <version>1.0.6.GA</version>
</parent>
<!-- Source Control Management -->
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2010-05-20 02:24:07 UTC (rev 12279)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -32,7 +32,7 @@
{
public enum DeploymentType
{
- JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3,
+ JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_JMS;
};
public enum DeploymentState
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2010-05-20 02:24:07 UTC (rev 12279)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -33,5 +33,8 @@
public abstract Service newService();
- public abstract Endpoint newEndpoint(String targetBean);
+ public abstract Endpoint newHttpEndpoint(String targetBean);
+
+ public abstract Endpoint newJMSEndpoint(String targetBean);
+
}
Modified: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-05-20 02:24:07 UTC (rev 12279)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -84,19 +84,7 @@
/** Use the deployment classloader to load the bean */
Class getTargetBeanClass();
-
- /** Get the URL pattern for this endpoint */
- String getURLPattern();
-
- /** Set the URL pattern for this endpoint */
- void setURLPattern(String urlPattern);
-
- /** Get endpoint address */
- String getAddress();
-
- /** Set endpoint address */
- void setAddress(String address);
-
+
/** Set the request handler for this endpoint */
void setRequestHandler(RequestHandler handler);
@@ -132,4 +120,10 @@
/** Returns associated JNDI context with this endpoint. */
Context getJNDIContext();
+
+ /** Get endpoint address */
+ String getAddress();
+
+ /** Set endpoint address */
+ void setAddress(String address);
}
Added: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java (rev 0)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -0,0 +1,37 @@
+/*
+ * 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.wsf.spi.deployment;
+
+/**
+ * To represents a http transport endpoint
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public interface HttpEndpoint extends Endpoint
+{
+ /** Get the URL pattern for this endpoint */
+ String getURLPattern();
+
+ /** Set the URL pattern for this endpoint */
+ void setURLPattern(String urlPattern);
+
+}
Added: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java (rev 0)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -0,0 +1,50 @@
+/*
+ * 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.wsf.spi.deployment;
+
+import java.net.URI;
+
+/**
+ * To represent the jms transport endpoint
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public interface JMSEndpoint extends Endpoint
+{
+ //Set jms target destination
+ void setTargetDestination(String dest);
+
+ //Get jms target destination
+ String getTargetDestination();
+
+ //Set jms reply destination
+ void setReplyDestination(String replyTo);
+
+ //Get jms reply destination
+ String getReplyDestination();
+
+ //Set soap over jms requestURI
+ void setRequestURI(URI uri);
+
+ //Get soap over jms requestURI
+ URI getRequestURI();
+}
Added: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java (rev 0)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -0,0 +1,96 @@
+/*
+ * 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.wsf.spi.metadata.jms;
+
+/**
+ * JMS Meta data class contains the implementor and address information
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JMSEndpointMetaData
+{
+ //Endpoint name
+ private String name;
+
+ //port name
+ private String endpointName = "";
+
+ //implementor class
+ private String implementor = "";
+
+ //wsdl location
+ private String wsdlLocation = "";
+
+
+ //parent component
+ private JMSEndpointsMetaData endpointsMetaData = null;
+
+ public JMSEndpointMetaData(JMSEndpointsMetaData endpoints)
+ {
+ endpointsMetaData = endpoints;
+ }
+
+ public JMSEndpointsMetaData getParentMetaData()
+ {
+ return endpointsMetaData;
+ }
+
+ public String getImplementor()
+ {
+ return implementor;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getEndpointName()
+ {
+ return endpointName;
+ }
+
+ public String getWsdlLocation()
+ {
+ return wsdlLocation;
+ }
+
+ public void setImplementor(String implementor)
+ {
+ this.implementor = implementor;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public void setEndpointName(String endpointName)
+ {
+ this.endpointName = endpointName;
+ }
+
+ public void setWsdlLocation(String wsdlLocation)
+ {
+ this.wsdlLocation = wsdlLocation;
+ }
+
+}
Added: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsFactory.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsFactory.java (rev 0)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsFactory.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -0,0 +1,93 @@
+/*
+ * 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.wsf.spi.metadata.jms;
+
+import java.net.URL;
+
+import org.jboss.logging.Logger;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+/**
+ * JMS Endpoints OjbectModelFactory
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JMSEndpointsFactory implements ObjectModelFactory
+{
+ public static final String DESCRIPTOR_FILE = "jbossws-cxf.xml";
+
+ private URL descriptorURL;
+
+ public JMSEndpointsFactory(URL descriptorURL)
+ {
+ this.descriptorURL = descriptorURL;
+ }
+
+ /**
+ * This method is called on the factory by the object model builder when the parsing starts.
+ *
+ * @return the root of the object model.
+ */
+ public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
+ {
+ JMSEndpointsMetaData endpointsMetaData = new JMSEndpointsMetaData(descriptorURL);
+ return endpointsMetaData;
+ }
+
+ public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
+ {
+ return root;
+ }
+
+ /**
+ * Called when parsing of a new element started.
+ */
+ public Object newChild(JMSEndpointsMetaData endpoints, UnmarshallingContext navigator, String namespaceURI,
+ String localName, Attributes attrs)
+ {
+ if ("endpoint".equals(localName) && attrs.getValue("transportId").equals("http://cxf.apache.org/transports/jms"))
+ {
+ JMSEndpointMetaData endpoint = new JMSEndpointMetaData(endpoints);
+ endpoint.setName(attrs.getValue("name"));
+ endpoint.setImplementor(attrs.getValue("implementor"));
+ endpoint.setEndpointName(attrs.getValue("endpointName"));
+ endpoint.setWsdlLocation(attrs.getValue("wsdlLocation"));
+ return endpoint;
+
+ }
+ else
+ return null;
+ }
+
+ /**
+ * Called when parsing character is complete.
+ */
+ public void addChild(JMSEndpointsMetaData endpoints, JMSEndpointMetaData endpointMetaData, UnmarshallingContext navigator, String namespaceURI,
+ String localName)
+ {
+ endpoints.addEndpointMetaData(endpointMetaData);
+ }
+
+}
Added: spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java (rev 0)
+++ spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2010-05-20 02:50:57 UTC (rev 12280)
@@ -0,0 +1,62 @@
+/*
+ * 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.wsf.spi.metadata.jms;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>Meta data class from jbossws-cxf.xml</p>
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+
+public class JMSEndpointsMetaData
+{
+ //The endpoints list
+ private List<JMSEndpointMetaData> endpointsMetaData = new ArrayList<JMSEndpointMetaData>();
+
+ private URL descriptorURL;
+
+ public JMSEndpointsMetaData()
+ {
+ }
+
+ public JMSEndpointsMetaData(URL descriptorURL)
+ {
+ this.descriptorURL = descriptorURL;
+ }
+
+ public URL getDescriptorURL()
+ {
+ return descriptorURL;
+ }
+
+ public void addEndpointMetaData(JMSEndpointMetaData endpointMetaData)
+ {
+ endpointsMetaData.add(endpointMetaData);
+ }
+
+ public List<JMSEndpointMetaData> getEndpointsMetaData() {
+ return this.endpointsMetaData;
+ }
+}
15 years, 11 months
JBossWS SVN: r12279 - in common/branches/jms-integration: src/main/java/org/jboss/wsf/common and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2010-05-19 22:24:07 -0400 (Wed, 19 May 2010)
New Revision: 12279
Added:
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java
Modified:
common/branches/jms-integration/pom.xml
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
common/branches/jms-integration/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java
common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java
Log:
[JBWS-2791]:Add JMSDeploymentAspet class and synched code with trunk
Modified: common/branches/jms-integration/pom.xml
===================================================================
--- common/branches/jms-integration/pom.xml 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/pom.xml 2010-05-20 02:24:07 UTC (rev 12279)
@@ -7,6 +7,7 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
<packaging>jar</packaging>
+ <description>JBossWS Common</description>
<version>1.3.0-SNAPSHOT</version>
@@ -14,7 +15,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.4.GA</version>
+ <version>1.0.6.GA</version>
</parent>
<!-- Source Control Management -->
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -140,8 +140,8 @@
try
{
//get the jar and open it
- String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator));
- String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1);
+ String folder = jarRoot.substring(5,jarRoot.lastIndexOf("/"));
+ String filename = jarRoot.substring(jarRoot.lastIndexOf("/")+1);
final File jar = new File(folder, filename);
PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>()
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -151,8 +151,8 @@
try
{
- String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator));
- String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1);
+ String folder = jarRoot.substring(5,jarRoot.lastIndexOf("/"));
+ String filename = jarRoot.substring(jarRoot.lastIndexOf("/")+1);
final File jar = new File(folder, filename);
PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>()
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -28,6 +28,7 @@
import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.naming.Context;
+import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.xml.ws.WebServiceContext;
@@ -109,7 +110,7 @@
injectResourceAnnotatedAccessibleObjects(instance, injections, ctx);
// inject @EJB annotated methods and fields
- injectEJBAnnotatedAccessibleObjects(instance, injections, ctx);
+ injectEJBAnnotatedAccessibleObjects(instance, injections);
}
/**
@@ -323,10 +324,11 @@
* @see org.jboss.wsf.common.injection.finders.EJBMethodFinder
* @see javax.ejb.EJB
*/
- private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections, final Context ctx)
+ private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
final Collection<Field> ejbAnnotatedFields = EJB_FIELD_FINDER.process(instance.getClass());
final Collection<Method> ejbAnnotatedMethods = EJB_METHOD_FINDER.process(instance.getClass());
+ final Context ctx = InjectionHelper.getDefaultContext();
// Inject @EJB annotated fields
for (Field field : ejbAnnotatedFields)
@@ -496,4 +498,26 @@
return result.isEmpty() ? null : result.iterator().next();
}
+ /**
+ * Returns default JNDI context.
+ *
+ * @return default JNDI context
+ */
+ private static Context getDefaultContext()
+ {
+ Context ctx = null;
+
+ try
+ {
+ ctx = new InitialContext();
+ }
+ catch (NamingException ne)
+ {
+ final String message = "Cannot create default JNDI context";
+ InjectionException.rethrow(message, ne);
+ }
+
+ return ctx;
+ }
+
}
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -37,7 +37,7 @@
* method declaration if necessary. The name of the resource, if not declared, is the
* name of the JavaBeans property as determined starting from the name of the setter
* method in question. The setter method must follow the standard JavaBeans
- * convention - name starts with a “set”, void return type and only one parameter.
+ * convention - name starts with a 'set', void return type and only one parameter.
* Additionally, the type of the parameter must be compatible with the type specified
* as a property of the Resource if present.
*
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -36,7 +36,7 @@
* method declaration if necessary. The name of the resource, if not declared, is the
* name of the JavaBeans property as determined starting from the name of the setter
* method in question. The setter method must follow the standard JavaBeans
- * convention - name starts with a “set”, void return type and only one parameter.
+ * convention - name starts with a 'set', void return type and only one parameter.
* Additionally, the type of the parameter must be compatible with the type specified
* as a property of the Resource if present.
*
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -134,8 +134,8 @@
public boolean canHandle(Deployment dep)
{
- return (this.isForJaxWs && WSHelper.isJaxwsDeployment(dep) ||
- this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep));
+ return (this.isForJaxWs() && WSHelper.isJaxwsDeployment(dep) ||
+ this.isForJaxRpc() && WSHelper.isJaxrpcDeployment(dep));
}
public boolean isForJaxWs()
Added: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java (rev 0)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -0,0 +1,35 @@
+/*
+ * 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.wsf.common.integration;
+
+import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+
+public class JMSDeploymentAspect extends AbstractDeploymentAspect
+{
+ @Override
+ public boolean canHandle(Deployment dep)
+ {
+ return isForJaxWs() && dep.getAttachment(JMSEndpointsMetaData.class) != null;
+ }
+}
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -24,7 +24,6 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData;
/**
* Cross WS stack and JBoss AS integration helper.
@@ -134,6 +133,18 @@
{
return DeploymentType.JAXWS_JSE.equals( dep.getType() );
}
+
+
+ /**
+ * Returns true if deployment represents JAXWS JMS deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if JAXWS JMS deployment, false otherwise
+ */
+ public static boolean isJaxwsJmsDeployment( final Deployment dep )
+ {
+ return DeploymentType.JAXWS_JMS.equals(dep.getType());
+ }
/**
* Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
@@ -190,10 +201,4 @@
return isJaxrpcEjb || isJaxrpcJse;
}
-
- public static boolean hasEndpointsDeployment(final Deployment dep)
- {
- return WSHelper.getOptionalAttachment(dep, EndpointsMetaData.class) != null ? true : false;
- }
-
}
Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
===================================================================
--- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -97,7 +97,7 @@
log.debug("Using local host: " + localHost.getHostName());
host = localHost.getHostName();
}
- this.webServiceHost = host;
+ this.webServiceHost = "127.0.0.1".equals(host) ? "localhost" : host; // TCK workaround
}
public void setWebServicePort(int port)
Modified: common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java
===================================================================
--- common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -72,7 +72,7 @@
UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/");
assertNotNull(common);
- assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir
+ assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir
assertEquals("common/", common.getName());
List<UnifiedVirtualFile> children = common.getChildren();
assertNotNull(children);
Modified: common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java
===================================================================
--- common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-19 16:25:37 UTC (rev 12278)
+++ common/branches/jms-integration/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-20 02:24:07 UTC (rev 12279)
@@ -76,7 +76,7 @@
UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/");
assertNotNull(common);
- assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir
+ assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir
assertEquals("common/", common.getName());
List<UnifiedVirtualFile> children = common.getChildren();
assertNotNull(children);
15 years, 11 months
JBossWS SVN: r12278 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-05-19 12:25:37 -0400 (Wed, 19 May 2010)
New Revision: 12278
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
Log:
[JBPAPP-3960] Implement unimplemented DOM related methods in JBossWS SAAJ Implementation .
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2010-05-19 15:53:59 UTC (rev 12277)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2010-05-19 16:25:37 UTC (rev 12278)
@@ -31,7 +31,6 @@
import javax.xml.soap.SOAPException;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.DOMWriter;
@@ -596,20 +595,17 @@
public short compareDocumentPosition(Node other) throws DOMException
{
- // FIXME compareDocumentPosition
- throw new NotImplementedException("compareDocumentPosition");
+ return this.domNode.compareDocumentPosition(other);
}
public String getBaseURI()
{
- // FIXME getBaseURI
- throw new NotImplementedException("getBaseURI");
+ return this.domNode.getBaseURI();
}
public Object getFeature(String feature, String version)
{
- // FIXME getFeature
- throw new NotImplementedException("getFeature");
+ return this.domNode.getFeature(feature, version);
}
public String getTextContent() throws DOMException
@@ -628,8 +624,7 @@
public boolean isDefaultNamespace(String namespaceURI)
{
- // FIXME isDefaultNamespace
- throw new NotImplementedException("isDefaultNamespace");
+ return this.domNode.isDefaultNamespace(namespaceURI);
}
public boolean isEqualNode(Node arg)
@@ -639,20 +634,17 @@
public boolean isSameNode(Node other)
{
- // FIXME isSameNode
- throw new NotImplementedException("isSameNode");
+ return this.domNode.isSameNode(other);
}
public String lookupNamespaceURI(String prefix)
{
- // FIXME lookupNamespaceURI
- throw new NotImplementedException("lookupNamespaceURI");
+ return this.domNode.lookupNamespaceURI(prefix);
}
public String lookupPrefix(String namespaceURI)
{
- // FIXME lookupPrefix
- throw new NotImplementedException("lookupPrefix");
+ return this.domNode.lookupPrefix(namespaceURI);
}
public void setTextContent(String textContent) throws DOMException
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2010-05-19 15:53:59 UTC (rev 12277)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2010-05-19 16:25:37 UTC (rev 12278)
@@ -21,6 +21,7 @@
*/
package org.jboss.ws.core.soap;
+import org.apache.xerces.dom.DocumentImpl;
import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -46,10 +47,11 @@
* enscapsulates a single ThreadLocal Document object.
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public class SOAPDocument implements Document
+@SuppressWarnings("serial")
+public class SOAPDocument extends DocumentImpl implements Document
{
- // TODO Revisit methods that are restricted or not implemented.
private Document doc = DOMUtils.getOwnerDocument();
@@ -57,18 +59,17 @@
public DocumentType getDoctype()
{
- return doc.getDoctype();
+ return null;
}
public DOMImplementation getImplementation()
{
- // Should this be allowed?
- return doc.getImplementation();
+ return this.doc.getImplementation();
}
public Element getDocumentElement()
{
- // The base SOAPDocument does not have an element, only SOAPPart will
+ // The base SOAPDocument does not have an element, only SOAPPart will have
return null;
}
@@ -79,50 +80,47 @@
public DocumentFragment createDocumentFragment()
{
- return doc.createDocumentFragment();
+ return this.doc.createDocumentFragment();
}
public Text createTextNode(String data)
{
- return doc.createTextNode(data);
+ return this.doc.createTextNode(data);
}
public Comment createComment(String data)
{
- return doc.createComment(data);
+ return this.doc.createComment(data);
}
public CDATASection createCDATASection(String data) throws DOMException
{
- return doc.createCDATASection(data);
+ return this.doc.createCDATASection(data);
}
public ProcessingInstruction createProcessingInstruction(String target, String data) throws DOMException
{
- return doc.createProcessingInstruction(target, data);
+ return this.doc.createProcessingInstruction(target, data);
}
public Attr createAttribute(String name) throws DOMException
{
- return doc.createAttribute(name);
+ return this.doc.createAttribute(name);
}
public EntityReference createEntityReference(String name) throws DOMException
{
- // Not allowed
- return null;
+ throw new UnsupportedOperationException("Entity References are not allowed in SOAP documents");
}
public NodeList getElementsByTagName(String tagname)
{
- // The base SOAPDocument does not have an element, only SOAPPart will
- return null;
+ return this.doc.getElementsByTagName(tagname);
}
public Node importNode(Node importedNode, boolean deep) throws DOMException
{
- // This should never be needed
- return doc.importNode(importedNode, deep);
+ return this.doc.importNode(importedNode, deep);
}
public Element createElementNS(String namespaceURI, String qualifiedName) throws DOMException
@@ -140,300 +138,270 @@
public Attr createAttributeNS(String namespaceURI, String qualifiedName) throws DOMException
{
- return doc.createAttributeNS(namespaceURI, qualifiedName);
+ return this.doc.createAttributeNS(namespaceURI, qualifiedName);
}
public NodeList getElementsByTagNameNS(String namespaceURI, String localName)
{
- // The base SOAPDocument does not have an element, only SOAPPart will
- return null;
+ return this.doc.getElementsByTagNameNS(namespaceURI, localName);
}
- public Element getElementById(String elementId)
- {
- // The base SOAPDocument does not have an element, only SOAPPart will
- return null;
- }
-
// Node methods
public String getNodeName()
{
- return doc.getNodeName();
+ return this.doc.getNodeName();
}
public String getNodeValue() throws DOMException
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getNodeValue();
}
public void setNodeValue(String nodeValue) throws DOMException
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ this.doc.setNodeValue(nodeValue);
}
public short getNodeType()
{
- return doc.getNodeType();
+ return this.doc.getNodeType();
}
public Node getParentNode()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getParentNode();
}
public NodeList getChildNodes()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getChildNodes();
}
public Node getFirstChild()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getFirstChild();
}
public Node getLastChild()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getLastChild();
}
public Node getPreviousSibling()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getPreviousSibling();
}
public Node getNextSibling()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getNextSibling();
}
public NamedNodeMap getAttributes()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getAttributes();
}
- public Document getOwnerDocument()
- {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
- }
-
public Node insertBefore(Node newChild, Node refChild) throws DOMException
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.insertBefore(newChild, refChild);
}
public Node replaceChild(Node newChild, Node oldChild) throws DOMException
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.replaceChild(newChild, oldChild);
}
public Node removeChild(Node oldChild) throws DOMException
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.removeChild(oldChild);
}
public Node appendChild(Node newChild) throws DOMException
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.appendChild(newChild);
}
public boolean hasChildNodes()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.hasChildNodes();
}
public Node cloneNode(boolean deep)
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.cloneNode(deep);
}
public void normalize()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ this.doc.normalize();
}
public boolean isSupported(String feature, String version)
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.isSupported(feature, version);
}
public String getNamespaceURI()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getNamespaceURI();
}
public String getPrefix()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getPrefix();
}
public void setPrefix(String prefix) throws DOMException
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ this.doc.setPrefix(prefix);
}
public String getLocalName()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.getLocalName();
}
public boolean hasAttributes()
{
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Node operations not allowed on SOAPDocument");
+ return this.doc.hasAttributes();
}
// DOM3 methods
public String getInputEncoding()
{
- // FIXME getInputEncoding
- return null;
+ return this.doc.getInputEncoding();
}
public String getXmlEncoding()
{
- // FIXME getXmlEncoding
- return null;
+ return this.doc.getXmlEncoding();
}
public boolean getXmlStandalone()
{
- // FIXME getXmlStandalone
- return false;
+ return this.doc.getXmlStandalone();
}
- public void setXmlStandalone(boolean arg0) throws DOMException
+ public void setXmlStandalone(boolean xmlStandalone) throws DOMException
{
- // FIXME setXmlStandalone
+ this.doc.setXmlStandalone(xmlStandalone);
}
public String getXmlVersion()
{
- // FIXME getXmlVersion
- return null;
+ return this.doc.getXmlVersion();
}
- public void setXmlVersion(String arg0) throws DOMException
+ public void setXmlVersion(String xmlVersion) throws DOMException
{
- // FIXME setXmlVersion
+ this.doc.setXmlVersion(xmlVersion);
}
public boolean getStrictErrorChecking()
{
- // FIXME getStrictErrorChecking
- return false;
+ return this.doc.getStrictErrorChecking();
}
- public void setStrictErrorChecking(boolean arg0)
+ public void setStrictErrorChecking(boolean strictErrorChecking)
{
- // FIXME setStrictErrorChecking
-
+ this.doc.setStrictErrorChecking(strictErrorChecking);
}
public String getDocumentURI()
{
- // FIXME getDocumentURI
- return null;
+ return this.doc.getDocumentURI();
}
- public void setDocumentURI(String arg0)
+ public void setDocumentURI(String documentURI)
{
- // FIXME setDocumentURI
-
+ this.doc.setDocumentURI(documentURI);
}
- public Node adoptNode(Node arg0) throws DOMException
+ public Node adoptNode(Node source) throws DOMException
{
- // FIXME adoptNode
- return null;
+ return this.doc.adoptNode(source);
}
public DOMConfiguration getDomConfig()
{
- // FIXME getDomConfig
- return null;
+ return this.doc.getDomConfig();
}
public void normalizeDocument()
{
- // FIXME normalizeDocument
-
+ this.doc.normalizeDocument();
}
- public Node renameNode(Node arg0, String arg1, String arg2) throws DOMException
+ public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException
{
- // FIXME renameNode
- return null;
+ return this.doc.renameNode(n, namespaceURI, qualifiedName);
}
public String getBaseURI()
{
- // FIXME getBaseURI
- return null;
+ return this.doc.getBaseURI();
}
- public short compareDocumentPosition(Node arg0) throws DOMException
+ public short compareDocumentPosition(Node other) throws DOMException
{
- // FIXME compareDocumentPosition
- return 0;
+ return this.doc.compareDocumentPosition(other);
}
public String getTextContent() throws DOMException
{
- // FIXME getTextContent
- return null;
+ return this.doc.getTextContent();
}
- public void setTextContent(String arg0) throws DOMException
+ public void setTextContent(String textContent) throws DOMException
{
- // FIXME setTextContent
-
+ this.doc.setTextContent(textContent);
}
- public boolean isSameNode(Node arg0)
+ public boolean isSameNode(Node other)
{
- // FIXME isSameNode
- return false;
+ return this.doc.isSameNode(other);
}
- public String lookupPrefix(String arg0)
+ public String lookupPrefix(String namespaceURI)
{
- // FIXME lookupPrefix
- return null;
+ return this.doc.lookupPrefix(namespaceURI);
}
- public boolean isDefaultNamespace(String arg0)
+ public boolean isDefaultNamespace(String namespaceURI)
{
- // FIXME isDefaultNamespace
- return false;
+ return this.doc.isDefaultNamespace(namespaceURI);
}
- public String lookupNamespaceURI(String arg0)
+ public String lookupNamespaceURI(String prefix)
{
- // FIXME lookupNamespaceURI
- return null;
+ return this.doc.lookupNamespaceURI(prefix);
}
- public boolean isEqualNode(Node arg0)
+ public boolean isEqualNode(Node arg)
{
- // FIXME isEqualNode
- return false;
+ return this.doc.isEqualNode(arg);
}
- public Object getFeature(String arg0, String arg1)
+ public Object getFeature(String feature, String version)
{
- // FIXME hasFeature
- return null;
+ return this.doc.getFeature(feature, version);
}
- public Object setUserData(String arg0, Object arg1, UserDataHandler arg2)
+ public Object setUserData(String key, Object data, UserDataHandler handler)
{
- // FIXME setUserData
- return null;
+ return this.doc.setUserData(key, data, handler);
}
public Object getUserData(String arg0)
{
- // FIXME getUserData
- return null;
+ return this.doc.getUserData(arg0);
}
+
+ public Element getElementById(String elementId)
+ {
+ return this.doc.getElementById(elementId);
+ }
+
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2010-05-19 15:53:59 UTC (rev 12277)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2010-05-19 16:25:37 UTC (rev 12278)
@@ -37,7 +37,6 @@
import javax.xml.soap.Text;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.wsf.common.DOMUtils;
@@ -807,22 +806,22 @@
public TypeInfo getSchemaTypeInfo()
{
- throw new NotImplementedException("getSchemaTypeInfo");
+ return this.element.getSchemaTypeInfo();
}
public void setIdAttribute(String name, boolean isId) throws DOMException
{
- throw new NotImplementedException("setIdAttribute");
+ this.element.setIdAttribute(name, isId);
}
public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException
{
- throw new NotImplementedException("setIdAttributeNode");
+ this.element.setIdAttributeNode(idAttr, isId);
}
public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException
{
- throw new NotImplementedException("setIdAttributeNS");
+ this.element.setIdAttributeNS(namespaceURI, localName, isId);
}
public void accept(SAAJVisitor visitor)
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2010-05-19 15:53:59 UTC (rev 12277)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2010-05-19 16:25:37 UTC (rev 12278)
@@ -39,7 +39,6 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.wsf.spi.util.ServiceLoader;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -61,8 +60,8 @@
/** An implementation of SOAPPart.
*
- *
* @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public class SOAPPartImpl extends SOAPPart
{
@@ -208,104 +207,104 @@
public DOMImplementation getImplementation()
{
- return doc.getImplementation();
+ return this.doc.getImplementation();
}
public DocumentFragment createDocumentFragment()
{
- return doc.createDocumentFragment();
+ return this.doc.createDocumentFragment();
}
public DocumentType getDoctype()
{
- return doc.getDoctype();
+ return this.doc.getDoctype();
}
public Element getDocumentElement()
{
- return soapEnvelope;
+ return this.soapEnvelope;
}
public Attr createAttribute(String name) throws DOMException
{
- return doc.createAttribute(name);
+ return this.doc.createAttribute(name);
}
public CDATASection createCDATASection(String data) throws DOMException
{
- return doc.createCDATASection(data);
+ return this.doc.createCDATASection(data);
}
public Comment createComment(String data)
{
- return doc.createComment(data);
+ return this.doc.createComment(data);
}
public Element createElement(String tagName) throws DOMException
{
- return doc.createElement(tagName);
+ return this.doc.createElement(tagName);
}
public Element getElementById(String elementId)
{
- return doc.getElementById(elementId);
+ return this.doc.getElementById(elementId);
}
public EntityReference createEntityReference(String name) throws DOMException
{
- return doc.createEntityReference(name);
+ return this.doc.createEntityReference(name);
}
public org.w3c.dom.Node importNode(org.w3c.dom.Node importedNode, boolean deep) throws DOMException
{
- return doc.importNode(importedNode, deep);
+ return this.doc.importNode(importedNode, deep);
}
public NodeList getElementsByTagName(String tagname)
{
- return doc.getElementsByTagName(tagname);
+ return this.doc.getElementsByTagName(tagname);
}
public Text createTextNode(String data)
{
- return doc.createTextNode(data);
+ return this.doc.createTextNode(data);
}
public Attr createAttributeNS(String namespaceURI, String qualifiedName) throws DOMException
{
- return doc.createAttributeNS(namespaceURI, qualifiedName);
+ return this.doc.createAttributeNS(namespaceURI, qualifiedName);
}
public Element createElementNS(String namespaceURI, String qualifiedName) throws DOMException
{
- return doc.createElementNS(namespaceURI, qualifiedName);
+ return this.doc.createElementNS(namespaceURI, qualifiedName);
}
public NodeList getElementsByTagNameNS(String namespaceURI, String localName)
{
- return doc.getElementsByTagNameNS(namespaceURI, localName);
+ return this.doc.getElementsByTagNameNS(namespaceURI, localName);
}
public ProcessingInstruction createProcessingInstruction(String target, String data) throws DOMException
{
- return doc.createProcessingInstruction(target, data);
+ return this.doc.createProcessingInstruction(target, data);
}
// Node *********************************************************************************************************
- public org.w3c.dom.Node appendChild(org.w3c.dom.Node node) throws DOMException
+ public org.w3c.dom.Node appendChild(org.w3c.dom.Node newChild) throws DOMException
{
- throw new NotImplementedException();
+ return this.doc.appendChild(newChild);
}
- public org.w3c.dom.Node cloneNode(boolean b)
+ public org.w3c.dom.Node cloneNode(boolean deep)
{
- throw new NotImplementedException();
+ return this.doc.cloneNode(deep);
}
public NamedNodeMap getAttributes()
{
- throw new NotImplementedException();
+ return this.doc.getAttributes();
}
public NodeList getChildNodes()
@@ -330,17 +329,17 @@
public String getLocalName()
{
- throw new NotImplementedException();
+ return this.doc.getLocalName();
}
public String getNamespaceURI()
{
- throw new NotImplementedException();
+ return this.doc.getNamespaceURI();
}
public org.w3c.dom.Node getNextSibling()
{
- throw new NotImplementedException();
+ return this.doc.getNextSibling();
}
public String getNodeName()
@@ -355,237 +354,232 @@
public String getNodeValue() throws DOMException
{
- throw new NotImplementedException();
+ return this.doc.getNodeValue();
}
public Document getOwnerDocument()
{
- return doc;
+ return this.doc;
}
public org.w3c.dom.Node getParentNode()
{
- throw new NotImplementedException();
+ return this.doc.getParentNode();
}
public String getPrefix()
{
- throw new NotImplementedException();
+ return this.doc.getPrefix();
}
public org.w3c.dom.Node getPreviousSibling()
{
- throw new NotImplementedException();
+ return this.doc.getPreviousSibling();
}
public boolean hasAttributes()
{
- throw new NotImplementedException();
+ return this.doc.hasAttributes();
}
public boolean hasChildNodes()
{
- throw new NotImplementedException();
+ return this.doc.hasChildNodes();
}
- public org.w3c.dom.Node insertBefore(org.w3c.dom.Node node, org.w3c.dom.Node node1) throws DOMException
+ public org.w3c.dom.Node insertBefore(org.w3c.dom.Node newChild, org.w3c.dom.Node refChild) throws DOMException
{
- throw new NotImplementedException();
+ return this.doc.insertBefore(newChild, refChild);
}
- public boolean isSupported(String s, String s1)
+ public boolean isSupported(String feature, String version)
{
- throw new NotImplementedException();
+ return this.doc.isSupported(feature, version);
}
public void normalize()
{
- throw new NotImplementedException();
+ this.doc.normalize();
}
- public org.w3c.dom.Node removeChild(org.w3c.dom.Node node) throws DOMException
+ public org.w3c.dom.Node removeChild(org.w3c.dom.Node oldChild) throws DOMException
{
- throw new NotImplementedException();
+ return this.doc.removeChild(oldChild);
}
- public org.w3c.dom.Node replaceChild(org.w3c.dom.Node node, org.w3c.dom.Node node1) throws DOMException
+ public org.w3c.dom.Node replaceChild(org.w3c.dom.Node newChild, org.w3c.dom.Node oldChild) throws DOMException
{
- throw new NotImplementedException();
+ return this.doc.replaceChild(newChild, oldChild);
}
- public void setNodeValue(String s) throws DOMException
+ public void setNodeValue(String nodeValue) throws DOMException
{
- throw new NotImplementedException();
+ this.doc.setNodeValue(nodeValue);
}
public void setPrefix(String s) throws DOMException
{
- throw new NotImplementedException();
+ this.doc.setPrefix(s);
}
public Node adoptNode(Node source) throws DOMException
{
- throw new NotImplementedException("adoptNode");
+ return this.doc.adoptNode(source);
}
public String getDocumentURI()
{
- throw new NotImplementedException("getDocumentURI");
+ return this.doc.getDocumentURI();
}
public DOMConfiguration getDomConfig()
{
- throw new NotImplementedException("getDomConfig");
+ return this.doc.getDomConfig();
}
public String getInputEncoding()
{
- throw new NotImplementedException("getInputEncoding");
+ return this.doc.getInputEncoding();
}
public boolean getStrictErrorChecking()
{
- throw new NotImplementedException("getStrictErrorChecking");
+ return this.doc.getStrictErrorChecking();
}
public String getXmlEncoding()
{
- throw new NotImplementedException("getXmlEncoding");
+ return this.doc.getXmlEncoding();
}
public boolean getXmlStandalone()
{
- throw new NotImplementedException("getXmlStandalone");
+ return this.doc.getXmlStandalone();
}
public String getXmlVersion()
{
- throw new NotImplementedException("getXmlVersion");
+ return this.doc.getXmlVersion();
}
public void normalizeDocument()
{
- throw new NotImplementedException("normalizeDocument");
+ this.doc.normalizeDocument();
}
public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException
{
- throw new NotImplementedException("renameNode");
+ return this.doc.renameNode(n, namespaceURI, qualifiedName);
}
public void setDocumentURI(String documentURI)
{
- throw new NotImplementedException("setDocumentURI");
+ this.doc.setDocumentURI(documentURI);
}
public void setStrictErrorChecking(boolean strictErrorChecking)
{
- throw new NotImplementedException("setStrictErrorChecking");
+ this.doc.setStrictErrorChecking(strictErrorChecking);
}
public void setXmlStandalone(boolean xmlStandalone) throws DOMException
{
- throw new NotImplementedException("setXmlStandalone");
+ this.doc.setXmlStandalone(xmlStandalone);
}
public void setXmlVersion(String xmlVersion) throws DOMException
{
- throw new NotImplementedException("setXmlVersion");
+ this.doc.setXmlVersion(xmlVersion);
}
public short compareDocumentPosition(Node other) throws DOMException
{
- throw new NotImplementedException("compareDocumentPosition");
+ return this.doc.compareDocumentPosition(other);
}
public String getBaseURI()
{
- throw new NotImplementedException("getBaseURI");
+ return this.doc.getBaseURI();
}
public Object getFeature(String feature, String version)
{
- throw new NotImplementedException("getFeature");
+ return this.doc.getFeature(feature, version);
}
public String getTextContent() throws DOMException
{
- throw new NotImplementedException("getTextContent");
+ return this.doc.getTextContent();
}
public Object getUserData(String key)
{
- throw new NotImplementedException("getUserData");
+ return this.doc.getUserData(key);
}
public boolean isDefaultNamespace(String namespaceURI)
{
- throw new NotImplementedException("isDefaultNamespace");
+ return this.doc.isDefaultNamespace(namespaceURI);
}
public boolean isEqualNode(Node arg)
{
- throw new NotImplementedException("isEqualNode");
+ return this.doc.isEqualNode(arg);
}
public boolean isSameNode(Node other)
{
- throw new NotImplementedException("isSameNode");
+ return this.doc.isSameNode(other);
}
public String lookupNamespaceURI(String prefix)
{
- throw new NotImplementedException("lookupNamespaceURI");
+ return this.doc.lookupNamespaceURI(prefix);
}
public String lookupPrefix(String namespaceURI)
{
- throw new NotImplementedException("lookupPrefix");
+ return this.doc.lookupPrefix(namespaceURI);
}
public void setTextContent(String textContent) throws DOMException
{
- throw new NotImplementedException("setTextContent");
+ this.doc.setTextContent(textContent);
}
public Object setUserData(String key, Object data, UserDataHandler handler)
{
- throw new NotImplementedException("setUserData");
+ return this.doc.setUserData(key, data, handler);
}
public void detachNode()
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ // does nothing
}
public SOAPElement getParentElement()
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ return null;
}
public String getValue()
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ return null;
}
public void recycleNode()
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ // does nothing
}
public void setParentElement(SOAPElement parent) throws SOAPException
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ throw new SOAPException("The parent element of a soap part is not defined");
}
public void setValue(String value)
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ throw new IllegalStateException("Setting value of a soap part is not defined");
}
+
}
15 years, 11 months
JBossWS SVN: r12277 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/scripts and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-05-19 11:53:59 -0400 (Wed, 19 May 2010)
New Revision: 12277
Added:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/CommentImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-3960] org.jboss.ws.core.soap.TextImpl does not implement org.w3c.dom.Comment.
Copied: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/CommentImpl.java (from rev 10326, stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/CommentImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/CommentImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/CommentImpl.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,37 @@
+/*
+ * 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.ws.core.soap;
+
+/**
+ * A representation of a node whose value is text. A Text
+ * object may represent text that is content or text that is a comment.
+ *
+ */
+public class CommentImpl extends TextImpl implements org.w3c.dom.Comment
+{
+
+ public CommentImpl(org.w3c.dom.Node node)
+ {
+ super(node);
+ }
+
+}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2010-05-19 15:34:36 UTC (rev 12276)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -561,7 +561,7 @@
}
else if (node instanceof org.w3c.dom.Comment)
{
- retNode = new TextImpl(node);
+ retNode = new CommentImpl(node);
}
else if (node instanceof org.w3c.dom.Element)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-05-19 15:34:36 UTC (rev 12276)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -525,6 +525,18 @@
<exclude name="org/jboss/test/ws/jaxws/jbws2486/*TestCase.class" />
</classes>
</war>
+
+ <!-- jaxws-jbws2526 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2526.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2526/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
<!-- jaxws-jbws2565 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565.jar">
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526 (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,50 +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.test.ws.jaxws.jbws2526;
-
-import javax.jws.HandlerChain;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- * Test endpoint.
- *
- */
-@WebService(name = "Port", serviceName = "Service", portName = "Port", targetNamespace = "urn:JBWS-2526-Service", wsdlLocation = "WEB-INF/wsdl/jbws2526.wsdl")
-@HandlerChain(file = "server-handlers.xml")
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-public class Endpoint
-{
-
- @WebMethod
- @WebResult(name = "Response", targetNamespace = "urn:JBWS-2526-Schema", partName = "response")
- public Response evaluate(@WebParam(name = "Request", targetNamespace = "urn:JBWS-2526-Schema", partName = "request") Request request)
- {
- Response response = new Response();
- response.setValue(request.getValue1() * request.getValue2());
- return response;
- }
-
-}
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Endpoint.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,50 @@
+/*
+ * 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.test.ws.jaxws.jbws2526;
+
+import javax.jws.HandlerChain;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * Test endpoint.
+ *
+ */
+@WebService(name = "Port", serviceName = "Service", portName = "Port", targetNamespace = "urn:JBWS-2526-Service", wsdlLocation = "WEB-INF/wsdl/jbws2526.wsdl")
+@HandlerChain(file = "server-handlers.xml")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public class Endpoint
+{
+
+ @WebMethod
+ @WebResult(name = "Response", targetNamespace = "urn:JBWS-2526-Schema", partName = "response")
+ public Response evaluate(@WebParam(name = "Request", targetNamespace = "urn:JBWS-2526-Schema", partName = "request") Request request)
+ {
+ Response response = new Response();
+ response.setValue(request.getValue1() * request.getValue2());
+ return response;
+ }
+
+}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,78 +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.test.ws.jaxws.jbws2526;
-
-import java.net.URL;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPMessage;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-2526] org.jboss.ws.core.soap.TextImpl does not implement
- * org.w3c.dom.Comment.
- *
- * @author <a href="mailto:gturner@unzane.com">Gerald Turner</a>
- */
-public class JBWS2526TestCase extends JBossWSTest
-{
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2526TestCase.class, "jaxws-jbws2526.war");
- }
-
- public void testWithoutComment() throws Exception
- {
- test("jaxws/jbws2526/request-message-without-comment.xml");
- }
-
- public void testWithComment() throws Exception
- {
- test("jaxws/jbws2526/request-message-with-comment.xml");
- }
-
- private void test(String requestFile) throws Exception
- {
- URL requestURL = getResourceFile(requestFile).toURL();
- MessageFactory messageFactory = MessageFactory.newInstance();
- SOAPMessage requestMessage = messageFactory.createMessage(null, requestURL.openStream());
- URL endpointURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2526/");
- SOAPConnection connection = SOAPConnectionFactory.newInstance().createConnection();
- SOAPMessage responseMessage = connection.call(requestMessage, endpointURL);
- SOAPBody responseBody = responseMessage.getSOAPPart().getEnvelope().getBody();
-
- assertFalse(responseBody.hasFault());
-
- // Assume request-message-*.xml has Value1 = 9
- // LogicalHandler will replace Value2 = 2
- assertEquals("18", responseBody.getFirstChild().getFirstChild().getFirstChild().getNodeValue());
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,78 @@
+/*
+ * 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.test.ws.jaxws.jbws2526;
+
+import java.net.URL;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2526] org.jboss.ws.core.soap.TextImpl does not implement
+ * org.w3c.dom.Comment.
+ *
+ * @author <a href="mailto:gturner@unzane.com">Gerald Turner</a>
+ */
+public class JBWS2526TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2526TestCase.class, "jaxws-jbws2526.war");
+ }
+
+ public void testWithoutComment() throws Exception
+ {
+ test("jaxws/jbws2526/request-message-without-comment.xml");
+ }
+
+ public void testWithComment() throws Exception
+ {
+ test("jaxws/jbws2526/request-message-with-comment.xml");
+ }
+
+ private void test(String requestFile) throws Exception
+ {
+ URL requestURL = getResourceFile(requestFile).toURL();
+ MessageFactory messageFactory = MessageFactory.newInstance();
+ SOAPMessage requestMessage = messageFactory.createMessage(null, requestURL.openStream());
+ URL endpointURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2526/");
+ SOAPConnection connection = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage responseMessage = connection.call(requestMessage, endpointURL);
+ SOAPBody responseBody = responseMessage.getSOAPPart().getEnvelope().getBody();
+
+ assertFalse(responseBody.hasFault());
+
+ // Assume request-message-*.xml has Value1 = 9
+ // LogicalHandler will replace Value2 = 2
+ assertEquals("18", responseBody.getFirstChild().getFirstChild().getFirstChild().getNodeValue());
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,71 +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.test.ws.jaxws.jbws2526;
-
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.LogicalMessage;
-import javax.xml.ws.handler.LogicalMessageContext;
-import javax.xml.ws.handler.MessageContext;
-
-import org.jboss.ws.WSException;
-import org.jboss.wsf.common.handler.GenericLogicalHandler;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Logical handler implementation.
- *
- */
-public class LogicalHandler extends GenericLogicalHandler
-{
-
- @Override
- protected boolean handleInbound(MessageContext messageContext)
- {
- LogicalMessageContext context = (LogicalMessageContext)messageContext;
- LogicalMessage message = context.getMessage();
- Object payload = message.getPayload();
- if (!(payload instanceof DOMSource))
- throw new WSException("Test requires DOMSource payload");
-
- Node node = ((DOMSource)payload).getNode();
- NodeList nodes = node.getChildNodes();
- for (int i = 0; i < nodes.getLength(); i++)
- {
- Node current = nodes.item(i);
- if (current.getNodeType() == Node.COMMENT_NODE)
- {
- if (!(current instanceof Comment))
- throw new WSException("Found comment node that does not implement org.w3c.dom.Comment");
- }
- else if ("Value2".equals(current.getLocalName()))
- {
- Node child = current.getFirstChild();
- child.setNodeValue("2");
- }
- }
-
- return true;
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/LogicalHandler.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,71 @@
+/*
+ * 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.test.ws.jaxws.jbws2526;
+
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.LogicalMessage;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.ws.WSException;
+import org.jboss.wsf.common.handler.GenericLogicalHandler;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Logical handler implementation.
+ *
+ */
+public class LogicalHandler extends GenericLogicalHandler
+{
+
+ @Override
+ protected boolean handleInbound(MessageContext messageContext)
+ {
+ LogicalMessageContext context = (LogicalMessageContext)messageContext;
+ LogicalMessage message = context.getMessage();
+ Object payload = message.getPayload();
+ if (!(payload instanceof DOMSource))
+ throw new WSException("Test requires DOMSource payload");
+
+ Node node = ((DOMSource)payload).getNode();
+ NodeList nodes = node.getChildNodes();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ Node current = nodes.item(i);
+ if (current.getNodeType() == Node.COMMENT_NODE)
+ {
+ if (!(current instanceof Comment))
+ throw new WSException("Found comment node that does not implement org.w3c.dom.Comment");
+ }
+ else if ("Value2".equals(current.getLocalName()))
+ {
+ Node child = current.getFirstChild();
+ child.setNodeValue("2");
+ }
+ }
+
+ return true;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,66 +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.test.ws.jaxws.jbws2526;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Test request parameter.
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "Request", namespace = "urn:JBWS-2526-Schema")
-@XmlType(name = "", propOrder = { "value1", "value2" })
-public class Request
-{
-
- @XmlElement(name = "Value1", required = true, namespace = "urn:JBWS-2526-Schema")
- protected int value1;
-
- @XmlElement(name = "Value2", required = true, namespace = "urn:JBWS-2526-Schema")
- protected int value2;
-
- public int getValue1()
- {
- return value1;
- }
-
- public void setValue1(int value1)
- {
- this.value1 = value1;
- }
-
- public int getValue2()
- {
- return value2;
- }
-
- public void setValue2(int value2)
- {
- this.value2 = value2;
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Request.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,66 @@
+/*
+ * 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.test.ws.jaxws.jbws2526;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Test request parameter.
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "Request", namespace = "urn:JBWS-2526-Schema")
+@XmlType(name = "", propOrder = { "value1", "value2" })
+public class Request
+{
+
+ @XmlElement(name = "Value1", required = true, namespace = "urn:JBWS-2526-Schema")
+ protected int value1;
+
+ @XmlElement(name = "Value2", required = true, namespace = "urn:JBWS-2526-Schema")
+ protected int value2;
+
+ public int getValue1()
+ {
+ return value1;
+ }
+
+ public void setValue1(int value1)
+ {
+ this.value1 = value1;
+ }
+
+ public int getValue2()
+ {
+ return value2;
+ }
+
+ public void setValue2(int value2)
+ {
+ this.value2 = value2;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,51 +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.test.ws.jaxws.jbws2526;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Test response parameter.
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "Response", namespace = "urn:JBWS-2526-Schema")
-public class Response
-{
-
- @XmlElement(name = "Value", required = true, namespace = "urn:JBWS-2526-Schema")
- protected int value;
-
- public int getValue()
- {
- return value;
- }
-
- public void setValue(int value)
- {
- this.value = value;
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/Response.java 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,51 @@
+/*
+ * 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.test.ws.jaxws.jbws2526;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Test response parameter.
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "Response", namespace = "urn:JBWS-2526-Schema")
+public class Response
+{
+
+ @XmlElement(name = "Value", required = true, namespace = "urn:JBWS-2526-Schema")
+ protected int value;
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public void setValue(int value)
+ {
+ this.value = value;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- javaee_web_services_1_2.xsd">
- <handler-chain>
- <handler>
- <handler-name>LogicalServerHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxws.jbws2526.LogicalHandler</handler-class>
- </handler>
- </handler-chain>
-</handler-chains>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ javaee_web_services_1_2.xsd">
+ <handler-chain>
+ <handler>
+ <handler-name>LogicalServerHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws2526.LogicalHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526 (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526)
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <servlet>
- <servlet-name>Endpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2526.Endpoint</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Endpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/web.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <servlet>
+ <servlet-name>Endpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2526.Endpoint</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Endpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="JBWS-2526"
- targetNamespace="urn:JBWS-2526-Service"
- xmlns:service="urn:JBWS-2526-Service"
- xmlns:schema="urn:JBWS-2526-Schema"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <types>
- <xs:schema>
- <xs:import namespace="urn:JBWS-2526-Schema"
- schemaLocation="jbws2526.xsd"/>
- </xs:schema>
- </types>
-
- <message name="Request">
- <part name="request" element="schema:Request"/>
- </message>
- <message name="Response">
- <part name="response" element="schema:Response"/>
- </message>
-
- <portType name="Port">
- <operation name="evaluate">
- <input message="service:Request"/>
- <output message="service:Response"/>
- </operation>
- </portType>
-
- <binding name="Binding" type="service:Port">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="evaluate">
- <soap:operation/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
- <service name="Service">
- <port binding="service:Binding" name="Port">
- <soap:address location="http://localhost:8080/jaxws-jbws2526"/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="JBWS-2526"
+ targetNamespace="urn:JBWS-2526-Service"
+ xmlns:service="urn:JBWS-2526-Service"
+ xmlns:schema="urn:JBWS-2526-Schema"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xs:schema>
+ <xs:import namespace="urn:JBWS-2526-Schema"
+ schemaLocation="jbws2526.xsd"/>
+ </xs:schema>
+ </types>
+
+ <message name="Request">
+ <part name="request" element="schema:Request"/>
+ </message>
+ <message name="Response">
+ <part name="response" element="schema:Response"/>
+ </message>
+
+ <portType name="Port">
+ <operation name="evaluate">
+ <input message="service:Request"/>
+ <output message="service:Response"/>
+ </operation>
+ </portType>
+
+ <binding name="Binding" type="service:Port">
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="evaluate">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="Service">
+ <port binding="service:Binding" name="Port">
+ <soap:address location="http://localhost:8080/jaxws-jbws2526"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<xs:schema xmlns="urn:JBWS-2526-Schema"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:JBWS-2526-Schema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified">
- <xs:element name="Request">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Value1" type="xs:int"/>
- <xs:element name="Value2" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="Response">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Result" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.xsd 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<xs:schema xmlns="urn:JBWS-2526-Schema"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:JBWS-2526-Schema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified">
+ <xs:element name="Request">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Value1" type="xs:int"/>
+ <xs:element name="Value2" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="Response">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Result" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
- soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns="urn:JBWS-2526-Schema">
- <soap:Body>
- <Request>
- <!-- This is a comment node which may trigger a ClassCastException -->
- <Value1>9</Value1>
- <Value2>9</Value2>
- </Request>
- </soap:Body>
-</soap:Envelope>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-with-comment.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+ soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns="urn:JBWS-2526-Schema">
+ <soap:Body>
+ <Request>
+ <!-- This is a comment node which may trigger a ClassCastException -->
+ <Value1>9</Value1>
+ <Value2>9</Value2>
+ </Request>
+ </soap:Body>
+</soap:Envelope>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml 2009-07-16 12:50:05 UTC (rev 10325)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
- soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns="urn:JBWS-2526-Schema">
- <soap:Body>
- <Request>
- <Value1>9</Value1>
- <Value2>9</Value2>
- </Request>
- </soap:Body>
-</soap:Envelope>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml (from rev 10325, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/request-message-without-comment.xml 2010-05-19 15:53:59 UTC (rev 12277)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+ soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns="urn:JBWS-2526-Schema">
+ <soap:Body>
+ <Request>
+ <Value1>9</Value1>
+ <Value2>9</Value2>
+ </Request>
+ </soap:Body>
+</soap:Envelope>
\ No newline at end of file
15 years, 11 months
JBossWS SVN: r12276 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-05-19 11:34:36 -0400 (Wed, 19 May 2010)
New Revision: 12276
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java
Log:
[JBWS-2682] Reverting invalid modification to this test case.
The test is that 1-1 is correctly detected as being an invalid value, adding additional content should not be required to trigger this.
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java 2010-05-19 13:39:35 UTC (rev 12275)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java 2010-05-19 15:34:36 UTC (rev 12276)
@@ -57,7 +57,7 @@
"<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2682'>" +
" <soapenv:Header/>" + " <soapenv:Body>" +
" <jbw:echo>" +
- " <arg0>1-1ciao</arg0>" +
+ " <arg0>1-1</arg0>" +
" </jbw:echo>" +
" </soapenv:Body>" +
"</soapenv:Envelope>";
15 years, 11 months
JBossWS SVN: r12275 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-19 09:39:35 -0400 (Wed, 19 May 2010)
New Revision: 12275
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-3030] Do not remove netty.jar from default installation
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-19 13:38:36 UTC (rev 12274)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-19 13:39:35 UTC (rev 12275)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar!
client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/wscommons!
-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
15 years, 11 months
JBossWS SVN: r12274 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-19 09:38:36 -0400 (Wed, 19 May 2010)
New Revision: 12274
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
Log:
[JBWS-3030] Do not remove netty.jar from default installation
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-19 13:38:14 UTC (rev 12273)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/deploy.conf 2010-05-19 13:38:36 UTC (rev 12274)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar!
client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/cxf-*.jar client/geronimo-*.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/wscommons!
-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/cxf-*.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar
15 years, 11 months