JBossWS SVN: r3780 - in trunk/integration: sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF and 3 other directories.
by jbossws-commitsï¼ lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-02 02:44:51 -0400 (Mon, 02 Jul 2007)
New Revision: 3780
Removed:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java
Modified:
trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml
trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml
Log:
Remove ManagedServerConfig
Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java 2007-07-01 23:33:22 UTC (rev 3779)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java 2007-07-02 06:44:51 UTC (rev 3780)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.container.jboss42;
-
-// $Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.management.BasicServerConfig;
-
-/**
- * A Service Endpoint Registry
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-May-2007
- */
-public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ManagedServerConfig.class);
-
- public void create() throws Exception
- {
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.registerMBean(this, OBJECT_NAME);
- }
- }
-
- public void destroy() throws Exception
- {
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.unregisterMBean(OBJECT_NAME);
- }
- }
-
- private MBeanServer getMBeanServer()
- {
- MBeanServer server = null;
- ArrayList servers = MBeanServerFactory.findMBeanServer(null);
- if (servers.size() > 0)
- {
- server = (MBeanServer)servers.get(0);
- }
- return server;
- }
-}
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-01 23:33:22 UTC (rev 3779)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-02 06:44:51 UTC (rev 3780)
@@ -3,7 +3,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-07-01 23:33:22 UTC (rev 3779)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-07-02 06:44:51 UTC (rev 3780)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-01 23:33:22 UTC (rev 3779)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-02 06:44:51 UTC (rev 3780)
@@ -3,7 +3,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-07-01 23:33:22 UTC (rev 3779)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-07-02 06:44:51 UTC (rev 3780)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3779 - branches/jbossws-2.0/build.
by jbossws-commitsï¼ lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-01 19:33:22 -0400 (Sun, 01 Jul 2007)
New Revision: 3779
Modified:
branches/jbossws-2.0/build/ant.properties.example
Log:
Use jbossas/branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-07-01 21:50:16 UTC (rev 3778)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-07-01 23:33:22 UTC (rev 3779)
@@ -4,7 +4,7 @@
# $Id$
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
+#jboss50.home=/home/tdiesler/svn/jbossas/branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3778 - in branches/jbossws-2.0: build/ant-import and 6 other directories.
by jbossws-commitsï¼ lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-01 17:50:16 -0400 (Sun, 01 Jul 2007)
New Revision: 3778
Added:
branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java
Modified:
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/build/ant.properties.example
branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
Log:
Rollback to deployer architecture in JBoss_5_0_0_Beta2
Use target branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -105,13 +105,17 @@
<pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ <pathelement location="${jboss.server.lib}/javax.servlet.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
</path>
<path id="tests.client.classpath">
<pathelement location="${jboss.client}/javassist.jar"/>
@@ -128,9 +132,6 @@
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="tests.javac.classpath"/>
</path>
</target>
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-07-01 21:50:16 UTC (rev 3778)
@@ -4,9 +4,9 @@
# $Id$
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
+#jboss50.home=/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
+#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
jbossws.integration.target=jboss50
@@ -32,16 +32,16 @@
hudson.admin.port=8150
hudson.http.port=8180
-hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss50.build=jboss-5.0.0.Beta3
+hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/branches/JBossWS_2_0_0_GA
+hudson.jboss50.build=jboss-5.0.0.Beta2
hudson.jboss50.rev=HEAD
-hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss42.build=jboss-4.2.1.GA
+hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_0_GA
+hudson.jboss42.build=jboss-4.2.0.GA
hudson.jboss42.rev=HEAD
-hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
-hudson.jboss40.build=jboss-4.0.5.SP1
+hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA_CP05
+hudson.jboss40.build=jboss-4.0.5.GA_CP05
hudson.jboss40.rev=HEAD
hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com
Modified: branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
===================================================================
--- branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-07-01 21:50:16 UTC (rev 3778)
@@ -13,44 +13,40 @@
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
</library>
<library name="jboss-4.2.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-jmx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-common.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-j2ee.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-xml-binding.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/servlet-api.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jbosssx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-jmx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jboss.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jboss-ejb3x.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-common.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jboss-j2ee.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-xml-binding.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/servlet-api.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jbosssx.jar"/>
</library>
<library name="jboss-5.0.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-j2se.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-javaee.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system-jmx.jar" source="/home/tdiesler/svn/jbossas/trunk/system-jmx/src/main"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-vfs.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss.jar" source="/home/tdiesler/svn/jbossas/trunk/server/src/main"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jnpserver.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-logging-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-xml-binding.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/client/jboss-ejb3-client.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-common-core.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jbosssx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/antlr.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-security-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-structure-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-core-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-deployers.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-j2se.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jboss-javaee.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-system-jmx.jar" source="/home/tdiesler/svn/jbossas/trunk/system-jmx/src/main"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-vfs.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jboss.jar" source="/home/tdiesler/svn/jbossas/trunk/server/src/main"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jnpserver.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-logging-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-xml-binding.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/client/jboss-ejb3-client.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-common-core.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jbosssx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/antlr.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jboss-security-spi.jar"/>
</library>
</eclipse-userlibraries>
Modified: branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -40,22 +40,20 @@
<pathelement location="${jboss50.lib}/dom4j.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
<pathelement location="${jboss50.lib}/jboss-system.jar"/>
<pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/>
<pathelement location="${jboss50.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss50.server.lib}/javax.servlet.jar"/>
<pathelement location="${jboss50.server.lib}/jboss.jar"/>
- <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/>
+ <pathelement location="${jboss50.server.lib}/jboss-j2ee.jar"/>
<pathelement location="${jboss50.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/>
<pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
</path>
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -21,7 +21,9 @@
*/
package org.jboss.wsf.container.jboss50;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+//$Id$
+
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.DeployerManager;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -29,9 +31,6 @@
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
-//$Id$
-
-
/**
* An abstract web service deployer.
*
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
//$Id$
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,10 +24,9 @@
import java.util.LinkedList;
import java.util.List;
+import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
//$Id$
@@ -38,13 +37,13 @@
* @author Thomas.Diesler(a)jboss.org
* @since 24-Apr-2007
*/
-public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer
+public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer
{
// provide logging
private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
-
+
public void addDeployerHook(DeployerHook deployer)
{
log.debug("Add deployer hook: " + deployer);
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -26,8 +26,7 @@
import java.net.URL;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.virtual.VirtualFile;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -144,7 +143,7 @@
private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
{
- VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml");
+ VirtualFile vf = unit.getMetaDataFile("webservices.xml");
return (vf != null ? new VirtualFileAdaptor(vf) : null);
}
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
/**
* An interface for all web service deployer hooks
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,8 +24,7 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
@@ -71,13 +70,13 @@
try
{
- if (unit.getParent() != null)
+ if (unit.getDeploymentContext().getParent() != null)
{
udi.parent = new UnifiedDeploymentInfo(null);
- buildDeploymentInfo(dep, udi.parent, unit.getParent());
+ buildDeploymentInfo(dep, udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit());
}
- udi.vfRoot = new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot());
+ udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
udi.name = unit.getName();
udi.simpleName = unit.getSimpleName();
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -40,15 +40,12 @@
import org.jboss.invocation.PayloadKey;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityAssociation;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.invocation.AbstractInvocationHandler;
import org.jboss.wsf.spi.invocation.HandlerCallback;
import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.SecurityAdaptor;
-import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
@@ -148,16 +145,9 @@
if (msgContext == null)
throw new IllegalStateException("Cannot obtain MessageContext");
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
- SecurityContext sc = SecurityContextAssociation.getSecurityContext();
- Principal principal = securityAdaptor.getPrincipal();
- Object credential = securityAdaptor.getCredential();
-
- if (principal == null && sc != null)
- principal = sc.getUtil().getUserPrincipal();
-
- if (credential == null && sc != null)
- credential = sc.getUtil().getCredential();
+ // these are provided by the ServerLoginHandler
+ Principal principal = SecurityAssociation.getPrincipal();
+ Object credential = SecurityAssociation.getCredential();
Method method = inv.getJavaMethod();
Object[] args = inv.getArgs();
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,8 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -54,7 +53,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,8 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -57,7 +56,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -28,8 +28,7 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.stateless.StatelessContainer;
@@ -57,7 +56,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -29,8 +29,7 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -57,7 +56,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.wsf.container.jboss50.AbstractDeployerHook;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -27,16 +27,18 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
+import org.jboss.deployers.spi.deployment.MainDeployer;
+import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.structure.DeploymentState;
import org.jboss.logging.Logger;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
-import org.jboss.wsf.spi.deployment.WebXMLRewriter;
/**
* Publish the HTTP service endpoint to Tomcat
@@ -49,11 +51,11 @@
// provide logging
private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class);
- private DeployerClient mainDeployer;
+ private MainDeployer mainDeployer;
private WebXMLRewriter webXMLRewriter;
- private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>();
+ private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
- public void setMainDeployer(DeployerClient mainDeployer)
+ public void setMainDeployer(MainDeployer mainDeployer)
{
this.mainDeployer = mainDeployer;
}
@@ -75,11 +77,12 @@
try
{
webXMLRewriter.rewriteWebXml(dep);
- org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(warURL);
+ DeploymentContext context = createDeploymentContext(warURL);
- mainDeployer.deploy(deployment);
+ mainDeployer.addDeploymentContext(context);
+ mainDeployer.process();
- deploymentMap.put(warURL.toExternalForm(), deployment);
+ contextMap.put(warURL.toExternalForm(), context);
}
catch (Exception ex)
{
@@ -103,11 +106,14 @@
log.debug("destroyServiceEndpoint: " + warURL);
try
{
- org.jboss.deployers.client.spi.Deployment deployment = deploymentMap.get(warURL.toExternalForm());
- if (deployment != null)
+ DeploymentContext context = contextMap.get(warURL.toExternalForm());
+ if (context != null)
{
- mainDeployer.undeploy(deployment);
- deploymentMap.remove(warURL.toExternalForm());
+ context.setState(DeploymentState.UNDEPLOYING);
+ mainDeployer.process();
+ mainDeployer.removeDeploymentContext(context.getName());
+
+ contextMap.remove(warURL.toExternalForm());
}
}
catch (Exception ex)
@@ -116,9 +122,9 @@
}
}
- private org.jboss.deployers.client.spi.Deployment createDeploymentContext(URL warURL) throws Exception
+ private DeploymentContext createDeploymentContext(URL warURL) throws Exception
{
VirtualFile file = VFS.getRoot(warURL);
- return VFSDeploymentFactory.getInstance().createVFSDeployment(file);
+ return new AbstractDeploymentContext(file);
}
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -29,7 +29,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.deployment.J2eeApplicationMetaData;
import org.jboss.deployment.J2eeModuleMetaData;
import org.jboss.metadata.WebMetaData;
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -8,6 +8,16 @@
<bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB">
<property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property>
<property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property>
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
<depends>EJB2xDeployer</depends>
<depends>EJBRegistrationDeployer</depends>
</bean>
@@ -17,6 +27,16 @@
-->
<bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE">
<property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
<depends>WebAppParsingDeployer</depends>
</bean>
@@ -26,6 +46,16 @@
<bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer">
<property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property>
<property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property>
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
<depends>WarDeployer</depends>
<depends>WebServiceDeployerEJB</depends>
<depends>WebServiceDeployerJSE</depends>
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -34,7 +34,7 @@
</bean>
<!-- Bind Service objects in client environment context -->
- <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
+ <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
<!-- Locate the single instance of the kernel -->
<bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
Added: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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 javax.xml.soap;
+
+import org.jboss.wsf.spi.utils.ServiceLoader;
+
+// $Id: FactoryLoader.java 2649 2007-03-20 22:23:25Z thomas.diesler(a)jboss.com $
+
+/**
+ * @deprecated
+ * @see ServiceLoader
+ */
+public abstract class FactoryLoader
+{
+ public static Object loadFactory(String propertyName, String defaultFactory)
+ {
+ return ServiceLoader.loadService(propertyName, defaultFactory);
+ }
+}
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3777 - branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx.
by jbossws-commitsï¼ lists.jboss.org
Author: richard_opalka
Date: 2007-07-01 17:43:07 -0400 (Sun, 01 Jul 2007)
New Revision: 3777
Modified:
branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java
Log:
fixing compilation issue
Modified: branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java
===================================================================
--- branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java 2007-07-01 21:20:12 UTC (rev 3776)
+++ branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java 2007-07-01 21:43:07 UTC (rev 3777)
@@ -100,7 +100,7 @@
sequence.terminate();
}
- private void setAddressingProperties(String soapAction, String replyTo) {
+ private void setAddressingProperties(String soapAction, String replyTo) throws Exception {
AddressingProperties requestProps =
AddressingClientUtil.createDefaultProps(soapAction, serviceURL);
requestProps.setMessageID(AddressingClientUtil.createMessageID());
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3776 - branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx.
by jbossws-commitsï¼ lists.jboss.org
Author: richard_opalka
Date: 2007-07-01 17:20:12 -0400 (Sun, 01 Jul 2007)
New Revision: 3776
Modified:
branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java
Log:
creating first test scenarios
Modified: branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java
===================================================================
--- branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java 2007-07-01 21:14:33 UTC (rev 3775)
+++ branches/ropalka/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsrx/RXTestCase.java 2007-07-01 21:20:12 UTC (rev 3776)
@@ -1,14 +1,21 @@
package org.jboss.test.ws.jaxws.samples.wsrx;
import java.io.File;
+import java.net.URI;
import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
+import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.AddressingProperties;
+import javax.xml.ws.addressing.JAXWSAConstants;
import junit.framework.Test;
+import org.jboss.ws.extensions.addressing.AddressingClientUtil;
+import org.jboss.ws.extensions.rx.Sequence;
+import org.jboss.ws.extensions.rx.RXProvider;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
@@ -21,8 +28,15 @@
public class RXTestCase extends JBossWSTest
{
private String targetNS = "http://www.jboss.org/wsrx/";
+ private String serviceURL;
private static RXService port;
+
+ private static final AddressingBuilder addressingBuilder;
+
+ static {
+ addressingBuilder = AddressingBuilder.getAddressingBuilder();
+ }
public static Test suite()
{
@@ -38,22 +52,81 @@
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(RXService.class);
+ serviceURL = "http://"+getServerHost()+":8080/"; // TODO: it seems that this URL is incorrect - debug it!
((BindingProvider)port).getRequestContext().put(
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- "http://"+getServerHost()+":8080/" // TODO: it seems that this URL is incorrect - debug it!
+ serviceURL
);
}
}
- public void testOneWay() throws Exception {
- System.out.println("FIXME: write RX one way usecase test");
- //port.oneWay("Hello world!");
+ public void testScenario1_anonymousOneWay() throws Exception {
+ System.out.println("FIXME: make this usecase to work");
+ if (true) return;
+
+ Sequence sequence = RXProvider.newSequence(port);
+ sequence.create(); // create new sequence - only one sequence can exist at time on one stub
+ port.oneWay("first");
+ port.oneWay("second");
+ sequence.lastMessage();
+ sequence.requestAck();
+ port.oneWay("third");
+ while(!sequence.acknowledged()) {
+ System.out.println("doing something else");
+ }
+ sequence.terminate();
}
- public void testReqResp() throws Exception {
- System.out.println("FIXME: write RX req resp usecase test");
- //System.out.println(port.reqResp("Hello world!"));
+ public void testScenario2_notAnonymousOneWay() throws Exception {
+ System.out.println("FIXME: make this usecase to work");
+ if (true) return;
+
+ Sequence sequence = RXProvider.newSequence(port);
+ sequence.create(); // create new sequence - only one sequence can exist at time on one stub
+ String soapAction = "http://www.jboss.org/wsrx/action/oneWay";
+ String replyTo = "http://localhost:8080/wsa10/replyTo";
+ setAddressingProperties(soapAction, replyTo);
+ port.oneWay("first");
+ setAddressingProperties(soapAction, replyTo);
+ port.oneWay("second");
+ sequence.lastMessage();
+ sequence.requestAck();
+ setAddressingProperties(soapAction, replyTo);
+ port.oneWay("third");
+ while(!sequence.acknowledged()) {
+ System.out.println("doing something else");
+ }
+ sequence.terminate();
}
+
+ private void setAddressingProperties(String soapAction, String replyTo) {
+ AddressingProperties requestProps =
+ AddressingClientUtil.createDefaultProps(soapAction, serviceURL);
+ requestProps.setMessageID(AddressingClientUtil.createMessageID());
+ requestProps.setReplyTo(addressingBuilder.newEndpointReference(new URI(replyTo)));
+ setRequestProperties((BindingProvider)port, requestProps);
+ }
+
+ public void testScenario3_requestResponse() throws Exception {
+ System.out.println("FIXME: make this usecase to work");
+ if (true) return;
+
+ Sequence sequence = RXProvider.newSequence(port);
+ sequence.create(); // create new sequence - only one sequence can exist at time on one stub
+ System.out.println(port.reqResp("first"));
+ System.out.println(port.reqResp("second"));
+ sequence.lastMessage();
+ sequence.requestAck();
+ System.out.println(port.reqResp("third"));
+ while(!sequence.acknowledged()) {
+ System.out.println("doing something else");
+ }
+ sequence.terminate();
+ }
+ private void setRequestProperties(BindingProvider bp, AddressingProperties props) {
+ bp.getRequestContext().put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, props);
+ }
+
}
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3775 - branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx.
by jbossws-commitsï¼ lists.jboss.org
Author: richard_opalka
Date: 2007-07-01 17:14:33 -0400 (Sun, 01 Jul 2007)
New Revision: 3775
Added:
branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/RXProvider.java
Modified:
branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/Sequence.java
Log:
making test compilable
Added: branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/RXProvider.java
===================================================================
--- branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/RXProvider.java (rev 0)
+++ branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/RXProvider.java 2007-07-01 21:14:33 UTC (rev 3775)
@@ -0,0 +1,14 @@
+package org.jboss.ws.extensions.rx;
+
+public class RXProvider
+{
+
+ private RXProvider() {
+ // break inheritance possibility
+ }
+
+ public static Sequence newSequence(Object stub) {
+ return null; // TODO: implement
+ }
+
+}
Property changes on: branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/RXProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/Sequence.java
===================================================================
--- branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/Sequence.java 2007-07-01 20:34:53 UTC (rev 3774)
+++ branches/ropalka/jbossws-core/src/main/java/org/jboss/ws/extensions/rx/Sequence.java 2007-07-01 21:14:33 UTC (rev 3775)
@@ -48,5 +48,11 @@
Sequence.State getState();
// TODO: provide other sequence methods
+
+ public void create();
+ public void lastMessage();
+ public void requestAck();
+ public boolean acknowledged();
+ public void terminate();
}
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3774 - branches/ropalka/jbossws-core/src/test/resources/jaxws/samples/wsrx/META-INF/wsdl.
by jbossws-commitsï¼ lists.jboss.org
Author: richard_opalka
Date: 2007-07-01 16:34:53 -0400 (Sun, 01 Jul 2007)
New Revision: 3774
Modified:
branches/ropalka/jbossws-core/src/test/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl
Log:
seting up soapAction
Modified: branches/ropalka/jbossws-core/src/test/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl
===================================================================
--- branches/ropalka/jbossws-core/src/test/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl 2007-07-01 20:32:41 UTC (rev 3773)
+++ branches/ropalka/jbossws-core/src/test/resources/jaxws/samples/wsrx/META-INF/wsdl/rxservice.wsdl 2007-07-01 20:34:53 UTC (rev 3774)
@@ -48,7 +48,7 @@
<!--wsp:PolicyReference URI="#RMPolicy"/-->
<soap:binding transport='http://schemas.xmlsoap.org/soap/http' style='rpc'/>
<operation name='oneWay'>
- <soap:operation soapAction='' style='rpc'/>
+ <soap:operation soapAction='http://www.jboss.org/wsrx/action/oneWay' style='rpc'/>
<input>
<soap:body parts='p0' use='literal' namespace='http://www.jboss.org/wsrx/RXService#oneWay?KExqYXZhL2xhbmcvU3RyaW5nOylW'/>
</input>
@@ -57,7 +57,7 @@
</output>
</operation>
<operation name='reqResp'>
- <soap:operation soapAction='' style='rpc'/>
+ <soap:operation soapAction='http://www.jboss.org/wsrx/action/reqResp' style='rpc'/>
<input>
<soap:body parts='p0' use='literal' namespace='http://www.jboss.org/wsrx/RXService#reqResp?KExqYXZhL2xhbmcvU3RyaW5nOylMa...'/>
</input>
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3773 - branches/jbossws-2.0.
by jbossws-commitsï¼ lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-01 16:32:41 -0400 (Sun, 01 Jul 2007)
New Revision: 3773
Modified:
branches/jbossws-2.0/mergeinfo.txt
Log:
Update mergeinfo
Modified: branches/jbossws-2.0/mergeinfo.txt
===================================================================
--- branches/jbossws-2.0/mergeinfo.txt 2007-07-01 19:29:13 UTC (rev 3772)
+++ branches/jbossws-2.0/mergeinfo.txt 2007-07-01 20:32:41 UTC (rev 3773)
@@ -8,6 +8,16 @@
#
# $Id$
+thomas.diesler(a)jboss.com 01-Jul-2007
+svn merge -r3577:3613 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+svn merge -r3616:3643 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+svn merge -r3649:3650 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+svn merge -r3654:3659 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+svn merge -r3663:3671 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+svn merge -r3672:3754 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+svn merge -r3760:3762 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+svn merge -r3767:3771 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
+
darran.lofthouse(a)jboss.com 18-Jun-2007
svn merge -r 3613:3614 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
17Â years, 3Â months
- 1
- 0
JBossWS SVN: r3772 - in trunk: build/ant-import and 277 other directories.
by jbossws-commitsï¼ lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-01 15:29:13 -0400 (Sun, 01 Jul 2007)
New Revision: 3772
Added:
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpoint.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointMBean.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointMetricsDeployer.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointMetrics.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/webservices.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/HelloService.wsdl
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-core/src/test/resources/jaxws/jbws1556/
trunk/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/
trunk/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml
trunk/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml
trunk/jbossws-core/src/test/resources/jaxws/jbws1611/
trunk/jbossws-core/src/test/resources/jaxws/jbws1611/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxws/jbws1611/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxws/jbws1666/
trunk/jbossws-core/src/test/resources/jaxws/jbws1666/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxws/jbws1666/WEB-INF/web.xml
trunk/testsuite/src/resources/jaxws/samples/context/META-INF/
trunk/testsuite/src/resources/jaxws/samples/context/META-INF/jboss.xml
trunk/testsuite/src/resources/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml
Removed:
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2_JDK6/
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/jms/
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/handler/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BindingException.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerFactoryBase.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializationContext.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerFactoryBase.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/EndpointInterface.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1446/JBWS1446TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/EndpointInterface.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/JBWS1556EarTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1556/UserType.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/JBWS1611TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/CoordinateData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/PropertyData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TraceData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TracePollData.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_206/tests/Attachment/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/Attachment/
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/webservices.xml
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/
trunk/jbossws-core/src/test/resources/jaxrpc/addressrewrite/WEB-INF/wsdl/HelloService.wsdl
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/
trunk/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/application.xml
trunk/jbossws-core/src/test/resources/jaxws/jbws1556/META-INF/jboss-app.xml
trunk/jbossws-core/src/test/resources/jaxws/jbws1611/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxws/jbws1611/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxws/jbws1666/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxws/jbws1666/WEB-INF/web.xml
trunk/testsuite/src/resources/jaxws/samples/context/META-INF/jboss.xml
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/build/ant.properties.example
trunk/build/build.sh
trunk/build/eclipse/jbossws.userlibraries
trunk/build/etc/default.mf
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
trunk/build/version.properties
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
trunk/integration/jboss50/ant-import/build-thirdparty.xml
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java
trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml
trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
trunk/integration/spi/.classpath
trunk/integration/spi/ant-import/build-thirdparty.xml
trunk/integration/spi/src/main/etc/wsconsume.sh
trunk/integration/spi/src/main/etc/wsprovide.sh
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationContext.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
trunk/jbossws-core/.classpath
trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
trunk/jbossws-core/ant-import-tests/build-samples-jaxrpc.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java
trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64DeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64SerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializerFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchHTTPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
trunk/jbossws-core/src/main/resources/schema/jboss-ws-security_1_0.xsd
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLitTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/outparam/OutParamDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/HeaderProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIUnconfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/DocJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIConfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcDIIUnconfiguredCallTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentDIITestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentProxyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/swa/AttachmentSAAJTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/BpelHelloTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/AttachmentHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1357/JBWS1357TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1529/JBWS1529TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1566/c/Jaxb20TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/namespace/MultipleNamespacesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingStatefulTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/AddressingHandlerEnableMU.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/action/CustomAddressingHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java
trunk/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml
trunk/jbossws-core/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml
trunk/jbossws-core/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml
trunk/jbossws-core/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml
trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt
trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt
trunk/jbossws-core/src/test/resources/tools/jbws1553/atm-binding-1.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1553/atm-service.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1553/atm.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1553/interface/account.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1553/interface/frontend.wsdl
trunk/jbossws-core/src/test/resources/tools/jbws1553/interface/ticket.wsdl
trunk/testsuite/ant-import/build-jars-jaxws.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousProxyTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/AuthorizationHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ClientMimeHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/LogHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/RoutingHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/ServerMimeHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpPayloadTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/RetailSampleTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/retail/handler/SOAPMessageTrace.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
Fix context-root for nested jse endpoint
Update to new deployer architecture
Install backward compatible context-root, url-pattern deployer
Fix jaxrpc handler init-param processing
Externalize JAXBHandler
Associate ServerEndpointMetaData with Endpoint
Restore JMS transport
Assume SC_OK, if there is no HTTP resonse code
Restore address rewriting test case
Enable @Resource WebServiceContext for jbossas-4.x
Service does not implement ConfigProvider any more
[JBWS-1178] Multiple virtual host and soap:address problem
[JBWS-1653] Post-handler-chain not invoked for Standard Client configuration
[JBWS-1609] Address in WSDL - Port value is -1
[JBWS-1680] Dispatch.invoke does not throw a ProtocolException on Fault
[JBWS-771] Use part names that are friendly to .NET
[JBWS-805] Fault code is always 'Client'
[JBWS-859] SOAPMessageUnMarshaller doesn't support HTTP server response [204] - No Content
[JBWS-862] Return SOAP Fault for invalid soap messages
[JBWS-1339] @Security domain vs. <security-domain>
[JBWS-1446] Invalid WSDL when a parameter of type Object is part of a webmethod
[JBWS-1640] Resurect endpoint metrics
[JBWS-1553] fails to read operations for portType from different namespace
[JBWS-1710] StackOverflowError when calling SOAPDocument.createCDATASection
[JBWS-1556] @WebWservice does not work with class isolation
[JBWS-1281] Marshalling exception with xsi:nil='1' but without xsi:type
[JBWS-1594] Support certificate password different from keystore
[JBWS-1611] SOAPAction is not sent in dispath requests
[JBWS-1620] - Incorrect handling of MIME boundaries in MultipartRelatedDecoder
[JBWS-1666] Simplify jbosws jar dependencies
svn merge -r3577:3613 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r3616:3643 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r3649:3650 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r3654:3659 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r3663:3671 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r3672:3754 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r3760:3762 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
svn merge -r3767:3771 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/ant-import/build-testsuite.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -146,10 +146,10 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-j2ee.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.server.lib}/servlet-api.jar"/>
</path>
<path id="tests.client.classpath">
@@ -258,7 +258,9 @@
<exclude name="jaxrpc/samples-override/**"/>
</fileset>
<filterset>
+ <filter token="java.home" value="${java.home}"/>
<filter token="jboss.bind.address" value="${node0}"/>
+ <filter token="tests.output.dir" value="${tests.output.dir}"/>
<filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
</filterset>
</copy>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/ant.properties.example 2007-07-01 19:29:13 UTC (rev 3772)
@@ -55,7 +55,7 @@
#force.thirdparty.get=true
# JDK settings
-jdk6.home=/opt/jdk1.6.0_01
+#jdk6.home=/usr/java/jdk1.6
# Java Compiler options
javac.debug=yes
Modified: trunk/build/build.sh
===================================================================
--- trunk/build/build.sh 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/build.sh 2007-07-01 19:29:13 UTC (rev 3772)
@@ -6,7 +6,7 @@
## Users should be sure to execute this file rather than 'ant' to ensure ##
## the correct version is being used with the correct configuration. ##
## ##
-## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ##
+## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ##
## ##
### ====================================================================== ###
Modified: trunk/build/eclipse/jbossws.userlibraries
===================================================================
--- trunk/build/eclipse/jbossws.userlibraries 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/eclipse/jbossws.userlibraries 2007-07-01 19:29:13 UTC (rev 3772)
@@ -13,24 +13,23 @@
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
</library>
<library name="jboss-4.2.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-jmx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-common.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-j2ee.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-xml-binding.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/servlet-api.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jbosssx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-jmx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-ejb3x.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-common.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-j2ee.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-xml-binding.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/servlet-api.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jbosssx.jar"/>
</library>
<library name="jboss-5.0.x" systemlibrary="false">
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-j2se.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-javaee.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system.jar"/>
@@ -48,5 +47,10 @@
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/antlr.jar"/>
<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-security-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-structure-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-core-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar"/>
</library>
</eclipse-userlibraries>
Modified: trunk/build/etc/default.mf
===================================================================
--- trunk/build/etc/default.mf 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/etc/default.mf 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.2
Created-By: @java.vm.version@ (@java.vm.vendor@)
Specification-Title: @specification.title@
Specification-Version: @specification.version@
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/hudson/hudson-home/config.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -54,6 +54,7 @@
<string>Core-Tests-ALL</string>
<string>Core-Tests-AS-5.0</string>
<string>Core-Tests-AS-4.2</string>
+ <string>Core-Tests-AS-4.2-JDK6</string>
<string>Core-Tests-AS-4.0</string>
</jobNames>
<name>Core Tests</name>
@@ -133,7 +134,6 @@
<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
-</table>
]]>
</description>
</view>
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL/config.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.0</childProjects>
+ <childProjects>Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.2-JDK6, Core-Tests-AS-4.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -85,7 +85,12 @@
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
+ <triggers class="vector">
+ <hudson.triggers.SCMTrigger>
+ <spec># Every 30 minutes after the hour
+30 * * * *</spec>
+ </hudson.triggers.SCMTrigger>
+ </triggers>
<logRotator>
<daysToKeep>-1</daysToKeep>
<numToKeep>20</numToKeep>
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6 (from rev 3671, branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6)
Deleted: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-06-21 09:33:15 UTC (rev 3671)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,108 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-CoreTests-AS-4.2-JDK6
-
-WORKSPACE=`pwd`
-JBWSDIR=$WORKSPACE/jbossws
-JBOSS_BINDADDR=(a)jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
-ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
-
-#
-# Verify JDK 6 availablility
-#
-if [ "@jdk6.home@" = "jdk6.home" ]; then
- echo "Please point jdk6.home (ant.properties) to your JAVA 1.6 installation"
- exit 1
-else
- JAVA_HOME="@jdk6.home@"
- cp $JBWSDIR/build/build.conf.example $JBWSDIR/build/build.conf
-fi
-
-#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-./build.sh clean
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-cd $JBWSDIR/jbossws-core
-./build.sh $ENVIRONMENT deploy-jboss42
-
-#
-# start jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
- $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# execute tests
-#
-./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <locations>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@svn.url@</remote>
- <local>jbossws</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- </locations>
- <useUpdate>true</useUpdate>
- <browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JBossWS/</url>
- <rootModule></rootModule>
- </browser>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>20</numToKeep>
- </logRotator>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml (from rev 3671, branches/jbossws-2.0/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-CoreTests-AS-4.2-JDK6
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+JBOSS_BINDADDR=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@
+ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
+
+#
+# Verify JDK 6 availablility
+#
+if [ "@jdk6.home@" = "jdk6.home" ]; then
+ echo "Please point jdk6.home (ant.properties) to your JAVA 1.6 installation"
+ exit 1
+else
+ JAVA_HOME="@jdk6.home@"
+ cp $JBWSDIR/build/build.conf.example $JBWSDIR/build/build.conf
+fi
+
+#
+# copy ant.properties
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+./build.sh clean
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $JBWSDIR/jbossws-core
+./build.sh $ENVIRONMENT deploy-jboss42
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_INSTANCE/server/@jboss.server.instance(a)/log/server.log
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# execute tests
+#
+./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-(a)version.id@ against AS-4.2</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -85,12 +85,7 @@
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector">
- <hudson.triggers.SCMTrigger>
- <spec># Every 10 minutes
-*/10 * * * *</spec>
- </hudson.triggers.SCMTrigger>
- </triggers>
+ <triggers class="vector"/>
<logRotator>
<daysToKeep>28</daysToKeep>
<numToKeep>-1</numToKeep>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/build/version.properties 2007-07-01 19:29:13 UTC (rev 3772)
@@ -22,7 +22,7 @@
jboss-common-logging-spi=2.0.2.GA
jboss-javaee=5.0.0-SNAPSHOT
jboss-jaxr=1.2.0.GA
-jboss-jbossxb=2.0.0.CR2
+jboss-jbossxb=1.0.0.GA
jboss-microcontainer=2.0.0.Beta3
junit=3.8.1
stax-api=1.0
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -70,7 +70,7 @@
throw new WebServiceException("Cannot find service endpoint target: " + objectName);
}
- public void invoke(Endpoint ep, Object beanInstance, Invocation epInv) throws Exception
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
{
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.List;
+import org.jboss.deployment.DeploymentInfo;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -43,8 +44,9 @@
*/
public abstract class AbstractApplicationMetaDataAdapter
{
- public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, ApplicationMetaData apmd)
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
{
+ ApplicationMetaData apmd = (ApplicationMetaData)di.metaData;
dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -39,6 +39,7 @@
import org.jboss.wsf.spi.deployment.WSDeploymentException;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
/**
* Build container independent application meta data
@@ -61,10 +62,10 @@
if (container instanceof StatelessContainer)
{
StatelessContainer slc = (StatelessContainer)container;
- UnifiedBeanMetaData uslc = new UnifiedBeanMetaData();
- uslc.setEjbName(slc.getEjbName());
- uslc.setEjbClass(slc.getBeanClassName());
- beans.add(uslc);
+ UnifiedBeanMetaData usmd = new UnifiedSessionMetaData();
+ usmd.setEjbName(slc.getEjbName());
+ usmd.setEjbClass(slc.getBeanClassName());
+ beans.add(usmd);
}
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -114,12 +114,12 @@
{
if (di.metaData instanceof WebMetaData)
{
- udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, (WebMetaData)di.metaData);
+ udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, di);
udi.webappURL = udi.url;
}
else if (di.metaData instanceof ApplicationMetaData)
{
- udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, (ApplicationMetaData)di.metaData);
+ udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, di);
}
else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3)
{
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -52,7 +52,7 @@
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
- * Handles invocations on EJB3 endpoints.
+ * Handles invocations on EJB21 endpoints.
*
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
@@ -119,7 +119,7 @@
}
- public void invoke(Endpoint ep, Object beanInstance, Invocation inv) throws Exception
+ public void invoke(Endpoint ep, Invocation inv) throws Exception
{
log.debug("Invoke: " + inv.getJavaMethod().getName());
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -78,7 +78,7 @@
throw new WebServiceException("Cannot find service endpoint target: " + objectName);
}
- public void invoke(Endpoint ep, Object beanInstance, Invocation epInv) throws Exception
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
{
Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java (from rev 3754, branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java)
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.container.jboss42;
+
+// $Id: InvocationHandlerEJB21.java 3524 2007-06-09 17:28:37Z thomas.diesler(a)jboss.com $
+
+import java.lang.reflect.Method;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.AbstractInvocationHandler;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on MDB EJB21 endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerMDB21 extends AbstractInvocationHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(InvocationHandlerMDB21.class);
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ log.debug("Invoke: " + epInv.getJavaMethod().getName());
+
+ try
+ {
+ InvocationContext invContext = epInv.getInvocationContext();
+ Object targetBean = invContext.getTargetBean();
+ Class implClass = targetBean.getClass();
+ Method seiMethod = epInv.getJavaMethod();
+ Method implMethod = getImplMethod(implClass, seiMethod);
+
+ Object[] args = epInv.getArgs();
+ Object retObj = implMethod.invoke(targetBean, args);
+ epInv.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -90,7 +90,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(ejbLink);
ep.setService(service);
- ep.setTargetBean(ejbClass);
+ ep.setTargetBeanName(ejbClass);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -107,7 +107,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(servletLink);
ep.setService(service);
- ep.setTargetBean(servletClass);
+ ep.setTargetBeanName(servletClass);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -76,7 +76,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(ejbName);
ep.setService(service);
- ep.setTargetBean(epBean);
+ ep.setTargetBeanName(epBean);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -82,7 +82,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(servletName);
ep.setService(service);
- ep.setTargetBean(servletClass);
+ ep.setTargetBeanName(servletClass);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfig.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,9 +44,6 @@
public void create() throws Exception
{
- log.debug("WebServiceHost: " + getWebServiceHost());
- log.debug("WebServicePort: " + getWebServicePort());
- log.debug("WebServiceSecurePort: " + getWebServiceSecurePort());
MBeanServer server = getMBeanServer();
if (server != null)
{
Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ManagedServerConfigMBean.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.container.jboss42;
-
-import org.jboss.wsf.spi.management.ServerConfig;
-
-/**
- * MBean interface.
- * @since 15-April-2004
- */
-public interface ManagedServerConfigMBean extends ServerConfig
-{
-}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -57,14 +57,14 @@
// <servlet-class> originally contained a javax.servlet.Servlet
for (Endpoint ep : dep.getService().getEndpoints())
{
- if (ep.getTargetBean() == null)
+ if (ep.getTargetBeanName() == null)
{
String servletName = ep.getShortName();
String beanClassName = results.sepTargetMap.get(servletName);
if (beanClassName == null)
throw new IllegalStateException("Cannot obtain target bean for: " + servletName);
- ep.setTargetBean(beanClassName);
+ ep.setTargetBeanName(beanClassName);
}
}
}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,9 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.J2eeApplicationMetaData;
+import org.jboss.deployment.J2eeModuleMetaData;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
@@ -48,19 +51,37 @@
*/
public class WebMetaDataAdapter
{
- public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, WebMetaData webMetaData)
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
{
- dep.getContext().addAttachment(WebMetaData.class, webMetaData);
-
+ String contextRoot = null;
+
+ WebMetaData wmd = (WebMetaData)di.metaData;
+ dep.getContext().addAttachment(WebMetaData.class, wmd);
+
+ if (di.parent != null)
+ {
+ J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData;
+ Iterator it = appmd.getModules();
+ while (it.hasNext())
+ {
+ J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
+ if (module.getFileName().equals(udi.simpleName))
+ contextRoot = module.getWebContext();
+ }
+ }
+
+ if (contextRoot == null)
+ contextRoot = wmd.getContextRoot();
+
UnifiedWebMetaData umd = new UnifiedWebMetaData();
- umd.setContextRoot(webMetaData.getContextRoot());
- umd.setServletMappings(webMetaData.getServletMappings());
- umd.setServletClassNames(getServletClassMap(webMetaData));
- umd.setConfigName(webMetaData.getConfigName());
- umd.setConfigFile(webMetaData.getConfigFile());
- umd.setSecurityDomain(webMetaData.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(webMetaData));
- umd.setSecurityMetaData(getSecurityMetaData(webMetaData.getSecurityContraints()));
+ umd.setContextRoot(contextRoot);
+ umd.setServletMappings(wmd.getServletMappings());
+ umd.setServletClassNames(getServletClassMap(wmd));
+ umd.setConfigName(wmd.getConfigName());
+ umd.setConfigFile(wmd.getConfigFile());
+ umd.setSecurityDomain(wmd.getSecurityDomain());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
+ umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
dep.getContext().addAttachment(UnifiedWebMetaData.class, umd);
return umd;
Modified: trunk/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -40,7 +40,11 @@
<pathelement location="${jboss50.lib}/dom4j.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
<pathelement location="${jboss50.lib}/jboss-system.jar"/>
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,9 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-//$Id$
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.DeployerManager;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -31,6 +29,9 @@
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
+//$Id$
+
+
/**
* An abstract web service deployer.
*
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
//$Id$
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,9 +24,10 @@
import java.util.LinkedList;
import java.util.List;
-import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
//$Id$
@@ -37,13 +38,13 @@
* @author Thomas.Diesler(a)jboss.org
* @since 24-Apr-2007
*/
-public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer
+public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer
{
// provide logging
private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
-
+
public void addDeployerHook(DeployerHook deployer)
{
log.debug("Add deployer hook: " + deployer);
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -26,7 +26,8 @@
import java.net.URL;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -143,7 +144,7 @@
private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
{
- VirtualFile vf = unit.getMetaDataFile("webservices.xml");
+ VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml");
return (vf != null ? new VirtualFileAdaptor(vf) : null);
}
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* An interface for all web service deployer hooks
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,7 +24,8 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
@@ -70,13 +71,13 @@
try
{
- if (unit.getDeploymentContext().getParent() != null)
+ if (unit.getParent() != null)
{
udi.parent = new UnifiedDeploymentInfo(null);
- buildDeploymentInfo(dep, udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit());
+ buildDeploymentInfo(dep, udi.parent, unit.getParent());
}
- udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
+ udi.vfRoot = new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot());
udi.name = unit.getName();
udi.simpleName = unit.getSimpleName();
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -121,7 +121,7 @@
}
- public void invoke(Endpoint ep, Object beanInstance, Invocation inv) throws Exception
+ public void invoke(Endpoint ep, Invocation inv) throws Exception
{
log.debug("Invoke: " + inv.getJavaMethod().getName());
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -76,7 +76,7 @@
throw new WebServiceException("Cannot find service endpoint target: " + objectName);
}
- public void invoke(Endpoint ep, Object beanInstance, Invocation wsInv) throws Exception
+ public void invoke(Endpoint ep, Invocation wsInv) throws Exception
{
try
{
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,7 +23,8 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -53,7 +54,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
@@ -89,7 +90,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(ejbLink);
ep.setService(service);
- ep.setTargetBean(ejbClass);
+ ep.setTargetBeanName(ejbClass);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,7 +23,8 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
@@ -89,7 +90,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(servletLink);
ep.setService(service);
- ep.setTargetBean(servletClass);
+ ep.setTargetBeanName(servletClass);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -28,7 +28,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.stateless.StatelessContainer;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
@@ -82,7 +83,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(ejbName);
ep.setService(service);
- ep.setTargetBean(epBean);
+ ep.setTargetBeanName(epBean);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,7 +29,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
@@ -79,7 +80,7 @@
Endpoint ep = createEndpoint();
ep.setShortName(servletName);
ep.setService(service);
- ep.setTargetBean(servletClass);
+ ep.setTargetBeanName(servletClass);
service.addEndpoint(ep);
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.wsf.container.jboss50.AbstractDeployerHook;
import org.jboss.wsf.spi.deployment.Deployment;
Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfig.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.container.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.management.BasicServerConfig;
-
-/**
- * A Service Endpoint Registry
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-May-2007
- */
-public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ManagedServerConfig.class);
-
- public void create() throws Exception
- {
- log.debug("WebServiceHost: " + getWebServiceHost());
- log.debug("WebServicePort: " + getWebServicePort());
- log.debug("WebServiceSecurePort: " + getWebServiceSecurePort());
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.registerMBean(this, OBJECT_NAME);
- }
- }
-
- public void destroy() throws Exception
- {
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.unregisterMBean(OBJECT_NAME);
- }
- }
-
- private MBeanServer getMBeanServer()
- {
- MBeanServer server = null;
- ArrayList servers = MBeanServerFactory.findMBeanServer(null);
- if (servers.size() > 0)
- {
- server = (MBeanServer)servers.get(0);
- }
- return server;
- }
-}
Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ManagedServerConfigMBean.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.container.jboss50;
-
-import org.jboss.wsf.spi.management.ServerConfig;
-
-/**
- * MBean interface.
- * @since 15-April-2004
- */
-public interface ManagedServerConfigMBean extends ServerConfig
-{
-}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,18 +27,16 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
-import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployers.spi.structure.DeploymentState;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.logging.Logger;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
+import org.jboss.wsf.spi.deployment.WebXMLRewriter;
/**
* Publish the HTTP service endpoint to Tomcat
@@ -51,11 +49,11 @@
// provide logging
private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class);
- private MainDeployer mainDeployer;
+ private DeployerClient mainDeployer;
private WebXMLRewriter webXMLRewriter;
- private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
+ private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>();
- public void setMainDeployer(MainDeployer mainDeployer)
+ public void setMainDeployer(DeployerClient mainDeployer)
{
this.mainDeployer = mainDeployer;
}
@@ -77,12 +75,11 @@
try
{
webXMLRewriter.rewriteWebXml(dep);
- DeploymentContext context = createDeploymentContext(warURL);
+ org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(warURL);
- mainDeployer.addDeploymentContext(context);
- mainDeployer.process();
+ mainDeployer.deploy(deployment);
- contextMap.put(warURL.toExternalForm(), context);
+ deploymentMap.put(warURL.toExternalForm(), deployment);
}
catch (Exception ex)
{
@@ -106,14 +103,11 @@
log.debug("destroyServiceEndpoint: " + warURL);
try
{
- DeploymentContext context = contextMap.get(warURL.toExternalForm());
- if (context != null)
+ org.jboss.deployers.client.spi.Deployment deployment = deploymentMap.get(warURL.toExternalForm());
+ if (deployment != null)
{
- context.setState(DeploymentState.UNDEPLOYING);
- mainDeployer.process();
- mainDeployer.removeDeploymentContext(context.getName());
-
- contextMap.remove(warURL.toExternalForm());
+ mainDeployer.undeploy(deployment);
+ deploymentMap.remove(warURL.toExternalForm());
}
}
catch (Exception ex)
@@ -122,9 +116,9 @@
}
}
- private DeploymentContext createDeploymentContext(URL warURL) throws Exception
+ private org.jboss.deployers.client.spi.Deployment createDeploymentContext(URL warURL) throws Exception
{
VirtualFile file = VFS.getRoot(warURL);
- return new AbstractDeploymentContext(file);
+ return VFSDeploymentFactory.getInstance().createVFSDeployment(file);
}
}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,7 +29,9 @@
import java.util.List;
import java.util.Map;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployment.J2eeApplicationMetaData;
+import org.jboss.deployment.J2eeModuleMetaData;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
@@ -52,11 +54,27 @@
{
public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit)
{
+ String contextRoot = null;
+
WebMetaData wmd = unit.getAttachment(WebMetaData.class);
dep.getContext().addAttachment(WebMetaData.class, wmd);
+ if (unit.getParent() != null)
+ {
+ J2eeApplicationMetaData appmd = unit.getParent().getAttachment(J2eeApplicationMetaData.class);
+ if (appmd != null)
+ {
+ J2eeModuleMetaData module = appmd.getModule(udi.simpleName);
+ if (module != null)
+ contextRoot = module.getWebContext();
+ }
+ }
+
+ if (contextRoot == null)
+ contextRoot = wmd.getContextRoot();
+
UnifiedWebMetaData umd = new UnifiedWebMetaData();
- umd.setContextRoot(wmd.getContextRoot());
+ umd.setContextRoot(contextRoot);
umd.setServletMappings(getServletMappings(wmd));
umd.setServletClassNames(getServletClassMap(wmd));
umd.setConfigName(wmd.getConfigName());
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -34,7 +34,12 @@
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
- </target>
+
+ <!-- [JBWS-1617] JAXRPC doc/literal trims empty string
+ <copy tofile="${jboss50.home}/client/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-2.0.0-20070620.094346-1.jar" overwrite="true"/>
+ <copy tofile="${jboss50.home}/lib/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-2.0.0-20070620.094346-1.jar" overwrite="true"/>
+ -->
+ </target>
<target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
@@ -67,7 +72,13 @@
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
- </target>
+
+ <!-- [JBWS-1617] JAXRPC doc/literal trims empty string
+ <copy tofile="${jboss42.home}/client/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-1.0.0-20070620.100638-1.jar" overwrite="true"/>
+ <copy tofile="${jboss42.home}/lib/jboss-xml-binding.jar" file="${core.dir}/thirdparty/jbossxb-1.0.0-20070620.100638-1.jar" overwrite="true"/>
+ -->
+
+ </target>
<target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
<macro-deploy-endorsed
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -40,6 +40,7 @@
<path id="tests.extra.classpath">
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/thirdparty/policy.jar"/>
+ <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
</path>
</target>
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -48,9 +48,9 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="streambuffer.jar"/>
<include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
@@ -76,7 +76,6 @@
<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-native50-deployer.zip"/>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/>
- <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
</sequential>
@@ -102,14 +101,14 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-jboss50.jar"/>
<include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
@@ -125,7 +124,6 @@
</delete>
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
</sequential>
</macrodef>
@@ -161,9 +159,9 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="streambuffer.jar"/>
<include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</copy>
@@ -201,14 +199,14 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-jboss42.jar"/>
<include name="policy.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
@@ -265,10 +263,10 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
<include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
</fileset>
</copy>
@@ -327,8 +325,6 @@
<include name="jaxb-xjc.jar"/>
<include name="jaxws-tools.jar"/>
<include name="jaxws-rt.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
@@ -336,6 +332,8 @@
<include name="jbossws-jboss40.jar"/>
<include name="policy.jar"/>
<include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
<include name="wsdl4j.jar"/>
<!-- Remove only, do not deploy -->
<include name="jbossws-wsconsume-impl.jar"/>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/build.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -109,14 +109,14 @@
</jar>
<!-- Build jbossws-context.war -->
- <mkdir dir="${native.output.lib.dir}"/>
- <war warfile="${native.output.lib.dir}/jbossws-context.war" webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
+ <mkdir dir="${native.output.lib.dir}/jbossws-context.war"/>
+ <copy todir="${native.output.lib.dir}/jbossws-context.war">
<fileset dir="${native.resources.dir}/jbossws-context.war">
<include name="index.html"/>
<include name="styles.css"/>
+ <include name="WEB-INF/**"/>
</fileset>
- <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/>
- </war>
+ </copy>
<!-- Build jbossws-native-src.zip -->
<zip zipfile="${native.output.lib.dir}/jbossws-native-src.zip" >
@@ -129,21 +129,11 @@
<ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/>
- <!-- Build jbossws-context.war -->
- <mkdir dir="${native.output.lib.dir}"/>
- <war warfile="${native.output.lib.dir}/jbossws-context.war" webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
- <fileset dir="${native.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/>
- </war>
-
<!-- Build jbossws-native50.sar -->
<jar jarfile="${native.output.lib.dir}/jbossws-native50.sar" manifest="${native.output.etc.dir}/default.mf">
<!-- [JBAS-4379] MC beans deployed twice because of jacc service
<fileset dir="${native.output.lib.dir}">
- <include name="jbossws-context.war"/>
+ <include name="jbossws-context.war/**"/>
</fileset>
-->
<fileset dir="${core.dir}/output/lib">
@@ -182,7 +172,7 @@
<mkdir dir="${native.output.lib.dir}"/>
<jar jarfile="${native.output.lib.dir}/jbossws-native42.sar" manifest="${native.output.etc.dir}/default.mf">
<fileset dir="${native.output.lib.dir}">
- <include name="jbossws-context.war"/>
+ <include name="jbossws-context.war/**"/>
<include name="jbossws-native.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
@@ -218,7 +208,7 @@
<mkdir dir="${native.output.lib.dir}"/>
<jar jarfile="${native.output.lib.dir}/jbossws-native40.sar" manifest="${native.output.etc.dir}/default.mf">
<fileset dir="${native.output.lib.dir}">
- <include name="jbossws-context.war"/>
+ <include name="jbossws-context.war/**"/>
<include name="jbossws-native.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
public void stop(Endpoint endpoint)
{
super.stop(endpoint);
- log.info("WebService stoped: " + getEndpointAddress(endpoint));
+ log.info("WebService stopped: " + getEndpointAddress(endpoint));
}
private String getEndpointAddress(Endpoint ep)
Copied: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpoint.java (from rev 3650, branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpoint.java)
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpoint.java (rev 0)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpoint.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws;
+
+// $Id: ManagedEndpointRegistry.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $
+
+import java.util.Date;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.EndpointMetrics;
+
+/**
+ * The endpoint MBean representation
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 20-Jun-2007
+ */
+public class ManagedEndpoint implements ManagedEndpointMBean
+{
+ private Endpoint endpoint;
+
+ public ManagedEndpoint(Endpoint endpoint)
+ {
+ this.endpoint = endpoint;
+ }
+
+ public long getAverageProcessingTime()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getAverageProcessingTime() : 0;
+ }
+
+ public long getFaultCount()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getFaultCount() : 0;
+ }
+
+ public long getMaxProcessingTime()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getMaxProcessingTime() : 0;
+ }
+
+ public long getMinProcessingTime()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getMinProcessingTime() : 0;
+ }
+
+ public long getRequestCount()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getRequestCount() : 0;
+ }
+
+ public long getResponseCount()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getResponseCount() : 0;
+ }
+
+ public Date getStartTime()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getStartTime() : null;
+ }
+
+ public Date getStopTime()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getStopTime() : null;
+ }
+
+ public long getTotalProcessingTime()
+ {
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ return metrics != null ? metrics.getTotalProcessingTime() : 0;
+ }
+
+ public void start()
+ {
+ endpoint.getLifecycleHandler().start(endpoint);
+ }
+
+ public void stop()
+ {
+ endpoint.getLifecycleHandler().stop(endpoint);
+ }
+}
Copied: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointMBean.java (from rev 3650, branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointMBean.java)
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointMBean.java (rev 0)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointMBean.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws;
+
+import java.util.Date;
+
+/**
+ * MBean interface.
+ * @since 15-April-2004
+ */
+public interface ManagedEndpointMBean
+{
+ void start();
+
+ void stop();
+
+ Date getStartTime();
+
+ Date getStopTime();
+
+ long getMinProcessingTime();
+
+ long getMaxProcessingTime();
+
+ long getAverageProcessingTime();
+
+ long getTotalProcessingTime();
+
+ long getRequestCount();
+
+ long getFaultCount();
+
+ long getResponseCount();
+}
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -25,8 +25,12 @@
import java.util.ArrayList;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.JMException;
+import javax.management.MBeanRegistrationException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
+import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
import org.jboss.logging.Logger;
@@ -94,6 +98,44 @@
return endpoint;
}
+ @Override
+ public void register(Endpoint endpoint)
+ {
+ super.register(endpoint);
+
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ try
+ {
+ ManagedEndpoint jmxEndpoint = new ManagedEndpoint(endpoint);
+ server.registerMBean(jmxEndpoint, endpoint.getName());
+ }
+ catch (JMException ex)
+ {
+ log.error("Cannot register endpoint with JMX server", ex);
+ }
+ }
+ }
+
+ @Override
+ public void unregister(Endpoint endpoint)
+ {
+ super.unregister(endpoint);
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ try
+ {
+ server.unregisterMBean(endpoint.getName());
+ }
+ catch (JMException ex)
+ {
+ log.error("Cannot unregister endpoint with JMX server", ex);
+ }
+ }
+ }
+
public void create() throws Exception
{
log.info(getImplementationTitle());
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
-import javax.xml.rpc.soap.SOAPFaultException;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
@@ -58,10 +57,11 @@
import org.jboss.ws.core.CommonBinding;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.MessageTrace;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC;
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
@@ -85,6 +85,7 @@
import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.utils.DOMWriter;
@@ -94,7 +95,6 @@
* A request handler
*
* @author Thomas.Diesler(a)jboss.org
- * @author mageshbk(a)jboss.com
* @since 25-Apr-2007
*/
public class RequestHandlerImpl implements RequestHandler
@@ -185,7 +185,7 @@
}
}
- public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
+ public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext invContext)
{
log.debug("handleRequest: " + endpoint.getName());
@@ -200,20 +200,22 @@
if (type == EndpointMetaData.Type.JAXRPC)
{
msgContext = new SOAPMessageContextJAXRPC();
+ invContext.addAttachment(javax.xml.rpc.handler.MessageContext.class, msgContext);
}
else
{
msgContext = new SOAPMessageContextJAXWS();
msgContext.put(MessageContextJAXWS.MESSAGE_OUTBOUND_PROPERTY, new Boolean(false));
msgContext.put(MessageContextJAXWS.INBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>());
+ invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext);
}
// Set servlet specific properties
HttpServletResponse httpResponse = null;
ServletHeaderSource headerSource = null;
- if (context instanceof ServletRequestContext)
+ if (invContext instanceof ServletRequestContext)
{
- ServletRequestContext reqContext = (ServletRequestContext)context;
+ ServletRequestContext reqContext = (ServletRequestContext)invContext;
ServletContext servletContext = reqContext.getServletContext();
HttpServletRequest httpRequest = reqContext.getHttpServletRequest();
@@ -244,7 +246,7 @@
try
{
- MessageAbstraction resMessage = processRequest(endpoint, headerSource, context, inStream);
+ MessageAbstraction resMessage = processRequest(endpoint, headerSource, invContext, inStream);
// Replace the message context with the response context
msgContext = MessageContextAssociation.peekMessageContext();
@@ -277,7 +279,8 @@
}
}
- sendResponse(outStream, msgContext, isFault);
+ if (outStream != null)
+ sendResponse(outStream, msgContext, isFault);
}
catch (Exception ex)
{
@@ -339,7 +342,7 @@
{
QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER;
String faultString = "Endpoint cannot handle requests in state: " + state;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
log.debug("BEGIN handleRequest: " + ep.getName());
@@ -439,15 +442,27 @@
private long initRequestMetrics(Endpoint endpoint)
{
- return 0;
+ long beginTime = 0;
+
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ if (metrics != null)
+ beginTime = metrics.processRequestMessage();
+
+ return beginTime;
}
- private void processResponseMetrics(Endpoint endpoint, long beginProcessing)
+ private void processResponseMetrics(Endpoint endpoint, long beginTime)
{
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ if (metrics != null)
+ metrics.processResponseMessage(beginTime);
}
- private void processFaultMetrics(Endpoint endpoint, long beginProcessing)
+ private void processFaultMetrics(Endpoint endpoint, long beginTime)
{
+ EndpointMetrics metrics = endpoint.getEndpointMetrics();
+ if (metrics != null)
+ metrics.processFaultMessage(beginTime);
}
/** Set response mime headers
@@ -490,10 +505,15 @@
String resPath = (String)req.getParameter("resource");
URL reqURL = new URL(req.getRequestURL().toString());
+ String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost();
+ if (reqURL.getPort() != -1)
+ wsdlHost += ":" + reqURL.getPort();
+
ServerConfigFactory factory = ServerConfigFactory.getInstance();
ServerConfig config = factory.getServerConfig();
- String wsdlHost = config.getDisplayHost(epMetaData.getEndpointAddress(),reqURL);
-
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false)
+ wsdlHost = config.getWebServiceHost();
+
log.debug("WSDL request, using host: " + wsdlHost);
WSDLRequestHandler wsdlRequestHandler = new WSDLRequestHandler(epMetaData);
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceLifecycleInvocationHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -39,30 +39,30 @@
*/
public class ServiceLifecycleInvocationHandler extends InvocationHandlerJSE
{
- public void invoke(Endpoint ep, Object beanInstance, Invocation epInv) throws Exception
+ @Override
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
{
- if (beanInstance == null)
- beanInstance = super.getBeanInstance(ep);
+ Object targetBean = getTargetBean(ep, epInv);
InvocationContext invContext = epInv.getInvocationContext();
- if (beanInstance instanceof ServiceLifecycle)
+ if (targetBean instanceof ServiceLifecycle)
{
ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class);
if (sepContext != null)
- ((ServiceLifecycle)beanInstance).init(sepContext);
+ ((ServiceLifecycle)targetBean).init(sepContext);
}
try
{
- super.invoke(ep, beanInstance, epInv);
+ super.invoke(ep, epInv);
}
finally
{
- if (beanInstance instanceof ServiceLifecycle)
+ if (targetBean instanceof ServiceLifecycle)
{
- ((ServiceLifecycle)beanInstance).destroy();
+ ((ServiceLifecycle)targetBean).destroy();
}
}
}
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -52,9 +52,11 @@
if (sepMetaData == null)
{
sepMetaData = getEndpointMetaData(umd, ep);
+ sepMetaData.setEndpoint(ep);
+
ep.addAttachment(ServerEndpointMetaData.class, sepMetaData);
- String targetBean = ep.getTargetBean();
+ String targetBean = ep.getTargetBeanName();
if (targetBean != null)
sepMetaData.setServiceEndpointImplName(targetBean);
}
Modified: trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -6,9 +6,10 @@
<jboss-web>
- <!--
- <security-domain>java:/jaas/jbossws</security-domain>
+ <!-- A security domain that restricts access
+ <security-domain>java:/jaas/JBossWS</security-domain>
-->
+
<context-root>jbossws</context-root>
</jboss-web>
Modified: trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -34,6 +34,32 @@
<url-pattern>/pclink</url-pattern>
</servlet-mapping>
+ <!-- A security constraint that restricts access
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>ContextServlet</web-resource-name>
+ <description>An example security config that only allows users with the
+ role 'friend' to access the JBossWS console web application
+ </description>
+ <url-pattern>/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>friend</role-name>
+ </auth-constraint>
+ </security-constraint>
+ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBossWS Management Console</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>friend</role-name>
+ </security-role>
+
<!--
currently the W3C haven't settled on a media type for WSDL;
http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -3,7 +3,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
@@ -11,7 +11,7 @@
If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
-->
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="modifySOAPAddress">true</property>
@@ -109,6 +109,7 @@
<inject bean="WSServiceEndpointInvokerDeployer"/>
<inject bean="WSEagerInitializeDeployer"/>
<inject bean="WSEventingDeployer"/>
+ <inject bean="WSEndpointMetricsDeployer"/>
<inject bean="WSEndpointRegistryDeployer"/>
<inject bean="WSEndpointLifecycleDeployer"/>
</list>
@@ -120,21 +121,26 @@
Each handles a single aspect of web service deployment
-->
<bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeployer"/>
- <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.BackwardCompatibleContextRootDeployer"/>
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
<property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
+ <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
<entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry>
+ <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry>
<entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
</map>
</property>
<property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointMetricsDeployer" class="org.jboss.wsf.spi.deployment.EndpointMetricsDeployer">
+ <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property>
+ </bean>
<bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
@@ -148,7 +154,7 @@
</bean>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
- <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.BackwardCompatibleURLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
</bean>
@@ -162,6 +168,7 @@
<property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
<property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
</bean>
+ <bean name="WSEndpointMetrics" class="org.jboss.wsf.spi.management.BasicEndpointMetrics"/>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -3,7 +3,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
@@ -11,7 +11,7 @@
If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
-->
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="modifySOAPAddress">true</property>
@@ -109,6 +109,7 @@
<inject bean="WSServiceEndpointInvokerDeployer"/>
<inject bean="WSEagerInitializeDeployer"/>
<inject bean="WSEventingDeployer"/>
+ <inject bean="WSEndpointMetricsDeployer"/>
<inject bean="WSEndpointRegistryDeployer"/>
<inject bean="WSEndpointLifecycleDeployer"/>
</list>
@@ -120,15 +121,17 @@
Each handles a single aspect of web service deployment
-->
<bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeployer"/>
- <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.BackwardCompatibleContextRootDeployer"/>
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
<property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
+ <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
<entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry>
+ <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry>
<entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
<entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss40.InvocationHandlerEJB3</value></entry>
</map>
@@ -136,6 +139,9 @@
<property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointMetricsDeployer" class="org.jboss.wsf.spi.deployment.EndpointMetricsDeployer">
+ <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property>
+ </bean>
<bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
@@ -149,7 +155,7 @@
</bean>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
- <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.BackwardCompatibleURLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -166,6 +172,7 @@
<property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
<property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
</bean>
+ <bean name="WSEndpointMetrics" class="org.jboss.wsf.spi.management.BasicEndpointMetrics"/>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/>
Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -3,7 +3,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
@@ -11,7 +11,7 @@
If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
-->
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="modifySOAPAddress">true</property>
@@ -113,6 +113,7 @@
<inject bean="WSServiceEndpointInvokerDeployer"/>
<inject bean="WSEagerInitializeDeployer"/>
<inject bean="WSEventingDeployer"/>
+ <inject bean="WSEndpointMetricsDeployer"/>
<inject bean="WSEndpointRegistryDeployer"/>
<inject bean="WSEndpointLifecycleDeployer"/>
</list>
@@ -124,15 +125,17 @@
Each handles a single aspect of web service deployment
-->
<bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeployer"/>
- <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.BackwardCompatibleContextRootDeployer"/>
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
<property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
+ <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
<entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry>
+ <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry>
<entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
<entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry>
</map>
@@ -140,6 +143,9 @@
<property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointMetricsDeployer" class="org.jboss.wsf.spi.deployment.EndpointMetricsDeployer">
+ <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property>
+ </bean>
<bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
@@ -153,7 +159,7 @@
</bean>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
- <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.BackwardCompatibleURLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
@@ -170,6 +176,7 @@
<property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
<property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
</bean>
+ <bean name="WSEndpointMetrics" class="org.jboss.wsf.spi.management.BasicEndpointMetrics"/>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
Modified: trunk/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -8,16 +8,6 @@
<bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB">
<property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property>
<property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<depends>EJB2xDeployer</depends>
<depends>EJBRegistrationDeployer</depends>
</bean>
@@ -27,16 +17,6 @@
-->
<bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE">
<property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<depends>WebAppParsingDeployer</depends>
</bean>
@@ -46,16 +26,6 @@
<bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer">
<property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property>
<property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property>
- <install bean="MainDeployer" method="addDeployer">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
<depends>WarDeployer</depends>
<depends>WebServiceDeployerEJB</depends>
<depends>WebServiceDeployerJSE</depends>
Modified: trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.ManagedServerConfig">
+ <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig">
<!--
The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
@@ -11,7 +11,7 @@
If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
- If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
-->
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="modifySOAPAddress">true</property>
@@ -124,6 +124,7 @@
<inject bean="WSServiceEndpointInvokerDeployer"/>
<inject bean="WSEagerInitializeDeployer"/>
<inject bean="WSEventingDeployer"/>
+ <inject bean="WSEndpointMetricsDeployer"/>
<inject bean="WSEndpointRegistryDeployer"/>
<inject bean="WSEndpointLifecycleDeployer"/>
</list>
@@ -140,6 +141,7 @@
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
<property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property>
+ <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property>
<property name="invocationHandler">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry>
@@ -151,6 +153,9 @@
<property name="invocationExceptionHandler">org.jboss.wsf.spi.invocation.UnwrapInvocationExceptionHandler</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
+ <bean name="WSEndpointMetricsDeployer" class="org.jboss.wsf.spi.deployment.EndpointMetricsDeployer">
+ <property name="endpointMetrics"><inject bean="WSEndpointMetrics"/></property>
+ </bean>
<bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
@@ -173,7 +178,7 @@
</bean>
<!-- Deployer helper beans -->
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/>
+ <bean name="WSEndpointMetrics" class="org.jboss.wsf.spi.management.BasicEndpointMetrics"/> <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/>
<bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl">
<property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property>
Modified: trunk/integration/spi/.classpath
===================================================================
--- trunk/integration/spi/.classpath 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/.classpath 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,5 +21,7 @@
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
<classpathentry kind="lib" path="thirdparty/getopt.jar"/>
+ <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -12,13 +12,13 @@
<!-- $Id$ -->
<project>
-
+
<property file="${core.dir}/version.properties"/>
-
+
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
-
+
<target name="thirdparty-init" depends="prepare">
<property name="thirdparty.dir" value="${spi.dir}/thirdparty"/>
@@ -35,9 +35,8 @@
<echo message="checksum.ok = ${checksum.ok}"/>
</target>
- <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty"
- description="Gets the thirdparty libraries">
-
+ <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries">
+
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
@@ -64,8 +63,8 @@
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
@@ -75,11 +74,11 @@
</target>
<target name="thirdparty-classpath" depends="thirdparty-get">
-
- <!-- The compile classpath for jbossws spi -->
+
+ <!-- The compile classpath for jbossws spi -->
<path id="spi.thirdparty.classpath">
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
@@ -89,12 +88,14 @@
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
<pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
</path>
-
+
</target>
-
-</project>
+
+</project>
\ No newline at end of file
Modified: trunk/integration/spi/src/main/etc/wsconsume.sh
===================================================================
--- trunk/integration/spi/src/main/etc/wsconsume.sh 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/etc/wsconsume.sh 2007-07-01 19:29:13 UTC (rev 3772)
@@ -98,10 +98,10 @@
# stack specific dependencies
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
- echo "Seems to be a Sun-RI stack deployed"
+ echo "JBossWS-SunRI stack deployed"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
else
- echo "Seems to be a JBossWS-Native stack deployed"
+ echo "JBossWS-Native stack deployed"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar"
Modified: trunk/integration/spi/src/main/etc/wsprovide.sh
===================================================================
--- trunk/integration/spi/src/main/etc/wsprovide.sh 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/etc/wsprovide.sh 2007-07-01 19:29:13 UTC (rev 3772)
@@ -98,15 +98,15 @@
# stack specific dependencies
if [ "x$JBOSSWS_NATIVE" = "x" ]; then
- echo "Seems to be a Sun-RI stack deployed"
+ echo "JBossWS-SunRI stack deployed"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-sunri-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
else
- echo "Seems to be a JBossWS-Native stack deployed"
- WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
+ echo "JBossWS-Native stack deployed"
+ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar"
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding)
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb)
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding.jaxb;
-
-// $Id: $
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
-/**
- * A basic JAXBHandler.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 26-Jun-2007
- */
-public class BasicJAXBHandler implements JAXBHandler
-{
- public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
- {
- JAXBContext ctx = JAXBContext.newInstance(javaTypes);
- return ctx;
- }
-}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding.jaxb;
+
+// $Id: $
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+/**
+ * A basic JAXBHandler.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 26-Jun-2007
+ */
+public class BasicJAXBHandler implements JAXBHandler
+{
+ public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
+ {
+ JAXBContext ctx = JAXBContext.newInstance(javaTypes);
+ return ctx;
+ }
+}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding.jaxb;
-
-// $Id: $
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
-import org.jboss.wsf.spi.utils.HashCodeUtil;
-
-/**
- * Cache JAXBContext's.
- *
- * @author Heiko.Braun(a)jboss.com
- * @author Thomas.Diesler(a)jboss.com
- * @since 26-Jun-2007
- */
-public class JAXBContextCache implements JAXBHandler
-{
- private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>();
-
- private JAXBContext get(Integer id)
- {
- return cache.get(id);
- }
-
- private void add(Integer id, JAXBContext context)
- {
- cache.put(id, context);
- }
-
- /**
- * Retrieve a cached JAXBContext instance.
- * If no instance is cached a new one will be created and registered.
- */
- public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
- {
- Integer id = buildId(javaTypes);
- JAXBContext ctx = get(id);
- if (null == ctx)
- {
- ctx = JAXBContext.newInstance(javaTypes);
- add(id, ctx);
- }
-
- return ctx;
- }
-
- private Integer buildId(Class[] classes)
- {
- int sum = HashCodeUtil.SEED;
- for (Class cls : classes)
- {
- sum = HashCodeUtil.hash(sum, cls.getName());
- }
- return new Integer(sum);
- }
-}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding.jaxb;
+
+// $Id: $
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+import org.jboss.wsf.spi.utils.HashCodeUtil;
+
+/**
+ * Cache JAXBContext's.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 26-Jun-2007
+ */
+public class JAXBContextCache implements JAXBHandler
+{
+ private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>();
+
+ /**
+ * Retrieve a cached JAXBContext instance.
+ * If no instance is cached a new one will be created and registered.
+ */
+ public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
+ {
+ Integer id = buildId(javaTypes);
+ JAXBContext context = cache.get(id);
+ if (null == context)
+ {
+ context = JAXBContext.newInstance(javaTypes);
+ cache.put(id, context);
+ }
+
+ return context;
+ }
+
+ private Integer buildId(Class[] classes)
+ {
+ int sum = HashCodeUtil.SEED;
+ for (Class cls : classes)
+ {
+ sum = HashCodeUtil.hash(sum, cls.getName());
+ }
+ return new Integer(sum);
+ }
+}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding.jaxb;
-
-// $Id: $
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
-/**
- * A factory for JAXBContext
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 26-Jun-2007
- */
-public interface JAXBHandler
-{
- /** Get a JAXBContext instance.
- */
- JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException;
-}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding.jaxb;
+
+// $Id: $
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+/**
+ * A factory for JAXBContext
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 26-Jun-2007
+ */
+public interface JAXBHandler
+{
+ /** Get a JAXBContext instance.
+ */
+ JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException;
+}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployerManager.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -103,7 +103,7 @@
failsafeStop(deployer, dep);
}
- dep.setState(DeploymentState.STOPED);
+ dep.setState(DeploymentState.STOPPED);
// destroy the deployment
for (int i = deployers.size(); 0 < i; i--)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,8 +27,10 @@
import javax.management.ObjectName;
+import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointMetrics;
/**
* A general JAXWS endpoint.
@@ -47,8 +49,10 @@
private RequestHandler requestHandler;
private InvocationHandler invocationHandler;
private LifecycleHandler lifecycleHandler;
+ private JAXBHandler jaxbHandler;
private Map<Class, Object> attachments = new HashMap<Class, Object>();
private Map<String, Object> properties = new HashMap<String, Object>();
+ private EndpointMetrics metrics;
public BasicEndpoint()
{
@@ -62,16 +66,18 @@
public void setService(Service service)
{
+ assertEndpointSetterAccess();
this.service = service;
}
- public String getTargetBean()
+ public String getTargetBeanName()
{
return targetBean;
}
- public void setTargetBean(String targetBean)
+ public void setTargetBeanName(String targetBean)
{
+ assertEndpointSetterAccess();
this.targetBean = targetBean;
}
@@ -95,6 +101,7 @@
}
return beanClass;
}
+
public ObjectName getName()
{
return name;
@@ -102,6 +109,7 @@
public void setName(ObjectName name)
{
+ assertEndpointSetterAccess();
this.name = name;
}
@@ -112,6 +120,7 @@
public void setShortName(String shortName)
{
+ assertEndpointSetterAccess();
this.shortName = shortName;
}
@@ -122,6 +131,7 @@
public void setURLPattern(String urlPattern)
{
+ assertEndpointSetterAccess();
this.urlPattern = urlPattern;
}
@@ -142,6 +152,7 @@
public void setRequestHandler(RequestHandler handler)
{
+ assertEndpointSetterAccess();
this.requestHandler = handler;
}
@@ -152,6 +163,7 @@
public void setLifecycleHandler(LifecycleHandler handler)
{
+ assertEndpointSetterAccess();
this.lifecycleHandler = handler;
}
@@ -162,9 +174,21 @@
public void setInvocationHandler(InvocationHandler handler)
{
+ assertEndpointSetterAccess();
this.invocationHandler = handler;
}
+ public JAXBHandler getJAXBHandler()
+ {
+ return jaxbHandler;
+ }
+
+ public void setJAXBHandler(JAXBHandler jaxbHandler)
+ {
+ assertEndpointSetterAccess();
+ this.jaxbHandler = jaxbHandler;
+ }
+
public <T> T addAttachment(Class<T> key, Object value)
{
return (T)attachments.put(key, value);
@@ -199,4 +223,23 @@
{
properties.put(key, value);
}
+
+ public EndpointMetrics getEndpointMetrics()
+ {
+ return metrics;
+ }
+
+ public void setEndpointMetrics(EndpointMetrics metrics)
+ {
+ assertEndpointSetterAccess();
+ metrics.setEndpoint(this);
+ this.metrics = metrics;
+
+ }
+
+ private void assertEndpointSetterAccess()
+ {
+ if (state == EndpointState.STARTED)
+ throw new IllegalStateException("Cannot modify endpoint properties in state: " + state);
+ }
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicLifecycleHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -55,6 +55,9 @@
throw new IllegalStateException("Cannot start endpoint in state: " + state);
ep.getInvocationHandler().start(ep);
+
+ if (ep.getEndpointMetrics() != null)
+ ep.getEndpointMetrics().start();
ep.setState(EndpointState.STARTED);
}
@@ -68,8 +71,11 @@
throw new IllegalStateException("Cannot stop endpoint in state: " + state);
ep.getInvocationHandler().stop(ep);
+
+ if (ep.getEndpointMetrics() != null)
+ ep.getEndpointMetrics().stop();
- ep.setState(EndpointState.STOPED);
+ ep.setState(EndpointState.STOPPED);
}
public void destroy(Endpoint ep)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
public enum DeploymentState
{
- UNDEFINED, CREATED, STARTED, STOPED, DESTROYED
+ UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
};
/** Get the root file for this deployment */
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,8 +27,10 @@
import javax.management.ObjectName;
+import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointMetrics;
/**
* A general JAXWS endpoint.
@@ -46,7 +48,7 @@
public enum EndpointState
{
- UNDEFINED, CREATED, STARTED, STOPED, DESTROYED
+ UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
};
/** Get the service this endpoint belongs to */
@@ -74,10 +76,10 @@
void setState(EndpointState state);
/** Get the endpoint implementation bean */
- String getTargetBean();
+ String getTargetBeanName();
/** Set the endpoint implementation bean */
- void setTargetBean(String epImpl);
+ void setTargetBeanName(String epImpl);
/** Use the deployment classloader to load the bean */
Class getTargetBeanClass();
@@ -105,7 +107,19 @@
/** Set the endpoint bean invoker */
void setInvocationHandler(InvocationHandler invoker);
+
+ /** Get the JAXBHandler for this endpoint */
+ JAXBHandler getJAXBHandler();
+
+ /** Set the JAXBHandler for this endpoint */
+ void setJAXBHandler(JAXBHandler handler);
+
+ /** Get the endpoint metrics for this endpoint */
+ EndpointMetrics getEndpointMetrics();
+ /** Set the endpoint metrics for this endpoint */
+ void setEndpointMetrics(EndpointMetrics metrics);
+
/** Add arbitrary attachments */
<T> T addAttachment(Class<T> key, Object value);
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -25,9 +25,13 @@
import java.util.Map;
+import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
import org.jboss.wsf.spi.invocation.InvocationExceptionHandler;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
/**
* A deployer that assigns the handlers to the Endpoint
@@ -41,6 +45,7 @@
private String lifecycleHandler;
private Map<String, String> invocationHandler;
private String invocationExceptionHandler;
+ private String jaxbHandler;
public void setLifecycleHandler(String handler)
{
@@ -62,6 +67,11 @@
this.invocationExceptionHandler = handler;
}
+ public void setJaxbHandler(String jaxbHandler)
+ {
+ this.jaxbHandler = jaxbHandler;
+ }
+
@Override
public void create(Deployment dep)
{
@@ -69,7 +79,8 @@
{
ep.setRequestHandler(getRequestHandler(dep));
ep.setLifecycleHandler(getLifecycleHandler(dep));
- ep.setInvocationHandler(getInvocationHandler(dep));
+ ep.setInvocationHandler(getInvocationHandler(ep));
+ ep.setJAXBHandler(getJAXBHandler(dep));
}
}
@@ -99,11 +110,38 @@
}
}
- private InvocationHandler getInvocationHandler(Deployment dep)
+ private JAXBHandler getJAXBHandler(Deployment dep)
{
- String className = invocationHandler.get(dep.getType().toString());
+ try
+ {
+ Class<?> handlerClass = dep.getClassLoader().loadClass(jaxbHandler);
+ return (JAXBHandler)handlerClass.newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new IllegalStateException("Cannot load jaxb handler: " + jaxbHandler);
+ }
+ }
+
+ private InvocationHandler getInvocationHandler(Endpoint ep)
+ {
+ Deployment dep = ep.getService().getDeployment();
+ String key = dep.getType().toString();
+
+ // Use a special key for MDB endpoints
+ UnifiedApplicationMetaData uapp = dep.getContext().getAttachment(UnifiedApplicationMetaData.class);
+ if (uapp != null)
+ {
+ UnifiedBeanMetaData bmd = uapp.getBeanByEjbName(ep.getShortName());
+ if (bmd instanceof UnifiedMessageDrivenMetaData)
+ {
+ key = "JAXRPC_MDB21";
+ }
+ }
+
+ String className = invocationHandler.get(key);
if (className == null)
- throw new IllegalStateException("Cannot obtain invocation handler for: " + dep.getType());
+ throw new IllegalStateException("Cannot obtain invocation handler for: " + key);
InvocationExceptionHandler exceptionHandler;
try
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointMetricsDeployer.java (from rev 3650, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointMetricsDeployer.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointMetricsDeployer.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointMetricsDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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;
+
+//$Id: EndpointNameDeployer.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $
+
+import org.jboss.wsf.spi.management.EndpointMetrics;
+
+/**
+ * A deployer that assigns the metrics to the Endpoint
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 20-Jun-2007
+ */
+public class EndpointMetricsDeployer extends AbstractDeployer
+{
+ private EndpointMetrics metrics;
+
+ public void setEndpointMetrics(EndpointMetrics metrics)
+ {
+ this.metrics = metrics;
+ }
+
+ @Override
+ public void create(Deployment dep)
+ {
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ ep.setEndpointMetrics(metrics);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,6 +23,9 @@
//$Id$
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
@@ -37,18 +40,27 @@
public void create(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
+ if (contextRoot.startsWith("/") == false)
+ throw new IllegalStateException("Context root expected to start with leading slash: " + contextRoot);
- if(contextRoot.startsWith("/"))
- contextRoot = contextRoot.substring(1);
- else
- throw new IllegalArgumentException("Expected context-root with leading slash");
-
for (Endpoint ep : dep.getService().getEndpoints())
{
StringBuilder name = new StringBuilder(Endpoint.SEPID_DOMAIN + ":");
- name.append(Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot + ",");
+ name.append(Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot.substring(1) + ",");
name.append(Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ep.getShortName());
+ // Append the JMS destination, for an MDB endpoint
+ UnifiedApplicationMetaData uapp = dep.getContext().getAttachment(UnifiedApplicationMetaData.class);
+ if (uapp != null)
+ {
+ UnifiedBeanMetaData bmd = uapp.getBeanByEjbName(ep.getShortName());
+ if (bmd instanceof UnifiedMessageDrivenMetaData)
+ {
+ String destName = ((UnifiedMessageDrivenMetaData)bmd).getDestinationJndiName();
+ name.append(",jms=" + destName);
+ }
+ }
+
ep.setName(ObjectNameFactory.create(name.toString()));
}
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -136,7 +136,7 @@
{
Element servlet = webApp.addElement("servlet");
servlet.addElement("servlet-name").addText(ep.getShortName());
- servlet.addElement("servlet-class").addText(ep.getTargetBean());
+ servlet.addElement("servlet-class").addText(ep.getTargetBeanName());
}
/*
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationContext.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationContext.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/BasicInvocationContext.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -32,8 +32,20 @@
*/
public class BasicInvocationContext implements InvocationContext
{
+ private Object targetBean;
private Map<Class, Object> attachments = new HashMap<Class, Object>();
+
+ public Object getTargetBean()
+ {
+ return targetBean;
+ }
+ public void setTargetBean(Object targetBean)
+ {
+ this.targetBean = targetBean;
+ }
+
+
public <T> T addAttachment(Class<T> key, Object value)
{
return (T)attachments.put(key, value);
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -31,6 +31,10 @@
*/
public interface InvocationContext
{
+ Object getTargetBean();
+
+ void setTargetBean(Object targetBean);
+
/** Add arbitrary attachments */
<T> T addAttachment(Class<T> key, Object value);
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -43,7 +43,7 @@
void start(Endpoint ep);
/** Invoke the the service endpoint */
- void invoke(Endpoint ep, Object beanInstance, Invocation inv) throws Exception;
+ void invoke(Endpoint ep, Invocation inv) throws Exception;
/** Stop the invocation handler */
void stop(Endpoint ep);
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerJSE.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -37,29 +37,41 @@
*/
public class InvocationHandlerJSE extends AbstractInvocationHandler
{
- protected Object getBeanInstance(Endpoint ep) throws InstantiationException, IllegalAccessException
+ protected Object getTargetBean(Endpoint ep, Invocation epInv)
{
- Class epImpl = ep.getTargetBeanClass();
- Object targetBean = epImpl.newInstance();
+ InvocationContext invCtx = epInv.getInvocationContext();
+ Object targetBean = invCtx.getTargetBean();
+ if (targetBean == null)
+ {
+ try
+ {
+ Class epImpl = ep.getTargetBeanClass();
+ targetBean = epImpl.newInstance();
+ invCtx.setTargetBean(targetBean);
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Canot get target bean instance", ex);
+ }
+ }
return targetBean;
}
-
- public void invoke(Endpoint ep, Object beanInstance, Invocation epInv) throws Exception
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
{
- if (beanInstance == null)
- beanInstance = getBeanInstance(ep);
+ Object targetBean = getTargetBean(ep, epInv);
InvocationContext invContext = epInv.getInvocationContext();
WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
if (wsContext != null)
{
- new WebServiceContextInjector().injectContext(beanInstance, (WebServiceContext)wsContext);
+ new WebServiceContextInjector().injectContext(targetBean, (WebServiceContext)wsContext);
}
- Method method = getImplMethod(beanInstance.getClass(), epInv.getJavaMethod());
- Object retObj = method.invoke(beanInstance, epInv.getArgs());
+ Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod());
+ Object retObj = method.invoke(targetBean, epInv.getArgs());
epInv.setReturnValue(retObj);
}
catch (Exception e)
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java (from rev 3771, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDummy.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.invocation;
+
+// $Id: WebServiceContextJSE.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $
+
+import java.security.Principal;
+
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A WebServiceContext implementation that has no access to
+ * a security context.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-Jun-2007
+ */
+public class WebServiceContextDummy extends AbstractWebServiceContext
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(WebServiceContextDummy.class);
+
+ public WebServiceContextDummy(MessageContext msgContext)
+ {
+ super(msgContext);
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ log.warn("No security context available");
+ return null;
+ }
+
+ @Override
+ public boolean isUserInRole(String role)
+ {
+ log.warn("No security context available");
+ return false;
+ }
+}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -38,10 +38,10 @@
{
private HttpServletRequest httpRequest;
- public WebServiceContextJSE(MessageContext messageContext)
+ public WebServiceContextJSE(MessageContext msgContext)
{
- super(messageContext);
- httpRequest = (HttpServletRequest)messageContext.get(MessageContext.SERVLET_REQUEST);
+ super(msgContext);
+ httpRequest = (HttpServletRequest)msgContext.get(MessageContext.SERVLET_REQUEST);
if (httpRequest == null)
throw new IllegalStateException("Cannot obtain HTTPServletRequest from message context");
}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws)
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler)
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxws.handler;
-
-// $Id: $
-
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * A generic jaxws handler
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 13-Aug-2006
- */
-public abstract class GenericHandler implements Handler
-{
- private String handlerName;
-
- public String getHandlerName()
- {
- return handlerName;
- }
-
- public void setHandlerName(String handlerName)
- {
- this.handlerName = handlerName;
- }
-
- public boolean handleMessage(MessageContext msgContext)
- {
- Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
- if (outbound == null)
- throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY);
-
- return outbound ? handleOutbound(msgContext) : handleInbound(msgContext);
- }
-
- protected boolean handleOutbound(MessageContext msgContext)
- {
- return true;
- }
-
- protected boolean handleInbound(MessageContext msgContext)
- {
- return true;
- }
-
- public boolean handleFault(MessageContext messagecontext)
- {
- return true;
- }
-
- public void close(MessageContext messageContext)
- {
- }
-
- public String toString()
- {
- return (handlerName != null ? handlerName : super.toString());
- }
-}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxws.handler;
+
+// $Id: $
+
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * A generic jaxws handler
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 13-Aug-2006
+ */
+public abstract class GenericHandler implements Handler
+{
+ private String handlerName;
+
+ public String getHandlerName()
+ {
+ return handlerName;
+ }
+
+ public void setHandlerName(String handlerName)
+ {
+ this.handlerName = handlerName;
+ }
+
+ public boolean handleMessage(MessageContext msgContext)
+ {
+ Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+ if (outbound == null)
+ throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY);
+
+ return outbound ? handleOutbound(msgContext) : handleInbound(msgContext);
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ return true;
+ }
+
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ return true;
+ }
+
+ public boolean handleFault(MessageContext messagecontext)
+ {
+ return true;
+ }
+
+ public void close(MessageContext messageContext)
+ {
+ }
+
+ public String toString()
+ {
+ return (handlerName != null ? handlerName : super.toString());
+ }
+}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxws.handler;
-
-// $Id$
-
-import javax.xml.ws.handler.LogicalHandler;
-import javax.xml.ws.handler.LogicalMessageContext;
-
-/**
- * A generic jaxws logical handler
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 13-Aug-2006
- */
-public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler
-{
-}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericLogicalHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxws.handler;
+
+// $Id$
+
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.LogicalMessageContext;
+
+/**
+ * A generic jaxws logical handler
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 13-Aug-2006
+ */
+public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler
+{
+}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxws.handler;
-
-// $Id: $
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.LogicalMessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-
-
-/**
- * A generic jaxws soap handler
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 13-Aug-2006
- */
-public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler
-{
- // The header blocks that can be processed by this Handler instance
- private Set<QName> headers = new HashSet<QName>();
-
- /** Gets the header blocks that can be processed by this Handler instance.
- */
- public Set<QName> getHeaders()
- {
- return headers;
- }
-
- /** Sets the header blocks that can be processed by this Handler instance.
- */
- public void setHeaders(Set<QName> headers)
- {
- this.headers = headers;
- }
-}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/jaxws/handler/GenericSOAPHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxws.handler;
+
+// $Id: $
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.handler.LogicalMessageContext;
+import javax.xml.ws.handler.soap.SOAPHandler;
+
+
+/**
+ * A generic jaxws soap handler
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 13-Aug-2006
+ */
+public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler
+{
+ // The header blocks that can be processed by this Handler instance
+ private Set<QName> headers = new HashSet<QName>();
+
+ /** Gets the header blocks that can be processed by this Handler instance.
+ */
+ public Set<QName> getHeaders()
+ {
+ return headers;
+ }
+
+ /** Sets the header blocks that can be processed by this Handler instance.
+ */
+ public void setHeaders(Set<QName> headers)
+ {
+ this.headers = headers;
+ }
+}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointMetrics.java (from rev 3650, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointMetrics.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointMetrics.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicEndpointMetrics.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,171 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.management;
+
+// $Id: ServiceEndpointMetrics.java 2253 2007-02-02 14:21:44Z heiko.braun(a)jboss.com $
+
+import java.util.Date;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * Service Endpoint Metrics
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Dec-2005
+ */
+public class BasicEndpointMetrics implements EndpointMetrics
+{
+ private Endpoint endpoint;
+
+ private Date startTime;
+ private Date stopTime;
+ private long requestCount;
+ private long responseCount;
+ private long faultCount;
+ private long maxProcessingTime;
+ private long minProcessingTime;
+ private long avgProcessingTime;
+ private long totalProcessingTime;
+
+ public Endpoint getEndpoint()
+ {
+ return endpoint;
+ }
+
+ public void setEndpoint(Endpoint endpoint)
+ {
+ this.endpoint = endpoint;
+ }
+
+ public void start()
+ {
+ startTime = new Date();
+ stopTime = null;
+ requestCount = 0;
+ responseCount = 0;
+ faultCount = 0;
+ maxProcessingTime = 0;
+ minProcessingTime = 0;
+ avgProcessingTime = 0;
+ totalProcessingTime = 0;
+ }
+
+ public void stop()
+ {
+ stopTime = new Date();
+ }
+
+ public long processRequestMessage()
+ {
+ requestCount++;
+ return System.currentTimeMillis();
+ }
+
+ public void processResponseMessage(long beginTime)
+ {
+ responseCount++;
+ processAnyMessage(beginTime);
+ }
+
+ public void processFaultMessage(long beginTime)
+ {
+ faultCount++;
+ processAnyMessage(beginTime);
+ }
+
+ private void processAnyMessage(long beginTime)
+ {
+ if (beginTime > 0)
+ {
+ long procTime = System.currentTimeMillis() - beginTime;
+
+ if (minProcessingTime == 0)
+ minProcessingTime = procTime;
+
+ maxProcessingTime = Math.max(maxProcessingTime, procTime);
+ minProcessingTime = Math.min(minProcessingTime, procTime);
+ totalProcessingTime = totalProcessingTime + procTime;
+ avgProcessingTime = totalProcessingTime / (responseCount + faultCount);
+ }
+ }
+
+ public Date getStartTime()
+ {
+ return startTime;
+ }
+
+ public Date getStopTime()
+ {
+ return stopTime;
+ }
+
+ public long getMinProcessingTime()
+ {
+ return minProcessingTime;
+ }
+
+ public long getMaxProcessingTime()
+ {
+ return maxProcessingTime;
+ }
+
+ public long getAverageProcessingTime()
+ {
+ return avgProcessingTime;
+ }
+
+ public long getTotalProcessingTime()
+ {
+ return totalProcessingTime;
+ }
+
+ public long getRequestCount()
+ {
+ return requestCount;
+ }
+
+ public long getFaultCount()
+ {
+ return faultCount;
+ }
+
+ public long getResponseCount()
+ {
+ return responseCount;
+ }
+
+ public String toString()
+ {
+ StringBuilder buffer = new StringBuilder("\nEndpoint Metrics: " + endpoint.getName());
+ buffer.append("\n startTime=" + startTime);
+ buffer.append("\n stopTime=" + stopTime);
+ buffer.append("\n requestCount=" + requestCount);
+ buffer.append("\n responseCount=" + responseCount);
+ buffer.append("\n faultCount=" + faultCount);
+ buffer.append("\n maxProcessingTime=" + maxProcessingTime);
+ buffer.append("\n minProcessingTime=" + minProcessingTime);
+ buffer.append("\n avgProcessingTime=" + avgProcessingTime);
+ buffer.append("\n totalProcessingTime=" + totalProcessingTime);
+ return buffer.toString();
+ }
+}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfig.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -25,9 +25,7 @@
import java.io.File;
import java.net.InetAddress;
-import java.net.MalformedURLException;
import java.net.UnknownHostException;
-import java.net.URL;
import java.util.Iterator;
import java.util.Set;
@@ -41,14 +39,13 @@
import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
- * JBoss specific implementation of a ServerConfig
+ * Basic implementation of a ServerConfig
*
* @author Thomas.Diesler(a)jboss.org
* @author darran.lofthouse(a)jboss.com
- * @author mageshbk(a)jboss.com
* @since 08-May-2006
*/
-public class BasicServerConfig implements ServerConfig
+public class BasicServerConfig implements BasicServerConfigMBean
{
private static final Logger log = Logger.getLogger(BasicServerConfig.class);
@@ -139,29 +136,51 @@
if (webServicePort <= 0)
webServicePort = getConnectorPort("HTTP/1.1", false);
- if (webServicePort <= 0)
+ int localPort = webServicePort;
+ if (localPort <= 0)
{
+ // Do not initialize webServicePort with the default, the connector port may become available later
log.warn("Unable to calculate 'WebServicePort', using default '8080'");
- webServicePort = 8080;
+ localPort = 8080;
}
- return webServicePort;
+ return localPort;
}
public int getWebServiceSecurePort()
{
if (webServiceSecurePort <= 0)
webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
-
- if (webServiceSecurePort <= 0)
+
+ int localPort = webServiceSecurePort;
+ if (localPort <= 0)
{
+ // Do not initialize webServiceSecurePort with the default, the connector port may become available later
log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'");
- webServiceSecurePort = 8443;
+ localPort = 8443;
}
- return webServiceSecurePort;
+ return localPort;
}
+ public void create() throws Exception
+ {
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.registerMBean(this, BasicServerConfigMBean.OBJECT_NAME);
+ }
+ }
+
+ public void destroy() throws Exception
+ {
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.unregisterMBean(BasicServerConfigMBean.OBJECT_NAME);
+ }
+ }
+
private int getConnectorPort(final String protocol, final boolean secure)
{
int port = -1;
@@ -218,63 +237,4 @@
}
return server;
}
-
- public String getDisplayAddress(String endpointAddress, URL requestURL) throws MalformedURLException
- {
- URL displayURL = new URL(endpointAddress);
- String displayHost = getDisplayHost(endpointAddress, requestURL);
-
- String displayAddress = displayHost + displayURL.getPath();
- if (log.isDebugEnabled())
- {
- log.trace("Mapping WSDL soap:address from '" + endpointAddress + "' to '" + displayAddress + "'");
- }
- return displayAddress;
- }
-
- /*
- * Formats the Service endpoint host according to the beans.xml definition and
- * the requested url and returns the URL as string
- *
- */
- public String getDisplayHost(String endpointAddress, URL requestURL) throws MalformedURLException
- {
- URL displayURL = new URL(endpointAddress);
- String protocol = displayURL.getProtocol();
- String host = displayURL.getHost();
- int port = displayURL.getPort();
- String uriScheme = requestURL.getProtocol();
- if (this.modifySOAPAddress || host.equals(BasicServerConfig.UNDEFINED_HOSTNAME) == true)
- {
- //Modify the address
- if (this.getWebServiceHost().equals(BasicServerConfig.UNDEFINED_HOSTNAME) == true)
- {
- //Use the incoming request's address
- protocol = uriScheme;
- host = requestURL.getHost();
- port = requestURL.getPort();
- }
- else
- {
- //Use the address given in jboss-beans.xml
- protocol = uriScheme;
- host = this.getWebServiceHost();
- if (protocol.equals("https"))
- {
- port = this.getWebServiceSecurePort();
- }
- else
- {
- port = this.getWebServicePort();
- }
- }
- }
- String displayHost = protocol + "://" + host + (port > 0 ? ":" + port : "");
-
- if (log.isDebugEnabled())
- {
- log.trace("Mapping WSDL host from '" + protocol + "://" + host + ":" + port + "' to '" + displayHost + "'");
- }
- return displayHost;
- }
}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/BasicServerConfigMBean.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.management;
+
+import javax.management.ObjectName;
+
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.utils.ObjectNameFactory;
+
+public interface BasicServerConfigMBean extends ServerConfig
+{
+ /** The object name in the MBean server */
+ ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig");
+}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java (from rev 3650, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointMetrics.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,42 @@
+package org.jboss.wsf.spi.management;
+
+import java.util.Date;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+public interface EndpointMetrics
+{
+
+ Endpoint getEndpoint();
+
+ void setEndpoint(Endpoint endpoint);
+
+ void start();
+
+ void stop();
+
+ long processRequestMessage();
+
+ void processResponseMessage(long beginTime);
+
+ void processFaultMessage(long beginTime);
+
+ Date getStartTime();
+
+ Date getStopTime();
+
+ long getMinProcessingTime();
+
+ long getMaxProcessingTime();
+
+ long getAverageProcessingTime();
+
+ long getTotalProcessingTime();
+
+ long getRequestCount();
+
+ long getFaultCount();
+
+ long getResponseCount();
+
+}
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,19 +24,14 @@
// $Id$
import java.io.File;
-import java.net.MalformedURLException;
import java.net.UnknownHostException;
-import java.net.URL;
-import javax.management.ObjectName;
-import org.jboss.wsf.spi.utils.ObjectNameFactory;
/**
* Interface to container independent config
*
* @author Thomas.Diesler(a)jboss.org
- * @author mageshbk(a)jboss.com
* @since 08-May-2006
*/
public interface ServerConfig
@@ -44,9 +39,6 @@
/** The default bean name */
String BEAN_NAME = "WSServerConfig";
- /** The object name in the MBean server */
- ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig");
-
/** The host name that is returned if there is no other defined */
String UNDEFINED_HOSTNAME = "jbossws.undefined.host";
@@ -69,8 +61,4 @@
boolean isModifySOAPAddress();
void setModifySOAPAddress(boolean flag);
-
- String getDisplayAddress(String endpointAddress, URL requestURL) throws MalformedURLException;
-
- String getDisplayHost(String endpointAddress, URL requestURL) throws MalformedURLException;
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,7 +29,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 05-May-2006
*/
-public class UnifiedBeanMetaData
+public abstract class UnifiedBeanMetaData
{
/** The ejb-name element specifies an enterprise bean's name. */
private String ejbName;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -36,6 +36,16 @@
// The required <param-value> element
private String paramValue;
+ public UnifiedInitParamMetaData(String paramName, String paramValue)
+ {
+ this.paramName = paramName;
+ this.paramValue = paramValue;
+ }
+
+ public UnifiedInitParamMetaData()
+ {
+ }
+
public String getParamName()
{
return paramName;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -61,7 +61,6 @@
super(name);
}
- /** Get the MBeanServerConnection from JNDI */
public MBeanServerConnection getServer() throws NamingException
{
return delegate.getServer();
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,7 +30,6 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.jboss.logging.Logger;
@@ -68,21 +67,21 @@
}
/** True, if -Djbossws.integration.target=jboss50 */
- public static boolean isTargetJBoss50()
+ public boolean isTargetJBoss50()
{
String target = getIntegrationTarget();
return "jboss50".equals(target);
}
/** True, if -Djbossws.integration.target=jboss42 */
- public static boolean isTargetJBoss42()
+ public boolean isTargetJBoss42()
{
String target = getIntegrationTarget();
return "jboss42".equals(target);
}
/** True, if -Djbossws.integration.target=jboss40 */
- public static boolean isTargetJBoss40()
+ public boolean isTargetJBoss40()
{
String target = getIntegrationTarget();
return "jboss40".equals(target);
@@ -93,18 +92,18 @@
String vendor = Service.class.getPackage().getImplementationVendor();
return vendor.startsWith("JBoss");
}
-
+
public boolean isIntegrationSunRI()
{
String vendor = Service.class.getPackage().getImplementationVendor();
return vendor.startsWith("Sun Microsystems");
}
-
+
public boolean isIntegrationXFire()
{
throw new NotImplementedException();
}
-
+
/**
* Get the JBoss server host from system property "jboss.bind.address"
* This defaults to "localhost"
@@ -139,7 +138,7 @@
return new TestDeployerJBoss(getServer());
}
- private static String getIntegrationTarget()
+ public String getIntegrationTarget()
{
if (integrationTarget == null)
{
@@ -149,10 +148,11 @@
throw new IllegalStateException("Cannot obtain jbossws.integration.target");
// Read the JBoss SpecificationVersion
+ String jbossVersion = null;
try
{
ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
+ jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
if (jbossVersion.startsWith("5.0"))
jbossVersion = "jboss50";
else if (jbossVersion.startsWith("4.2"))
@@ -160,17 +160,14 @@
else if (jbossVersion.startsWith("4.0"))
jbossVersion = "jboss40";
else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
-
- if (jbossVersion.equals(integrationTarget) == false)
- {
- throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
- //integrationTarget = jbossVersion;
- }
}
catch (Throwable th)
{
// ignore, we are not running on jboss-4.2 or greater
}
+
+ if (jbossVersion != null && jbossVersion.equals(integrationTarget) == false)
+ throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
}
return integrationTarget;
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,11 @@
import java.util.List;
import java.util.StringTokenizer;
+import javax.management.MBeanServerConnection;
+import javax.naming.NamingException;
+
+import org.jboss.logging.Logger;
+
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -39,29 +44,27 @@
*/
public class JBossWSTestSetup extends TestSetup
{
+ // provide logging
+ private static Logger log = Logger.getLogger(JBossWSTestSetup.class);
+
private JBossWSTestHelper delegate = new JBossWSTestHelper();
private String[] archives = new String[0];
- public static JBossWSTestSetup newTestSetup(Class testClass, String archiveList)
+ public JBossWSTestSetup(Class testClass, String archiveList)
{
- return new JBossWSTestSetup(testClass, archiveList);
+ super(new TestSuite(testClass));
+ getArchiveArray(archiveList);
}
- public static JBossWSTestSetup newTestSetup(Test test, String archiveList)
+ public JBossWSTestSetup(Test test, String archiveList)
{
- return new JBossWSTestSetup(test, archiveList);
- }
-
- protected JBossWSTestSetup(Class testClass, String archiveList)
- {
- super(new TestSuite(testClass));
+ super(test);
getArchiveArray(archiveList);
}
- protected JBossWSTestSetup(Test test, String archiveList)
+ public JBossWSTestSetup(Test test)
{
super(test);
- getArchiveArray(archiveList);
}
private void getArchiveArray(String archiveList)
@@ -78,6 +81,10 @@
protected void setUp() throws Exception
{
+ // verify integration target
+ String integrationTarget = delegate.getIntegrationTarget();
+ log.debug("Integration target: " + integrationTarget);
+
List clientJars = new ArrayList();
for (int i = 0; i < archives.length; i++)
{
@@ -121,4 +128,9 @@
delegate.undeploy(archive);
}
}
+
+ public MBeanServerConnection getServer() throws NamingException
+ {
+ return delegate.getServer();
+ }
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -227,7 +227,7 @@
out.println(" -h, --help Show this help message");
out.println(" -k, --keep Keep/Generate Java source");
out.println(" -w, --wsdl Enable WSDL file generation");
- out.println(" -c. --classpath=<path> The classpath that contains the endpoint");
+ out.println(" -c, --classpath=<path> The classpath that contains the endpoint");
out.println(" -o, --output=<directory> The directory to put generated artifacts");
out.println(" -r, --resource=<directory> The directory to put resource artifacts");
out.println(" -s, --source=<directory> The directory to put Java source");
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport)
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms)
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,280 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.transport.jms;
-
-// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.xml.soap.SOAPException;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.NestedRuntimeException;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.BasicInvocationContext;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-
-/**
- * The abstract base class for MDBs that want to act as web service endpoints.
- * A subclass should only need to implement the service endpoint interface.
- *
- * @author Thomas.Diesler(a)jboss.org
- */
-public abstract class JMSTransportSupport implements MessageDrivenBean, MessageListener
-{
- // logging support
- protected Logger log = Logger.getLogger(JMSTransportSupport.class);
-
- //private MessageDrivenContext mdbCtx;
- private QueueConnectionFactory queueFactory;
-
- /**
- * All messages come in here, if it is a BytesMessage we pass it on for further processing.
- */
- public void onMessage(Message message)
- {
- try
- {
- String msgStr = null;
- if (message instanceof BytesMessage)
- {
- msgStr = getMessageStr((BytesMessage)message);
- }
- else if (message instanceof TextMessage)
- {
- msgStr = ((TextMessage)message).getText();
- }
- else
- {
- log.warn("Invalid message type: " + message);
- return;
- }
-
- log.debug("Incomming SOAP message: " + msgStr);
-
- String fromName = null;
- Destination destination = message.getJMSDestination();
- if (destination instanceof Queue)
- fromName = "queue/" + ((Queue)destination).getQueueName();
- if (destination instanceof Topic)
- fromName = "topic/" + ((Topic)destination).getTopicName();
-
- InputStream inputStream = new ByteArrayInputStream(msgStr.getBytes());
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024);
- processSOAPMessage(fromName, inputStream, outputStream);
-
- msgStr = new String(outputStream.toByteArray());
- log.debug("Outgoing SOAP message: " + msgStr);
-
- if (msgStr.length() > 0)
- {
- Queue replyQueue = getReplyQueue(message);
- if (replyQueue != null)
- {
- sendResponse(replyQueue, msgStr);
- }
- else
- {
- log.warn("No reply queue, ignore response message");
- }
- }
- else
- {
- log.debug("SOAP response message is null");
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception e)
- {
- throw new EJBException(e);
- }
- }
-
- protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException
- {
- EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry();
- Endpoint endpoint = getEndpointForDestination(epRegistry, fromName);
-
- if (endpoint == null)
- throw new IllegalStateException("Cannot find endpoint for: " + fromName);
-
- log.debug("dipatchMessage: " + endpoint.getName());
-
- RequestHandler reqHandler = endpoint.getRequestHandler();
-
- try
- {
- BasicInvocationContext invContext = new BasicInvocationContext();
- invContext.setTargetBean(this);
-
- reqHandler.handleRequest(endpoint, inputStream, outStream, invContext);
- }
- catch (Exception ex)
- {
- throw new RemoteException("Cannot process SOAP request", ex);
- }
- }
-
- // The destination jndiName is encoded in the service object name under key 'jms'
- private Endpoint getEndpointForDestination(EndpointRegistry epRegistry, String fromName)
- {
- Endpoint endpoint = null;
- for (ObjectName oname : epRegistry.getEndpoints())
- {
- Endpoint aux = epRegistry.getEndpoint(oname);
- String jmsProp = aux.getName().getKeyProperty("jms");
- if (jmsProp != null && jmsProp.equals(fromName))
- {
- endpoint = aux;
- break;
- }
- }
- return endpoint;
- }
-
- private String getMessageStr(BytesMessage message) throws Exception
- {
- byte[] buffer = new byte[8 * 1024];
- ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.length);
- int read = message.readBytes(buffer);
- while (read != -1)
- {
- out.write(buffer, 0, read);
- read = message.readBytes(buffer);
- }
-
- byte[] msgBytes = out.toByteArray();
- return new String(msgBytes);
- }
-
- /**
- * Get the reply queue.
- */
- protected Queue getReplyQueue(Message message) throws JMSException
- {
- Queue replyQueue = (Queue)message.getJMSReplyTo();
- return replyQueue;
- }
-
- /**
- * Respond to the call by sending a message to the reply queue
- */
- protected void sendResponse(Queue replyQueue, String msgStr) throws SOAPException, IOException, JMSException
- {
- QueueConnection qc = queueFactory.createQueueConnection();
- QueueSession session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- QueueSender sender = null;
- try
- {
- sender = session.createSender(replyQueue);
- TextMessage responseMessage = session.createTextMessage(msgStr);
- sender.send(responseMessage);
- log.info("Sent response");
- }
- finally
- {
- try
- {
- sender.close();
- }
- catch (JMSException ignored)
- {
- }
- try
- {
- session.close();
- }
- catch (JMSException ignored)
- {
- }
- try
- {
- qc.close();
- }
- catch (JMSException ignored)
- {
- }
- }
- }
-
- // MDB lifecycle methods ********************************************************************************************
-
- public void ejbCreate()
- {
- try
- {
- InitialContext ctx = new InitialContext();
- queueFactory = (QueueConnectionFactory)ctx.lookup("java:/ConnectionFactory");
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception e)
- {
- throw new NestedRuntimeException(e);
- }
- }
-
- /**
- * A container invokes this method before it ends the life of the message-driven object.
- */
- public void ejbRemove() throws EJBException
- {
- }
-
- /**
- * Set the associated message-driven context.
- */
- public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException
- {
- //this.mdbCtx = ctx;
- }
-}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/transport/jms/JMSTransportSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,280 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.transport.jms;
+
+// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBException;
+import javax.ejb.MessageDrivenBean;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.BytesMessage;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSender;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.xml.soap.SOAPException;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.NestedRuntimeException;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.BasicInvocationContext;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+/**
+ * The abstract base class for MDBs that want to act as web service endpoints.
+ * A subclass should only need to implement the service endpoint interface.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public abstract class JMSTransportSupport implements MessageDrivenBean, MessageListener
+{
+ // logging support
+ protected Logger log = Logger.getLogger(JMSTransportSupport.class);
+
+ //private MessageDrivenContext mdbCtx;
+ private QueueConnectionFactory queueFactory;
+
+ /**
+ * All messages come in here, if it is a BytesMessage we pass it on for further processing.
+ */
+ public void onMessage(Message message)
+ {
+ try
+ {
+ String msgStr = null;
+ if (message instanceof BytesMessage)
+ {
+ msgStr = getMessageStr((BytesMessage)message);
+ }
+ else if (message instanceof TextMessage)
+ {
+ msgStr = ((TextMessage)message).getText();
+ }
+ else
+ {
+ log.warn("Invalid message type: " + message);
+ return;
+ }
+
+ log.debug("Incomming SOAP message: " + msgStr);
+
+ String fromName = null;
+ Destination destination = message.getJMSDestination();
+ if (destination instanceof Queue)
+ fromName = "queue/" + ((Queue)destination).getQueueName();
+ if (destination instanceof Topic)
+ fromName = "topic/" + ((Topic)destination).getTopicName();
+
+ InputStream inputStream = new ByteArrayInputStream(msgStr.getBytes());
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream(1024);
+ processSOAPMessage(fromName, inputStream, outputStream);
+
+ msgStr = new String(outputStream.toByteArray());
+ log.debug("Outgoing SOAP message: " + msgStr);
+
+ if (msgStr.length() > 0)
+ {
+ Queue replyQueue = getReplyQueue(message);
+ if (replyQueue != null)
+ {
+ sendResponse(replyQueue, msgStr);
+ }
+ else
+ {
+ log.warn("No reply queue, ignore response message");
+ }
+ }
+ else
+ {
+ log.debug("SOAP response message is null");
+ }
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new EJBException(e);
+ }
+ }
+
+ protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException
+ {
+ EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry();
+ Endpoint endpoint = getEndpointForDestination(epRegistry, fromName);
+
+ if (endpoint == null)
+ throw new IllegalStateException("Cannot find endpoint for: " + fromName);
+
+ log.debug("dipatchMessage: " + endpoint.getName());
+
+ RequestHandler reqHandler = endpoint.getRequestHandler();
+
+ try
+ {
+ BasicInvocationContext invContext = new BasicInvocationContext();
+ invContext.setTargetBean(this);
+
+ reqHandler.handleRequest(endpoint, inputStream, outStream, invContext);
+ }
+ catch (Exception ex)
+ {
+ throw new RemoteException("Cannot process SOAP request", ex);
+ }
+ }
+
+ // The destination jndiName is encoded in the service object name under key 'jms'
+ private Endpoint getEndpointForDestination(EndpointRegistry epRegistry, String fromName)
+ {
+ Endpoint endpoint = null;
+ for (ObjectName oname : epRegistry.getEndpoints())
+ {
+ Endpoint aux = epRegistry.getEndpoint(oname);
+ String jmsProp = aux.getName().getKeyProperty("jms");
+ if (jmsProp != null && jmsProp.equals(fromName))
+ {
+ endpoint = aux;
+ break;
+ }
+ }
+ return endpoint;
+ }
+
+ private String getMessageStr(BytesMessage message) throws Exception
+ {
+ byte[] buffer = new byte[8 * 1024];
+ ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.length);
+ int read = message.readBytes(buffer);
+ while (read != -1)
+ {
+ out.write(buffer, 0, read);
+ read = message.readBytes(buffer);
+ }
+
+ byte[] msgBytes = out.toByteArray();
+ return new String(msgBytes);
+ }
+
+ /**
+ * Get the reply queue.
+ */
+ protected Queue getReplyQueue(Message message) throws JMSException
+ {
+ Queue replyQueue = (Queue)message.getJMSReplyTo();
+ return replyQueue;
+ }
+
+ /**
+ * Respond to the call by sending a message to the reply queue
+ */
+ protected void sendResponse(Queue replyQueue, String msgStr) throws SOAPException, IOException, JMSException
+ {
+ QueueConnection qc = queueFactory.createQueueConnection();
+ QueueSession session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ QueueSender sender = null;
+ try
+ {
+ sender = session.createSender(replyQueue);
+ TextMessage responseMessage = session.createTextMessage(msgStr);
+ sender.send(responseMessage);
+ log.info("Sent response");
+ }
+ finally
+ {
+ try
+ {
+ sender.close();
+ }
+ catch (JMSException ignored)
+ {
+ }
+ try
+ {
+ session.close();
+ }
+ catch (JMSException ignored)
+ {
+ }
+ try
+ {
+ qc.close();
+ }
+ catch (JMSException ignored)
+ {
+ }
+ }
+ }
+
+ // MDB lifecycle methods ********************************************************************************************
+
+ public void ejbCreate()
+ {
+ try
+ {
+ InitialContext ctx = new InitialContext();
+ queueFactory = (QueueConnectionFactory)ctx.lookup("java:/ConnectionFactory");
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new NestedRuntimeException(e);
+ }
+ }
+
+ /**
+ * A container invokes this method before it ends the life of the message-driven object.
+ */
+ public void ejbRemove() throws EJBException
+ {
+ }
+
+ /**
+ * Set the associated message-driven context.
+ */
+ public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException
+ {
+ //this.mdbCtx = ctx;
+ }
+}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java (from rev 3754, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.utils;
+
+import java.lang.reflect.Array;
+
+/**
+ * Collected methods which allow easy implementation of <code>hashCode</code>.
+ *
+ * Example use case:
+ * <pre>
+ * public int hashCode(){
+ * int result = HashCodeUtil.SEED;
+ * //collect the contributions of various fields
+ * result = HashCodeUtil.hash(result, fPrimitive);
+ * result = HashCodeUtil.hash(result, fObject);
+ * result = HashCodeUtil.hash(result, fArray);
+ * return result;
+ * }
+ * </pre>
+ */
+public final class HashCodeUtil
+{
+
+ /**
+ * An initial value for a <code>hashCode</code>, to which is added contributions
+ * from fields. Using a non-zero value decreases collisons of <code>hashCode</code>
+ * values.
+ */
+ public static final int SEED = 23;
+
+ /**
+ * booleans.
+ */
+ public static int hash(int aSeed, boolean aBoolean)
+ {
+ return firstTerm(aSeed) + (aBoolean ? 1 : 0);
+ }
+
+ /**
+ * chars.
+ */
+ public static int hash(int aSeed, char aChar)
+ {
+ return firstTerm(aSeed) + (int)aChar;
+ }
+
+ /**
+ * ints.
+ */
+ public static int hash(int aSeed, int aInt)
+ {
+ /*
+ * Implementation Note
+ * Note that byte and short are handled by this method, through
+ * implicit conversion.
+ */
+ return firstTerm(aSeed) + aInt;
+ }
+
+ /**
+ * longs.
+ */
+ public static int hash(int aSeed, long aLong)
+ {
+ return firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32));
+ }
+
+ /**
+ * floats.
+ */
+ public static int hash(int aSeed, float aFloat)
+ {
+ return hash(aSeed, Float.floatToIntBits(aFloat));
+ }
+
+ /**
+ * doubles.
+ */
+ public static int hash(int aSeed, double aDouble)
+ {
+ return hash(aSeed, Double.doubleToLongBits(aDouble));
+ }
+
+ /**
+ * <code>aObject</code> is a possibly-null object field, and possibly an array.
+ *
+ * If <code>aObject</code> is an array, then each element may be a primitive
+ * or a possibly-null object.
+ */
+ public static int hash(int aSeed, Object aObject)
+ {
+ int result = aSeed;
+ if (aObject == null)
+ {
+ result = hash(result, 0);
+ }
+ else if (!isArray(aObject))
+ {
+ result = hash(result, aObject.hashCode());
+ }
+ else
+ {
+ int length = Array.getLength(aObject);
+ for (int idx = 0; idx < length; ++idx)
+ {
+ Object item = Array.get(aObject, idx);
+ //recursive call!
+ result = hash(result, item);
+ }
+ }
+ return result;
+ }
+
+ /// PRIVATE ///
+ private static final int fODD_PRIME_NUMBER = 37;
+
+ private static int firstTerm(int aSeed)
+ {
+ return fODD_PRIME_NUMBER * aSeed;
+ }
+
+ private static boolean isArray(Object aObject)
+ {
+ return aObject.getClass().isArray();
+ }
+}
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/.classpath 2007-07-01 19:29:13 UTC (rev 3772)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="output/tests/wsconsume/java"/>
- <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/" kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/getopt.jar"/>
@@ -17,11 +17,11 @@
<classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-remoting.jar" sourcepath="thirdparty/jboss-remoting-src.jar"/>
<classpathentry kind="lib" path="thirdparty/jbosssx-client.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar" sourcepath="thirdparty/jboss-xml-binding-sources.jar"/>
<classpathentry kind="lib" path="thirdparty/mail.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/wsdl4j.jar" sourcepath="thirdparty/wsdl4j-src.jar"/>
<classpathentry kind="lib" path="thirdparty/wstx.jar"/>
<classpathentry kind="lib" path="thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -105,6 +105,9 @@
<unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/>
<unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
+ <get src="http://snapshots.jboss.org/maven2/org/jboss/jbossxb/2.0.0-SNAPSHOT/jbossx..." dest="${thirdparty.dir}/jbossxb-2.0.0-20070620.094346-1.jar" usetimestamp="true" verbose="true"/>
+ <get src="http://snapshots.jboss.org/maven2/jboss/jbossxb/jbossxb/1.0.0-SNAPSHOT/jb..." dest="${thirdparty.dir}/jbossxb-1.0.0-20070620.100638-1.jar" usetimestamp="true" verbose="true"/>
+
<checksum file="${core.dir}/version.properties" fileext=".md5"/>
</target>
@@ -115,8 +118,8 @@
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
@@ -134,14 +137,14 @@
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/stax-api.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
<pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/xalan.jar"/>
<pathelement location="${thirdparty.dir}/xmlsec.jar"/>
<pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
- <pathelement location="${thirdparty.dir}/policy.jar"/>
</path>
</target>
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -20,6 +20,30 @@
<mkdir dir="${tests.output.dir}/libs"/>
+ <!-- jaxrpc-addressrewrite -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-addressrewrite.war" webxml="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxrpc-addressrewrite-sec.war" webxml="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF/web-sec.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/addressrewrite/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-anonymous -->
<war warfile="${tests.output.dir}/libs/jaxrpc-anonymous.war" webxml="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -2498,6 +2522,32 @@
</webinf>
</war>
+ <!-- jbossws-jbws1653 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1653.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1653-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1653/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -2629,6 +2679,7 @@
<include name="org/jboss/test/ws/jaxrpc/serviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF">
<include name="jaxrpc-mapping.xml"/>
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -197,21 +197,45 @@
</fileset>
</war>
- <!-- jaxws-jbws1529 -->
- <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/>
- </classes>
- </war>
+ <!-- jaxws-jbws1446 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1446.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1446/EJB3Bean.class"/>
+ </fileset>
+ </jar>
+
+ <!-- jaxws-jbws1529 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws-jbws1556 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1556/EJB3Bean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1556/UserType.class"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1556.ear">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxws-jbws1556.jar"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF">
+ <include name="application.xml"/>
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </jar>
- <!-- jaxws-jbws1566-->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
- </fileset>
- </jar>
+ <!-- jaxws-jbws1566-->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1566.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1566/**/*.class"/>
+ </fileset>
+ </jar>
<!-- jaxws-jbws1581 -->
<war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml">
@@ -264,17 +288,31 @@
</fileset>
</jar>
- <!-- jaxws namespace -->
- <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
- <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
+ <!-- jaxws-jbws1611 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class"/>
+ </classes>
+ </war>
+ <!-- jaxws-jbws1666 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws namespace -->
+ <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
<!-- jaxws-serviceref -->
<war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: trunk/jbossws-core/ant-import-tests/build-samples-jaxrpc.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-samples-jaxrpc.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/ant-import-tests/build-samples-jaxrpc.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -488,7 +488,6 @@
</jar>
<!-- jaxrpc-samples-store-pass-encrypt.war -->
- <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
<war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war"
webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/build.xml 2007-07-01 19:29:13 UTC (rev 3772)
@@ -224,7 +224,7 @@
<target name="main" description="Executes the default target (most)." depends="most"/>
- <target name="most" description="Builds almost everything." depends="jars,tests-jars"/>
+ <target name="most" description="Builds almost everything." depends="jars"/>
<target name="all" description="Create a distribution zip file" depends="most">
</target>
Modified: trunk/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -59,8 +59,9 @@
public HandlerInfo(Class handlerClass, Map config, QName[] headers)
{
this.handlerClass = handlerClass;
- this.configMap = config;
this.headers = headers;
+ if (config != null)
+ this.configMap.putAll(config);
}
/** Gets the Handler class
@@ -97,7 +98,8 @@
public void setHandlerConfig(Map config)
{
configMap.clear();
- configMap.putAll(config);
+ if (config != null)
+ configMap.putAll(config);
}
/** Gets the header blocks processed by this Handler.
Modified: trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java
===================================================================
--- trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -95,7 +95,7 @@
}
catch (Exception ex)
{
- throw new WebServiceException("Unable to createEndpointReference Provider: " + ex.getMessage());
+ throw new WebServiceException("Unable to load Provider: " + ex.getMessage(), ex);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBinding.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBinding.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,7 +27,7 @@
import javax.xml.namespace.QName;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -104,6 +104,9 @@
{
this.epMetaData = serviceMetaData.getEndpoints().get(0);
}
+
+ // Initialize the binding provider
+ this.bindingProvider = getCommonBindingProvider();
}
/** Create a call for a known WSDL endpoint.
@@ -111,6 +114,9 @@
protected CommonClient(EndpointMetaData epMetaData)
{
this.epMetaData = epMetaData;
+
+ // Initialize the binding provider
+ this.bindingProvider = getCommonBindingProvider();
}
/** Create a call for a known WSDL endpoint.
@@ -137,6 +143,9 @@
{
setOperationName(opName);
}
+
+ // Initialize the binding provider
+ this.bindingProvider = getCommonBindingProvider();
}
/** Gets the address of a target service endpoint.
@@ -472,14 +481,7 @@
protected abstract CommonMessageContext processPivot(CommonMessageContext requestContext);
- protected CommonBindingProvider getCommonBindingProvider()
- {
- if (bindingProvider == null)
- {
- bindingProvider = new CommonBindingProvider(getEndpointMetaData());
- }
- return bindingProvider;
- }
+ protected abstract CommonBindingProvider getCommonBindingProvider();
protected abstract Map<String, Object> getRequestContext();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -33,7 +33,7 @@
import javax.xml.ws.handler.MessageContext.Scope;
import org.jboss.logging.Logger;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -51,8 +51,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.MessageFactoryImpl;
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPFaultException.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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;
+
+// $Id: SOAPFaultException.java 3509 2007-06-08 15:50:12Z thomas.diesler(a)jboss.com $
+
+import javax.xml.namespace.QName;
+
+/**
+ * The SOAPFaultException exception represents a SOAP fault.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public class CommonSOAPFaultException extends RuntimeException
+{
+ private QName faultCode;
+ private String faultString;
+
+ public CommonSOAPFaultException(QName faultCode, String faultString)
+ {
+ super(faultString);
+
+ this.faultCode = faultCode;
+ this.faultString = faultString;
+ }
+
+ public QName getFaultCode()
+ {
+ return faultCode;
+ }
+
+ public String getFaultString()
+ {
+ return faultString;
+ }
+}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding)
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id: DeserializerFactoryBase.java 2210 2007-01-31 09:51:54Z thomas.diesler(a)jboss.com $
-
-import java.util.Iterator;
-
-import javax.xml.rpc.encoding.Deserializer;
-import javax.xml.rpc.encoding.DeserializerFactory;
-
-import org.jboss.util.NotImplementedException;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class AbstractDeserializerFactory implements DeserializerFactory
-{
- public abstract DeserializerSupport getDeserializer() throws BindingException;
-
- public Deserializer getDeserializerAs(String mechanismType)
- {
- throw new NotImplementedException();
- }
-
- public Iterator getSupportedMechanismTypes()
- {
- throw new NotImplementedException();
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id: DeserializerFactoryBase.java 2210 2007-01-31 09:51:54Z thomas.diesler(a)jboss.com $
+
+import java.util.Iterator;
+
+import javax.xml.rpc.encoding.Deserializer;
+import javax.xml.rpc.encoding.DeserializerFactory;
+
+import org.jboss.util.NotImplementedException;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-Dec-2004
+ */
+public abstract class AbstractDeserializerFactory implements DeserializerFactory
+{
+ public abstract DeserializerSupport getDeserializer() throws BindingException;
+
+ public Deserializer getDeserializerAs(String mechanismType)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Iterator getSupportedMechanismTypes()
+ {
+ throw new NotImplementedException();
+ }
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id: SerializerFactoryBase.java 2210 2007-01-31 09:51:54Z thomas.diesler(a)jboss.com $
-
-import java.util.Iterator;
-
-import javax.xml.rpc.encoding.Serializer;
-import javax.xml.rpc.encoding.SerializerFactory;
-
-import org.jboss.util.NotImplementedException;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class AbstractSerializerFactory implements SerializerFactory
-{
- public abstract SerializerSupport getSerializer() throws BindingException;
-
- public Serializer getSerializerAs(String mechanismType)
- {
- throw new NotImplementedException();
- }
-
- public Iterator getSupportedMechanismTypes()
- {
- throw new NotImplementedException();
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/AbstractSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id: SerializerFactoryBase.java 2210 2007-01-31 09:51:54Z thomas.diesler(a)jboss.com $
+
+import java.util.Iterator;
+
+import javax.xml.rpc.encoding.Serializer;
+import javax.xml.rpc.encoding.SerializerFactory;
+
+import org.jboss.util.NotImplementedException;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-Dec-2004
+ */
+public abstract class AbstractSerializerFactory implements SerializerFactory
+{
+ public abstract SerializerSupport getSerializer() throws BindingException;
+
+ public Serializer getSerializerAs(String mechanismType)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Iterator getSupportedMechanismTypes()
+ {
+ throw new NotImplementedException();
+ }
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,92 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id$
-
-/** An exception that may occur during message binding
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-Oct-2004
- */
-public class BindingException extends Exception
-{
- /**
- * Constructs a new exception with <code>null</code> as its detail message.
- * The cause is not initialized, and may subsequently be initialized by a
- * call to {@link #initCause}.
- */
- public BindingException()
- {
- }
-
- /**
- * Constructs a new exception with the specified detail message. The
- * cause is not initialized, and may subsequently be initialized by
- * a call to {@link #initCause}.
- *
- * @param message the detail message. The detail message is saved for
- * later retrieval by the {@link #getMessage()} method.
- */
- public BindingException(String message)
- {
- super(message);
- }
-
- /**
- * Constructs a new exception with the specified cause and a detail
- * message of <tt>(cause==null ? null : cause.toString())</tt> (which
- * typically contains the class and detail message of <tt>cause</tt>).
- * This constructor is useful for exceptions that are little more than
- * wrappers for other throwables (for example, {@link
- * java.security.PrivilegedActionException}).
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @since 1.4
- */
- public BindingException(Throwable cause)
- {
- super(cause);
- }
-
- /**
- * Constructs a new exception with the specified detail message and
- * cause. <p>Note that the detail message associated with
- * <code>cause</code> is <i>not</i> automatically incorporated in
- * this exception's detail message.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @since 1.4
- */
- public BindingException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BindingException.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,92 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id$
+
+/** An exception that may occur during message binding
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 16-Oct-2004
+ */
+public class BindingException extends Exception
+{
+ /**
+ * Constructs a new exception with <code>null</code> as its detail message.
+ * The cause is not initialized, and may subsequently be initialized by a
+ * call to {@link #initCause}.
+ */
+ public BindingException()
+ {
+ }
+
+ /**
+ * Constructs a new exception with the specified detail message. The
+ * cause is not initialized, and may subsequently be initialized by
+ * a call to {@link #initCause}.
+ *
+ * @param message the detail message. The detail message is saved for
+ * later retrieval by the {@link #getMessage()} method.
+ */
+ public BindingException(String message)
+ {
+ super(message);
+ }
+
+ /**
+ * Constructs a new exception with the specified cause and a detail
+ * message of <tt>(cause==null ? null : cause.toString())</tt> (which
+ * typically contains the class and detail message of <tt>cause</tt>).
+ * This constructor is useful for exceptions that are little more than
+ * wrappers for other throwables (for example, {@link
+ * java.security.PrivilegedActionException}).
+ *
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method). (A <tt>null</tt> value is
+ * permitted, and indicates that the cause is nonexistent or
+ * unknown.)
+ * @since 1.4
+ */
+ public BindingException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ /**
+ * Constructs a new exception with the specified detail message and
+ * cause. <p>Note that the detail message associated with
+ * <code>cause</code> is <i>not</i> automatically incorporated in
+ * this exception's detail message.
+ *
+ * @param message the detail message (which is saved for later retrieval
+ * by the {@link #getMessage()} method).
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method). (A <tt>null</tt> value is
+ * permitted, and indicates that the cause is nonexistent or
+ * unknown.)
+ * @since 1.4
+ */
+ public BindingException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id: $
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-import javax.xml.transform.stream.StreamResult;
-
-import org.jboss.ws.WSException;
-import org.jboss.wsf.spi.utils.IOUtils;
-
-/**
- * @author Heiko.Braun(a)jboss.org
- * @author Thomas.Diesler(a)jboss.org
- * @since 06.02.2007
- */
-public class BufferedStreamResult extends StreamResult
-{
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
-
- public BufferedStreamResult()
- {
- }
-
- public BufferedStreamResult(String xmlFragment)
- {
- try
- {
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
- }
- catch (IOException e)
- {
- WSException.rethrow(e);
- }
- }
-
- @Override
- public Writer getWriter()
- {
- return null;
- }
-
- @Override
- public OutputStream getOutputStream()
- {
- return baos;
- }
-
- @Override
- public void setWriter(Writer writer)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setOutputStream(OutputStream outputStream)
- {
- throw new UnsupportedOperationException();
- }
-
- public String toString()
- {
- return baos.toString();
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id: $
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+
+import javax.xml.transform.stream.StreamResult;
+
+import org.jboss.ws.WSException;
+import org.jboss.wsf.spi.utils.IOUtils;
+
+/**
+ * @author Heiko.Braun(a)jboss.org
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 06.02.2007
+ */
+public class BufferedStreamResult extends StreamResult
+{
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+
+ public BufferedStreamResult()
+ {
+ }
+
+ public BufferedStreamResult(String xmlFragment)
+ {
+ try
+ {
+ IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
+ }
+ catch (IOException e)
+ {
+ WSException.rethrow(e);
+ }
+ }
+
+ @Override
+ public Writer getWriter()
+ {
+ return null;
+ }
+
+ @Override
+ public OutputStream getOutputStream()
+ {
+ return baos;
+ }
+
+ @Override
+ public void setWriter(Writer writer)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setOutputStream(OutputStream outputStream)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String toString()
+ {
+ return baos.toString();
+ }
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding;
-
-
-
-// $Id$
-
-/**
- * A Deserializer that can handle complex types by delegating to JAXB.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class ComplexTypeDeserializer extends DeserializerSupport
-{
-
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding;
+
+
+
+// $Id$
+
+/**
+ * A Deserializer that can handle complex types by delegating to JAXB.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-Dec-2004
+ */
+public abstract class ComplexTypeDeserializer extends DeserializerSupport
+{
+
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding;
-
-
-
-
-// $Id: ComplexTypeSerializer.java 1757 2006-12-22 15:40:24Z thomas.diesler(a)jboss.com $
-
-/**
- * A Serializer that can handle complex types by delegating to JAXB.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class ComplexTypeSerializer extends SerializerSupport
-{
-
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/ComplexTypeSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding;
+
+
+
+
+// $Id: ComplexTypeSerializer.java 1757 2006-12-22 15:40:24Z thomas.diesler(a)jboss.com $
+
+/**
+ * A Serializer that can handle complex types by delegating to JAXB.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-Dec-2004
+ */
+public abstract class ComplexTypeSerializer extends SerializerSupport
+{
+
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,160 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id$
-
-import java.io.ByteArrayOutputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.Deserializer;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.soap.SOAPContentElement;
-import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver;
-import org.jboss.wsf.spi.utils.DOMWriter;
-import org.w3c.dom.Node;
-
-/** The base class for all Deserializers.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class DeserializerSupport implements Deserializer
-{
- private static final Logger log = Logger.getLogger(DeserializerSupport.class);
-
- public Object deserialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
- {
- QName xmlName = soapElement.getElementQName();
- QName xmlType = soapElement.getXmlType();
-
- Source source = soapElement.getXMLFragment().getSource();
- return deserialize(xmlName, xmlType, source, serContext);
- }
-
- /** Deserialize an XML fragment to an object value
- *
- * @param xmlName The root element name of the resulting fragment
- * @param xmlType The associated schema type
- * @param xmlFragment The XML fragment to deserialize
- * @param serContext The serialization context
- */
- public abstract Object deserialize(QName xmlName, QName xmlType, Source xmlFragment, SerializationContext serContext) throws BindingException;
-
- // TODO: remove when JBossXB supports unmarshall(Source)
- // http://jira.jboss.org/jira/browse/JBXB-100
- protected static String sourceToString(Source source)
- {
- String xmlFragment = null;
- try
- {
- if (source instanceof DOMSource)
- {
- Node node = ((DOMSource)source).getNode();
- xmlFragment = DOMWriter.printNode(node, false);
- }
- else
- {
- // Note, this code will not handler namespaces correctly that
- // are defined on a parent of the DOMSource
- //
- // <env:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- // <env:Body>
- // <myMethod>
- // <param xsi:type='xsd:string'>Hello World!</param>
- // </myMethod>
- // </env:Body>
- // </env:Envelope>
- //
- TransformerFactory tf = TransformerFactory.newInstance();
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- StreamResult streamResult = new StreamResult(baos);
- tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
- if (xmlFragment.startsWith("<?xml"))
- {
- int index = xmlFragment.indexOf(">");
- xmlFragment = xmlFragment.substring(index + 1);
- }
- }
- }
- catch (TransformerException e)
- {
- WSException.rethrow(e);
- }
-
- return xmlFragment;
- }
-
- /** Unwrap the value string from the XML fragment
- *
- * @return The value string or null if the startTag contains a xsi:nil='true' attribute
- */
- protected String unwrapValueStr(String xmlFragment)
- {
- // We only scan for :nil if the xmlFragment is an empty element
- if (isEmptyElement(xmlFragment))
- {
- return (isNil(xmlFragment) ? null : "");
- }
-
- int endOfStartTag = xmlFragment.indexOf(">");
- int startOfEndTag = xmlFragment.lastIndexOf("</");
- if (endOfStartTag < 0 || startOfEndTag < 0)
- throw new IllegalArgumentException("Invalid XML fragment: " + xmlFragment);
-
- String valueStr = xmlFragment.substring(endOfStartTag + 1, startOfEndTag);
-
- return XMLPredefinedEntityReferenceResolver.resolve(valueStr);
- }
-
- protected boolean isEmptyElement(String xmlFragment)
- {
- return xmlFragment.startsWith("<") && xmlFragment.endsWith("/>");
- }
-
- protected boolean isNil(String xmlFragment)
- {
- boolean isNil = false;
- if (isEmptyElement(xmlFragment))
- {
- int endOfStartTag = xmlFragment.indexOf(">");
- String startTag = xmlFragment.substring(0, endOfStartTag);
- isNil = startTag.indexOf(":nil='1'") > 0 || startTag.indexOf(":nil=\"1\"") > 0;
- isNil = isNil || startTag.indexOf(":nil='true'") > 0 || startTag.indexOf(":nil=\"true\"") > 0;
- }
- return isNil;
- }
-
- public String getMechanismType()
- {
- throw new NotImplementedException();
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,160 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id$
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.encoding.Deserializer;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver;
+import org.jboss.wsf.spi.utils.DOMWriter;
+import org.w3c.dom.Node;
+
+/** The base class for all Deserializers.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-Dec-2004
+ */
+public abstract class DeserializerSupport implements Deserializer
+{
+ private static final Logger log = Logger.getLogger(DeserializerSupport.class);
+
+ public Object deserialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
+ {
+ QName xmlName = soapElement.getElementQName();
+ QName xmlType = soapElement.getXmlType();
+
+ Source source = soapElement.getXMLFragment().getSource();
+ return deserialize(xmlName, xmlType, source, serContext);
+ }
+
+ /** Deserialize an XML fragment to an object value
+ *
+ * @param xmlName The root element name of the resulting fragment
+ * @param xmlType The associated schema type
+ * @param xmlFragment The XML fragment to deserialize
+ * @param serContext The serialization context
+ */
+ public abstract Object deserialize(QName xmlName, QName xmlType, Source xmlFragment, SerializationContext serContext) throws BindingException;
+
+ // TODO: remove when JBossXB supports unmarshall(Source)
+ // http://jira.jboss.org/jira/browse/JBXB-100
+ protected static String sourceToString(Source source)
+ {
+ String xmlFragment = null;
+ try
+ {
+ if (source instanceof DOMSource)
+ {
+ Node node = ((DOMSource)source).getNode();
+ xmlFragment = DOMWriter.printNode(node, false);
+ }
+ else
+ {
+ // Note, this code will not handler namespaces correctly that
+ // are defined on a parent of the DOMSource
+ //
+ // <env:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ // <env:Body>
+ // <myMethod>
+ // <param xsi:type='xsd:string'>Hello World!</param>
+ // </myMethod>
+ // </env:Body>
+ // </env:Envelope>
+ //
+ TransformerFactory tf = TransformerFactory.newInstance();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+ StreamResult streamResult = new StreamResult(baos);
+ tf.newTransformer().transform(source, streamResult);
+ xmlFragment = new String(baos.toByteArray());
+ if (xmlFragment.startsWith("<?xml"))
+ {
+ int index = xmlFragment.indexOf(">");
+ xmlFragment = xmlFragment.substring(index + 1);
+ }
+ }
+ }
+ catch (TransformerException e)
+ {
+ WSException.rethrow(e);
+ }
+
+ return xmlFragment;
+ }
+
+ /** Unwrap the value string from the XML fragment
+ *
+ * @return The value string or null if the startTag contains a xsi:nil='true' attribute
+ */
+ protected String unwrapValueStr(String xmlFragment)
+ {
+ // We only scan for :nil if the xmlFragment is an empty element
+ if (isEmptyElement(xmlFragment))
+ {
+ return (isNil(xmlFragment) ? null : "");
+ }
+
+ int endOfStartTag = xmlFragment.indexOf(">");
+ int startOfEndTag = xmlFragment.lastIndexOf("</");
+ if (endOfStartTag < 0 || startOfEndTag < 0)
+ throw new IllegalArgumentException("Invalid XML fragment: " + xmlFragment);
+
+ String valueStr = xmlFragment.substring(endOfStartTag + 1, startOfEndTag);
+
+ return XMLPredefinedEntityReferenceResolver.resolve(valueStr);
+ }
+
+ protected boolean isEmptyElement(String xmlFragment)
+ {
+ return xmlFragment.startsWith("<") && xmlFragment.endsWith("/>");
+ }
+
+ protected boolean isNil(String xmlFragment)
+ {
+ boolean isNil = false;
+ if (isEmptyElement(xmlFragment))
+ {
+ int endOfStartTag = xmlFragment.indexOf(">");
+ String startTag = xmlFragment.substring(0, endOfStartTag);
+ isNil = startTag.indexOf(":nil='1'") > 0 || startTag.indexOf(":nil=\"1\"") > 0;
+ isNil = isNil || startTag.indexOf(":nil='true'") > 0 || startTag.indexOf(":nil=\"true\"") > 0;
+ }
+ return isNil;
+ }
+
+ public String getMechanismType()
+ {
+ throw new NotImplementedException();
+ }
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id: SerializationContext.java 2634 2007-03-16 23:44:09Z jason.greene(a)jboss.com $
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.xb.binding.NamespaceRegistry;
-
-/**
- * An abstract serialization context
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class SerializationContext
-{
- private Class javaType;
-
- private TypeMappingImpl typeMapping;
- // The namespace registry that is valid for this serialization context
- private NamespaceRegistry namespaceRegistry = new NamespaceRegistry();
- // An arbitrary property bag
- private Map<Object, Object> properties = new HashMap<Object, Object>();
-
- public Object getProperty(Object key)
- {
- return properties.get(key);
- }
-
- public void setProperty(Object key, Object value)
- {
- properties.put(key, value);
- }
-
- public TypeMappingImpl getTypeMapping()
- {
- return typeMapping;
- }
-
- public void setTypeMapping(TypeMappingImpl typeMapping)
- {
- this.typeMapping = typeMapping;
- }
-
- public NamespaceRegistry getNamespaceRegistry()
- {
- return namespaceRegistry;
- }
-
- public Class getJavaType()
- {
- return javaType;
- }
-
- public void setJavaType(Class javaType)
- {
- this.javaType = javaType;
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializationContext.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id: SerializationContext.java 2634 2007-03-16 23:44:09Z jason.greene(a)jboss.com $
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.xb.binding.NamespaceRegistry;
+
+/**
+ * An abstract serialization context
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-Dec-2004
+ */
+public abstract class SerializationContext
+{
+ private Class javaType;
+
+ private TypeMappingImpl typeMapping;
+ // The namespace registry that is valid for this serialization context
+ private NamespaceRegistry namespaceRegistry = new NamespaceRegistry();
+ // An arbitrary property bag
+ private Map<Object, Object> properties = new HashMap<Object, Object>();
+
+ public Object getProperty(Object key)
+ {
+ return properties.get(key);
+ }
+
+ public void setProperty(Object key, Object value)
+ {
+ properties.put(key, value);
+ }
+
+ public TypeMappingImpl getTypeMapping()
+ {
+ return typeMapping;
+ }
+
+ public void setTypeMapping(TypeMappingImpl typeMapping)
+ {
+ this.typeMapping = typeMapping;
+ }
+
+ public NamespaceRegistry getNamespaceRegistry()
+ {
+ return namespaceRegistry;
+ }
+
+ public Class getJavaType()
+ {
+ return javaType;
+ }
+
+ public void setJavaType(Class javaType)
+ {
+ this.javaType = javaType;
+ }
+}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,205 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id: SerializerSupport.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.Serializer;
-import javax.xml.transform.Result;
-
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.Constants;
-import org.jboss.ws.core.soap.SOAPContentElement;
-import org.jboss.xb.binding.NamespaceRegistry;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * The base class for all Serializers.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
- * @since 04-Dec-2004
- */
-public abstract class SerializerSupport implements Serializer
-{
-
- public Result serialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
- {
- QName xmlName = soapElement.getElementQName();
- QName xmlType = soapElement.getXmlType();
- NamedNodeMap attributes = soapElement.getAttributes();
- Object objectValue = soapElement.getObjectValue();
- return serialize(xmlName, xmlType, objectValue, serContext, attributes);
- }
-
- /** Serialize an object value to an XML fragment
- *
- * @param xmlName The root element name of the resulting fragment
- * @param xmlType The associated schema type
- * @param value The value to serialize
- * @param serContext The serialization context
- * @param attributes The attributes on this element
- */
- public abstract Result serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException;
-
- /** Wrap the value string in a XML fragment with the given name
- */
- protected String wrapValueStr(QName xmlName, String valueStr, NamespaceRegistry nsRegistry, Set<String> nsExtras, NamedNodeMap attributes, boolean normalize)
- {
- String xmlNameURI = xmlName.getNamespaceURI();
- String localPart = xmlName.getLocalPart();
-
- Map<String, String> namespaces = new HashMap<String, String>();
-
- StringBuilder nsAttr = new StringBuilder("");
- if (attributes != null)
- {
- for (int i = 0; i < attributes.getLength(); i++)
- {
- Node attr = attributes.item(i);
- String attrName = attr.getNodeName();
- String attrValue = attr.getNodeValue();
- nsAttr.append(" " + attrName + "='" + attrValue + "'");
-
- if (attrName.startsWith("xmlns:"))
- {
- String prefix = attrName.substring(6);
- namespaces.put(attrValue, prefix);
- }
- }
- }
-
- String elName;
- if (xmlNameURI.length() > 0)
- {
- xmlName = nsRegistry.registerQName(xmlName);
- String prefix = xmlName.getPrefix();
- elName = prefix + ":" + localPart;
- if (namespaces.get(xmlNameURI) == null || !prefix.equals(namespaces.get(xmlNameURI)))
- {
- nsAttr.append(" xmlns:" + prefix + "='" + xmlNameURI + "'");
- namespaces.put(xmlNameURI, prefix);
- }
- }
- else
- {
- elName = localPart;
- }
-
- if (nsExtras != null)
- {
- for (String nsURI : nsExtras)
- {
- String prefix = nsRegistry.getPrefix(nsURI);
- if (namespaces.get(nsURI) == null || !prefix.equals(namespaces.get(nsURI)))
- {
- nsAttr.append(" xmlns:" + prefix + "='" + nsURI + "'");
- namespaces.put(nsURI, prefix);
- }
- }
- }
-
- String xmlFragment;
- if (valueStr == null)
- {
- String xsins = "";
- if (namespaces.get(Constants.NS_SCHEMA_XSI) == null || !Constants.PREFIX_XSI.equals(namespaces.get(xmlNameURI)))
- {
- xsins = " xmlns:" + Constants.PREFIX_XSI + "='" + Constants.NS_SCHEMA_XSI + "'";
- namespaces.put(Constants.NS_SCHEMA_XSI, Constants.PREFIX_XSI);
- }
-
- xmlFragment = "<" + elName + nsAttr + " " + Constants.PREFIX_XSI + ":nil='1'" + xsins + "/>";
- }
- else
- {
- if (normalize)
- valueStr = normalize(valueStr);
-
- xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
- }
-
- return xmlFragment;
- }
-
- public String getMechanismType()
- {
- throw new NotImplementedException();
- }
-
- private String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
-}
\ No newline at end of file
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,205 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id: SerializerSupport.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.encoding.Serializer;
+import javax.xml.transform.Result;
+
+import org.jboss.util.NotImplementedException;
+import org.jboss.ws.Constants;
+import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.xb.binding.NamespaceRegistry;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * The base class for all Serializers.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ * @since 04-Dec-2004
+ */
+public abstract class SerializerSupport implements Serializer
+{
+
+ public Result serialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
+ {
+ QName xmlName = soapElement.getElementQName();
+ QName xmlType = soapElement.getXmlType();
+ NamedNodeMap attributes = soapElement.getAttributes();
+ Object objectValue = soapElement.getObjectValue();
+ return serialize(xmlName, xmlType, objectValue, serContext, attributes);
+ }
+
+ /** Serialize an object value to an XML fragment
+ *
+ * @param xmlName The root element name of the resulting fragment
+ * @param xmlType The associated schema type
+ * @param value The value to serialize
+ * @param serContext The serialization context
+ * @param attributes The attributes on this element
+ */
+ public abstract Result serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException;
+
+ /** Wrap the value string in a XML fragment with the given name
+ */
+ protected String wrapValueStr(QName xmlName, String valueStr, NamespaceRegistry nsRegistry, Set<String> nsExtras, NamedNodeMap attributes, boolean normalize)
+ {
+ String xmlNameURI = xmlName.getNamespaceURI();
+ String localPart = xmlName.getLocalPart();
+
+ Map<String, String> namespaces = new HashMap<String, String>();
+
+ StringBuilder nsAttr = new StringBuilder("");
+ if (attributes != null)
+ {
+ for (int i = 0; i < attributes.getLength(); i++)
+ {
+ Node attr = attributes.item(i);
+ String attrName = attr.getNodeName();
+ String attrValue = attr.getNodeValue();
+ nsAttr.append(" " + attrName + "='" + attrValue + "'");
+
+ if (attrName.startsWith("xmlns:"))
+ {
+ String prefix = attrName.substring(6);
+ namespaces.put(attrValue, prefix);
+ }
+ }
+ }
+
+ String elName;
+ if (xmlNameURI.length() > 0)
+ {
+ xmlName = nsRegistry.registerQName(xmlName);
+ String prefix = xmlName.getPrefix();
+ elName = prefix + ":" + localPart;
+ if (namespaces.get(xmlNameURI) == null || !prefix.equals(namespaces.get(xmlNameURI)))
+ {
+ nsAttr.append(" xmlns:" + prefix + "='" + xmlNameURI + "'");
+ namespaces.put(xmlNameURI, prefix);
+ }
+ }
+ else
+ {
+ elName = localPart;
+ }
+
+ if (nsExtras != null)
+ {
+ for (String nsURI : nsExtras)
+ {
+ String prefix = nsRegistry.getPrefix(nsURI);
+ if (namespaces.get(nsURI) == null || !prefix.equals(namespaces.get(nsURI)))
+ {
+ nsAttr.append(" xmlns:" + prefix + "='" + nsURI + "'");
+ namespaces.put(nsURI, prefix);
+ }
+ }
+ }
+
+ String xmlFragment;
+ if (valueStr == null)
+ {
+ String xsins = "";
+ if (namespaces.get(Constants.NS_SCHEMA_XSI) == null || !Constants.PREFIX_XSI.equals(namespaces.get(xmlNameURI)))
+ {
+ xsins = " xmlns:" + Constants.PREFIX_XSI + "='" + Constants.NS_SCHEMA_XSI + "'";
+ namespaces.put(Constants.NS_SCHEMA_XSI, Constants.PREFIX_XSI);
+ }
+
+ xmlFragment = "<" + elName + nsAttr + " " + Constants.PREFIX_XSI + ":nil='1'" + xsins + "/>";
+ }
+ else
+ {
+ if (normalize)
+ valueStr = normalize(valueStr);
+
+ xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
+ }
+
+ return xmlFragment;
+ }
+
+ public String getMechanismType()
+ {
+ throw new NotImplementedException();
+ }
+
+ private String normalize(String valueStr)
+ {
+ // We assume most strings will not contain characters that need "escaping",
+ // and optimize for this case.
+ boolean found = false;
+ int i = 0;
+
+ outer: for (; i < valueStr.length(); i++)
+ {
+ switch (valueStr.charAt(i))
+ {
+ case '<':
+ case '>':
+ case '&':
+ case '"':
+ found = true;
+ break outer;
+ }
+ }
+
+ if (!found)
+ return valueStr;
+
+ // Resume where we left off
+ StringBuilder builder = new StringBuilder();
+ builder.append(valueStr.substring(0, i));
+ for (; i < valueStr.length(); i++)
+ {
+ char c = valueStr.charAt(i);
+ switch (c)
+ {
+ case '<':
+ builder.append("<");
+ break;
+ case '>':
+ builder.append(">");
+ break;
+ case '&':
+ builder.append("&");
+ break;
+ case '"':
+ builder.append(""");
+ break;
+ default:
+ builder.append(c);
+ }
+ }
+
+ return builder.toString();
+ }
+}
\ No newline at end of file
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,744 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.binding;
-
-// $Id$
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.DeserializerFactory;
-import javax.xml.rpc.encoding.SerializerFactory;
-import javax.xml.rpc.encoding.TypeMapping;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.binding.Base64DeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.Base64SerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.CalendarDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.CalendarSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.DateDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.DateSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.HexDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.HexSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.QNameDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory;
-import org.jboss.wsf.spi.utils.HashCodeUtil;
-import org.jboss.wsf.spi.utils.JavaUtils;
-
-/**
- * This is the representation of a type mapping.
- * This TypeMapping implementation supports the literal encoding style.
- *
- * The TypeMapping instance maintains a tuple of the type
- * {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-Oct-2004
- */
-public abstract class TypeMappingImpl implements TypeMapping
-{
- // provide logging
- private static final Logger log = Logger.getLogger(TypeMappingImpl.class);
-
- // Map<KeyPair,FactoryPair>
- private Map<KeyPair, FactoryPair> tupleMap = new LinkedHashMap<KeyPair, FactoryPair>();
-
- private Map<Integer, List<KeyPair>> keyPairCache = new ConcurrentHashMap<Integer, List<KeyPair>>();
-
- /**
- * Gets the DeserializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @return Registered DeserializerFactory or null if there is no registered factory
- */
- public DeserializerFactory getDeserializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- return (fPair != null ? fPair.getDeserializerFactory() : null);
- }
-
- /**
- * Gets the SerializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @return Registered SerializerFactory or null if there is no registered factory
- */
- public SerializerFactory getSerializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- return (fPair != null ? fPair.getSerializerFactory() : null);
- }
-
- /**
- * Returns the encodingStyle URIs (as String[]) supported by this TypeMapping instance.
- * A TypeMapping that contains only encoding style independent serializers and deserializers
- * returns null from this method.
- *
- * @return Array of encodingStyle URIs for the supported encoding styles
- */
- public abstract String[] getSupportedEncodings();
-
- /**
- * Sets the encodingStyle URIs supported by this TypeMapping instance. A TypeMapping that contains only encoding
- * independent serializers and deserializers requires null as the parameter for this method.
- *
- * @param encodingStyleURIs Array of encodingStyle URIs for the supported encoding styles
- */
- public abstract void setSupportedEncodings(String[] encodingStyleURIs);
-
- /**
- * Checks whether or not type mapping between specified XML type and Java type is registered.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @return boolean; true if type mapping between the specified XML type and Java type is registered; otherwise false
- */
- public boolean isRegistered(Class javaType, QName xmlType)
- {
- return getFactoryPair(new IQName(xmlType), javaType) != null;
- }
-
- /**
- * Registers SerializerFactory and DeserializerFactory for a specific type mapping between an XML type and Java type.
- * This method replaces any existing registered SerializerFactory DeserializerFactory instances.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @param sf SerializerFactory
- * @param df DeserializerFactory
- * @throws javax.xml.rpc.JAXRPCException If any error during the registration
- */
- public void register(Class javaType, QName xmlType, SerializerFactory sf, DeserializerFactory df)
- {
- if (log.isTraceEnabled())
- log.trace("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]");
-
- registerInternal(javaType, new IQName(xmlType), sf, df);
- keyPairCache.clear();
- }
-
- private void registerInternal(Class javaType, IQName xmlType, SerializerFactory sf, DeserializerFactory df)
- {
- if (javaType == null)
- throw new IllegalArgumentException("javaType cannot be null for: " + xmlType);
- if (xmlType == null)
- throw new IllegalArgumentException("xmlType cannot be null for: " + javaType);
-
- KeyPair kPair = new KeyPair(xmlType, javaType);
- FactoryPair fPair = new FactoryPair(sf, df);
- tupleMap.put(kPair, fPair);
- }
-
- /**
- * Removes the DeserializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @throws javax.xml.rpc.JAXRPCException If there is error in removing the registered DeserializerFactory
- */
- public void removeDeserializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- if (fPair != null)
- fPair.setDeserializerFactory(null);
- }
-
- /**
- * Removes the SerializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @throws javax.xml.rpc.JAXRPCException If there is error in removing the registered SerializerFactory
- */
- public void removeSerializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- if (fPair != null)
- fPair.setSerializerFactory(null);
- }
-
- /** Get the list of registered XML types */
- public List<QName> getRegisteredXmlTypes()
- {
- List<QName> types = new ArrayList<QName>();
- for (KeyPair keyPair : getKeyPairs(null, null))
- {
- types.add(keyPair.getXmlType().toQName());
- }
- return types;
- }
-
- /** Get the list of registered Java types */
- public List<Class> getRegisteredJavaTypes()
- {
- List<Class> types = new ArrayList<Class>();
- for (KeyPair keyPair : getKeyPairs(null, null))
- {
- types.add(keyPair.getJavaType());
- }
- return types;
- }
-
- /** Get the Class that was registered last for this xmlType */
- public Class getJavaType(QName xmlType)
- {
- Class javaType = null;
-
- List keyPairList = getKeyPairs(new IQName(xmlType), null);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- javaType = kPair.getJavaType();
- }
-
- return javaType;
- }
-
- /**
- * Get all of the Classes registered for this xmlType.
- */
- public List<Class> getJavaTypes(QName xmlType)
- {
- List<KeyPair> keyPairList = getKeyPairs( new IQName(xmlType), null);
- List<Class> classes = new ArrayList<Class>(keyPairList.size());
-
- for (KeyPair current : keyPairList)
- {
- classes.add(current.getJavaType());
- }
-
- return classes;
- }
-
- /**
- * Get the Class that was registered last for this xmlType
- * If there are two Java Types registered for the xmlType
- * return the primitive type rather than the wrapper,
- * if available
- */
- public Class getJavaType(QName xmlType,boolean getPrimitive)
- {
- //Lets get the primitive type if available
- Class javaType = null;
-
- List keyPairList = getKeyPairs(new IQName(xmlType), null);
- int size = keyPairList.size();
- if (size == 2 && getPrimitive)
- {
- KeyPair kPair1 = (KeyPair)keyPairList.get(0);
- Class javaType1 = kPair1.getJavaType();
- KeyPair kPair2 = (KeyPair)keyPairList.get(1);
- Class javaType2 = kPair2.getJavaType();
- if(javaType2.isPrimitive() && !javaType1.isPrimitive())
- javaType = javaType2;
- else
- if(javaType1.isPrimitive() && !javaType2.isPrimitive())
- javaType = javaType1;
- else
- javaType = javaType2; //Fallback on the most latest
- }
- else
- return getJavaType(xmlType);
-
- return javaType;
- }
-
- /** Get the Class name that was registered last for this xmlType */
- public String getJavaTypeName(QName xmlType)
- {
- Class javaType = getJavaType(xmlType);
- return (javaType != null ? javaType.getName() : null);
- }
-
- /** Get the QName that was registered last for this javaType */
- public QName getXMLType(Class javaType)
- {
- QName xmlType = null;
-
- List keyPairList = getKeyPairs(null, javaType);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- xmlType = kPair.getXmlType().toQName();
- }
-
- return xmlType;
- }
-
- /** Get the QNames that was registered last for this javaType */
- public List<QName> getXMLTypes(Class javaType)
- {
- List<QName> xmlTypes = new ArrayList<QName>();
-
- for (KeyPair kPair : getKeyPairs(null, javaType))
- {
- xmlTypes.add(kPair.getXmlType().toQName());
- }
- return xmlTypes;
- }
-
- /**
- * Get the QName that was registered last for this javaType
- * @param javaType class for which XML Type is needed
- * @param tryAssignable If the xmlType is not registered for javaType
- * should a base class type be checked?
- *
- */
- public QName getXMLType(Class javaType, boolean tryAssignable)
- {
- if(tryAssignable) return getXMLType(javaType);
-
- QName xmlType = null;
-
- List keyPairList = getKeyPairs(null, javaType, tryAssignable);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- xmlType = kPair.getXmlType().toQName();
- }
-
- return xmlType;
- }
-
- /**
- * Get the serializer/deserializer factory pair for the given xmlType, javaType
- * Both xmlType, javaType may be null. In that case, this implementation still
- * returns a FactoryPair if there is only one possible match.
- *
- * @param xmlType can be null
- * @param javaType can be null
- */
- private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType)
- {
- Integer cacheId = cacheIdFor(javaType, xmlType);
-
- List<KeyPair> keyPairList = keyPairCache.get(cacheId);
- if(null == keyPairList)
- {
- keyPairList = getKeyPairsInternal(xmlType, javaType);
- keyPairCache.put(cacheId, keyPairList);
- }
-
- return keyPairList;
- }
-
- private Integer cacheIdFor(Class javaType, IQName xmlType) {
- int result = HashCodeUtil.SEED;
- int nullHash = HashCodeUtil.hash(result, "null");
- result = javaType!= null ? HashCodeUtil.hash(result, javaType.getName()) : HashCodeUtil.hash(result, nullHash);
- result = xmlType!= null ? HashCodeUtil.hash(result, xmlType.hashCode()): HashCodeUtil.hash(result, nullHash);
- return new Integer(result);
- }
-
- private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType)
- {
- List<KeyPair> keyPairList = new ArrayList<KeyPair>();
-
- // Getting the exact matching pair
- if (xmlType != null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()) && entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- // No exact match, try assignable
- if (keyPairList.size() == 0)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()) && JavaUtils.isAssignableFrom(entry.getJavaType(), javaType))
- {
- keyPairList.add(entry);
- }
- }
- }
- }
-
- // Getting the pair for a given xmlType
- else if (xmlType != null && javaType == null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()))
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the pair for a given javaType
- else if (xmlType == null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- // No exact match, try assignable
- if (keyPairList.size() == 0)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (JavaUtils.isAssignableFrom(entry.getJavaType(), javaType))
- {
- keyPairList.add(entry);
- }
- }
- }
- }
-
- // Getting the all pairs
- else if (xmlType == null && javaType == null)
- {
- keyPairList.addAll(tupleMap.keySet());
- }
-
- return keyPairList;
- }
-
- private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType, boolean tryAssignable)
- {
- Integer cacheId = cacheIdFor(javaType, xmlType);
-
- List<KeyPair> keyPairList = keyPairCache.get(cacheId);
- if(null == keyPairList)
- {
- keyPairList = getKeyPairsInternal(xmlType, javaType, tryAssignable);
- keyPairCache.put(cacheId, keyPairList);
- }
-
- return keyPairList;
- }
-
- /**
- * Get the serializer/deserializer factory pair for the given xmlType, javaType
- * Both xmlType, javaType may be null. In that case, this implementation still
- * returns a FactoryPair if there is only one possible match.
- * <br>Note: This method does not try for the base class, if no keypair exists for the
- * javaType in question.
- */
- private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType, boolean tryAssignable)
- {
- if(tryAssignable) return getKeyPairs( xmlType, javaType );
-
- List<KeyPair> keyPairList = new ArrayList<KeyPair>();
-
- // Getting the exact matching pair
- if (xmlType != null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()) && entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the pair for a given xmlType
- else if (xmlType != null && javaType == null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()))
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the pair for a given javaType
- else if (xmlType == null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the all pairs
- else if (xmlType == null && javaType == null)
- {
- keyPairList.addAll(tupleMap.keySet());
- }
-
- return keyPairList;
- }
-
- /**
- * Get the serializer/deserializer factory pair for the given xmlType, javaType
- * Both xmlType, javaType may be null. In that case, this implementation still
- * returns a FactoryPair that was last registered
- */
- private FactoryPair getFactoryPair(IQName xmlType, Class javaType)
- {
- FactoryPair fPair = null;
-
- List<KeyPair> keyPairList = getKeyPairs(xmlType, javaType);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = keyPairList.get(size - 1);
- fPair = (FactoryPair)tupleMap.get(kPair);
- }
-
- return fPair;
- }
-
- protected void registerStandardLiteralTypes()
- {
- register(BigDecimal.class, Constants.TYPE_LITERAL_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(BigInteger.class, Constants.TYPE_LITERAL_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(Date.class, Constants.TYPE_LITERAL_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory());
-
- register(Calendar.class, Constants.TYPE_LITERAL_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- register(Calendar.class, Constants.TYPE_LITERAL_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- register(Calendar.class, Constants.TYPE_LITERAL_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
-
- register(QName.class, Constants.TYPE_LITERAL_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory());
-
- register(String.class, Constants.TYPE_LITERAL_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(String[].class, Constants.TYPE_LITERAL_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(URI.class, Constants.TYPE_LITERAL_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(Byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
- register(byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
-
- register(Byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
- register(byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
-
- register(double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(int.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Integer.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(int.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Integer.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- }
-
- /** A tuple of the type {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
- */
- private static class KeyPair
- {
- private IQName xmlType;
- private Class javaType;
-
- public KeyPair(IQName xmlType, Class javaType)
- {
- this.javaType = javaType;
- this.xmlType = xmlType;
- }
-
- public Class getJavaType()
- {
- return javaType;
- }
-
- public IQName getXmlType()
- {
- return xmlType;
- }
-
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (!(o instanceof KeyPair)) return false;
-
- final KeyPair keyPair = (KeyPair)o;
-
- if (!javaType.equals(keyPair.javaType)) return false;
- if (!xmlType.equals(keyPair.xmlType)) return false;
-
- return true;
- }
-
- public int hashCode()
- {
- int result;
- result = xmlType.hashCode();
- result = 29 * result + javaType.hashCode();
- return result;
- }
-
- public String toString()
- {
- return "[xmlType=" + xmlType + ",javaType=" + javaType.getName() + "]";
- }
- }
-
- /** A tuple of the type {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
- */
- public static class FactoryPair
- {
- private SerializerFactory serializerFactory;
- private DeserializerFactory deserializerFactory;
-
- FactoryPair(SerializerFactory sf, DeserializerFactory df)
- {
- this.deserializerFactory = df;
- this.serializerFactory = sf;
- }
-
- public DeserializerFactory getDeserializerFactory()
- {
- return deserializerFactory;
- }
-
- public SerializerFactory getSerializerFactory()
- {
- return serializerFactory;
- }
-
- public void setDeserializerFactory(DeserializerFactory df)
- {
- this.deserializerFactory = df;
- }
-
- public void setSerializerFactory(SerializerFactory sf)
- {
- this.serializerFactory = sf;
- }
- }
-
- /**
- * A duck typed QName that relies on internalized Strings.<p>
- * Taken from the {@link javax.xml.namespace.QName} docs:<br>
- * The value of a QName contains a Namespace URI, local part and prefix.
- * The prefix is included in QName to retain lexical information when present in an XML input source.
- * The prefix is NOT used in QName.equals(Object) or to compute the QName.hashCode().
- * Equality and the hash code are defined using only the Namespace URI and local part.
- * If not specified, the Namespace URI is set to "" (the empty string).
- * If not specified, the prefix is set to "" (the empty string).
- */
- private final class IQName
- {
- public String namespace;
- public String localPart;
- public String prefix;
- public int hash;
-
- public IQName(QName name)
- {
- namespace = name.getNamespaceURI() != null ? name.getNamespaceURI().intern() : "".intern();
- localPart = name.getLocalPart() != null ? name.getLocalPart().intern() : "".intern();
- prefix = name.getPrefix() != null ? name.getPrefix().intern() : "".intern();
- hash = name.hashCode();
- }
-
- public boolean equals(Object object) {
- if(!(object instanceof IQName))
- throw new IllegalArgumentException("Cannot compare IQName to " + object);
-
- IQName iqn = (IQName)object;
- return (iqn.namespace == this.namespace && iqn.localPart == this.localPart);
- }
-
- public QName toQName()
- {
- QName qname;
-
- if(null == namespace)
- qname = new QName(localPart);
- else if(null == prefix)
- qname = new QName(namespace, localPart);
- else
- qname = new QName(namespace, localPart, prefix);
-
- return qname;
- }
-
- /**
- * This implementation currently represents a QName as: "{" + Namespace URI + "}" + local part.
- * If the Namespace URI .equals(""), only the local part is returned.
- */
- public String toString() {
- String ns = "".equals(namespace) ? namespace : "{"+namespace+"}";
- return ns+localPart;
- }
-
- public int hashCode()
- {
- return this.hash;
- }
- }
-}
Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java)
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java (rev 0)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,744 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.binding;
+
+// $Id$
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.encoding.DeserializerFactory;
+import javax.xml.rpc.encoding.SerializerFactory;
+import javax.xml.rpc.encoding.TypeMapping;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.Constants;
+import org.jboss.ws.core.jaxrpc.binding.Base64DeserializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.Base64SerializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.CalendarDeserializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.CalendarSerializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.DateDeserializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.DateSerializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.HexDeserializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.HexSerializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.QNameDeserializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory;
+import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory;
+import org.jboss.wsf.spi.utils.HashCodeUtil;
+import org.jboss.wsf.spi.utils.JavaUtils;
+
+/**
+ * This is the representation of a type mapping.
+ * This TypeMapping implementation supports the literal encoding style.
+ *
+ * The TypeMapping instance maintains a tuple of the type
+ * {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-Oct-2004
+ */
+public abstract class TypeMappingImpl implements TypeMapping
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(TypeMappingImpl.class);
+
+ // Map<KeyPair,FactoryPair>
+ private Map<KeyPair, FactoryPair> tupleMap = new LinkedHashMap<KeyPair, FactoryPair>();
+
+ private Map<Integer, List<KeyPair>> keyPairCache = new ConcurrentHashMap<Integer, List<KeyPair>>();
+
+ /**
+ * Gets the DeserializerFactory registered for the specified pair of Java type and XML data type.
+ * @param javaType Class of the Java type
+ * @param xmlType QName of the XML type
+ * @return Registered DeserializerFactory or null if there is no registered factory
+ */
+ public DeserializerFactory getDeserializer(Class javaType, QName xmlType)
+ {
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
+ return (fPair != null ? fPair.getDeserializerFactory() : null);
+ }
+
+ /**
+ * Gets the SerializerFactory registered for the specified pair of Java type and XML data type.
+ * @param javaType Class of the Java type
+ * @param xmlType QName of the XML type
+ * @return Registered SerializerFactory or null if there is no registered factory
+ */
+ public SerializerFactory getSerializer(Class javaType, QName xmlType)
+ {
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
+ return (fPair != null ? fPair.getSerializerFactory() : null);
+ }
+
+ /**
+ * Returns the encodingStyle URIs (as String[]) supported by this TypeMapping instance.
+ * A TypeMapping that contains only encoding style independent serializers and deserializers
+ * returns null from this method.
+ *
+ * @return Array of encodingStyle URIs for the supported encoding styles
+ */
+ public abstract String[] getSupportedEncodings();
+
+ /**
+ * Sets the encodingStyle URIs supported by this TypeMapping instance. A TypeMapping that contains only encoding
+ * independent serializers and deserializers requires null as the parameter for this method.
+ *
+ * @param encodingStyleURIs Array of encodingStyle URIs for the supported encoding styles
+ */
+ public abstract void setSupportedEncodings(String[] encodingStyleURIs);
+
+ /**
+ * Checks whether or not type mapping between specified XML type and Java type is registered.
+ * @param javaType Class of the Java type
+ * @param xmlType QName of the XML type
+ * @return boolean; true if type mapping between the specified XML type and Java type is registered; otherwise false
+ */
+ public boolean isRegistered(Class javaType, QName xmlType)
+ {
+ return getFactoryPair(new IQName(xmlType), javaType) != null;
+ }
+
+ /**
+ * Registers SerializerFactory and DeserializerFactory for a specific type mapping between an XML type and Java type.
+ * This method replaces any existing registered SerializerFactory DeserializerFactory instances.
+ * @param javaType Class of the Java type
+ * @param xmlType QName of the XML type
+ * @param sf SerializerFactory
+ * @param df DeserializerFactory
+ * @throws javax.xml.rpc.JAXRPCException If any error during the registration
+ */
+ public void register(Class javaType, QName xmlType, SerializerFactory sf, DeserializerFactory df)
+ {
+ if (log.isTraceEnabled())
+ log.trace("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]");
+
+ registerInternal(javaType, new IQName(xmlType), sf, df);
+ keyPairCache.clear();
+ }
+
+ private void registerInternal(Class javaType, IQName xmlType, SerializerFactory sf, DeserializerFactory df)
+ {
+ if (javaType == null)
+ throw new IllegalArgumentException("javaType cannot be null for: " + xmlType);
+ if (xmlType == null)
+ throw new IllegalArgumentException("xmlType cannot be null for: " + javaType);
+
+ KeyPair kPair = new KeyPair(xmlType, javaType);
+ FactoryPair fPair = new FactoryPair(sf, df);
+ tupleMap.put(kPair, fPair);
+ }
+
+ /**
+ * Removes the DeserializerFactory registered for the specified pair of Java type and XML data type.
+ * @param javaType Class of the Java type
+ * @param xmlType QName of the XML type
+ * @throws javax.xml.rpc.JAXRPCException If there is error in removing the registered DeserializerFactory
+ */
+ public void removeDeserializer(Class javaType, QName xmlType)
+ {
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
+ if (fPair != null)
+ fPair.setDeserializerFactory(null);
+ }
+
+ /**
+ * Removes the SerializerFactory registered for the specified pair of Java type and XML data type.
+ * @param javaType Class of the Java type
+ * @param xmlType QName of the XML type
+ * @throws javax.xml.rpc.JAXRPCException If there is error in removing the registered SerializerFactory
+ */
+ public void removeSerializer(Class javaType, QName xmlType)
+ {
+ FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
+ if (fPair != null)
+ fPair.setSerializerFactory(null);
+ }
+
+ /** Get the list of registered XML types */
+ public List<QName> getRegisteredXmlTypes()
+ {
+ List<QName> types = new ArrayList<QName>();
+ for (KeyPair keyPair : getKeyPairs(null, null))
+ {
+ types.add(keyPair.getXmlType().toQName());
+ }
+ return types;
+ }
+
+ /** Get the list of registered Java types */
+ public List<Class> getRegisteredJavaTypes()
+ {
+ List<Class> types = new ArrayList<Class>();
+ for (KeyPair keyPair : getKeyPairs(null, null))
+ {
+ types.add(keyPair.getJavaType());
+ }
+ return types;
+ }
+
+ /** Get the Class that was registered last for this xmlType */
+ public Class getJavaType(QName xmlType)
+ {
+ Class javaType = null;
+
+ List keyPairList = getKeyPairs(new IQName(xmlType), null);
+ int size = keyPairList.size();
+ if (size > 0)
+ {
+ KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
+ javaType = kPair.getJavaType();
+ }
+
+ return javaType;
+ }
+
+ /**
+ * Get all of the Classes registered for this xmlType.
+ */
+ public List<Class> getJavaTypes(QName xmlType)
+ {
+ List<KeyPair> keyPairList = getKeyPairs( new IQName(xmlType), null);
+ List<Class> classes = new ArrayList<Class>(keyPairList.size());
+
+ for (KeyPair current : keyPairList)
+ {
+ classes.add(current.getJavaType());
+ }
+
+ return classes;
+ }
+
+ /**
+ * Get the Class that was registered last for this xmlType
+ * If there are two Java Types registered for the xmlType
+ * return the primitive type rather than the wrapper,
+ * if available
+ */
+ public Class getJavaType(QName xmlType,boolean getPrimitive)
+ {
+ //Lets get the primitive type if available
+ Class javaType = null;
+
+ List keyPairList = getKeyPairs(new IQName(xmlType), null);
+ int size = keyPairList.size();
+ if (size == 2 && getPrimitive)
+ {
+ KeyPair kPair1 = (KeyPair)keyPairList.get(0);
+ Class javaType1 = kPair1.getJavaType();
+ KeyPair kPair2 = (KeyPair)keyPairList.get(1);
+ Class javaType2 = kPair2.getJavaType();
+ if(javaType2.isPrimitive() && !javaType1.isPrimitive())
+ javaType = javaType2;
+ else
+ if(javaType1.isPrimitive() && !javaType2.isPrimitive())
+ javaType = javaType1;
+ else
+ javaType = javaType2; //Fallback on the most latest
+ }
+ else
+ return getJavaType(xmlType);
+
+ return javaType;
+ }
+
+ /** Get the Class name that was registered last for this xmlType */
+ public String getJavaTypeName(QName xmlType)
+ {
+ Class javaType = getJavaType(xmlType);
+ return (javaType != null ? javaType.getName() : null);
+ }
+
+ /** Get the QName that was registered last for this javaType */
+ public QName getXMLType(Class javaType)
+ {
+ QName xmlType = null;
+
+ List keyPairList = getKeyPairs(null, javaType);
+ int size = keyPairList.size();
+ if (size > 0)
+ {
+ KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
+ xmlType = kPair.getXmlType().toQName();
+ }
+
+ return xmlType;
+ }
+
+ /** Get the QNames that was registered last for this javaType */
+ public List<QName> getXMLTypes(Class javaType)
+ {
+ List<QName> xmlTypes = new ArrayList<QName>();
+
+ for (KeyPair kPair : getKeyPairs(null, javaType))
+ {
+ xmlTypes.add(kPair.getXmlType().toQName());
+ }
+ return xmlTypes;
+ }
+
+ /**
+ * Get the QName that was registered last for this javaType
+ * @param javaType class for which XML Type is needed
+ * @param tryAssignable If the xmlType is not registered for javaType
+ * should a base class type be checked?
+ *
+ */
+ public QName getXMLType(Class javaType, boolean tryAssignable)
+ {
+ if(tryAssignable) return getXMLType(javaType);
+
+ QName xmlType = null;
+
+ List keyPairList = getKeyPairs(null, javaType, tryAssignable);
+ int size = keyPairList.size();
+ if (size > 0)
+ {
+ KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
+ xmlType = kPair.getXmlType().toQName();
+ }
+
+ return xmlType;
+ }
+
+ /**
+ * Get the serializer/deserializer factory pair for the given xmlType, javaType
+ * Both xmlType, javaType may be null. In that case, this implementation still
+ * returns a FactoryPair if there is only one possible match.
+ *
+ * @param xmlType can be null
+ * @param javaType can be null
+ */
+ private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType)
+ {
+ Integer cacheId = cacheIdFor(javaType, xmlType);
+
+ List<KeyPair> keyPairList = keyPairCache.get(cacheId);
+ if(null == keyPairList)
+ {
+ keyPairList = getKeyPairsInternal(xmlType, javaType);
+ keyPairCache.put(cacheId, keyPairList);
+ }
+
+ return keyPairList;
+ }
+
+ private Integer cacheIdFor(Class javaType, IQName xmlType) {
+ int result = HashCodeUtil.SEED;
+ int nullHash = HashCodeUtil.hash(result, "null");
+ result = javaType!= null ? HashCodeUtil.hash(result, javaType.getName()) : HashCodeUtil.hash(result, nullHash);
+ result = xmlType!= null ? HashCodeUtil.hash(result, xmlType.hashCode()): HashCodeUtil.hash(result, nullHash);
+ return new Integer(result);
+ }
+
+ private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType)
+ {
+ List<KeyPair> keyPairList = new ArrayList<KeyPair>();
+
+ // Getting the exact matching pair
+ if (xmlType != null && javaType != null)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (xmlType.equals(entry.getXmlType()) && entry.getJavaType() == javaType)
+ {
+ keyPairList.add(entry);
+ }
+ }
+ // No exact match, try assignable
+ if (keyPairList.size() == 0)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (xmlType.equals(entry.getXmlType()) && JavaUtils.isAssignableFrom(entry.getJavaType(), javaType))
+ {
+ keyPairList.add(entry);
+ }
+ }
+ }
+ }
+
+ // Getting the pair for a given xmlType
+ else if (xmlType != null && javaType == null)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (xmlType.equals(entry.getXmlType()))
+ {
+ keyPairList.add(entry);
+ }
+ }
+ }
+
+ // Getting the pair for a given javaType
+ else if (xmlType == null && javaType != null)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (entry.getJavaType() == javaType)
+ {
+ keyPairList.add(entry);
+ }
+ }
+ // No exact match, try assignable
+ if (keyPairList.size() == 0)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (JavaUtils.isAssignableFrom(entry.getJavaType(), javaType))
+ {
+ keyPairList.add(entry);
+ }
+ }
+ }
+ }
+
+ // Getting the all pairs
+ else if (xmlType == null && javaType == null)
+ {
+ keyPairList.addAll(tupleMap.keySet());
+ }
+
+ return keyPairList;
+ }
+
+ private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType, boolean tryAssignable)
+ {
+ Integer cacheId = cacheIdFor(javaType, xmlType);
+
+ List<KeyPair> keyPairList = keyPairCache.get(cacheId);
+ if(null == keyPairList)
+ {
+ keyPairList = getKeyPairsInternal(xmlType, javaType, tryAssignable);
+ keyPairCache.put(cacheId, keyPairList);
+ }
+
+ return keyPairList;
+ }
+
+ /**
+ * Get the serializer/deserializer factory pair for the given xmlType, javaType
+ * Both xmlType, javaType may be null. In that case, this implementation still
+ * returns a FactoryPair if there is only one possible match.
+ * <br>Note: This method does not try for the base class, if no keypair exists for the
+ * javaType in question.
+ */
+ private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType, boolean tryAssignable)
+ {
+ if(tryAssignable) return getKeyPairs( xmlType, javaType );
+
+ List<KeyPair> keyPairList = new ArrayList<KeyPair>();
+
+ // Getting the exact matching pair
+ if (xmlType != null && javaType != null)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (xmlType.equals(entry.getXmlType()) && entry.getJavaType() == javaType)
+ {
+ keyPairList.add(entry);
+ }
+ }
+ }
+
+ // Getting the pair for a given xmlType
+ else if (xmlType != null && javaType == null)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (xmlType.equals(entry.getXmlType()))
+ {
+ keyPairList.add(entry);
+ }
+ }
+ }
+
+ // Getting the pair for a given javaType
+ else if (xmlType == null && javaType != null)
+ {
+ for (KeyPair entry : tupleMap.keySet())
+ {
+ if (entry.getJavaType() == javaType)
+ {
+ keyPairList.add(entry);
+ }
+ }
+ }
+
+ // Getting the all pairs
+ else if (xmlType == null && javaType == null)
+ {
+ keyPairList.addAll(tupleMap.keySet());
+ }
+
+ return keyPairList;
+ }
+
+ /**
+ * Get the serializer/deserializer factory pair for the given xmlType, javaType
+ * Both xmlType, javaType may be null. In that case, this implementation still
+ * returns a FactoryPair that was last registered
+ */
+ private FactoryPair getFactoryPair(IQName xmlType, Class javaType)
+ {
+ FactoryPair fPair = null;
+
+ List<KeyPair> keyPairList = getKeyPairs(xmlType, javaType);
+ int size = keyPairList.size();
+ if (size > 0)
+ {
+ KeyPair kPair = keyPairList.get(size - 1);
+ fPair = (FactoryPair)tupleMap.get(kPair);
+ }
+
+ return fPair;
+ }
+
+ protected void registerStandardLiteralTypes()
+ {
+ register(BigDecimal.class, Constants.TYPE_LITERAL_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(BigInteger.class, Constants.TYPE_LITERAL_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(BigInteger.class, Constants.TYPE_LITERAL_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(Date.class, Constants.TYPE_LITERAL_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory());
+
+ register(Calendar.class, Constants.TYPE_LITERAL_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_LITERAL_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+ register(Calendar.class, Constants.TYPE_LITERAL_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
+
+ register(QName.class, Constants.TYPE_LITERAL_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory());
+
+ register(String.class, Constants.TYPE_LITERAL_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(String.class, Constants.TYPE_LITERAL_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(String[].class, Constants.TYPE_LITERAL_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(URI.class, Constants.TYPE_LITERAL_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(Byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
+ register(byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
+
+ register(Byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
+ register(byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
+
+ register(double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(int.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Integer.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(int.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Integer.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+
+ register(short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ register(Short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
+ }
+
+ /** A tuple of the type {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
+ */
+ private static class KeyPair
+ {
+ private IQName xmlType;
+ private Class javaType;
+
+ public KeyPair(IQName xmlType, Class javaType)
+ {
+ this.javaType = javaType;
+ this.xmlType = xmlType;
+ }
+
+ public Class getJavaType()
+ {
+ return javaType;
+ }
+
+ public IQName getXmlType()
+ {
+ return xmlType;
+ }
+
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (!(o instanceof KeyPair)) return false;
+
+ final KeyPair keyPair = (KeyPair)o;
+
+ if (!javaType.equals(keyPair.javaType)) return false;
+ if (!xmlType.equals(keyPair.xmlType)) return false;
+
+ return true;
+ }
+
+ public int hashCode()
+ {
+ int result;
+ result = xmlType.hashCode();
+ result = 29 * result + javaType.hashCode();
+ return result;
+ }
+
+ public String toString()
+ {
+ return "[xmlType=" + xmlType + ",javaType=" + javaType.getName() + "]";
+ }
+ }
+
+ /** A tuple of the type {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
+ */
+ public static class FactoryPair
+ {
+ private SerializerFactory serializerFactory;
+ private DeserializerFactory deserializerFactory;
+
+ FactoryPair(SerializerFactory sf, DeserializerFactory df)
+ {
+ this.deserializerFactory = df;
+ this.serializerFactory = sf;
+ }
+
+ public DeserializerFactory getDeserializerFactory()
+ {
+ return deserializerFactory;
+ }
+
+ public SerializerFactory getSerializerFactory()
+ {
+ return serializerFactory;
+ }
+
+ public void setDeserializerFactory(DeserializerFactory df)
+ {
+ this.deserializerFactory = df;
+ }
+
+ public void setSerializerFactory(SerializerFactory sf)
+ {
+ this.serializerFactory = sf;
+ }
+ }
+
+ /**
+ * A duck typed QName that relies on internalized Strings.<p>
+ * Taken from the {@link javax.xml.namespace.QName} docs:<br>
+ * The value of a QName contains a Namespace URI, local part and prefix.
+ * The prefix is included in QName to retain lexical information when present in an XML input source.
+ * The prefix is NOT used in QName.equals(Object) or to compute the QName.hashCode().
+ * Equality and the hash code are defined using only the Namespace URI and local part.
+ * If not specified, the Namespace URI is set to "" (the empty string).
+ * If not specified, the prefix is set to "" (the empty string).
+ */
+ private final class IQName
+ {
+ public String namespace;
+ public String localPart;
+ public String prefix;
+ public int hash;
+
+ public IQName(QName name)
+ {
+ namespace = name.getNamespaceURI() != null ? name.getNamespaceURI().intern() : "".intern();
+ localPart = name.getLocalPart() != null ? name.getLocalPart().intern() : "".intern();
+ prefix = name.getPrefix() != null ? name.getPrefix().intern() : "".intern();
+ hash = name.hashCode();
+ }
+
+ public boolean equals(Object object) {
+ if(!(object instanceof IQName))
+ throw new IllegalArgumentException("Cannot compare IQName to " + object);
+
+ IQName iqn = (IQName)object;
+ return (iqn.namespace == this.namespace && iqn.localPart == this.localPart);
+ }
+
+ public QName toQName()
+ {
+ QName qname;
+
+ if(null == namespace)
+ qname = new QName(localPart);
+ else if(null == prefix)
+ qname = new QName(namespace, localPart);
+ else
+ qname = new QName(namespace, localPart, prefix);
+
+ return qname;
+ }
+
+ /**
+ * This implementation currently represents a QName as: "{" + Namespace URI + "}" + local part.
+ * If the Namespace URI .equals(""), only the local part is returned.
+ */
+ public String toString() {
+ String ns = "".equals(namespace) ? namespace : "{"+namespace+"}";
+ return ns+localPart;
+ }
+
+ public int hashCode()
+ {
+ return this.hash;
+ }
+ }
+}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -58,61 +58,63 @@
*/
protected void narrowPortSelection(UnifiedServiceRefMetaData serviceRef, ServiceMetaData serviceMetaData)
{
- Map<String, UnifiedPortComponentRefMetaData> pcrefs = new HashMap<String, UnifiedPortComponentRefMetaData>();
- for (UnifiedPortComponentRefMetaData pcref : serviceRef.getPortComponentRefs())
+ if (serviceMetaData.getEndpoints().size() > 1)
{
- String seiName = pcref.getServiceEndpointInterface();
+ Map<String, UnifiedPortComponentRefMetaData> pcrefs = new HashMap<String, UnifiedPortComponentRefMetaData>();
+ for (UnifiedPortComponentRefMetaData pcref : serviceRef.getPortComponentRefs())
+ {
+ String seiName = pcref.getServiceEndpointInterface();
- // Constraint#1: within a service-ref it's not allowed to use a SEI across different pcref's
- if (pcrefs.get(seiName) != null)
- throw new WSException("Within a <service-ref> it's not allowed to use a SEI across different <port-component-ref>'s: " + seiName);
-
- pcrefs.put(seiName, pcref);
- }
+ // Constraint#1: within a service-ref it's not allowed to use a SEI across different pcref's
+ if (pcrefs.get(seiName) != null)
+ throw new WSException("Within a <service-ref> it's not allowed to use a SEI across different <port-component-ref>'s: " + seiName);
+
+ pcrefs.put(seiName, pcref);
+ }
- // Constraint#2: A pcref may only match one EndpointMetaData
- for (String sei : pcrefs.keySet())
- {
- // Narrow available endpoints by port-component-ref declaration
- List<QName> narrowedEndpoints = new ArrayList<QName>();
+ // Constraint#2: A pcref may only match one EndpointMetaData
+ for (String sei : pcrefs.keySet())
+ {
+ // Narrow available endpoints by port-component-ref declaration
+ List<QName> narrowedEndpoints = new ArrayList<QName>();
- UnifiedPortComponentRefMetaData pcref = pcrefs.get(sei);
+ UnifiedPortComponentRefMetaData pcref = pcrefs.get(sei);
- // Constraint#3: Port selection only applies when both SEI and QName are given
- if (pcref.getServiceEndpointInterface() != null && pcref.getPortQName() != null)
- {
- List<QName> pcRef2EndpointMapping = new ArrayList<QName>();
- for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
+ // Constraint#3: Port selection only applies when both SEI and QName are given
+ if (pcref.getServiceEndpointInterface() != null && pcref.getPortQName() != null)
{
- if (pcref.getServiceEndpointInterface().equals(epMetaData.getServiceEndpointInterfaceName()))
+ List<QName> pcRef2EndpointMapping = new ArrayList<QName>();
+ for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
{
- pcRef2EndpointMapping.add(epMetaData.getPortName());
+ if (pcref.getServiceEndpointInterface().equals(epMetaData.getServiceEndpointInterfaceName()))
+ {
+ pcRef2EndpointMapping.add(epMetaData.getPortName());
+ }
}
- }
- for (QName q : pcRef2EndpointMapping)
- {
- EndpointMetaData mappedEndpoint = serviceMetaData.getEndpoint(q);
- if (!pcref.getPortQName().equals(mappedEndpoint.getPortName()))
- narrowedEndpoints.add(q);
- }
+ for (QName q : pcRef2EndpointMapping)
+ {
+ EndpointMetaData mappedEndpoint = serviceMetaData.getEndpoint(q);
+ if (!pcref.getPortQName().equals(mappedEndpoint.getPortName()))
+ narrowedEndpoints.add(q);
+ }
- // Constraint: Dont exclude all of them ;)
- if (pcRef2EndpointMapping.size() > 0 && (pcRef2EndpointMapping.size() == narrowedEndpoints.size()))
- throw new WSException("Failed to narrow available endpoints by <port-component-ref> declaration");
+ // Constraint: Dont exclude all of them ;)
+ if (pcRef2EndpointMapping.size() > 0 && (pcRef2EndpointMapping.size() == narrowedEndpoints.size()))
+ throw new WSException("Failed to narrow available endpoints by <port-component-ref> declaration");
- for (QName q : narrowedEndpoints)
+ for (QName q : narrowedEndpoints)
+ {
+ EndpointMetaData removed = serviceMetaData.removeEndpoint(q);
+ log.debug("Narrowed endpoint " + q + "(" + removed + ")");
+ }
+ }
+ else
{
- EndpointMetaData removed = serviceMetaData.removeEndpoint(q);
- log.debug("Narrowed endpoint " + q + "(" + removed + ")");
+ // TODO: In case there is more then one EMPD this should cause an exception
+ log.warn("Unable to narrow port selection for " + pcref);
}
}
- else
- {
- // TODO: In case there is more then one EMPD this should cause an exception
- log.warn("Unable to narrow port selection for " + pcref);
- }
-
}
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/EncodedTypeMapping.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -34,6 +34,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.Base64DeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.Base64SerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.CalendarDeserializerFactory;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -32,6 +32,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.ElementDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.ElementSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,6 +41,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.soap.Style;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -39,7 +39,6 @@
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
@@ -48,13 +47,13 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
-import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.SerializerSupport;
+import org.jboss.ws.core.CommonSOAPFaultException;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.MessageFactoryImpl;
import org.jboss.ws.core.soap.NameImpl;
@@ -125,7 +124,7 @@
Class javaType = faultMetaData.getJavaType();
// Get the deserializer from the type mapping
- DeserializerFactoryBase desFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(javaType, xmlType);
+ AbstractDeserializerFactory desFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(javaType, xmlType);
if (desFactory == null)
throw new JAXRPCException("Cannot obtain deserializer factory for: " + xmlType);
@@ -181,9 +180,18 @@
{
faultEx = (SOAPFaultException)reqEx;
}
+ else if (reqEx instanceof CommonSOAPFaultException)
+ {
+ CommonSOAPFaultException soapEx = (CommonSOAPFaultException)reqEx;
+ QName faultCode = soapEx.getFaultCode();
+ String faultString = soapEx.getFaultString();
+ Throwable cause = soapEx.getCause();
+ faultEx = new SOAPFaultException(faultCode, faultString, null, null);
+ faultEx.initCause(cause);
+ }
else
{
- QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ QName faultCode = Constants.SOAP11_FAULT_CODE_SERVER;
String faultString = (reqEx.getMessage() != null ? reqEx.getMessage() : reqEx.toString());
faultEx = new SOAPFaultException(faultCode, faultString, null, null);
faultEx.initCause(reqEx);
@@ -258,7 +266,7 @@
xmlName = nsRegistry.registerQName(xmlName);
// Get the serializer from the type mapping
- SerializerFactoryBase serFactory = (SerializerFactoryBase)typeMapping.getSerializer(javaType, xmlType);
+ AbstractSerializerFactory serFactory = (AbstractSerializerFactory)typeMapping.getSerializer(javaType, xmlType);
if (serFactory == null)
throw new JAXRPCException("Cannot obtain serializer factory for: " + xmlType);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,7 +29,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,744 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.jaxrpc;
-
-// $Id$
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.DeserializerFactory;
-import javax.xml.rpc.encoding.SerializerFactory;
-import javax.xml.rpc.encoding.TypeMapping;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.Constants;
-import org.jboss.ws.core.jaxrpc.binding.Base64DeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.Base64SerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.CalendarDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.CalendarSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.DateDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.DateSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.HexDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.HexSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.QNameDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory;
-import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory;
-import org.jboss.ws.core.utils.HashCodeUtil;
-import org.jboss.wsf.spi.utils.JavaUtils;
-
-/**
- * This is the representation of a type mapping.
- * This TypeMapping implementation supports the literal encoding style.
- *
- * The TypeMapping instance maintains a tuple of the type
- * {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-Oct-2004
- */
-public abstract class TypeMappingImpl implements TypeMapping
-{
- // provide logging
- private static final Logger log = Logger.getLogger(TypeMappingImpl.class);
-
- // Map<KeyPair,FactoryPair>
- private Map<KeyPair, FactoryPair> tupleMap = new LinkedHashMap<KeyPair, FactoryPair>();
-
- private Map<Integer, List<KeyPair>> keyPairCache = new ConcurrentHashMap<Integer, List<KeyPair>>();
-
- /**
- * Gets the DeserializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @return Registered DeserializerFactory or null if there is no registered factory
- */
- public DeserializerFactory getDeserializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- return (fPair != null ? fPair.getDeserializerFactory() : null);
- }
-
- /**
- * Gets the SerializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @return Registered SerializerFactory or null if there is no registered factory
- */
- public SerializerFactory getSerializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- return (fPair != null ? fPair.getSerializerFactory() : null);
- }
-
- /**
- * Returns the encodingStyle URIs (as String[]) supported by this TypeMapping instance.
- * A TypeMapping that contains only encoding style independent serializers and deserializers
- * returns null from this method.
- *
- * @return Array of encodingStyle URIs for the supported encoding styles
- */
- public abstract String[] getSupportedEncodings();
-
- /**
- * Sets the encodingStyle URIs supported by this TypeMapping instance. A TypeMapping that contains only encoding
- * independent serializers and deserializers requires null as the parameter for this method.
- *
- * @param encodingStyleURIs Array of encodingStyle URIs for the supported encoding styles
- */
- public abstract void setSupportedEncodings(String[] encodingStyleURIs);
-
- /**
- * Checks whether or not type mapping between specified XML type and Java type is registered.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @return boolean; true if type mapping between the specified XML type and Java type is registered; otherwise false
- */
- public boolean isRegistered(Class javaType, QName xmlType)
- {
- return getFactoryPair(new IQName(xmlType), javaType) != null;
- }
-
- /**
- * Registers SerializerFactory and DeserializerFactory for a specific type mapping between an XML type and Java type.
- * This method replaces any existing registered SerializerFactory DeserializerFactory instances.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @param sf SerializerFactory
- * @param df DeserializerFactory
- * @throws javax.xml.rpc.JAXRPCException If any error during the registration
- */
- public void register(Class javaType, QName xmlType, SerializerFactory sf, DeserializerFactory df)
- {
- if (log.isTraceEnabled())
- log.trace("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]");
-
- registerInternal(javaType, new IQName(xmlType), sf, df);
- keyPairCache.clear();
- }
-
- private void registerInternal(Class javaType, IQName xmlType, SerializerFactory sf, DeserializerFactory df)
- {
- if (javaType == null)
- throw new IllegalArgumentException("javaType cannot be null for: " + xmlType);
- if (xmlType == null)
- throw new IllegalArgumentException("xmlType cannot be null for: " + javaType);
-
- KeyPair kPair = new KeyPair(xmlType, javaType);
- FactoryPair fPair = new FactoryPair(sf, df);
- tupleMap.put(kPair, fPair);
- }
-
- /**
- * Removes the DeserializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @throws javax.xml.rpc.JAXRPCException If there is error in removing the registered DeserializerFactory
- */
- public void removeDeserializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- if (fPair != null)
- fPair.setDeserializerFactory(null);
- }
-
- /**
- * Removes the SerializerFactory registered for the specified pair of Java type and XML data type.
- * @param javaType Class of the Java type
- * @param xmlType QName of the XML type
- * @throws javax.xml.rpc.JAXRPCException If there is error in removing the registered SerializerFactory
- */
- public void removeSerializer(Class javaType, QName xmlType)
- {
- FactoryPair fPair = getFactoryPair(new IQName(xmlType), javaType);
- if (fPair != null)
- fPair.setSerializerFactory(null);
- }
-
- /** Get the list of registered XML types */
- public List<QName> getRegisteredXmlTypes()
- {
- List<QName> types = new ArrayList<QName>();
- for (KeyPair keyPair : getKeyPairs(null, null))
- {
- types.add(keyPair.getXmlType().toQName());
- }
- return types;
- }
-
- /** Get the list of registered Java types */
- public List<Class> getRegisteredJavaTypes()
- {
- List<Class> types = new ArrayList<Class>();
- for (KeyPair keyPair : getKeyPairs(null, null))
- {
- types.add(keyPair.getJavaType());
- }
- return types;
- }
-
- /** Get the Class that was registered last for this xmlType */
- public Class getJavaType(QName xmlType)
- {
- Class javaType = null;
-
- List keyPairList = getKeyPairs(new IQName(xmlType), null);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- javaType = kPair.getJavaType();
- }
-
- return javaType;
- }
-
- /**
- * Get all of the Classes registered for this xmlType.
- */
- public List<Class> getJavaTypes(QName xmlType)
- {
- List<KeyPair> keyPairList = getKeyPairs( new IQName(xmlType), null);
- List<Class> classes = new ArrayList<Class>(keyPairList.size());
-
- for (KeyPair current : keyPairList)
- {
- classes.add(current.getJavaType());
- }
-
- return classes;
- }
-
- /**
- * Get the Class that was registered last for this xmlType
- * If there are two Java Types registered for the xmlType
- * return the primitive type rather than the wrapper,
- * if available
- */
- public Class getJavaType(QName xmlType,boolean getPrimitive)
- {
- //Lets get the primitive type if available
- Class javaType = null;
-
- List keyPairList = getKeyPairs(new IQName(xmlType), null);
- int size = keyPairList.size();
- if (size == 2 && getPrimitive)
- {
- KeyPair kPair1 = (KeyPair)keyPairList.get(0);
- Class javaType1 = kPair1.getJavaType();
- KeyPair kPair2 = (KeyPair)keyPairList.get(1);
- Class javaType2 = kPair2.getJavaType();
- if(javaType2.isPrimitive() && !javaType1.isPrimitive())
- javaType = javaType2;
- else
- if(javaType1.isPrimitive() && !javaType2.isPrimitive())
- javaType = javaType1;
- else
- javaType = javaType2; //Fallback on the most latest
- }
- else
- return getJavaType(xmlType);
-
- return javaType;
- }
-
- /** Get the Class name that was registered last for this xmlType */
- public String getJavaTypeName(QName xmlType)
- {
- Class javaType = getJavaType(xmlType);
- return (javaType != null ? javaType.getName() : null);
- }
-
- /** Get the QName that was registered last for this javaType */
- public QName getXMLType(Class javaType)
- {
- QName xmlType = null;
-
- List keyPairList = getKeyPairs(null, javaType);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- xmlType = kPair.getXmlType().toQName();
- }
-
- return xmlType;
- }
-
- /** Get the QNames that was registered last for this javaType */
- public List<QName> getXMLTypes(Class javaType)
- {
- List<QName> xmlTypes = new ArrayList<QName>();
-
- for (KeyPair kPair : getKeyPairs(null, javaType))
- {
- xmlTypes.add(kPair.getXmlType().toQName());
- }
- return xmlTypes;
- }
-
- /**
- * Get the QName that was registered last for this javaType
- * @param javaType class for which XML Type is needed
- * @param tryAssignable If the xmlType is not registered for javaType
- * should a base class type be checked?
- *
- */
- public QName getXMLType(Class javaType, boolean tryAssignable)
- {
- if(tryAssignable) return getXMLType(javaType);
-
- QName xmlType = null;
-
- List keyPairList = getKeyPairs(null, javaType, tryAssignable);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = (KeyPair)keyPairList.get(size - 1);
- xmlType = kPair.getXmlType().toQName();
- }
-
- return xmlType;
- }
-
- /**
- * Get the serializer/deserializer factory pair for the given xmlType, javaType
- * Both xmlType, javaType may be null. In that case, this implementation still
- * returns a FactoryPair if there is only one possible match.
- *
- * @param xmlType can be null
- * @param javaType can be null
- */
- private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType)
- {
- Integer cacheId = cacheIdFor(javaType, xmlType);
-
- List<KeyPair> keyPairList = keyPairCache.get(cacheId);
- if(null == keyPairList)
- {
- keyPairList = getKeyPairsInternal(xmlType, javaType);
- keyPairCache.put(cacheId, keyPairList);
- }
-
- return keyPairList;
- }
-
- private Integer cacheIdFor(Class javaType, IQName xmlType) {
- int result = HashCodeUtil.SEED;
- int nullHash = HashCodeUtil.hash(result, "null");
- result = javaType!= null ? HashCodeUtil.hash(result, javaType.getName()) : HashCodeUtil.hash(result, nullHash);
- result = xmlType!= null ? HashCodeUtil.hash(result, xmlType.hashCode()): HashCodeUtil.hash(result, nullHash);
- return new Integer(result);
- }
-
- private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType)
- {
- List<KeyPair> keyPairList = new ArrayList<KeyPair>();
-
- // Getting the exact matching pair
- if (xmlType != null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()) && entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- // No exact match, try assignable
- if (keyPairList.size() == 0)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()) && JavaUtils.isAssignableFrom(entry.getJavaType(), javaType))
- {
- keyPairList.add(entry);
- }
- }
- }
- }
-
- // Getting the pair for a given xmlType
- else if (xmlType != null && javaType == null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()))
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the pair for a given javaType
- else if (xmlType == null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- // No exact match, try assignable
- if (keyPairList.size() == 0)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (JavaUtils.isAssignableFrom(entry.getJavaType(), javaType))
- {
- keyPairList.add(entry);
- }
- }
- }
- }
-
- // Getting the all pairs
- else if (xmlType == null && javaType == null)
- {
- keyPairList.addAll(tupleMap.keySet());
- }
-
- return keyPairList;
- }
-
- private List<KeyPair> getKeyPairs(IQName xmlType, Class javaType, boolean tryAssignable)
- {
- Integer cacheId = cacheIdFor(javaType, xmlType);
-
- List<KeyPair> keyPairList = keyPairCache.get(cacheId);
- if(null == keyPairList)
- {
- keyPairList = getKeyPairsInternal(xmlType, javaType, tryAssignable);
- keyPairCache.put(cacheId, keyPairList);
- }
-
- return keyPairList;
- }
-
- /**
- * Get the serializer/deserializer factory pair for the given xmlType, javaType
- * Both xmlType, javaType may be null. In that case, this implementation still
- * returns a FactoryPair if there is only one possible match.
- * <br>Note: This method does not try for the base class, if no keypair exists for the
- * javaType in question.
- */
- private List<KeyPair> getKeyPairsInternal(IQName xmlType, Class javaType, boolean tryAssignable)
- {
- if(tryAssignable) return getKeyPairs( xmlType, javaType );
-
- List<KeyPair> keyPairList = new ArrayList<KeyPair>();
-
- // Getting the exact matching pair
- if (xmlType != null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()) && entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the pair for a given xmlType
- else if (xmlType != null && javaType == null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (xmlType.equals(entry.getXmlType()))
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the pair for a given javaType
- else if (xmlType == null && javaType != null)
- {
- for (KeyPair entry : tupleMap.keySet())
- {
- if (entry.getJavaType() == javaType)
- {
- keyPairList.add(entry);
- }
- }
- }
-
- // Getting the all pairs
- else if (xmlType == null && javaType == null)
- {
- keyPairList.addAll(tupleMap.keySet());
- }
-
- return keyPairList;
- }
-
- /**
- * Get the serializer/deserializer factory pair for the given xmlType, javaType
- * Both xmlType, javaType may be null. In that case, this implementation still
- * returns a FactoryPair that was last registered
- */
- private FactoryPair getFactoryPair(IQName xmlType, Class javaType)
- {
- FactoryPair fPair = null;
-
- List<KeyPair> keyPairList = getKeyPairs(xmlType, javaType);
- int size = keyPairList.size();
- if (size > 0)
- {
- KeyPair kPair = keyPairList.get(size - 1);
- fPair = (FactoryPair)tupleMap.get(kPair);
- }
-
- return fPair;
- }
-
- protected void registerStandardLiteralTypes()
- {
- register(BigDecimal.class, Constants.TYPE_LITERAL_DECIMAL, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(BigInteger.class, Constants.TYPE_LITERAL_POSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_NEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_NONPOSITIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_NONNEGATIVEINTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_UNSIGNEDLONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(BigInteger.class, Constants.TYPE_LITERAL_INTEGER, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(Date.class, Constants.TYPE_LITERAL_DATETIME, new DateSerializerFactory(), new DateDeserializerFactory());
-
- register(Calendar.class, Constants.TYPE_LITERAL_DATE, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- register(Calendar.class, Constants.TYPE_LITERAL_TIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
- register(Calendar.class, Constants.TYPE_LITERAL_DATETIME, new CalendarSerializerFactory(), new CalendarDeserializerFactory());
-
- register(QName.class, Constants.TYPE_LITERAL_QNAME, new QNameSerializerFactory(), new QNameDeserializerFactory());
-
- register(String.class, Constants.TYPE_LITERAL_ANYSIMPLETYPE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_DURATION, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GMONTHDAY, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GYEAR, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_GYEARMONTH, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_ID, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_LANGUAGE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NCNAME, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NMTOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_NORMALIZEDSTRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_TOKEN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(String.class, Constants.TYPE_LITERAL_STRING, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(String[].class, Constants.TYPE_LITERAL_NMTOKENS, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(URI.class, Constants.TYPE_LITERAL_ANYURI, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Boolean.class, Constants.TYPE_LITERAL_BOOLEAN, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Byte.class, Constants.TYPE_LITERAL_BYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(Byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
- register(byte[].class, Constants.TYPE_LITERAL_HEXBINARY, new HexSerializerFactory(), new HexDeserializerFactory());
-
- register(Byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
- register(byte[].class, Constants.TYPE_LITERAL_BASE64BINARY, new Base64SerializerFactory(), new Base64DeserializerFactory());
-
- register(double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Double.class, Constants.TYPE_LITERAL_DOUBLE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Float.class, Constants.TYPE_LITERAL_FLOAT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(int.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Integer.class, Constants.TYPE_LITERAL_UNSIGNEDSHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(int.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Integer.class, Constants.TYPE_LITERAL_INT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Long.class, Constants.TYPE_LITERAL_UNSIGNEDINT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Long.class, Constants.TYPE_LITERAL_LONG, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
-
- register(short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Short.class, Constants.TYPE_LITERAL_UNSIGNEDBYTE, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- register(Short.class, Constants.TYPE_LITERAL_SHORT, new SimpleSerializerFactory(), new SimpleDeserializerFactory());
- }
-
- /** A tuple of the type {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
- */
- private static class KeyPair
- {
- private IQName xmlType;
- private Class javaType;
-
- public KeyPair(IQName xmlType, Class javaType)
- {
- this.javaType = javaType;
- this.xmlType = xmlType;
- }
-
- public Class getJavaType()
- {
- return javaType;
- }
-
- public IQName getXmlType()
- {
- return xmlType;
- }
-
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (!(o instanceof KeyPair)) return false;
-
- final KeyPair keyPair = (KeyPair)o;
-
- if (!javaType.equals(keyPair.javaType)) return false;
- if (!xmlType.equals(keyPair.xmlType)) return false;
-
- return true;
- }
-
- public int hashCode()
- {
- int result;
- result = xmlType.hashCode();
- result = 29 * result + javaType.hashCode();
- return result;
- }
-
- public String toString()
- {
- return "[xmlType=" + xmlType + ",javaType=" + javaType.getName() + "]";
- }
- }
-
- /** A tuple of the type {XML typeQName, Java Class, SerializerFactory, DeserializerFactory}.
- */
- public static class FactoryPair
- {
- private SerializerFactory serializerFactory;
- private DeserializerFactory deserializerFactory;
-
- FactoryPair(SerializerFactory sf, DeserializerFactory df)
- {
- this.deserializerFactory = df;
- this.serializerFactory = sf;
- }
-
- public DeserializerFactory getDeserializerFactory()
- {
- return deserializerFactory;
- }
-
- public SerializerFactory getSerializerFactory()
- {
- return serializerFactory;
- }
-
- public void setDeserializerFactory(DeserializerFactory df)
- {
- this.deserializerFactory = df;
- }
-
- public void setSerializerFactory(SerializerFactory sf)
- {
- this.serializerFactory = sf;
- }
- }
-
- /**
- * A duck typed QName that relies on internalized Strings.<p>
- * Taken from the {@link javax.xml.namespace.QName} docs:<br>
- * The value of a QName contains a Namespace URI, local part and prefix.
- * The prefix is included in QName to retain lexical information when present in an XML input source.
- * The prefix is NOT used in QName.equals(Object) or to compute the QName.hashCode().
- * Equality and the hash code are defined using only the Namespace URI and local part.
- * If not specified, the Namespace URI is set to "" (the empty string).
- * If not specified, the prefix is set to "" (the empty string).
- */
- private final class IQName
- {
- public String namespace;
- public String localPart;
- public String prefix;
- public int hash;
-
- public IQName(QName name)
- {
- namespace = name.getNamespaceURI() != null ? name.getNamespaceURI().intern() : "".intern();
- localPart = name.getLocalPart() != null ? name.getLocalPart().intern() : "".intern();
- prefix = name.getPrefix() != null ? name.getPrefix().intern() : "".intern();
- hash = name.hashCode();
- }
-
- public boolean equals(Object object) {
- if(!(object instanceof IQName))
- throw new IllegalArgumentException("Cannot compare IQName to " + object);
-
- IQName iqn = (IQName)object;
- return (iqn.namespace == this.namespace && iqn.localPart == this.localPart);
- }
-
- public QName toQName()
- {
- QName qname;
-
- if(null == namespace)
- qname = new QName(localPart);
- else if(null == prefix)
- qname = new QName(namespace, localPart);
- else
- qname = new QName(namespace, localPart, prefix);
-
- return qname;
- }
-
- /**
- * This implementation currently represents a QName as: "{" + Namespace URI + "}" + local part.
- * If the Namespace URI .equals(""), only the local part is returned.
- */
- public String toString() {
- String ns = "".equals(namespace) ? namespace : "{"+namespace+"}";
- return ns+localPart;
- }
-
- public int hashCode()
- {
- return this.hash;
- }
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -32,6 +32,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.binding.TypeMappingImpl;
/**
* This defines a registry of TypeMapping instances for encoding styles.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl;
import org.jboss.wsf.spi.utils.DOMUtils;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64DeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64DeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64DeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class Base64DeserializerFactory extends DeserializerFactoryBase
+public class Base64DeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,10 @@
import javax.xml.transform.Result;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl;
import org.jboss.wsf.spi.utils.JavaUtils;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64SerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64SerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64SerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class Base64SerializerFactory extends SerializerFactoryBase
+public class Base64SerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BindingException.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BindingException.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BindingException.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,92 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-// $Id$
-
-/** An exception that may occur during message binding
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-Oct-2004
- */
-public class BindingException extends Exception
-{
- /**
- * Constructs a new exception with <code>null</code> as its detail message.
- * The cause is not initialized, and may subsequently be initialized by a
- * call to {@link #initCause}.
- */
- public BindingException()
- {
- }
-
- /**
- * Constructs a new exception with the specified detail message. The
- * cause is not initialized, and may subsequently be initialized by
- * a call to {@link #initCause}.
- *
- * @param message the detail message. The detail message is saved for
- * later retrieval by the {@link #getMessage()} method.
- */
- public BindingException(String message)
- {
- super(message);
- }
-
- /**
- * Constructs a new exception with the specified cause and a detail
- * message of <tt>(cause==null ? null : cause.toString())</tt> (which
- * typically contains the class and detail message of <tt>cause</tt>).
- * This constructor is useful for exceptions that are little more than
- * wrappers for other throwables (for example, {@link
- * java.security.PrivilegedActionException}).
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @since 1.4
- */
- public BindingException(Throwable cause)
- {
- super(cause);
- }
-
- /**
- * Constructs a new exception with the specified detail message and
- * cause. <p>Note that the detail message associated with
- * <code>cause</code> is <i>not</i> automatically incorporated in
- * this exception's detail message.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
- * @since 1.4
- */
- public BindingException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamResult.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-// $Id: $
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-
-import javax.xml.transform.stream.StreamResult;
-
-import org.jboss.ws.WSException;
-import org.jboss.wsf.spi.utils.IOUtils;
-
-/**
- * @author Heiko.Braun(a)jboss.org
- * @author Thomas.Diesler(a)jboss.org
- * @since 06.02.2007
- */
-public class BufferedStreamResult extends StreamResult
-{
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
-
- public BufferedStreamResult()
- {
- }
-
- public BufferedStreamResult(String xmlFragment)
- {
- try
- {
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
- }
- catch (IOException e)
- {
- WSException.rethrow(e);
- }
- }
-
- @Override
- public Writer getWriter()
- {
- return null;
- }
-
- @Override
- public OutputStream getOutputStream()
- {
- return baos;
- }
-
- @Override
- public void setWriter(Writer writer)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void setOutputStream(OutputStream outputStream)
- {
- throw new UnsupportedOperationException();
- }
-
- public String toString()
- {
- return baos.toString();
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.xb.binding.SimpleTypeBindings;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class CalendarDeserializerFactory extends DeserializerFactoryBase
+public class CalendarDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -29,7 +32,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class CalendarSerializerFactory extends SerializerFactoryBase
+public class CalendarSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-
-// $Id$
-
-/**
- * A Deserializer that can handle complex types by delegating to JAXB.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class ComplexTypeDeserializer extends DeserializerSupport
-{
-
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ComplexTypeSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-
-// $Id$
-
-/**
- * A Serializer that can handle complex types by delegating to JAXB.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class ComplexTypeSerializer extends SerializerSupport
-{
-
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,9 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.xb.binding.SimpleTypeBindings;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class DateDeserializerFactory extends DeserializerFactoryBase
+public class DateDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -31,6 +31,10 @@
import javax.xml.transform.Result;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class DateSerializerFactory extends SerializerFactoryBase
+public class DateSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerFactoryBase.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerFactoryBase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerFactoryBase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-// $Id$
-
-import java.util.Iterator;
-
-import javax.xml.rpc.encoding.Deserializer;
-import javax.xml.rpc.encoding.DeserializerFactory;
-
-import org.jboss.util.NotImplementedException;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class DeserializerFactoryBase implements DeserializerFactory
-{
- public abstract DeserializerSupport getDeserializer() throws BindingException;
-
- public Deserializer getDeserializerAs(String mechanismType)
- {
- throw new NotImplementedException();
- }
-
- public Iterator getSupportedMechanismTypes()
- {
- throw new NotImplementedException();
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,160 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-// $Id$
-
-import java.io.ByteArrayOutputStream;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.Deserializer;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.soap.SOAPContentElement;
-import org.jboss.ws.core.utils.XMLPredefinedEntityReferenceResolver;
-import org.jboss.wsf.spi.utils.DOMWriter;
-import org.w3c.dom.Node;
-
-/** The base class for all Deserializers.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class DeserializerSupport implements Deserializer
-{
- private static final Logger log = Logger.getLogger(DeserializerSupport.class);
-
- public Object deserialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
- {
- QName xmlName = soapElement.getElementQName();
- QName xmlType = soapElement.getXmlType();
-
- Source source = soapElement.getXMLFragment().getSource();
- return deserialize(xmlName, xmlType, source, serContext);
- }
-
- /** Deserialize an XML fragment to an object value
- *
- * @param xmlName The root element name of the resulting fragment
- * @param xmlType The associated schema type
- * @param xmlFragment The XML fragment to deserialize
- * @param serContext The serialization context
- */
- public abstract Object deserialize(QName xmlName, QName xmlType, Source xmlFragment, SerializationContext serContext) throws BindingException;
-
- // TODO: remove when JBossXB supports unmarshall(Source)
- // http://jira.jboss.org/jira/browse/JBXB-100
- protected static String sourceToString(Source source)
- {
- String xmlFragment = null;
- try
- {
- if (source instanceof DOMSource)
- {
- Node node = ((DOMSource)source).getNode();
- xmlFragment = DOMWriter.printNode(node, false);
- }
- else
- {
- // Note, this code will not handler namespaces correctly that
- // are defined on a parent of the DOMSource
- //
- // <env:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- // <env:Body>
- // <myMethod>
- // <param xsi:type='xsd:string'>Hello World!</param>
- // </myMethod>
- // </env:Body>
- // </env:Envelope>
- //
- TransformerFactory tf = TransformerFactory.newInstance();
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- StreamResult streamResult = new StreamResult(baos);
- tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
- if (xmlFragment.startsWith("<?xml"))
- {
- int index = xmlFragment.indexOf(">");
- xmlFragment = xmlFragment.substring(index + 1);
- }
- }
- }
- catch (TransformerException e)
- {
- WSException.rethrow(e);
- }
-
- return xmlFragment;
- }
-
- /** Unwrap the value string from the XML fragment
- *
- * @return The value string or null if the startTag contains a xsi:nil='true' attribute
- */
- protected String unwrapValueStr(String xmlFragment)
- {
- // We only scan for :nil if the xmlFragment is an empty element
- if (isEmptyElement(xmlFragment))
- {
- return (isNil(xmlFragment) ? null : "");
- }
-
- int endOfStartTag = xmlFragment.indexOf(">");
- int startOfEndTag = xmlFragment.lastIndexOf("</");
- if (endOfStartTag < 0 || startOfEndTag < 0)
- throw new IllegalArgumentException("Invalid XML fragment: " + xmlFragment);
-
- String valueStr = xmlFragment.substring(endOfStartTag + 1, startOfEndTag);
-
- return XMLPredefinedEntityReferenceResolver.resolve(valueStr);
- }
-
- protected boolean isEmptyElement(String xmlFragment)
- {
- return xmlFragment.startsWith("<") && xmlFragment.endsWith("/>");
- }
-
- protected boolean isNil(String xmlFragment)
- {
- boolean isNil = false;
- if (isEmptyElement(xmlFragment))
- {
- int endOfStartTag = xmlFragment.indexOf(">");
- String startTag = xmlFragment.substring(0, endOfStartTag);
- isNil = startTag.indexOf(":nil='1'") > 0 || startTag.indexOf(":nil=\"1\"") > 0;
- isNil = isNil || startTag.indexOf(":nil='true'") > 0 || startTag.indexOf(":nil=\"true\"") > 0;
- }
- return isNil;
- }
-
- public String getMechanismType()
- {
- throw new NotImplementedException();
- }
-}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,9 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class ElementDeserializerFactory extends DeserializerFactoryBase
+public class ElementDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,10 @@
import javax.xml.transform.Result;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
/**
@@ -30,7 +33,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 23-Jun-2005
*/
-public class ElementSerializerFactory extends SerializerFactoryBase
+public class ElementSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,9 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.xb.binding.SimpleTypeBindings;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class HexDeserializerFactory extends DeserializerFactoryBase
+public class HexDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,10 @@
import javax.xml.transform.Result;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.wsf.spi.utils.JavaUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class HexSerializerFactory extends SerializerFactoryBase
+public class HexSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,9 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.ComplexTypeDeserializer;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBUnmarshaller;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,11 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
/**
@@ -31,7 +35,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class JBossXBDeserializerFactory extends DeserializerFactoryBase
+public class JBossXBDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer() throws BindingException
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -31,6 +31,10 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.ComplexTypeSerializer;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBConstants;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.JBossXBMarshaller;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,11 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -32,7 +36,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class JBossXBSerializerFactory extends SerializerFactoryBase
+public class JBossXBSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer() throws BindingException
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -28,6 +28,10 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,6 +29,9 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -29,7 +32,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class QNameDeserializerFactory extends DeserializerFactoryBase
+public class QNameDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,10 @@
import javax.xml.transform.Result;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class QNameSerializerFactory extends SerializerFactoryBase
+public class QNameSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -35,7 +35,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.JavaUtils;
@@ -78,11 +82,11 @@
Object[] retArray = (Object[])Array.newInstance(compJavaType, arrDims);
TypeMappingImpl typeMapping = serContext.getTypeMapping();
- DeserializerFactoryBase compDeserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(compJavaType, compXmlType);
+ AbstractDeserializerFactory compDeserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(compJavaType, compXmlType);
if (compDeserializerFactory == null)
{
log.warn("Cannot obtain component deserializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
- compDeserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(null, compXmlType);
+ compDeserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(null, compXmlType);
}
if (compDeserializerFactory == null)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,11 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
/**
@@ -30,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 31-Oct-2005
*/
-public class SOAPArrayDeserializerFactory extends DeserializerFactoryBase
+public class SOAPArrayDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer() throws BindingException
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,7 +29,12 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.XMLFragment;
@@ -101,11 +106,11 @@
// Get the component type serializer factory
log.debug("Get component serializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
- SerializerFactoryBase compSerializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(compJavaType, compXmlType);
+ AbstractSerializerFactory compSerializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(compJavaType, compXmlType);
if (compSerializerFactory == null)
{
log.warn("Cannot obtain component serializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]");
- compSerializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(null, compXmlType);
+ compSerializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(null, compXmlType);
}
if (compSerializerFactory == null)
throw new WSException("Cannot obtain component serializer for: " + compXmlType);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,11 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -31,7 +35,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 31-Oct-2005
*/
-public class SOAPArraySerializerFactory extends SerializerFactoryBase
+public class SOAPArraySerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer() throws BindingException
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -28,6 +28,9 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class SOAPElementDeserializerFactory extends DeserializerFactoryBase
+public class SOAPElementDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -28,6 +28,10 @@
import javax.xml.transform.Result;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
/**
@@ -30,7 +33,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 23-Jun-2005
*/
-public class SOAPElementSerializerFactory extends SerializerFactoryBase
+public class SOAPElementSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializationContext.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializationContext.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializationContext.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-// $Id$
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
-import org.jboss.xb.binding.NamespaceRegistry;
-
-/**
- * An abstract serialization context
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class SerializationContext
-{
- public static final String CONTEXT_TYPES = "org.jboss.ws.jaxrpc.binding.contextTypes";
-
- private Class javaType;
-
- private TypeMappingImpl typeMapping;
- // The namespace registry that is valid for this serialization context
- private NamespaceRegistry namespaceRegistry = new NamespaceRegistry();
- // An arbitrary property bag
- private Map<Object, Object> properties = new HashMap<Object, Object>();
-
- public Object getProperty(Object key)
- {
- return properties.get(key);
- }
-
- public void setProperty(Object key, Object value)
- {
- properties.put(key, value);
- }
-
- public TypeMappingImpl getTypeMapping()
- {
- return typeMapping;
- }
-
- public void setTypeMapping(TypeMappingImpl typeMapping)
- {
- this.typeMapping = typeMapping;
- }
-
- public NamespaceRegistry getNamespaceRegistry()
- {
- return namespaceRegistry;
- }
-
- public Class getJavaType()
- {
- return javaType;
- }
-
- public void setJavaType(Class javaType)
- {
- this.javaType = javaType;
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerFactoryBase.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerFactoryBase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerFactoryBase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-// $Id$
-
-import java.util.Iterator;
-
-import javax.xml.rpc.encoding.Serializer;
-import javax.xml.rpc.encoding.SerializerFactory;
-
-import org.jboss.util.NotImplementedException;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Dec-2004
- */
-public abstract class SerializerFactoryBase implements SerializerFactory
-{
- public abstract SerializerSupport getSerializer() throws BindingException;
-
- public Serializer getSerializerAs(String mechanismType)
- {
- throw new NotImplementedException();
- }
-
- public Iterator getSupportedMechanismTypes()
- {
- throw new NotImplementedException();
- }
-}
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SerializerSupport.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,209 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.binding;
-
-// $Id$
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.Serializer;
-import javax.xml.transform.Result;
-
-import org.jboss.util.NotImplementedException;
-import org.jboss.ws.Constants;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.soap.SOAPContentElement;
-import org.jboss.wsf.spi.utils.IOUtils;
-import org.jboss.xb.binding.NamespaceRegistry;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * The base class for all Serializers.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
- * @since 04-Dec-2004
- */
-public abstract class SerializerSupport implements Serializer
-{
-
- public Result serialize(SOAPContentElement soapElement, SerializationContext serContext) throws BindingException
- {
- QName xmlName = soapElement.getElementQName();
- QName xmlType = soapElement.getXmlType();
- NamedNodeMap attributes = soapElement.getAttributes();
- Object objectValue = soapElement.getObjectValue();
- return serialize(xmlName, xmlType, objectValue, serContext, attributes);
- }
-
- /** Serialize an object value to an XML fragment
- *
- * @param xmlName The root element name of the resulting fragment
- * @param xmlType The associated schema type
- * @param value The value to serialize
- * @param serContext The serialization context
- * @param attributes The attributes on this element
- */
- public abstract Result serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException;
-
- /** Wrap the value string in a XML fragment with the given name
- */
- protected String wrapValueStr(QName xmlName, String valueStr, NamespaceRegistry nsRegistry, Set<String> nsExtras, NamedNodeMap attributes, boolean normalize)
- {
- String xmlNameURI = xmlName.getNamespaceURI();
- String localPart = xmlName.getLocalPart();
-
- Map<String, String> namespaces = new HashMap<String, String>();
-
- StringBuilder nsAttr = new StringBuilder("");
- if (attributes != null)
- {
- for (int i = 0; i < attributes.getLength(); i++)
- {
- Node attr = attributes.item(i);
- String attrName = attr.getNodeName();
- String attrValue = attr.getNodeValue();
- nsAttr.append(" " + attrName + "='" + attrValue + "'");
-
- if (attrName.startsWith("xmlns:"))
- {
- String prefix = attrName.substring(6);
- namespaces.put(attrValue, prefix);
- }
- }
- }
-
- String elName;
- if (xmlNameURI.length() > 0)
- {
- xmlName = nsRegistry.registerQName(xmlName);
- String prefix = xmlName.getPrefix();
- elName = prefix + ":" + localPart;
- if (namespaces.get(xmlNameURI) == null || !prefix.equals(namespaces.get(xmlNameURI)))
- {
- nsAttr.append(" xmlns:" + prefix + "='" + xmlNameURI + "'");
- namespaces.put(xmlNameURI, prefix);
- }
- }
- else
- {
- elName = localPart;
- }
-
- if (nsExtras != null)
- {
- for (String nsURI : nsExtras)
- {
- String prefix = nsRegistry.getPrefix(nsURI);
- if (namespaces.get(nsURI) == null || !prefix.equals(namespaces.get(nsURI)))
- {
- nsAttr.append(" xmlns:" + prefix + "='" + nsURI + "'");
- namespaces.put(nsURI, prefix);
- }
- }
- }
-
- String xmlFragment;
- if (valueStr == null)
- {
- String xsins = "";
- if (namespaces.get(Constants.NS_SCHEMA_XSI) == null || !Constants.PREFIX_XSI.equals(namespaces.get(xmlNameURI)))
- {
- xsins = " xmlns:" + Constants.PREFIX_XSI + "='" + Constants.NS_SCHEMA_XSI + "'";
- namespaces.put(Constants.NS_SCHEMA_XSI, Constants.PREFIX_XSI);
- }
-
- xmlFragment = "<" + elName + nsAttr + " " + Constants.PREFIX_XSI + ":nil='1'" + xsins + "/>";
- }
- else
- {
- if (normalize)
- valueStr = normalize(valueStr);
-
- xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
- }
-
- return xmlFragment;
- }
-
- public String getMechanismType()
- {
- throw new NotImplementedException();
- }
-
- private String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
-}
\ No newline at end of file
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,6 +27,9 @@
import javax.xml.transform.Source;
import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.xb.binding.SimpleTypeBindings;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class SimpleDeserializerFactory extends DeserializerFactoryBase
+public class SimpleDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -28,6 +28,10 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.xb.binding.NamespaceRegistry;
import org.jboss.xb.binding.SimpleTypeBindings;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,7 +21,10 @@
*/
package org.jboss.ws.core.jaxrpc.binding;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+
// $Id$
@@ -31,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Oct-2004
*/
-public class SimpleSerializerFactory extends SerializerFactoryBase
+public class SimpleSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -47,12 +47,13 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonClient;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.RoleSource;
import org.jboss.ws.core.WSTimeoutException;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.SchemaGenerator;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.UnqualifiedCallParameter;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
@@ -478,6 +479,15 @@
else return null;
}
+ protected CommonBindingProvider getCommonBindingProvider()
+ {
+ if (bindingProvider == null)
+ {
+ bindingProvider = new CommonBindingProvider(getEndpointMetaData());
+ }
+ return bindingProvider;
+ }
+
@Override
protected void setInboundContextProperties()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,7 +24,10 @@
// $Id$
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -39,6 +42,7 @@
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
@@ -113,8 +117,28 @@
handler.setEndpointMetaData(epMetaData);
handler.setHandlerClassName(info.getHandlerClass().getName());
handler.setSoapRoles(roles);
- if(log.isDebugEnabled()) log.debug("Add handler to: " + portName + handler);
+
+ // copy headers
+ Set<QName> headers = new HashSet<QName>();
+ for (QName header : info.getHeaders())
+ headers.add(header);
+ handler.setSoapHeaders(headers);
+
+ // copy init params
+ List<UnifiedInitParamMetaData> initParams = new ArrayList<UnifiedInitParamMetaData>();
+ Iterator<Map.Entry> entries = info.getHandlerConfig().entrySet().iterator();
+ while (entries.hasNext())
+ {
+ Map.Entry entry = entries.next();
+ String key = (String)entry.getKey();
+ Object value = entry.getValue();
+ if (value instanceof String)
+ initParams.add(new UnifiedInitParamMetaData(key, (String)value));
+ }
+ handler.setInitParams(initParams);
+
epMetaData.addHandler(handler);
+ log.debug("Add handler to: " + portName + handler);
}
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -415,6 +415,9 @@
ClassLoader cl = epMetaData.getClassLoader();
Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, Stub.class, StubExt.class }, handler);
+ // Setup the handler chain
+ setupHandlerChain(epMetaData);
+
return proxy;
}
@@ -490,35 +493,39 @@
void setupHandlerChain(EndpointMetaData epMetaData)
{
- QName portName = epMetaData.getPortName();
- Set<String> handlerRoles = new HashSet<String>();
- ArrayList handlerInfos = new ArrayList();
- for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL))
+ if (epMetaData.isHandlersInitialized() == false)
{
- HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
- handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
-
- HashMap hConfig = new HashMap();
- for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams())
+ QName portName = epMetaData.getPortName();
+ Set<String> handlerRoles = new HashSet<String>();
+ List<HandlerInfo> handlerInfos = new ArrayList<HandlerInfo>();
+ for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL))
{
- hConfig.put(param.getParamName(), param.getParamValue());
- }
+ HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
+ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
- Set<QName> headers = jaxrpcMetaData.getSoapHeaders();
- QName[] headerArr = new QName[headers.size()];
- headers.toArray(headerArr);
+ HashMap hConfig = new HashMap();
+ for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams())
+ {
+ hConfig.put(param.getParamName(), param.getParamValue());
+ }
- Class hClass = jaxrpcMetaData.getHandlerClass();
- hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
- HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
+ Set<QName> headers = jaxrpcMetaData.getSoapHeaders();
+ QName[] headerArr = new QName[headers.size()];
+ headers.toArray(headerArr);
- if (log.isDebugEnabled())
+ Class hClass = jaxrpcMetaData.getHandlerClass();
+ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
+ HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
+
log.debug("Adding client side handler to endpoint '" + portName + "': " + info);
- handlerInfos.add(info);
-
+ handlerInfos.add(info);
+ }
+
// register the handlers with the client engine
if (handlerInfos.size() > 0)
registerHandlerChain(portName, handlerInfos, handlerRoles);
+
+ epMetaData.setHandlersInitialized(true);
}
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/MessageContextJAXRPC.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -32,8 +32,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.xb.binding.NamespaceRegistry;
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxws;
-
-// $Id: $
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.core.utils.HashCodeUtil;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-
-/**
- * Cache JAXBContext's.
- *
- * @author Heiko.Braun(a)jboss.org
- * @since 26.01.2007
- */
-public class JAXBContextCache
-{
- private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>();
-
- public JAXBContext get(Class[] clazzes)
- {
- Integer id = buildId(clazzes);
- return get(id);
- }
-
- public void add(Class[] clazzes, JAXBContext context)
- {
- Integer id = buildId(clazzes);
- add(id, context);
- }
-
- private JAXBContext get(Integer id)
- {
- return cache.get(id);
- }
-
- private void add(Integer id, JAXBContext context)
- {
- cache.put(id, context);
- }
-
- /**
- * Retrieve a cached JAXBContext instance.
- * If no instance is cached a new one will be created and registered.
- */
- public JAXBContext getInstance(Class[] classes) throws JAXBException
- {
- Integer id = buildId(classes);
- JAXBContext ctx = get(id);
- if (null == ctx)
- {
- ctx = JAXBContext.newInstance(classes);
- add(id, ctx);
- }
-
- return ctx;
- }
-
- private static Integer buildId(Class[] classes)
- {
- int sum = HashCodeUtil.SEED;
- for (Class cls : classes)
- {
- sum = HashCodeUtil.hash(sum, cls.getName());
- }
- return sum;
- }
-
- /**
- * Access the JAXBContext cache through the message context.
- * The actual instance is assiciated with the EndpointMetaData.
- * @return JAXBContextCache
- */
- public static JAXBContextCache getContextCache()
- {
- CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
- EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
- return epMetaData.getJaxbCache();
- }
-}
-
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,13 +23,6 @@
// $Id$
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
-import org.jboss.ws.core.jaxrpc.binding.ComplexTypeDeserializer;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
-import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
@@ -37,6 +30,13 @@
import javax.xml.transform.Source;
import javax.xml.ws.WebServiceException;
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.ComplexTypeDeserializer;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.TypeMappingImpl;
+import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl;
+
/**
* A Deserializer that can handle complex types by delegating to JAXB.
*
@@ -59,13 +59,12 @@
Object value = null;
try
{
- Class[] javaTypes = (Class[])serContext.getProperty(SerializationContext.CONTEXT_TYPES);
+ Class[] javaTypes = (Class[])serContext.getProperty(SerializationContextJAXWS.JAXB_CONTEXT_TYPES);
TypeMappingImpl typeMapping = serContext.getTypeMapping();
Class javaType = typeMapping.getJavaType(xmlType);
-
- JAXBContext jaxbContext = getJAXBContext(javaTypes);
-
+ JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes);
+
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl());
@@ -82,22 +81,6 @@
}
- /**
- * Retrieve JAXBContext from cache or create new one and cache it.
- * @param types
- * @return JAXBContext
- */
- private JAXBContext getJAXBContext(Class[] types){
- JAXBContextCache cache = JAXBContextCache.getContextCache();
- JAXBContext context = cache.get(types);
- if(null==context)
- {
- context = JAXBContextFactory.newInstance().createContext(types);
- cache.add(types, context);
- }
- return context;
- }
-
// 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall
// a request or unmarshall a response, an implementation MUST throw a WebServiceException whose
// cause is set to the original JAXBException.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,9 +21,9 @@
*/
package org.jboss.ws.core.jaxws;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
// $Id$
@@ -34,7 +34,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class JAXBDeserializerFactory extends DeserializerFactoryBase
+public class JAXBDeserializerFactory extends AbstractDeserializerFactory
{
public DeserializerSupport getDeserializer() throws BindingException
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,22 +23,27 @@
// $Id$
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
-import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult;
-import org.jboss.ws.core.jaxrpc.binding.ComplexTypeSerializer;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
-import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl;
-import org.w3c.dom.NamedNodeMap;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import javax.xml.transform.Result;
import javax.xml.ws.WebServiceException;
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.ComplexTypeSerializer;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.wsf.spi.binding.jaxb.JAXBContextCache;
+import org.w3c.dom.NamedNodeMap;
+
/**
* A Serializer that can handle complex types by delegating to JAXB.
*
@@ -57,7 +62,8 @@
@Override
public Result serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException
{
- if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]");
+ if (log.isDebugEnabled())
+ log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]");
Result result = null;
try
@@ -66,10 +72,9 @@
// This should be more efficient and accurate than searching the type mapping
Class expectedType = serContext.getJavaType();
Class actualType = value.getClass();
- Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType};
-
- JAXBContext jaxbContext = getJAXBContext(types);
-
+ Class[] javaTypes = shouldFilter(actualType) ? new Class[] { expectedType } : new Class[] { expectedType, actualType };
+ JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes);
+
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
@@ -80,7 +85,8 @@
result = new BufferedStreamResult();
marshaller.marshal(new JAXBElement(xmlName, expectedType, value), result);
- if(log.isDebugEnabled()) log.debug("serialized: " + result);
+ if (log.isDebugEnabled())
+ log.debug("serialized: " + result);
}
catch (Exception ex)
{
@@ -90,22 +96,6 @@
return result;
}
- /**
- * Retrieve JAXBContext from cache or create new one and cache it.
- * @param types
- * @return JAXBContext
- */
- private JAXBContext getJAXBContext(Class[] types){
- JAXBContextCache cache = JAXBContextCache.getContextCache();
- JAXBContext context = cache.get(types);
- if(null==context)
- {
- context = JAXBContextFactory.newInstance().createContext(types);
- cache.add(types, context);
- }
- return context;
- }
-
// Remove this when we add a XMLGregorianCalendar Serializer
private boolean shouldFilter(Class<?> actualType)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializerFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializerFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -21,9 +21,9 @@
*/
package org.jboss.ws.core.jaxws;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
-import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.SerializerSupport;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
// $Id$
@@ -35,7 +35,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Dec-2004
*/
-public class JAXBSerializerFactory extends SerializerFactoryBase
+public class JAXBSerializerFactory extends AbstractSerializerFactory
{
public SerializerSupport getSerializer() throws BindingException
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -26,7 +26,6 @@
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
@@ -36,14 +35,14 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.MessageAbstraction;
+import org.jboss.ws.core.CommonSOAPFaultException;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
-import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.SerializerSupport;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
@@ -93,7 +92,7 @@
Class<?> faultBeanClass = faultMetaData.getFaultBean();
// Get the deserializer from the type mapping
- DeserializerFactoryBase desFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(faultBeanClass, xmlType);
+ AbstractDeserializerFactory desFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(faultBeanClass, xmlType);
if (desFactory == null)
throw new WebServiceException("Cannot obtain deserializer factory: xmlType=" + xmlType + ", javaType=" + faultBeanClass);
@@ -120,7 +119,7 @@
try
{
Class[] types = opMetaData.getEndpointMetaData().getRegisteredTypes().toArray(new Class[0]);
- serContext.setProperty(SerializationContext.CONTEXT_TYPES, types);
+ serContext.setProperty(SerializationContextJAXWS.JAXB_CONTEXT_TYPES, types);
Source source = new DOMSource(deElement);
DeserializerSupport des = (DeserializerSupport)desFactory.getDeserializer();
@@ -153,10 +152,8 @@
{
faultMessage = toSOAPMessage((SOAPFaultException)reqEx);
}
- else if (reqEx instanceof javax.xml.rpc.soap.SOAPFaultException)
+ else if (reqEx instanceof CommonSOAPFaultException)
{
- /* this exception should not occur in JAX-WS endpoints, but JBossWS
- * throws it to signal internal error conditions */
faultMessage = SOAPFaultHelperJAXRPC.exceptionToFaultMessage(reqEx);
}
else
@@ -307,7 +304,7 @@
QName xmlType = faultMetaData.getXmlType();
Class javaType = faultMetaData.getFaultBean();
serContext.setJavaType(javaType);
- SerializerFactoryBase serFactory = (SerializerFactoryBase)serContext.getTypeMapping().getSerializer(javaType, xmlType);
+ AbstractSerializerFactory serFactory = (AbstractSerializerFactory)serContext.getTypeMapping().getSerializer(javaType, xmlType);
if (serFactory == null)
throw new WebServiceException("Cannot obtain serializer factory: xmlType=" + xmlType + ", javaType=" + javaType);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,31 +1,36 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxws;
// $Id$
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+
/**
* The serialization context for JAXWS endpoints/clients
*
@@ -34,7 +39,16 @@
*/
public class SerializationContextJAXWS extends SerializationContext
{
- // provide logging
- private static final Logger log = Logger.getLogger(SerializationContextJAXWS.class);
+ public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types";
+ /**
+ * Access the JAXBContext through the message context.
+ * The actual instance is assiciated with the EndpointMetaData.
+ */
+ public static JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
+ {
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
+ return epMetaData.getJAXBContext(javaTypes);
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -40,7 +40,7 @@
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.HeaderSource;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.metadata.umdm.OperationMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -37,7 +37,7 @@
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.HeaderSource;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.HeaderSource;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchHTTPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchHTTPBinding.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchHTTPBinding.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -26,7 +26,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
-import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.BufferedStreamResult;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,6 +29,7 @@
import java.util.concurrent.Future;
import javax.xml.bind.JAXBContext;
+import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
import javax.xml.ws.AsyncHandler;
@@ -111,6 +112,31 @@
{
MessageAbstraction reqMsg = getRequestMessage(obj);
String targetAddress = epMetaData.getEndpointAddress();
+
+ // R2744 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field
+ // with a quoted value equal to the value of the soapAction attribute of
+ // soapbind:operation, if present in the corresponding WSDL description.
+
+ // R2745 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field
+ // with a quoted empty string value, if in the corresponding WSDL description,
+ // the soapAction attribute of soapbind:operation is either not present, or
+ // present with an empty string as its value.
+ String bindingID = bindingProvider.getBinding().getBindingID();
+ if (bindingID.indexOf("soap") > 0)
+ {
+ String soapAction = null;
+ Map<String, Object> reqContext = getRequestContext();
+ Boolean useSOAPAction = (Boolean)reqContext.get(BindingProvider.SOAPACTION_USE_PROPERTY);
+ if (Boolean.TRUE.equals(useSOAPAction))
+ {
+ soapAction = (String)reqContext.get(BindingProvider.SOAPACTION_URI_PROPERTY);
+ if (soapAction == null)
+ throw new IllegalStateException("Cannot obtain: " + BindingProvider.SOAPACTION_URI_PROPERTY);
+ }
+ MimeHeaders mimeHeaders = reqMsg.getMimeHeaders();
+ mimeHeaders.addHeader("SOAPAction", soapAction != null ? soapAction : "");
+ }
+
MessageAbstraction resMsg = getRemotingConnection().invoke(reqMsg, targetAddress, false);
Object retObj = getReturnObject(resMsg);
return retObj;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -33,6 +33,7 @@
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerFactory;
@@ -41,6 +42,7 @@
import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.Service.Mode;
+import javax.xml.ws.soap.SOAPFaultException;
import org.jboss.logging.Logger;
import org.jboss.ws.core.MessageAbstraction;
@@ -157,6 +159,11 @@
if (mode == Mode.PAYLOAD)
{
SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody();
+
+ SOAPFault soapFault = soapBody.getFault();
+ if (soapFault != null)
+ throw new SOAPFaultException(soapFault);
+
SOAPElement soapElement = soapBody.getBodyElement();
retObj = new DOMSource(soapElement);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,8 +49,8 @@
import org.jboss.ws.metadata.umdm.HandlerMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
-import org.jboss.wsf.spi.handler.GenericHandler;
-import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+import org.jboss.wsf.spi.jaxws.handler.GenericHandler;
+import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/MessageContextJAXWS.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -27,7 +27,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
+import org.jboss.ws.core.binding.SerializationContext;
import org.jboss.ws.core.jaxws.SerializationContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -38,16 +38,14 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
/**
* The servlet that that is associated with context /jbossws
*
* @author Thomas.Diesler(a)jboss.org
- * @author mageshbk(a)jboss.com
* @since 21-Mar-2005
*/
public class ContextServlet extends HttpServlet
@@ -84,75 +82,76 @@
writer.print("<table>");
// begin iteration
- Set<ObjectName> endpoints = epRegistry.getEndpoints();
+ Set<ObjectName> epNames = epRegistry.getEndpoints();
- if (endpoints.isEmpty())
+ if (epNames.isEmpty())
{
writer.print("<tr>");
writer.print(" <td><h3>There are currently no endpoints deployed</h3></td>");
writer.print("</tr>");
}
- for (ObjectName oname : endpoints)
+ for (ObjectName oname : epNames)
{
Endpoint ep = epRegistry.getEndpoint(oname);
ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class);
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
- String displayAddress = config.getDisplayAddress(sepMetaData.getEndpointAddress(),requestURL);
writer.print("<tr>");
- writer.print(" <td>ServiceEndpointID</td>");
+ writer.print(" <td>Endpoint Name</td>");
writer.print(" <td>" + ep.getName() + "</td>");
writer.print("</tr>");
writer.print("<tr>");
- writer.print(" <td>ServiceEndpointAddress</td>");
- writer.print(" <td><a href='" + displayAddress + "?wsdl'>" + displayAddress + "?wsdl</a></td>");
+ writer.print(" <td>Endpoint Address</td>");
+ writer.print(" <td><a href='" + sepMetaData.getEndpointAddress() + "?wsdl'>" + sepMetaData.getEndpointAddress() + "?wsdl</a></td>");
writer.print("</tr>");
writer.print("<tr>");
writer.print(" <td colspan=2>");
writer.print(" ");
writer.print("");
- /*
- writer.print("<table class='metrics'>");
- writer.print("<tr>");
- writer.print(" <td>StartTime</td>");
- writer.print(" <td>StopTime</td>");
- writer.print(" <td></td>");
- writer.print("</tr>");
- writer.print("<tr>");
- writer.print(" <td>" + ep.getSeMetrics().getStartTime() + "</td>");
- String stopTime = ep.getSeMetrics().getStopTime() != null ? ep.getSeMetrics().getStopTime().toString() : "";
- writer.print(" <td>" + stopTime + "</td>");
- writer.print(" <td></td>");
- writer.print("</tr>");
- writer.print("<tr>");
+ EndpointMetrics metrics = ep.getEndpointMetrics();
+ if (metrics != null)
+ {
+ writer.print("<table class='metrics'>");
+ writer.print("<tr>");
+ writer.print(" <td>StartTime</td>");
+ writer.print(" <td>StopTime</td>");
+ writer.print(" <td></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>" + metrics.getStartTime() + "</td>");
- writer.print(" <td>RequestCount</td>");
- writer.print(" <td>ResponseCount</td>");
- writer.print(" <td>FaultCount</td>");
- writer.print("</tr>");
- writer.print("<tr>");
- writer.print(" <td>" + ep.getSeMetrics().getRequestCount() + "</td>");
- writer.print(" <td>" + ep.getSeMetrics().getResponseCount() + "</td>");
- writer.print(" <td>" + ep.getSeMetrics().getFaultCount() + "</td>");
- writer.print("</tr>");
- writer.print("<tr>");
- writer.print(" <td>MinProcessingTime</td>");
- writer.print(" <td>MaxProcessingTime</td>");
- writer.print(" <td>AvgProcessingTime</td>");
- writer.print("</tr>");
- writer.print("<tr>");
- writer.print(" <td>" + ep.getSeMetrics().getMinProcessingTime() + "</td>");
- writer.print(" <td>" + ep.getSeMetrics().getMaxProcessingTime() + "</td>");
- writer.print(" <td>" + ep.getSeMetrics().getAverageProcessingTime() + "</td>");
- writer.print("</tr>");
- writer.print("");
- writer.print("");
- writer.print("</table>");
- */
- writer.print("");
+ String stopTime = metrics.getStopTime() != null ? metrics.getStopTime().toString() : "";
+ writer.print(" <td>" + stopTime + "</td>");
+ writer.print(" <td></td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+
+ writer.print(" <td>RequestCount</td>");
+ writer.print(" <td>ResponseCount</td>");
+ writer.print(" <td>FaultCount</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>" + metrics.getRequestCount() + "</td>");
+ writer.print(" <td>" + metrics.getResponseCount() + "</td>");
+ writer.print(" <td>" + metrics.getFaultCount() + "</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>MinProcessingTime</td>");
+ writer.print(" <td>MaxProcessingTime</td>");
+ writer.print(" <td>AvgProcessingTime</td>");
+ writer.print("</tr>");
+ writer.print("<tr>");
+ writer.print(" <td>" + metrics.getMinProcessingTime() + "</td>");
+ writer.print(" <td>" + metrics.getMaxProcessingTime() + "</td>");
+ writer.print(" <td>" + metrics.getAverageProcessingTime() + "</td>");
+ writer.print("</tr>");
+ writer.print("");
+ writer.print("");
+ writer.print("</table>");
+ writer.print("");
+ }
+
writer.print(" </td>");
writer.print("</tr>");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/DelegatingInvocation.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,7 +30,7 @@
import org.jboss.ws.core.CommonBinding;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.EndpointInvocation;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.wsf.spi.invocation.BasicEndpointInvocation;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -36,6 +36,7 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.http.HTTPBinding;
import org.jboss.logging.Logger;
@@ -44,6 +45,7 @@
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.CommonSOAPBinding;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.DirectionHolder;
import org.jboss.ws.core.EndpointInvocation;
import org.jboss.ws.core.MessageAbstraction;
@@ -64,9 +66,11 @@
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.WebServiceContextDummy;
import org.jboss.wsf.spi.invocation.WebServiceContextJSE;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.wsf.spi.utils.JavaUtils;
@@ -199,7 +203,7 @@
// Invoke an instance of the SEI implementation bean
Invocation inv = setupInvocation(endpoint, sepInv, invContext);
InvocationHandler invHandler = endpoint.getInvocationHandler();
- invHandler.invoke(endpoint, null, inv);
+ invHandler.invoke(endpoint, inv);
// Handler processing might have replaced the endpoint invocation
sepInv = inv.getInvocationContext().getAttachment(EndpointInvocation.class);
@@ -280,7 +284,19 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext instanceof SOAPMessageContextJAXWS)
{
- invContext.addAttachment(WebServiceContext.class, new WebServiceContextJSE((SOAPMessageContextJAXWS)msgContext));
+ if (ep.getService().getDeployment().getType() == DeploymentType.JAXWS_JSE)
+ {
+ WebServiceContext wsContext;
+ if (msgContext.get(MessageContext.SERVLET_REQUEST) != null)
+ {
+ wsContext = new WebServiceContextJSE((SOAPMessageContextJAXWS)msgContext);
+ }
+ else
+ {
+ wsContext = new WebServiceContextDummy((SOAPMessageContextJAXWS)msgContext);
+ }
+ invContext.addAttachment(WebServiceContext.class, wsContext);
+ }
invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext);
}
if (msgContext instanceof SOAPMessageContextJAXRPC)
@@ -413,12 +429,12 @@
if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext())
{
QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
else
{
QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,7 +29,7 @@
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.EndpointInvocation;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -46,7 +47,6 @@
* For a discussion of this topic.
*
* @author Thomas.Diesler(a)jboss.org
- * @author mageshbk(a)jboss.com
* @since 23-Mar-2005
*/
public class WSDLRequestHandler
@@ -72,12 +72,12 @@
public Document getDocumentForPath(URL reqURL, String wsdlHost, String resPath) throws IOException
{
Document wsdlDoc;
-
+
// The WSDLFilePublisher should set the location to an URL
URL wsdlLocation = epMetaData.getServiceMetaData().getWsdlLocation();
if (wsdlLocation == null)
throw new IllegalStateException("Cannot obtain wsdl location");
-
+
// get the root wsdl
if (resPath == null)
{
@@ -135,7 +135,7 @@
String reqPath = reqURL.getPath();
String completeHost = wsdlHost;
- if (! (wsdlHost.startsWith("http://") || wsdlHost.startsWith("https://")) )
+ if (!(wsdlHost.startsWith("http://") || wsdlHost.startsWith("https://")))
{
String reqProtocol = reqURL.getProtocol();
int reqPort = reqURL.getPort();
@@ -145,7 +145,7 @@
String newLocation = completeHost + reqPath + "?wsdl&resource=" + newResourcePath;
locationAttr.setNodeValue(newLocation);
-
+
log.trace("Mapping import from '" + orgLocation + "' to '" + newLocation + "'");
}
}
@@ -158,14 +158,30 @@
if (locationAttr != null)
{
String orgLocation = locationAttr.getNodeValue();
-
- URL locURL = new URL(orgLocation);
- String locPath = locURL.getPath();
- String newLocation = wsdlHost + locPath;
- locationAttr.setNodeValue(newLocation);
+ URL orgURL = new URL(orgLocation);
+ String orgProtocol = orgURL.getProtocol();
+ String orgHost = orgURL.getHost();
+ int orgPort = orgURL.getPort();
+ String orgPath = orgURL.getPath();
- log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'");
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(orgHost))
+ {
+ URL newURL = new URL(wsdlHost);
+ String newHost = newURL.getHost();
+ int newPort = newURL.getPort();
+
+ String newLocation = orgProtocol + "://" + newHost;
+ if (orgPort != -1)
+ newLocation += ":" + orgPort;
+ else if (newPort != -1)
+ newLocation += ":" + newPort;
+
+ newLocation += orgPath;
+ locationAttr.setNodeValue(newLocation);
+
+ log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'");
+ }
}
}
else
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,6 +41,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
@@ -88,7 +89,8 @@
{
return null;
}
- throw ex;
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex.getMessage());
}
return build(soapMessage, domEnv);
@@ -108,7 +110,8 @@
{
return null;
}
- throw ex;
+ QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT;
+ throw new CommonSOAPFaultException(faultCode, ex.getMessage());
}
return build(soapMessage, domEnv);
@@ -143,10 +146,6 @@
log.warn("Ignore envelope child: " + elName);
}
}
- else
- {
- log.warn("Ignore child type: " + childType);
- }
}
return soapEnv;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,12 +30,12 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.NullValueSerializer;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
-import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.SerializerSupport;
import org.jboss.wsf.spi.utils.JavaUtils;
/**
@@ -148,7 +148,7 @@
SerializerSupport ser;
if (objectValue != null)
{
- SerializerFactoryBase serializerFactory = getSerializerFactory(typeMapping, javaType, xmlType);
+ AbstractSerializerFactory serializerFactory = getSerializerFactory(typeMapping, javaType, xmlType);
ser = (SerializerSupport)serializerFactory.getSerializer();
}
else
@@ -172,9 +172,9 @@
/**
* Get the serializer factory for a given javaType and xmlType
*/
- private SerializerFactoryBase getSerializerFactory(TypeMappingImpl typeMapping, Class javaType, QName xmlType)
+ private AbstractSerializerFactory getSerializerFactory(TypeMappingImpl typeMapping, Class javaType, QName xmlType)
{
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(javaType, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(javaType, xmlType);
// The type mapping might contain a mapping for the array wrapper bean
if (serializerFactory == null && javaType.isArray())
@@ -188,7 +188,7 @@
Class returnType = toArrayMethod.getReturnType();
if (JavaUtils.isAssignableFrom(javaType, returnType))
{
- serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(arrayWrapperType, xmlType);
+ serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(arrayWrapperType, xmlType);
}
}
catch (NoSuchMethodException e)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -95,12 +95,12 @@
public CDATASection createCDATASection(String data) throws DOMException
{
- return createCDATASection(data);
+ return doc.createCDATASection(data);
}
public ProcessingInstruction createProcessingInstruction(String target, String data) throws DOMException
{
- return createProcessingInstruction(target, data);
+ return doc.createProcessingInstruction(target, data);
}
public Attr createAttribute(String name) throws DOMException
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -37,6 +37,7 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.w3c.dom.Document;
/**
@@ -199,7 +200,7 @@
{
QName faultCode = Constants.SOAP11_FAULT_CODE_VERSION_MISMATCH;
String faultString = "Invalid SOAP envelope namespace: " + namespaceURI;
- throw new SOAPFaultException(faultCode, faultString, null, null);
+ throw new CommonSOAPFaultException(faultCode, faultString);
}
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -54,6 +54,7 @@
{
validResponseCodes.add(HttpServletResponse.SC_OK);
validResponseCodes.add(HttpServletResponse.SC_ACCEPTED);
+ validResponseCodes.add(HttpServletResponse.SC_NO_CONTENT);
validResponseCodes.add(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
@@ -65,12 +66,23 @@
try
{
Integer resCode = (Integer)metadata.get(HTTPMetadataConstants.RESPONSE_CODE);
+ if (resCode == null)
+ {
+ log.warn("No HTTP resonse code, assuming: SC_OK");
+ resCode = HttpServletResponse.SC_OK;
+ }
+
String resMessage = (String)metadata.get(HTTPMetadataConstants.RESPONSE_CODE_MESSAGE);
- if (resCode != null && validResponseCodes.contains(resCode) == false)
+ if (validResponseCodes.contains(resCode) == false)
throw new WSException("Invalid HTTP server response [" + resCode + "] - " + resMessage);
- MimeHeaders mimeHeaders = getMimeHeaders(metadata);
- SOAPMessage soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true);
+ // [JBWS-859] SOAPMessageUnMarshaller doesn't support HTTP server response [204] - No Content
+ SOAPMessage soapMsg = null;
+ if (resCode != HttpServletResponse.SC_NO_CONTENT)
+ {
+ MimeHeaders mimeHeaders = getMimeHeaders(metadata);
+ soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true);
+ }
return soapMsg;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,11 +41,12 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
-import org.jboss.ws.core.jaxrpc.binding.BindingException;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
+import org.jboss.ws.core.binding.BindingException;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.TypeMappingImpl;
+import org.jboss.ws.core.jaxws.SerializationContextJAXWS;
import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource;
import org.jboss.ws.core.utils.MimeUtils;
import org.jboss.ws.extensions.xop.XOPContext;
@@ -167,13 +168,13 @@
serContext.setProperty(ParameterMetaData.class.getName(), pmd);
serContext.setJavaType(javaType);
List<Class> registeredTypes = opMetaData.getEndpointMetaData().getRegisteredTypes();
- serContext.setProperty(SerializationContext.CONTEXT_TYPES, registeredTypes.toArray(new Class[0]));
+ serContext.setProperty(SerializationContextJAXWS.JAXB_CONTEXT_TYPES, registeredTypes.toArray(new Class[0]));
try
{
// Get the deserializer from the type mapping
TypeMappingImpl typeMapping = serContext.getTypeMapping();
- DeserializerFactoryBase deserializerFactory = getDeserializerFactory(typeMapping, javaType, xmlType);
+ AbstractDeserializerFactory deserializerFactory = getDeserializerFactory(typeMapping, javaType, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
obj = des.deserialize(container, serContext);
@@ -255,9 +256,9 @@
}
// Get the deserializer factory for a given javaType and xmlType
- private static DeserializerFactoryBase getDeserializerFactory(TypeMappingImpl typeMapping, Class javaType, QName xmlType)
+ private static AbstractDeserializerFactory getDeserializerFactory(TypeMappingImpl typeMapping, Class javaType, QName xmlType)
{
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(javaType, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(javaType, xmlType);
// The type mapping might contain a mapping for the array wrapper bean
if (deserializerFactory == null && javaType.isArray())
@@ -271,7 +272,7 @@
Class returnType = toArrayMethod.getReturnType();
if (JavaUtils.isAssignableFrom(javaType, returnType))
{
- deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(arrayWrapperType, xmlType);
+ deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(arrayWrapperType, xmlType);
}
}
catch (NoSuchMethodException e)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult;
+import org.jboss.ws.core.binding.BufferedStreamResult;
import org.jboss.ws.core.jaxrpc.binding.BufferedStreamSource;
import org.jboss.wsf.spi.utils.DOMUtils;
import org.jboss.wsf.spi.utils.DOMWriter;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.PushbackInputStream;
import java.io.UnsupportedEncodingException;
import java.util.Collection;
import java.util.Enumeration;
@@ -89,6 +90,7 @@
String boundaryParameter = contentType.getParameter("boundary");
String start = contentType.getParameter("start");
byte[] boundary;
+ byte[] crlf;
if (boundaryParameter == null)
throw new IllegalArgumentException("multipart/related content type did not contain a boundary");
@@ -100,13 +102,19 @@
boundary = ("--" + boundaryParameter).getBytes("US-ASCII");
else
boundary = ("\r\n--" + boundaryParameter).getBytes("US-ASCII");
+
+ crlf = ("\r\n").getBytes("US-ASCII");
}
catch (UnsupportedEncodingException e)
{
throw new WSException("US-ASCII not supported, this should never happen");
}
+
+ // [JBWS-1620] - Incorrect handling of MIME boundaries in MultipartRelatedDecoder
+ PushbackInputStream pushBackStream = new PushbackInputStream(stream,2);
+ pushBackStream.unread(crlf);
- BoundaryDelimitedInputStream delimitedStream = new BoundaryDelimitedInputStream(stream, boundary);
+ BoundaryDelimitedInputStream delimitedStream = new BoundaryDelimitedInputStream(pushBackStream, boundary);
// Eat first inner stream since its empty
byte[] buffer = new byte[256];
Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,134 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.utils;
-
-import java.lang.reflect.Array;
-
-/**
-* Collected methods which allow easy implementation of <code>hashCode</code>.
-*
-* Example use case:
-* <pre>
-* public int hashCode(){
-* int result = HashCodeUtil.SEED;
-* //collect the contributions of various fields
-* result = HashCodeUtil.hash(result, fPrimitive);
-* result = HashCodeUtil.hash(result, fObject);
-* result = HashCodeUtil.hash(result, fArray);
-* return result;
-* }
-* </pre>
-*/
-public final class HashCodeUtil {
-
- /**
- * An initial value for a <code>hashCode</code>, to which is added contributions
- * from fields. Using a non-zero value decreases collisons of <code>hashCode</code>
- * values.
- */
- public static final int SEED = 23;
-
- /**
- * booleans.
- */
- public static int hash( int aSeed, boolean aBoolean ) {
- return firstTerm( aSeed ) + ( aBoolean ? 1 : 0 );
- }
-
- /**
- * chars.
- */
- public static int hash( int aSeed, char aChar ) {
- return firstTerm( aSeed ) + (int)aChar;
- }
-
- /**
- * ints.
- */
- public static int hash( int aSeed , int aInt ) {
- /*
- * Implementation Note
- * Note that byte and short are handled by this method, through
- * implicit conversion.
- */
- return firstTerm( aSeed ) + aInt;
- }
-
- /**
- * longs.
- */
- public static int hash( int aSeed , long aLong ) {
- return firstTerm(aSeed) + (int)( aLong ^ (aLong >>> 32) );
- }
-
- /**
- * floats.
- */
- public static int hash( int aSeed , float aFloat ) {
- return hash( aSeed, Float.floatToIntBits(aFloat) );
- }
-
- /**
- * doubles.
- */
- public static int hash( int aSeed , double aDouble ) {
- return hash( aSeed, Double.doubleToLongBits(aDouble) );
- }
-
- /**
- * <code>aObject</code> is a possibly-null object field, and possibly an array.
- *
- * If <code>aObject</code> is an array, then each element may be a primitive
- * or a possibly-null object.
- */
- public static int hash( int aSeed , Object aObject ) {
- int result = aSeed;
- if ( aObject == null) {
- result = hash(result, 0);
- }
- else if ( ! isArray(aObject) ) {
- result = hash(result, aObject.hashCode());
- }
- else {
- int length = Array.getLength(aObject);
- for ( int idx = 0; idx < length; ++idx ) {
- Object item = Array.get(aObject, idx);
- //recursive call!
- result = hash(result, item);
- }
- }
- return result;
- }
-
-
- /// PRIVATE ///
- private static final int fODD_PRIME_NUMBER = 37;
-
- private static int firstTerm( int aSeed ){
- return fODD_PRIME_NUMBER * aSeed;
- }
-
- private static boolean isArray(Object aObject){
- return aObject.getClass().isArray();
- }
-}
-
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -37,13 +37,7 @@
*/
public class ThreadLocalAssociation
{
-
/**
- * Handles invocations on MDB endpoints.
- */
- private static ThreadLocal invokerMDBAssoc = new ThreadLocal();
-
- /**
* SOAP message context
* @see org.jboss.ws.core.soap.MessageContextAssociation
*/
@@ -54,11 +48,6 @@
*/
private static ThreadLocal<SecurityStore> strTransformAssoc = new ThreadLocal<SecurityStore>();
- public static ThreadLocal localInvokerMDBAssoc()
- {
- return invokerMDBAssoc;
- }
-
public static ThreadLocal<Stack<CommonMessageContext>> localMsgContextAssoc()
{
return msgContextAssoc;
@@ -71,7 +60,6 @@
public static void clear()
{
- invokerMDBAssoc.set(null);
msgContextAssoc.set(null);
strTransformAssoc.set(null);
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,7 +24,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
-import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -26,7 +26,7 @@
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPMessage;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/EventSource.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -36,7 +36,7 @@
{
enum State
{
- CREATED, STARTED, STOPED, DESTROYED
+ CREATED, STARTED, STOPPED, DESTROYED
}
private State state;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,6 +45,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.List;
import java.util.StringTokenizer;
@@ -54,8 +55,8 @@
* <code>SecurityStore</code> holds and loads the keystore and truststore required for encyption and signing.
*
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
- * @author <a href="mailto:jason.greene@jboss.com">Magesh Kumar B</a>
- * @version $Revision$
+ * @author Magesh Kumar B
+ * @author Thomas.Diesler(a)jboss.com
*/
public class SecurityStore
{
@@ -69,22 +70,26 @@
private String trustStorePassword;
+ private HashMap<String, String> keyPasswords;
+
public SecurityStore() throws WSSecurityException
{
- this(null, null, null, null, null, null);
+ this(null, null, null, null, null, null, null);
}
- public SecurityStore(URL keyStoreURL, String keyStoreType, String keyStorePassword) throws WSSecurityException
+ public SecurityStore(URL keyStoreURL, String keyStoreType, String keyStorePassword, HashMap<String, String> keyPasswords) throws WSSecurityException
{
loadKeyStore(keyStoreURL, keyStoreType, keyStorePassword);
loadTrustStore(keyStoreURL, keyStoreType, keyStorePassword);
+ this.keyPasswords = keyPasswords;
}
- public SecurityStore(URL keyStoreURL, String keyStoreType, String keyStorePassword, URL trustStoreURL, String trustStoreType, String trustStorePassword)
+ public SecurityStore(URL keyStoreURL, String keyStoreType, String keyStorePassword, HashMap<String, String> keyPasswords, URL trustStoreURL, String trustStoreType, String trustStorePassword)
throws WSSecurityException
{
loadKeyStore(keyStoreURL, keyStoreType, keyStorePassword);
loadTrustStore(trustStoreURL, trustStoreType, trustStorePassword);
+ this.keyPasswords = keyPasswords;
}
private void loadKeyStore(URL keyStoreURL, String keyStoreType, String keyStorePassword) throws WSSecurityException
@@ -405,7 +410,10 @@
PrivateKey key;
try
{
- key = (PrivateKey)keyStore.getKey(alias, decryptPassword(keyStorePassword).toCharArray());
+ String password = keyStorePassword;
+ if (keyPasswords != null && keyPasswords.containsKey(alias))
+ password = keyPasswords.get(alias);
+ key = (PrivateKey)keyStore.getKey(alias, decryptPassword(password).toCharArray());
}
catch (Exception e)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -35,6 +35,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.CommonSOAPFaultException;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.soap.SOAPMessageImpl;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -98,9 +99,9 @@
return operation.getConfig();
}
- private static SOAPFaultException convertToFault(WSSecurityException e)
+ private static CommonSOAPFaultException convertToFault(WSSecurityException e)
{
- return new SOAPFaultException(e.getFaultCode(), e.getFaultString(), null, null);
+ return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString());
}
public static void handleInbound(CommonMessageContext ctx) throws SOAPException, SOAPFaultException
@@ -138,7 +139,7 @@
try
{
- SecurityStore securityStore = new SecurityStore(config.getKeyStoreURL(), config.getKeyStoreType(), config.getKeyStorePassword(), config.getTrustStoreURL(),
+ SecurityStore securityStore = new SecurityStore(config.getKeyStoreURL(), config.getKeyStoreType(), config.getKeyStorePassword(), config.getKeyPasswords(), config.getTrustStoreURL(),
config.getTrustStoreType(), config.getTrustStorePassword());
SecurityDecoder decoder = new SecurityDecoder(securityStore);
@@ -289,7 +290,7 @@
try
{
- SecurityStore securityStore = new SecurityStore(config.getKeyStoreURL(), config.getKeyStoreType(), config.getKeyStorePassword(), config.getTrustStoreURL(),
+ SecurityStore securityStore = new SecurityStore(config.getKeyStoreURL(), config.getKeyStoreType(), config.getKeyStorePassword(), config.getKeyPasswords() , config.getTrustStoreURL(),
config.getTrustStoreType(), config.getTrustStorePassword());
SecurityEncoder encoder = new SecurityEncoder(operations, securityStore);
encoder.encode(soapMessage.getSOAPPart());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
-import org.jboss.wsf.spi.handler.GenericSOAPHandler;
+import org.jboss.wsf.spi.jaxws.handler.GenericSOAPHandler;
/**
* An abstract JAXWS handler that delegates to the WSSecurityDispatcher
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -303,8 +303,7 @@
if (alwaysModify || uriScheme == null || orgAddress.indexOf("REPLACE_WITH_ACTUAL_URL") >= 0)
{
- if (log.isDebugEnabled())
- log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'");
+ log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'");
wsdlEndpoint.setAddress(serviceEndpointURL);
sepMetaData.setEndpointAddress(serviceEndpointURL);
@@ -314,8 +313,7 @@
}
else
{
- if (log.isDebugEnabled())
- log.debug("Don't replace service endpoint address '" + orgAddress + "'");
+ log.debug("Don't replace service endpoint address '" + orgAddress + "'");
try
{
sepMetaData.setEndpointAddress(new URL(orgAddress).toExternalForm());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -37,9 +37,9 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.EncodedTypeMapping;
import org.jboss.ws.core.jaxrpc.LiteralTypeMapping;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
import org.jboss.ws.core.jaxrpc.UnqualifiedFaultException;
import org.jboss.ws.core.soap.Style;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -137,7 +137,13 @@
wsdlService = wsdlDefinitions.getService(serviceName);
}
if (wsdlService == null)
- throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceName);
+ {
+ List<QName> serviceNames = new ArrayList<QName>();
+ for (WSDLService wsdls : wsdlDefinitions.getServices())
+ serviceNames.add(wsdls.getName());
+
+ throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceName + " we have " + serviceNames);
+ }
// Build endpoint meta data
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,9 +23,13 @@
// $Id$
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.jboss.ws.metadata.config.ConfigurationProvider;
+import org.jboss.wsf.spi.binding.jaxb.JAXBContextCache;
+import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
@@ -36,17 +40,25 @@
*/
public class ClientEndpointMetaData extends EndpointMetaData
{
+ private JAXBHandler jaxbHandler = new JAXBContextCache();
+
public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName, Type type)
{
super(service, qname, portTypeName, type);
- super.configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME;
+ configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME;
if (type == Type.JAXRPC)
- super.configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE;
+ configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE;
else
- super.configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE;
+ configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE;
}
+ @Override
+ public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
+ {
+ return jaxbHandler.getJAXBContext(javaTypes);
+ }
+
public String toString()
{
StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -36,6 +36,8 @@
import java.util.Set;
import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.ws.Service.Mode;
@@ -45,23 +47,23 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonSOAPBinding;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory;
-import org.jboss.ws.core.jaxws.JAXBContextCache;
import org.jboss.ws.core.jaxws.JAXBDeserializerFactory;
import org.jboss.ws.core.jaxws.JAXBSerializerFactory;
import org.jboss.ws.core.jaxws.client.DispatchBinding;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.config.Configurable;
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.config.EndpointFeature;
import org.jboss.ws.metadata.config.JBossWSConfigFactory;
-import org.jboss.ws.integration.UnifiedVirtualFile;
+import org.jboss.wsf.spi.binding.jaxb.JAXBContextCache;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.wsf.spi.utils.JavaUtils;
@@ -325,6 +327,8 @@
return type;
}
+ public abstract JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException;
+
public String getAuthMethod()
{
return authMethod;
@@ -601,11 +605,6 @@
}
}
- public JAXBContextCache getJaxbCache()
- {
- return jaxbCache;
- }
-
// ---------------------------------------------------------------
// Configuration provider impl
@@ -637,7 +636,7 @@
{
DispatchBinding dpb = (DispatchBinding)configurable;
dpb.setValidateDispatch(config.hasFeature(EndpointFeature.VALIDATE_DISPATCH));
- }
+ }
}
public UnifiedVirtualFile getRootFile()
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -140,7 +140,7 @@
return soapHeaders;
}
- public void seiInitParams(List<UnifiedInitParamMetaData> initParams)
+ public void setInitParams(List<UnifiedInitParamMetaData> initParams)
{
this.initParams = initParams;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXRPC.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,7 +49,7 @@
HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(type);
hmd.setHandlerName(uhmd.getHandlerName());
hmd.setHandlerClassName(uhmd.getHandlerClass());
- hmd.seiInitParams(uhmd.getInitParams());
+ hmd.setInitParams(uhmd.getInitParams());
hmd.setSoapHeaders(uhmd.getSoapHeaders());
hmd.setSoapRoles(uhmd.getSoapRoles());
hmd.setPortNames(uhmd.getPortNames());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -51,7 +51,7 @@
HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(type);
hmd.setHandlerName(uhmd.getHandlerName());
hmd.setHandlerClassName(uhmd.getHandlerClass());
- hmd.seiInitParams(uhmd.getInitParams());
+ hmd.setInitParams(uhmd.getInitParams());
UnifiedHandlerChainMetaData handlerChain = uhmd.getHandlerChain();
if (handlerChain != null)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -30,6 +30,7 @@
import java.util.Set;
import java.util.StringTokenizer;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
@@ -104,8 +105,14 @@
this.xmlName = xmlName;
this.opMetaData = opMetaData;
this.mode = ParameterMode.IN;
- this.partName = xmlName.getLocalPart();
this.javaTypeName = javaTypeName;
+
+ // [JBWS-771] Use part names that are friendly to .NET
+ if (opMetaData.isDocumentWrapped())
+ partName = "parameters";
+ else
+ partName = xmlName.getLocalPart();
+
}
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -24,10 +24,14 @@
// $Id$
import javax.management.ObjectName;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.config.ConfigurationProvider;
+import org.jboss.wsf.spi.binding.jaxb.JAXBHandler;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
@@ -44,7 +48,10 @@
public static final String SEPID_DOMAIN = "jboss.ws";
public static final String SEPID_PROPERTY_CONTEXT = "context";
public static final String SEPID_PROPERTY_ENDPOINT = "endpoint";
-
+
+ // The associated SPI endpoint
+ private Endpoint endpoint;
+
// The REQUIRED link name
private String linkName;
// Legacy JSR-109 port component name
@@ -75,6 +82,16 @@
configFile = ConfigurationProvider.DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE;
}
+ public Endpoint getEndpoint()
+ {
+ return endpoint;
+ }
+
+ public void setEndpoint(Endpoint endpoint)
+ {
+ this.endpoint = endpoint;
+ }
+
public String getLinkName()
{
return linkName;
@@ -170,6 +187,12 @@
{
this.secureWSDLAccess = secureWSDLAccess;
}
+
+ @Override
+ public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
+ {
+ return endpoint.getJAXBHandler().getJAXBContext(javaTypes);
+ }
public String toString()
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -38,7 +38,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder;
import org.jboss.ws.core.soap.Use;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfiguration.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,6 +45,7 @@
private URL trustStoreURL;
private String trustStoreType;
private String trustStorePassword;
+ private HashMap<String, String> keyPasswords = new HashMap<String, String>();
public WSSecurityConfiguration()
{
@@ -154,4 +155,14 @@
{
this.trustStoreFile = trustStoreFile;
}
+
+ public HashMap<String, String> getKeyPasswords()
+ {
+ return keyPasswords;
+ }
+
+ public void setKeyPasswords(HashMap<String, String> keyPasswords)
+ {
+ this.keyPasswords = keyPasswords;
+ }
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.metadata.wsse;
import java.io.IOException;
@@ -88,7 +88,7 @@
try
{
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- WSSecurityConfiguration configuration = (WSSecurityConfiguration) unmarshaller.unmarshal(is, this, null);
+ WSSecurityConfiguration configuration = (WSSecurityConfiguration)unmarshaller.unmarshal(is, this, null);
return configuration;
}
catch (JBossXBException e)
@@ -105,28 +105,27 @@
}
}
-
public WSSecurityConfiguration parse(String xmlString) throws JBossXBException
{
if (xmlString == null)
throw new IllegalArgumentException("Security config xml String cannot be null");
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- WSSecurityConfiguration configuration = (WSSecurityConfiguration) unmarshaller.unmarshal(xmlString, this, null);
+ WSSecurityConfiguration configuration = (WSSecurityConfiguration)unmarshaller.unmarshal(xmlString, this, null);
return configuration;
-
+
}
-
+
public WSSecurityConfiguration parse(StringReader strReader) throws JBossXBException
{
if (strReader == null)
throw new IllegalArgumentException("Security InputStream cannot be null");
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- WSSecurityConfiguration configuration = (WSSecurityConfiguration) unmarshaller.unmarshal(strReader, this, null);
+ WSSecurityConfiguration configuration = (WSSecurityConfiguration)unmarshaller.unmarshal(strReader, this, null);
return configuration;
}
-
+
/**
* This method is called on the factory by the object model builder when the
* parsing starts.
@@ -141,18 +140,17 @@
return root;
}
- public void setValue(WSSecurityConfiguration configuration, UnmarshallingContext navigator, String namespaceURI,
- String localName, String value)
+ public void setValue(WSSecurityConfiguration configuration, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
log.trace("setValue: [obj=" + configuration + ",value=" + value + "]");
- String method = (String) options.get(localName);
+ String method = (String)options.get(localName);
if (method == null)
return;
// Dispatch to propper initializer
try
{
- WSSecurityConfiguration.class.getMethod(method, new Class[] {String.class}).invoke(configuration, new Object[]{value});
+ WSSecurityConfiguration.class.getMethod(method, new Class[] { String.class }).invoke(configuration, new Object[] { value });
}
catch (Exception e)
{
@@ -163,14 +161,19 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(WSSecurityConfiguration configuration, UnmarshallingContext navigator, String namespaceURI,
- String localName, Attributes attrs)
+ public Object newChild(WSSecurityConfiguration configuration, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
log.trace("newChild: " + localName);
if ("config".equals(localName))
{
return new Config();
}
+ if ("key-passwords".equals(localName))
+ {
+ HashMap pwds = new HashMap();
+ configuration.setKeyPasswords(pwds);
+ return pwds;
+ }
if ("port".equals(localName))
{
return new Port(attrs.getValue("", "name"));
@@ -179,10 +182,24 @@
}
/**
+ * Called when parsing the contents of the <key-password> tag.
+ */
+ public Object newChild(HashMap passwords, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ log.trace("newChild: " + localName);
+ if ("key-password".equals(localName))
+ {
+ String alias = attrs.getValue("", "alias");
+ String pwd = attrs.getValue("", "password");
+ passwords.put(alias, pwd);
+ }
+ return null;
+ }
+
+ /**
* Called when parsing character is complete.
*/
- public void addChild(WSSecurityConfiguration configuration, Config defaultConfig, UnmarshallingContext navigator,
- String namespaceURI, String localName)
+ public void addChild(WSSecurityConfiguration configuration, Config defaultConfig, UnmarshallingContext navigator, String namespaceURI, String localName)
{
log.trace("addChild: [obj=" + configuration + ",child=" + defaultConfig + "]");
configuration.setDefaultConfig(defaultConfig);
@@ -191,8 +208,7 @@
/**
* Called when parsing character is complete.
*/
- public void addChild(WSSecurityConfiguration configuration, Port port, UnmarshallingContext navigator, String namespaceURI,
- String localName)
+ public void addChild(WSSecurityConfiguration configuration, Port port, UnmarshallingContext navigator, String namespaceURI, String localName)
{
log.trace("addChild: [obj=" + configuration + ",child=" + port + "]");
configuration.addPort(port);
@@ -210,7 +226,7 @@
Boolean include = new Boolean(true);
String timestamp = attrs.getValue("", "includeTimestamp");
if (timestamp != null)
- include = (Boolean) SimpleTypeBindings.unmarshal(timestamp, SimpleTypeBindings.XS_BOOLEAN_NAME, null);
+ include = (Boolean)SimpleTypeBindings.unmarshal(timestamp, SimpleTypeBindings.XS_BOOLEAN_NAME, null);
return new Sign(attrs.getValue("", "type"), attrs.getValue("", "alias"), include.booleanValue());
}
@@ -279,7 +295,6 @@
config.setRequires(requires);
}
-
private Object handleTargets(Object object, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
log.trace("newChild: " + localName);
@@ -456,8 +471,7 @@
/**
* Called when parsing of a new element started.
*/
- public Object newChild(Operation operation, UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ public Object newChild(Operation operation, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
log.trace("newChild: " + localName);
if ("config".equals(localName))
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -23,10 +23,13 @@
// $Id$
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.wsf.spi.binding.jaxb.BasicJAXBHandler;
/**
* Tools Endpoint Metadata
@@ -41,4 +44,10 @@
{
super(service, portName, portTypeName, Type.JAXRPC);
}
+
+ @Override
+ public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException
+ {
+ return new BasicJAXBHandler().getJAXBContext(javaTypes);
+ }
}
\ No newline at end of file
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -29,6 +29,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -142,6 +143,14 @@
// SWA handling
private Map<QName, List<String>> skippedSWAParts = new HashMap<QName, List<String>>();
+ // It is generally unsafe to use the getter for a top level element on another top level element.
+ // For examples Binding.getPortType() returns a PortType which might might be undefined
+ // The lists below only contain "defined" top level elements
+ private Map<String, List<Service>> servicesByNamespace = new HashMap<String, List<Service>>();
+ private Map<String, List<Binding>> bindingsByNamespace = new HashMap<String, List<Binding>>();
+ private Map<String, List<PortType>> portTypesByNamespace = new HashMap<String, List<PortType>>();
+ private Map<String, List<Message>> messagesByNamespace = new HashMap<String, List<Message>>();
+
/**
* Takes a WSDL11 Definition element and converts into
* our object graph that has been developed for WSDL20
@@ -159,6 +168,7 @@
destWsdl.setWsdlNamespace(Constants.NS_WSDL11);
processNamespaces(srcWsdl);
+ processTopLevelElements(srcWsdl);
processTypes(srcWsdl, wsdlLoc);
processUnknownExtensibilityElements(srcWsdl, destWsdl);
processServices(srcWsdl);
@@ -171,6 +181,77 @@
return destWsdl;
}
+ private void processTopLevelElements(Definition srcWsdl)
+ {
+ String targetNS = srcWsdl.getTargetNamespace();
+
+ // Messages
+ Collection<Message> messages = srcWsdl.getMessages().values();
+ for (Message message : messages)
+ {
+ List<Message> list = messagesByNamespace.get(targetNS);
+ if (list == null)
+ {
+ list = new ArrayList<Message>();
+ messagesByNamespace.put(targetNS, list);
+ }
+ if (message.isUndefined() == false)
+ list.add(message);
+ }
+
+ // PortTypes
+ Collection<PortType> portTypes = srcWsdl.getPortTypes().values();
+ for (PortType portType : portTypes)
+ {
+ List<PortType> list = portTypesByNamespace.get(targetNS);
+ if (list == null)
+ {
+ list = new ArrayList<PortType>();
+ portTypesByNamespace.put(targetNS, list);
+ }
+ if (portType.isUndefined() == false)
+ list.add(portType);
+ }
+
+ // Bindings
+ Collection<Binding> bindings = srcWsdl.getBindings().values();
+ for (Binding binding : bindings)
+ {
+ List<Binding> list = bindingsByNamespace.get(targetNS);
+ if (list == null)
+ {
+ list = new ArrayList<Binding>();
+ bindingsByNamespace.put(targetNS, list);
+ }
+ if (binding.isUndefined() == false)
+ list.add(binding);
+ }
+
+ // Services
+ Collection<Service> services = srcWsdl.getServices().values();
+ for (Service service : services)
+ {
+ List<Service> list = servicesByNamespace.get(targetNS);
+ if (list == null)
+ {
+ list = new ArrayList<Service>();
+ servicesByNamespace.put(targetNS, list);
+ }
+ list.add(service);
+ }
+
+ // Imports
+ Collection<List<Import>> importLists = srcWsdl.getImports().values();
+ for (List<Import> imports : importLists)
+ {
+ for (Import imp : imports)
+ {
+ Definition impWsdl = imp.getDefinition();
+ processTopLevelElements(impWsdl);
+ }
+ }
+ }
+
private void cleanupTemporaryFiles()
{
for (File current : tempFiles)
@@ -214,18 +295,18 @@
destWsdl.registerNamespaceURI(nsURI, prefix);
}
}
-
+
private void processUnknownExtensibilityElements(ElementExtensible src, Extendable dest) throws WSDLException
{
List extElements = src.getExtensibilityElements();
- for (int i=0; i<extElements.size(); i++)
+ for (int i = 0; i < extElements.size(); i++)
{
ExtensibilityElement extElement = (ExtensibilityElement)extElements.get(i);
processPolicyElements(extElement, dest);
//add processing of further extensibility element types below
}
}
-
+
private void processPolicyElements(ExtensibilityElement extElement, Extendable dest)
{
if (extElement instanceof UnknownExtensibilityElement)
@@ -238,19 +319,17 @@
copyMissingNamespaceDeclarations(element, srcElement);
if (element.getLocalName().equals("Policy"))
{
- dest.addExtensibilityElement(
- new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICY,element));
+ dest.addExtensibilityElement(new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICY, element));
}
else if (element.getLocalName().equals("PolicyReference"))
{
- dest.addExtensibilityElement(
- new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICYREFERENCE,element));
+ dest.addExtensibilityElement(new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICYREFERENCE, element));
}
-
+
}
}
}
-
+
private void processTypes(Definition srcWsdl, URL wsdlLoc) throws IOException, WSDLException
{
log.trace("BEGIN processTypes: " + wsdlLoc);
@@ -352,7 +431,7 @@
parent = parent.getParentNode();
}
}
-
+
private void copyMissingNamespaceDeclarations(Element destElement, Element srcElement)
{
String prefix = destElement.getPrefix();
@@ -365,24 +444,24 @@
{
nsUri = null;
}
- if (prefix!=null && nsUri == null)
+ if (prefix != null && nsUri == null)
{
- destElement.setAttributeNS(Constants.NS_XMLNS,"xmlns:"+prefix,srcElement.lookupNamespaceURI(prefix));
-
+ destElement.setAttributeNS(Constants.NS_XMLNS, "xmlns:" + prefix, srcElement.lookupNamespaceURI(prefix));
+
}
-
+
NamedNodeMap attributes = destElement.getAttributes();
for (int i = 0; i < attributes.getLength(); i++)
{
Attr attr = (Attr)attributes.item(i);
String attrPrefix = attr.getPrefix();
- if (attrPrefix!=null && !attr.getName().startsWith("xmlns") && destElement.lookupNamespaceURI(attrPrefix) == null)
+ if (attrPrefix != null && !attr.getName().startsWith("xmlns") && destElement.lookupNamespaceURI(attrPrefix) == null)
{
- destElement.setAttributeNS(Constants.NS_XMLNS,"xmlns:"+attrPrefix,srcElement.lookupNamespaceURI(attrPrefix));
+ destElement.setAttributeNS(Constants.NS_XMLNS, "xmlns:" + attrPrefix, srcElement.lookupNamespaceURI(attrPrefix));
}
}
NodeList childrenList = destElement.getChildNodes();
- for (int i=0; i<childrenList.getLength(); i++)
+ for (int i = 0; i < childrenList.getLength(); i++)
{
Node node = childrenList.item(i);
if (node instanceof Element)
@@ -543,14 +622,14 @@
if (destWsdl.getInterface(qname) == null)
{
WSDLInterface destInterface = new WSDLInterface(destWsdl, qname);
-
+
//policy extensions
QName policyURIsProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSP_POLICYURIS);
if (policyURIsProp != null && !"".equalsIgnoreCase(policyURIsProp.getLocalPart()))
{
destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policyURIsProp.getLocalPart()));
}
-
+
// eventing extensions
QName eventSourceProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSE_EVENTSOURCE);
if (eventSourceProp != null && eventSourceProp.getLocalPart().equals(Boolean.TRUE.toString()))
@@ -914,9 +993,7 @@
if (destWsdl.getBinding(srcBindingQName) == null)
{
- PortType srcPortType = srcBinding.getPortType();
- if (srcPortType == null)
- throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find port type for binding: " + srcBindingQName);
+ PortType srcPortType = getDefinedPortType(srcBinding);
// Get binding type
String bindingType = null;
@@ -979,13 +1056,71 @@
return true;
}
+ /** The port might reference a binding which is defined in another wsdl
+ */
+ private Binding getDefinedBinding(Port srcPort) throws WSDLException
+ {
+ Binding srcBinding = srcPort.getBinding();
+ if (srcBinding == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find binding for port: " + srcPort.getName());
+
+ QName srcBindingName = srcBinding.getQName();
+ if (srcBinding.isUndefined())
+ {
+ String nsURI = srcBindingName.getNamespaceURI();
+ List<Binding> bindings = bindingsByNamespace.get(nsURI);
+ if (bindings == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find bindings for namespace: " + nsURI);
+
+ for (Binding auxBinding : bindings)
+ {
+ if (srcBindingName.equals(auxBinding.getQName()))
+ {
+ srcBinding = auxBinding;
+ break;
+ }
+ }
+ }
+
+ return srcBinding;
+ }
+
+ /** The binding might reference a port type which is defined in another wsdl
+ */
+ private PortType getDefinedPortType(Binding srcBinding) throws WSDLException
+ {
+ QName srcBindingQName = srcBinding.getQName();
+
+ PortType srcPortType = srcBinding.getPortType();
+ if (srcPortType == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find port type for binding: " + srcBindingQName);
+
+ QName srcPortTypeName = srcPortType.getQName();
+ if (srcPortType.isUndefined())
+ {
+ String nsURI = srcPortTypeName.getNamespaceURI();
+ List<PortType> portTypes = portTypesByNamespace.get(nsURI);
+ if (portTypes == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find port types for namespace: " + nsURI);
+
+ for (PortType auxPortType : portTypes)
+ {
+ if (srcPortTypeName.equals(auxPortType.getQName()))
+ {
+ srcPortType = auxPortType;
+ break;
+ }
+ }
+ }
+
+ return srcPortType;
+ }
+
/**
* Identify and mark message parts that belong to
* an SWA binding and can be skipped when processing this WSDL
- * @param srcBinding
- * @param srcWsdl
*/
- private void preProcessSWAParts(Binding srcBinding, Definition srcWsdl)
+ private void preProcessSWAParts(Binding srcBinding, Definition srcWsdl) throws WSDLException
{
Iterator opIt = srcBinding.getBindingOperations().iterator();
@@ -1003,7 +1138,7 @@
}
}
- private void markSWAParts(List extensions, Binding srcBinding, Definition srcWsdl)
+ private void markSWAParts(List extensions, Binding srcBinding, Definition srcWsdl) throws WSDLException
{
Iterator extIt = extensions.iterator();
while (extIt.hasNext())
@@ -1012,7 +1147,7 @@
if (o instanceof MIMEMultipartRelated)
{
- QName portTypeName = srcBinding.getPortType().getQName();
+ QName portTypeName = getDefinedPortType(srcBinding).getQName();
if (log.isTraceEnabled())
log.trace("SWA found on portType" + portTypeName);
@@ -1038,13 +1173,13 @@
}
}
- private Map<QName, Binding> getPortTypeBindings(Definition srcWsdl)
+ private Map<QName, Binding> getPortTypeBindings(Definition srcWsdl) throws WSDLException
{
getAllDefinedBindings(srcWsdl);
return portTypeBindings;
}
- private Map<QName, Binding> getAllDefinedBindings(Definition srcWsdl)
+ private Map<QName, Binding> getAllDefinedBindings(Definition srcWsdl) throws WSDLException
{
if (allBindings != null)
return allBindings;
@@ -1057,7 +1192,7 @@
{
Binding srcBinding = (Binding)itBinding.next();
allBindings.put(srcBinding.getQName(), srcBinding);
- portTypeBindings.put(srcBinding.getPortType().getQName(), srcBinding);
+ portTypeBindings.put(getDefinedPortType(srcBinding).getQName(), srcBinding);
}
// Bindings not available when pulled in through <wsdl:import>
@@ -1072,7 +1207,7 @@
Port srcPort = (Port)itPort.next();
Binding srcBinding = srcPort.getBinding();
allBindings.put(srcBinding.getQName(), srcBinding);
- portTypeBindings.put(srcBinding.getPortType().getQName(), srcBinding);
+ portTypeBindings.put(getDefinedPortType(srcBinding).getQName(), srcBinding);
}
}
@@ -1229,7 +1364,7 @@
{
SOAP12Body body = (SOAP12Body)extElement;
processEncodingStyle(body, destBindingOperation);
-
+
String namespaceURI = body.getNamespaceURI();
destBindingOperation.setNamespaceURI(namespaceURI);
}
@@ -1415,7 +1550,7 @@
{
log.trace("processPort: " + srcPort.getName());
- Binding srcBinding = srcPort.getBinding();
+ Binding srcBinding = getDefinedBinding(srcPort);
QName endpointName = new QName(srcWsdl.getTargetNamespace(), srcPort.getName());
WSDLEndpoint destEndpoint = new WSDLEndpoint(destService, endpointName);
destEndpoint.setBinding(srcBinding.getQName());
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,28 +1,41 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.tools.wsdl;
// $Id$
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.net.ConnectException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.wsdl.Definition;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.parsers.DocumentBuilder;
+
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
@@ -34,18 +47,6 @@
import org.w3c.dom.Element;
import org.xml.sax.EntityResolver;
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.ConnectException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* A factory that creates a <code>WSDLDefinitions</code> object from an URL.
*
@@ -58,137 +59,138 @@
*/
public class WSDLDefinitionsFactory
{
- // provide logging
- private static final Logger log = Logger.getLogger(WSDLDefinitionsFactory.class);
+ // provide logging
+ private static final Logger log = Logger.getLogger(WSDLDefinitionsFactory.class);
- // This feature is set by default in wsdl4j, it means the object structure contains the imported arguments
- public static final String FEATURE_IMPORT_DOCUMENTS = "javax.wsdl.importDocuments";
- // Set this feature for additional debugging output
- public static final String FEATURE_VERBOSE = "javax.wsdl.verbose";
+ // This feature is set by default in wsdl4j, it means the object structure contains the imported arguments
+ public static final String FEATURE_IMPORT_DOCUMENTS = "javax.wsdl.importDocuments";
+ // Set this feature for additional debugging output
+ public static final String FEATURE_VERBOSE = "javax.wsdl.verbose";
- // The WSDL reader features
- private Map features = new HashMap();
+ // The WSDL reader features
+ private Map features = new HashMap();
- // Hide constructor
- private WSDLDefinitionsFactory()
- {
- }
+ // Hide constructor
+ private WSDLDefinitionsFactory()
+ {
+ }
- /**
- * Create a new instance of a wsdl factory
- */
- public static WSDLDefinitionsFactory newInstance()
- {
- return new WSDLDefinitionsFactory();
- }
+ /**
+ * Create a new instance of a wsdl factory
+ */
+ public static WSDLDefinitionsFactory newInstance()
+ {
+ return new WSDLDefinitionsFactory();
+ }
- /**
- * Set a feature on the underlying reader
- */
- public void setFeature(String name, boolean value) throws IllegalArgumentException
- {
- features.put(name, new Boolean(value));
- }
+ /**
+ * Set a feature on the underlying reader
+ */
+ public void setFeature(String name, boolean value) throws IllegalArgumentException
+ {
+ features.put(name, new Boolean(value));
+ }
- /**
- * Read the wsdl document from the given URL
- */
- public WSDLDefinitions parse(URL wsdlLocation) throws WSDLException
- {
- if (wsdlLocation == null)
- throw new IllegalArgumentException("URL cannot be null");
+ /**
+ * Read the wsdl document from the given URL
+ */
+ public WSDLDefinitions parse(URL wsdlLocation) throws WSDLException
+ {
+ if (wsdlLocation == null)
+ throw new IllegalArgumentException("URL cannot be null");
- if(log.isDebugEnabled()) log.debug("parse: " + wsdlLocation.toExternalForm());
+ if (log.isDebugEnabled())
+ log.debug("parse: " + wsdlLocation.toExternalForm());
- EntityResolver entityResolver = new JBossWSEntityResolver();
- WSDLDefinitions wsdlDefinitions = null;
- try
- {
- Document wsdlDoc = getDocument(wsdlLocation);
- String defaultNamespace = getDefaultNamespace(wsdlDoc);
- if (Constants.NS_WSDL11.equals(defaultNamespace))
- {
- WSDLFactory wsdlFactory = WSDLFactory.newInstance(JBossWSDLFactoryImpl.class.getName());
- WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
- wsdlReader.setFeature("javax.wsdl.verbose", false);
+ EntityResolver entityResolver = new JBossWSEntityResolver();
+ WSDLDefinitions wsdlDefinitions = null;
+ try
+ {
+ Document wsdlDoc = getDocument(wsdlLocation);
+ String defaultNamespace = getDefaultNamespace(wsdlDoc);
+ if (Constants.NS_WSDL11.equals(defaultNamespace))
+ {
+ WSDLFactory wsdlFactory = WSDLFactory.newInstance(JBossWSDLFactoryImpl.class.getName());
+ WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
+ wsdlReader.setFeature("javax.wsdl.verbose", false);
- // Setup reader features
- Iterator it = features.entrySet().iterator();
-
- while (it.hasNext())
- {
- Map.Entry entry = (Map.Entry)it.next();
- String key = (String)entry.getKey();
- Boolean flag = (Boolean)entry.getValue();
- wsdlReader.setFeature(key, flag.booleanValue());
- }
+ // Setup reader features
+ Iterator it = features.entrySet().iterator();
- Definition definition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation));
- wsdlDefinitions = new WSDL11Reader().processDefinition(definition, wsdlLocation);
- wsdlDefinitions.setWsdlDocument(wsdlDoc);
- }
- else
- {
- throw new WSDLException("Invalid default namespace: " + defaultNamespace);
- }
-
- if (log.isTraceEnabled())
- {
- StringWriter stwr = new StringWriter();
- WSDL11Writer wsdlWriter = new WSDL11Writer(wsdlDefinitions);
- wsdlWriter.write(stwr);
- log.trace("\n" + stwr.toString());
- }
- }
- catch (WSDLException e)
- {
- throw e;
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception e)
- {
- throw new WSDLException(e);
- }
+ while (it.hasNext())
+ {
+ Map.Entry entry = (Map.Entry)it.next();
+ String key = (String)entry.getKey();
+ Boolean flag = (Boolean)entry.getValue();
+ wsdlReader.setFeature(key, flag.booleanValue());
+ }
- return wsdlDefinitions;
- }
+ Definition definition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation));
+ wsdlDefinitions = new WSDL11Reader().processDefinition(definition, wsdlLocation);
+ wsdlDefinitions.setWsdlDocument(wsdlDoc);
+ }
+ else
+ {
+ throw new WSDLException("Invalid default namespace: " + defaultNamespace);
+ }
- /** Get the WSDL document.
- */
- private Document getDocument(URL wsdlLocation) throws WSDLException
- {
- try
- {
- InputStream inputStream = new ResourceURL(wsdlLocation).openStream();
- try
- {
- DocumentBuilder builder = DOMUtils.getDocumentBuilder();
- return builder.parse(inputStream);
- }
- finally
- {
- inputStream.close();
- }
- }
- catch (ConnectException ex)
- {
- throw new WSDLException("Cannot connect to: " + wsdlLocation);
- }
- catch (Exception ex)
- {
- throw new WSDLException("Cannot parse wsdlLocation: " + wsdlLocation, ex);
- }
- }
+ if (log.isTraceEnabled())
+ {
+ StringWriter stwr = new StringWriter();
+ WSDL11Writer wsdlWriter = new WSDL11Writer(wsdlDefinitions);
+ wsdlWriter.write(stwr);
+ log.trace("\n" + stwr.toString());
+ }
+ }
+ catch (WSDLException e)
+ {
+ throw e;
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WSDLException(e);
+ }
- /** Get the default namespace for the given WSDL
- */
- private String getDefaultNamespace(Document wsdlDoc) throws WSDLException
- {
- Element root = wsdlDoc.getDocumentElement();
- String defaultNamespace = root.getNamespaceURI();
- return defaultNamespace;
- }
+ return wsdlDefinitions;
+ }
+
+ /** Get the WSDL document.
+ */
+ private Document getDocument(URL wsdlLocation) throws WSDLException
+ {
+ try
+ {
+ InputStream inputStream = new ResourceURL(wsdlLocation).openStream();
+ try
+ {
+ DocumentBuilder builder = DOMUtils.getDocumentBuilder();
+ return builder.parse(inputStream);
+ }
+ finally
+ {
+ inputStream.close();
+ }
+ }
+ catch (ConnectException ex)
+ {
+ throw new WSDLException("Cannot connect to: " + wsdlLocation);
+ }
+ catch (Exception ex)
+ {
+ throw new WSDLException("Cannot parse wsdlLocation: " + wsdlLocation, ex);
+ }
+ }
+
+ /** Get the default namespace for the given WSDL
+ */
+ private String getDefaultNamespace(Document wsdlDoc) throws WSDLException
+ {
+ Element root = wsdlDoc.getDocumentElement();
+ String defaultNamespace = root.getNamespaceURI();
+ return defaultNamespace;
+ }
}
Modified: trunk/jbossws-core/src/main/resources/schema/jboss-ws-security_1_0.xsd
===================================================================
--- trunk/jbossws-core/src/main/resources/schema/jboss-ws-security_1_0.xsd 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/main/resources/schema/jboss-ws-security_1_0.xsd 2007-07-01 19:29:13 UTC (rev 3772)
@@ -33,6 +33,11 @@
<xs:documentation>This specifies the trust store's password.</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="key-passwords" type="passwordsType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>The passwords for the private keys in the keystore. Only required if the passwords are different from that of the keystore.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="config" type="configType" minOccurs="0">
<xs:annotation>
<xs:documentation>The default security configuration that is applied to all operations on all ports. This is only used if there is no port/operation config.</xs:documentation>
@@ -46,6 +51,27 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:complexType name="passwordsType">
+ <xs:sequence>
+ <xs:element name="key-password" type="passwordType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>The password for a private key in the keystore. Necessary only if the password is different from that of the keystore.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="passwordType">
+ <xs:attribute name="alias" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>The name of the private key.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="password" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>The password of this private key. If not specified, the keystore password will be used.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
<xs:complexType name="configType" mixed="true">
<xs:all>
<xs:element name="timestamp" type="timestampType" minOccurs="0">
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar");
+ return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -43,7 +43,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar");
+ return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxrpc-benchmark-doclit.war, jaxrpc-benchmark-doclit-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar");
+ return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar");
+ return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxws/BenchmarkDocJSETestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -48,7 +48,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BenchmarkDocJSETestCase.class, "jaxws-benchmark-doclit.war");
+ return new JBossWSTestSetup(BenchmarkDocJSETestCase.class, "jaxws-benchmark-doclit.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/jbossxb/SerializerDeserializerTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -35,14 +35,14 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.binding.AbstractDeserializerFactory;
+import org.jboss.ws.core.binding.DeserializerSupport;
+import org.jboss.ws.core.binding.SerializationContext;
+import org.jboss.ws.core.binding.AbstractSerializerFactory;
+import org.jboss.ws.core.binding.SerializerSupport;
+import org.jboss.ws.core.binding.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC;
-import org.jboss.ws.core.jaxrpc.TypeMappingImpl;
import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.DeserializerSupport;
-import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
-import org.jboss.ws.core.jaxrpc.binding.SerializerFactoryBase;
-import org.jboss.ws.core.jaxrpc.binding.SerializerSupport;
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.xb.binding.NamespaceRegistry;
@@ -76,12 +76,12 @@
QName xmlType = Constants.TYPE_LITERAL_STRING;
String value = "Hello World!";
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(String.class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(String.class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(String.class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(String.class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
String out = (String)des.deserialize(xmlName, xmlType, source, serContext);
@@ -94,12 +94,12 @@
QName xmlType = Constants.TYPE_LITERAL_DATETIME;
Calendar value = new GregorianCalendar(2004, 10, 20, 14, 53, 25);
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(Calendar.class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(Calendar.class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(Calendar.class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(Calendar.class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
Calendar out = (Calendar)des.deserialize(xmlName, xmlType, source, serContext);
@@ -113,12 +113,12 @@
QName xmlType = Constants.TYPE_LITERAL_INTEGER;
BigInteger value = new BigInteger("12345678901234567890");
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(BigInteger.class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(BigInteger.class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(BigInteger.class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(BigInteger.class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
BigInteger out = (BigInteger)des.deserialize(xmlName, xmlType, source, serContext);
@@ -131,12 +131,12 @@
QName xmlType = Constants.TYPE_LITERAL_DECIMAL;
BigDecimal value = new BigDecimal("12345678901234567890");
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(BigDecimal.class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(BigDecimal.class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(BigDecimal.class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(BigDecimal.class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
BigDecimal out = (BigDecimal)des.deserialize(xmlName, xmlType, source, serContext);
@@ -149,7 +149,7 @@
QName xmlType = Constants.TYPE_LITERAL_QNAME;
QName value = new QName("http://some-ns", "localPart", "ns1");
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(QName.class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(QName.class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
@@ -159,7 +159,7 @@
assertEquals("ns1", nsRegistry.getPrefix("http://some-ns"));
nsRegistry.unregisterURI("http://some-ns");
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(QName.class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(QName.class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
QName out = (QName)des.deserialize(xmlName, xmlType, source, serContext);
@@ -172,12 +172,12 @@
QName xmlType = Constants.TYPE_LITERAL_ANYURI;
URI value = new URI("http://someURI:that:has:more:parts");
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(URI.class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(URI.class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(URI.class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(URI.class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
URI out = (URI)des.deserialize(xmlName, xmlType, source, serContext);
@@ -190,12 +190,12 @@
QName xmlType = Constants.TYPE_LITERAL_BASE64BINARY;
byte[] value = new String("Some base64 binary string").getBytes();
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(byte[].class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(byte[].class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(byte[].class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(byte[].class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
byte[] out = (byte[])des.deserialize(xmlName, xmlType, source, serContext);
@@ -208,12 +208,12 @@
QName xmlType = Constants.TYPE_LITERAL_HEXBINARY;
byte[] value = new String("Some hex binary string").getBytes();
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(byte[].class, xmlType);
+ AbstractSerializerFactory serializerFactory = (AbstractSerializerFactory)typeMapping.getSerializer(byte[].class, xmlType);
SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
Result result = ser.serialize(xmlName, xmlType, value, serContext, null);
assertNotNull(result);
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(byte[].class, xmlType);
+ AbstractDeserializerFactory deserializerFactory = (AbstractDeserializerFactory)typeMapping.getDeserializer(byte[].class, xmlType);
DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
Source source = new StreamSource(new ByteArrayInputStream( new XMLFragment(result).toXMLString().getBytes()));
byte[] out = (byte[])des.deserialize(xmlName, xmlType, source, serContext);
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -234,4 +234,20 @@
//System.out.println(wasBody);
assertEquals(expBody, wasBody);
}
+
+ // [JBWS-862] Return SOAP Fault for invalid soap messages
+ public void testBlankSOAPMessage() throws Exception
+ {
+ try
+ {
+ String xmlMessage = " ";
+ MessageFactory factory = MessageFactory.newInstance();
+ factory.createMessage(null,new ByteArrayInputStream(xmlMessage.getBytes()));
+ fail("Exception expected");
+ }
+ catch (Exception e)
+ {
+ // ignore
+ }
+ }
}
\ No newline at end of file
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -52,28 +52,28 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(SOAPConnectionTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war");
+ return new JBossWSTestSetup(SOAPConnectionTestCase.class, "jaxrpc-samples-jsr109pojo-rpc.war");
}
public void testConnectString() throws Exception
{
- doConnect(TARGET_ENDPOINT_ADDRESS);
+ runEndpointTest(TARGET_ENDPOINT_ADDRESS);
}
public void testConnectURL() throws Exception
{
- doConnect(new URL(TARGET_ENDPOINT_ADDRESS));
+ runEndpointTest(new URL(TARGET_ENDPOINT_ADDRESS));
}
- private void doConnect(Object endPoint) throws Exception
+ private void runEndpointTest(Object endPoint) throws Exception
{
- SOAPMessage request = buildMessage();
+ SOAPMessage request = buildValidMessage();
SOAPConnection connection = SOAPConnectionFactory.newInstance().createConnection();
SOAPMessage response = connection.call(request, endPoint);
validateResponse(response);
}
- private SOAPMessage buildMessage() throws Exception
+ private SOAPMessage buildValidMessage() throws Exception
{
SOAPMessage message = MessageFactory.newInstance().createMessage();
SOAPPart sp = message.getSOAPPart();
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BaseDataTypesDocLitBTestCase.class, "jbossws-interop-BaseDataTypesDocLitB.war");
+ return new JBossWSTestSetup(BaseDataTypesDocLitBTestCase.class, "jbossws-interop-BaseDataTypesDocLitB.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BaseDataTypesDocLitWTestCase.class, "jbossws-interop-BaseDataTypesDocLitW.war");
+ return new JBossWSTestSetup(BaseDataTypesDocLitWTestCase.class, "jbossws-interop-BaseDataTypesDocLitW.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(BaseDataTypesRpcLitTestCase.class, "jbossws-interop-BaseDataTypesRpcLit.war");
+ return new JBossWSTestSetup(BaseDataTypesRpcLitTestCase.class, "jbossws-interop-BaseDataTypesRpcLit.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -72,7 +72,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10.war");
+ return new JBossWSTestSetup(AddressingTestCase.class, "jbossws-interop-wsa10-service.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -35,7 +35,7 @@
public static Test suite()
{
addClientConfToClasspath("jbossws-interop-wsse10Encrypt-client.jar");
- return JBossWSTestSetup.newTestSetup(EncryptTestCase.class, "jbossws-interop-wsse10Encrypt.war");
+ return new JBossWSTestSetup(EncryptTestCase.class, "jbossws-interop-wsse10Encrypt.war");
}
String getEndpointURL() {
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -34,7 +34,7 @@
public static Test suite()
{
addClientConfToClasspath("jbossws-interop-wsse10Sign-client.jar");
- return JBossWSTestSetup.newTestSetup(SignTestCase.class, "jbossws-interop-wsse10Sign.war");
+ return new JBossWSTestSetup(SignTestCase.class, "jbossws-interop-wsse10Sign.war");
}
String getEndpointURL() {
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite)
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,163 +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.jaxrpc.addressrewrite;
-
-import java.net.URL;
-
-import javax.management.Attribute;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceFactory;
-
-import org.jboss.wsf.spi.management.BasicServerConfigMBean;
-import org.jboss.wsf.spi.test.JBossWSTest;
-
-/**
- * Test soap:address rewriting in the WSDL.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 22-Jun-2007
- */
-public class AddressRewriteTestCase extends JBossWSTest
-{
- private static String NAMESPACE = "http://test.jboss.org/addressrewrite";
- private String wsdlLocation;
- private String wsdlLocationSec;
-
- private Boolean modifySOAPAddress;
- private String webServiceHost;
-
- public void setUp() throws Exception
- {
- wsdlLocation = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite/ValidURL?wsdl";
- wsdlLocationSec = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite-sec/ValidURL?wsdl";
- modifySOAPAddress = (Boolean)getServer().getAttribute(BasicServerConfigMBean.OBJECT_NAME, "ModifySOAPAddress");
- webServiceHost = (String)getServer().getAttribute(BasicServerConfigMBean.OBJECT_NAME, "WebServiceHost");
- }
-
- public void tearDown() throws Exception
- {
- Attribute attr = new Attribute("ModifySOAPAddress", modifySOAPAddress);
- getServer().setAttribute(BasicServerConfigMBean.OBJECT_NAME, attr);
- }
-
- public void testRewrite() throws Exception
- {
- setModifySOAPAddress(true);
- deploy("jaxrpc-addressrewrite.war");
- try
- {
- ServiceFactory serviceFactory = ServiceFactory.newInstance();
-
- Service service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidURLService"));
- Call call = (Call)service.createCall(new QName(NAMESPACE, "ValidURLPort"), "sayHello");
- assertEquals("http://" + webServiceHost + ":8080/jaxrpc-addressrewrite/ValidURL", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "InvalidURLPort"), "sayHello");
- assertEquals("http://" + webServiceHost + ":8080/jaxrpc-addressrewrite/InvalidURL", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidSecureURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "ValidSecureURLPort"), "sayHello");
- assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite/ValidSecureURL", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidSecureURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "InvalidSecureURLPort"), "sayHello");
- assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite/InvalidSecureURL", call.getTargetEndpointAddress());
- }
- finally
- {
- undeploy("jaxrpc-addressrewrite.war");
- }
- }
-
- /**
- * Rewrite soap:address URL according to transport guarantee
- *
- * http://jira.jboss.org/jira/browse/JBWS-454
- */
- public void testSecureRewrite() throws Exception
- {
- deploy("jaxrpc-addressrewrite-sec.war");
- try
- {
- ServiceFactory serviceFactory = ServiceFactory.newInstance();
-
- Service service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "ValidURLService"));
- Call call = (Call)service.createCall(new QName(NAMESPACE, "ValidURLPort"), "sayHello");
- assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/ValidURL", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "InvalidURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "InvalidURLPort"), "sayHello");
- assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/InvalidURL", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "ValidSecureURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "ValidSecureURLPort"), "sayHello");
- assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/ValidSecureURL", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "InvalidSecureURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "InvalidSecureURLPort"), "sayHello");
- assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/InvalidSecureURL", call.getTargetEndpointAddress());
- }
- finally
- {
- undeploy("jaxrpc-addressrewrite-sec.war");
- }
- }
-
- public void testNoRewrite() throws Exception
- {
- setModifySOAPAddress(false);
- deploy("jaxrpc-addressrewrite.war");
- try
- {
- ServiceFactory serviceFactory = ServiceFactory.newInstance();
-
- Service service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidURLService"));
- Call call = (Call)service.createCall(new QName(NAMESPACE, "ValidURLPort"), "sayHello");
- assertEquals("http://somehost:80/somepath", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "InvalidURLPort"), "sayHello");
- assertEquals("http://" + webServiceHost + ":8080/jaxrpc-addressrewrite/InvalidURL", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidSecureURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "ValidSecureURLPort"), "sayHello");
- assertEquals("https://somehost:443/some-secure-path", call.getTargetEndpointAddress());
-
- service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidSecureURLService"));
- call = (Call)service.createCall(new QName(NAMESPACE, "InvalidSecureURLPort"), "sayHello");
- assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite/InvalidSecureURL", call.getTargetEndpointAddress());
- }
- finally
- {
- undeploy("jaxrpc-addressrewrite.war");
- }
- }
-
- private void setModifySOAPAddress(Boolean value) throws Exception
- {
- Attribute attr = new Attribute("ModifySOAPAddress", value);
- getServer().setAttribute(BasicServerConfigMBean.OBJECT_NAME, attr);
- }
-}
\ No newline at end of file
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,163 @@
+/*
+ * 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.jaxrpc.addressrewrite;
+
+import java.net.URL;
+
+import javax.management.Attribute;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Call;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+
+import org.jboss.wsf.spi.management.BasicServerConfigMBean;
+import org.jboss.wsf.spi.test.JBossWSTest;
+
+/**
+ * Test soap:address rewriting in the WSDL.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 22-Jun-2007
+ */
+public class AddressRewriteTestCase extends JBossWSTest
+{
+ private static String NAMESPACE = "http://test.jboss.org/addressrewrite";
+ private String wsdlLocation;
+ private String wsdlLocationSec;
+
+ private Boolean modifySOAPAddress;
+ private String webServiceHost;
+
+ public void setUp() throws Exception
+ {
+ wsdlLocation = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite/ValidURL?wsdl";
+ wsdlLocationSec = "http://" + getServerHost() + ":8080/jaxrpc-addressrewrite-sec/ValidURL?wsdl";
+ modifySOAPAddress = (Boolean)getServer().getAttribute(BasicServerConfigMBean.OBJECT_NAME, "ModifySOAPAddress");
+ webServiceHost = (String)getServer().getAttribute(BasicServerConfigMBean.OBJECT_NAME, "WebServiceHost");
+ }
+
+ public void tearDown() throws Exception
+ {
+ Attribute attr = new Attribute("ModifySOAPAddress", modifySOAPAddress);
+ getServer().setAttribute(BasicServerConfigMBean.OBJECT_NAME, attr);
+ }
+
+ public void testRewrite() throws Exception
+ {
+ setModifySOAPAddress(true);
+ deploy("jaxrpc-addressrewrite.war");
+ try
+ {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+
+ Service service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidURLService"));
+ Call call = (Call)service.createCall(new QName(NAMESPACE, "ValidURLPort"), "sayHello");
+ assertEquals("http://" + webServiceHost + ":8080/jaxrpc-addressrewrite/ValidURL", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "InvalidURLPort"), "sayHello");
+ assertEquals("http://" + webServiceHost + ":8080/jaxrpc-addressrewrite/InvalidURL", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidSecureURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "ValidSecureURLPort"), "sayHello");
+ assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite/ValidSecureURL", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidSecureURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "InvalidSecureURLPort"), "sayHello");
+ assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite/InvalidSecureURL", call.getTargetEndpointAddress());
+ }
+ finally
+ {
+ undeploy("jaxrpc-addressrewrite.war");
+ }
+ }
+
+ /**
+ * Rewrite soap:address URL according to transport guarantee
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-454
+ */
+ public void testSecureRewrite() throws Exception
+ {
+ deploy("jaxrpc-addressrewrite-sec.war");
+ try
+ {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+
+ Service service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "ValidURLService"));
+ Call call = (Call)service.createCall(new QName(NAMESPACE, "ValidURLPort"), "sayHello");
+ assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/ValidURL", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "InvalidURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "InvalidURLPort"), "sayHello");
+ assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/InvalidURL", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "ValidSecureURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "ValidSecureURLPort"), "sayHello");
+ assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/ValidSecureURL", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocationSec), new QName(NAMESPACE, "InvalidSecureURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "InvalidSecureURLPort"), "sayHello");
+ assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite-sec/InvalidSecureURL", call.getTargetEndpointAddress());
+ }
+ finally
+ {
+ undeploy("jaxrpc-addressrewrite-sec.war");
+ }
+ }
+
+ public void testNoRewrite() throws Exception
+ {
+ setModifySOAPAddress(false);
+ deploy("jaxrpc-addressrewrite.war");
+ try
+ {
+ ServiceFactory serviceFactory = ServiceFactory.newInstance();
+
+ Service service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidURLService"));
+ Call call = (Call)service.createCall(new QName(NAMESPACE, "ValidURLPort"), "sayHello");
+ assertEquals("http://somehost:80/somepath", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "InvalidURLPort"), "sayHello");
+ assertEquals("http://" + webServiceHost + ":8080/jaxrpc-addressrewrite/InvalidURL", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "ValidSecureURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "ValidSecureURLPort"), "sayHello");
+ assertEquals("https://somehost:443/some-secure-path", call.getTargetEndpointAddress());
+
+ service = serviceFactory.createService(new URL(wsdlLocation), new QName(NAMESPACE, "InvalidSecureURLService"));
+ call = (Call)service.createCall(new QName(NAMESPACE, "InvalidSecureURLPort"), "sayHello");
+ assertEquals("https://" + webServiceHost + ":8443/jaxrpc-addressrewrite/InvalidSecureURL", call.getTargetEndpointAddress());
+ }
+ finally
+ {
+ undeploy("jaxrpc-addressrewrite.war");
+ }
+ }
+
+ private void setModifySOAPAddress(Boolean value) throws Exception
+ {
+ Attribute attr = new Attribute("ModifySOAPAddress", value);
+ getServer().setAttribute(BasicServerConfigMBean.OBJECT_NAME, attr);
+ }
+}
\ No newline at end of file
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,38 +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.jaxrpc.addressrewrite;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-
-public class HelloJavaBean implements HelloWs, Serializable
-{
- public HelloJavaBean()
- {
- }
-
- public String sayHello(String input) throws RemoteException
- {
- return "'" + input + "' to you too!";
- }
-
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloJavaBean.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -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.jaxrpc.addressrewrite;
+
+import java.io.Serializable;
+import java.rmi.RemoteException;
+
+public class HelloJavaBean implements HelloWs, Serializable
+{
+ public HelloJavaBean()
+ {
+ }
+
+ public String sayHello(String input) throws RemoteException
+ {
+ return "'" + input + "' to you too!";
+ }
+
+}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,30 +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.jaxrpc.addressrewrite;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface HelloWs extends Remote
-{
- public String sayHello(String input) throws RemoteException;
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/HelloWs.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,30 @@
+/*
+ * 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.jaxrpc.addressrewrite;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface HelloWs extends Remote
+{
+ public String sayHello(String input) throws RemoteException;
+}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-client.jar");
+ return new JBossWSTestSetup(AnonymousTypesTestCase.class, "jaxrpc-anonymous.war, jaxrpc-anonymous-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -43,7 +43,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-client.jar");
+ return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-href.war, jaxrpc-encoded-href-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,7 +49,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-client.jar");
+ return new JBossWSTestSetup(MarshallTestCase.class, "jaxrpc-encoded-marshalltest.war, jaxrpc-encoded-marshalltest-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -131,7 +131,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(ParameterModeTestCase.class, "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-client.jar");
+ return new JBossWSTestSetup(ParameterModeTestCase.class, "jaxrpc-encoded-parametermode.war, jaxrpc-encoded-parametermode-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-client.jar");
+ return new JBossWSTestSetup(EnvEntryEJBTestCase.class, "jaxrpc-enventry.jar, jaxrpc-enventry-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war, jaxrpc-enventry-client.jar");
+ return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxrpc-enventry.war, jaxrpc-enventry-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-client.jar");
+ return new JBossWSTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-client.jar");
+ return new JBossWSTestSetup(JBWS1011TestCase.class, "jaxrpc-jbws1011.jar, jaxrpc-jbws1011-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -54,7 +54,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar");
+ return new JBossWSTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -43,7 +43,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-client.jar");
+ return new JBossWSTestSetup(JBWS1107TestCase.class, "jaxrpc-jbws1107.war, jaxrpc-jbws1107-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -48,7 +48,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear");
+ return new JBossWSTestSetup(JBWS1121TestCase.class, "jaxrpc-jbws1121.ear");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
{
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1124TestCase.class, "jaxrpc-jbws1124one.war, jaxrpc-jbws1124two.war");
+ return new JBossWSTestSetup(JBWS1124TestCase.class, "jaxrpc-jbws1124one.war, jaxrpc-jbws1124two.war");
}
public void testEnpointOne() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -52,7 +52,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-client.jar");
+ return new JBossWSTestSetup(JBWS1125TestCase.class, "jaxrpc-jbws1125.war, jaxrpc-jbws1125-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar");
+ return new JBossWSTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar");
+ return new JBossWSTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -54,7 +54,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1186TestCase.class, "jaxrpc-jbws1186.war");
+ return new JBossWSTestSetup(JBWS1186TestCase.class, "jaxrpc-jbws1186.war");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-client.jar");
+ return new JBossWSTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME + ", jaxrpc-jbws1190-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-client.jar");
+ return new JBossWSTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-client.jar");
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS124TestCase.class, "jaxrpc-jbws124.war, jaxrpc-jbws124-client.jar");
+ return new JBossWSTestSetup(JBWS124TestCase.class, "jaxrpc-jbws124.war, jaxrpc-jbws124-client.jar");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS128TestCase.class, "jaxrpc-jbws128.ear");
+ return new JBossWSTestSetup(JBWS128TestCase.class, "jaxrpc-jbws128.ear");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar");
+ return new JBossWSTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,7 +49,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS1378TestCase.class, "jaxrpc-jbws1378.war");
+ return new JBossWSTestSetup(JBWS1378TestCase.class, "jaxrpc-jbws1378.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -50,7 +50,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS1384TestCase.class, "jaxrpc-jbws1384.war");
+ return new JBossWSTestSetup(JBWS1384TestCase.class, "jaxrpc-jbws1384.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1386/JBWS1386TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,7 +49,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war");
+ return new JBossWSTestSetup(JBWS1386TestCase.class, "jaxrpc-jbws1386.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -51,7 +51,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war");
+ return new JBossWSTestSetup(JBWS1410TestCase.class, "jaxrpc-jbws1410.war");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -52,7 +52,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS1427TestCase.class, "jaxrpc-jbws1427.jar");
+ return new JBossWSTestSetup(JBWS1427TestCase.class, "jaxrpc-jbws1427.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS153TestCase.class, "jaxrpc-jbws153.war, jaxrpc-jbws153-client.jar");
+ return new JBossWSTestSetup(JBWS153TestCase.class, "jaxrpc-jbws153.war, jaxrpc-jbws153-client.jar");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar");
+ return new JBossWSTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,7 +49,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-client.jar");
+ return new JBossWSTestSetup(JBWS163TestCase.class, "jaxrpc-jbws163.war, jaxrpc-jbws163-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -38,7 +38,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war");
+ return new JBossWSTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war");
}
public String getMessage()
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -38,7 +38,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war");
+ return new JBossWSTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war");
}
public String getMessage()
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,7 +49,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS165TestCase.class, "jaxrpc-jbws165.ear");
+ return new JBossWSTestSetup(JBWS165TestCase.class, "jaxrpc-jbws165.ear");
}
public void testNone() throws Exception
@@ -65,12 +65,8 @@
public void testPortComponentURIOne() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCOne?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCOne?wsdl");
- // In JBoss40 the context-root is derived from the first token in port-component-uri
- if (isTargetJBoss40())
- wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCOne?wsdl");
-
URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL();
QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
@@ -82,12 +78,8 @@
public void testPortComponentURITwo() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCTwo?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCTwo?wsdl");
- // In JBoss40 the context-root is derived from the first token in port-component-uri
- if (isTargetJBoss40())
- wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCTwo?wsdl");
-
URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL();
QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653 (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653)
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,69 +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.jaxrpc.jbws1653;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPMessage;
-
-import org.jboss.logging.Logger;
-
-/**
- * A simple client side handler
- *
- * @author thomas.diesler(a)jboss.org
- */
-public class ClientHandler extends GenericHandler
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ClientHandler.class);
-
- public static String message;
-
- public QName[] getHeaders()
- {
- return new QName[0];
- }
-
- public boolean handleResponse(MessageContext msgContext)
- {
- log.info("handleResponse");
-
- try
- {
- SOAPMessageContext soapContext = (SOAPMessageContext)msgContext;
- SOAPMessage soapMessage = soapContext.getMessage();
- SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
- soapElement = (SOAPElement)soapElement.getChildElements().next();
- message = soapElement.getValue();
- }
- catch (Exception e)
- {
- log.error("Handler processing error", e);
- }
-
- return true;
- }
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,69 @@
+/*
+ * 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.jaxrpc.jbws1653;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A simple client side handler
+ *
+ * @author thomas.diesler(a)jboss.org
+ */
+public class ClientHandler extends GenericHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ClientHandler.class);
+
+ public static String message;
+
+ public QName[] getHeaders()
+ {
+ return new QName[0];
+ }
+
+ public boolean handleResponse(MessageContext msgContext)
+ {
+ log.info("handleResponse");
+
+ try
+ {
+ SOAPMessageContext soapContext = (SOAPMessageContext)msgContext;
+ SOAPMessage soapMessage = soapContext.getMessage();
+ SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
+ soapElement = (SOAPElement)soapElement.getChildElements().next();
+ message = soapElement.getValue();
+ }
+ catch (Exception e)
+ {
+ log.error("Handler processing error", e);
+ }
+
+ return true;
+ }
+}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1653;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.spi.test.JBossWSTest;
-import org.jboss.wsf.spi.test.JBossWSTestSetup;
-
-/**
- * [JBWS-1653] Post-handler-chain not invoked for "Standard Client" configuration
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 26-Jun-2007
- */
-public class JBWS1653TestCase extends JBossWSTest
-{
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-client.jar");
- }
-
- public void setUp() throws Exception
- {
- ClientHandler.message = null;
- }
-
- public void testStandardConfig() throws Exception
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
- String retStr = port.echoString("kermit");
- assertEquals("kermit", retStr);
- assertNull(ClientHandler.message);
- }
-
- public void testCustomConfig() throws Exception
- {
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader)
- {
- public URL getResource(String resName)
- {
- URL resURL = super.getResource(resName);
- try
- {
- if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml"))
- resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL();
- }
- catch (MalformedURLException ex)
- {
- // ignore
- }
- return resURL;
- }
- };
- Thread.currentThread().setContextClassLoader(urlLoader);
-
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
- try
- {
- String retStr = port.echoString("kermit");
- assertEquals("kermit", retStr);
- assertEquals("kermit", ClientHandler.message);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(ctxLoader);
- }
- }
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1653;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1653] Post-handler-chain not invoked for "Standard Client" configuration
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 26-Jun-2007
+ */
+public class JBWS1653TestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ ClientHandler.message = null;
+ }
+
+ public void testStandardConfig() throws Exception
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ String retStr = port.echoString("kermit");
+ assertEquals("kermit", retStr);
+ assertNull(ClientHandler.message);
+ }
+
+ public void testCustomConfig() throws Exception
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader)
+ {
+ public URL getResource(String resName)
+ {
+ URL resURL = super.getResource(resName);
+ try
+ {
+ if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml"))
+ resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL();
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ return resURL;
+ }
+ };
+ Thread.currentThread().setContextClassLoader(urlLoader);
+
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ try
+ {
+ String retStr = port.echoString("kermit");
+ assertEquals("kermit", retStr);
+ assertEquals("kermit", ClientHandler.message);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
+ }
+}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1653;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface TestEndpoint extends Remote
-{
-
- public String echoString(final String message) throws RemoteException;
-
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1653;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface TestEndpoint extends Remote
+{
+
+ public String echoString(final String message) throws RemoteException;
+
+}
Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java 2007-06-28 11:16:18 UTC (rev 3754)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1653;
-
-import java.rmi.RemoteException;
-
-import org.jboss.logging.Logger;
-
-public class TestEndpointImpl implements TestEndpoint
-{
- private Logger log = Logger.getLogger(TestEndpointImpl.class);
-
- public String echoString(String message) throws RemoteException
- {
- log.info("echoString: " + message);
- return message;
- }
-}
Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java (from rev 3754, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java)
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1653;
+
+import java.rmi.RemoteException;
+
+import org.jboss.logging.Logger;
+
+public class TestEndpointImpl implements TestEndpoint
+{
+ private Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ public String echoString(String message) throws RemoteException
+ {
+ log.info("echoString: " + message);
+ return message;
+ }
+}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws167/JBWS167TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -56,7 +56,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS167TestCase.class, "jaxrpc-jbws167.war");
+ return new JBossWSTestSetup(JBWS167TestCase.class, "jaxrpc-jbws167.war");
}
public void testHttpHeaders() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS168TestCase.class, "jaxrpc-jbws168.war, jaxrpc-jbws168-client.jar");
+ return new JBossWSTestSetup(JBWS168TestCase.class, "jaxrpc-jbws168.war, jaxrpc-jbws168-client.jar");
}
public void testEmptyProperty() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -41,7 +41,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-client.jar");
+ return new JBossWSTestSetup(JBWS217TestCase.class, "jaxrpc-jbws217.war, jaxrpc-jbws217-client.jar");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -43,7 +43,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-client.jar");
+ return new JBossWSTestSetup(JBWS231TestCase.class, "jaxrpc-jbws231.war, jaxrpc-jbws231-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-client.jar");
+ return new JBossWSTestSetup(JBWS251TestCase.class, "jaxrpc-jbws251.war, jaxrpc-jbws251-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -48,7 +48,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-client.jar");
+ return new JBossWSTestSetup(JBWS316TestCase.class, "jaxrpc-jbws316.war, jaxrpc-jbws316-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -43,7 +43,7 @@
{
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS331TestCase.class, "jaxrpc-jbws331.ear");
+ return new JBossWSTestSetup(JBWS331TestCase.class, "jaxrpc-jbws331.ear");
}
public void testEndpointAccess() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-client.jar");
+ return new JBossWSTestSetup(JBWS349TestCase.class, "jaxrpc-jbws349.war, jaxrpc-jbws349-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-client.jar");
+ return new JBossWSTestSetup(JBWS377TestCase.class, "jaxrpc-jbws377.war, jaxrpc-jbws377-client.jar");
}
public void testEndpointNotNull() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-client.jar");
+ return new JBossWSTestSetup(JBWS381TestCase.class, "jaxrpc-jbws381.war, jaxrpc-jbws381-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-client.jar");
+ return new JBossWSTestSetup(JBWS383TestCase.class, "jaxrpc-jbws383.war, jaxrpc-jbws383-client.jar");
}
public void testEndpoint() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -49,7 +49,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-client.jar");
+ return new JBossWSTestSetup(JBWS413TestCase.class, "jaxrpc-jbws413.war, jaxrpc-jbws413-client.jar");
}
public void testClientAccess() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-client.jar");
+ return new JBossWSTestSetup(JBWS414TestCase.class, "jaxrpc-jbws414.war, jaxrpc-jbws414-client.jar");
}
public void testEndpoint() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-client.jar");
+ return new JBossWSTestSetup(JBWS423TestCase.class, "jaxrpc-jbws423.war, jaxrpc-jbws423-client.jar");
}
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-client.jar");
+ return new JBossWSTestSetup(JBWS424TestCase.class, "jaxrpc-jbws424.war, jaxrpc-jbws424-client.jar");
}
public void testEndpoint() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -59,7 +59,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-client.jar");
+ return new JBossWSTestSetup(JBWS425TestCase.class, "jaxrpc-jbws425.war, jaxrpc-jbws425-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -39,10 +39,8 @@
import org.w3c.dom.NamedNodeMap;
/**
- * Support sequences of anys
+ * [JBWS-434] Support sequences of anys
*
- * http://jira.jboss.org/jira/browse/JBWS-434
- *
* @author Thomas.Diesler(a)jboss.org
* @since 11-Nov-2005
*/
@@ -52,7 +50,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-client.jar");
+ return new JBossWSTestSetup(JBWS434TestCase.class, "jaxrpc-jbws434.war, jaxrpc-jbws434-client.jar");
}
protected void setUp() throws Exception
@@ -144,9 +142,6 @@
SOAPElement el1 = factory.createElement("knownWildcard", "ns1", "http://somens");
el1.setValue("Kermmit");
- System.out.println("FIXME: [JBWS-434] Support sequences of anys");
- if (true) return;
-
TypeOfAny3 inObj = new TypeOfAny3(el1);
TypeOfAny3 retObj = port.echo3(inObj);
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-client.jar");
+ return new JBossWSTestSetup(JBWS456TestCase.class, "jaxrpc-jbws456.war, jaxrpc-jbws456-client.jar");
}
public void testEndpoint() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-client.jar");
+ return new JBossWSTestSetup(JBWS463TestCase.class, "jaxrpc-jbws463.war, jaxrpc-jbws463-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -47,7 +47,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-client.jar");
+ return new JBossWSTestSetup(JBWS464TestCase.class, "jaxrpc-jbws464.war, jaxrpc-jbws464-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-client.jar");
+ return new JBossWSTestSetup(JBWS484TestCase.class, "jaxrpc-jbws484.war, jaxrpc-jbws484-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear");
+ return new JBossWSTestSetup(JBWS626TestCase.class, "jaxrpc-jbws626.ear");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-client.jar");
+ return new JBossWSTestSetup(JBWS632TestCase.class, "jaxrpc-jbws632.war, jaxrpc-jbws632-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-client.jar");
+ return new JBossWSTestSetup(JBWS637TestCase.class, "jaxrpc-jbws637-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws64/JBWS64TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -60,7 +60,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS64TestCase.class, "jaxrpc-jbws64.war");
+ return new JBossWSTestSetup(JBWS64TestCase.class, "jaxrpc-jbws64.war");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-client.jar");
+ return new JBossWSTestSetup(JBWS643TestCase.class, "jaxrpc-jbws643.war, jaxrpc-jbws643-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-client.jar");
+ return new JBossWSTestSetup(JBWS663BareBoundTestCase.class, "jaxrpc-jbws663bb.war, jaxrpc-jbws663bb-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-client.jar");
+ return new JBossWSTestSetup(JBWS663BareUnboundTestCase.class, "jaxrpc-jbws663b.war, jaxrpc-jbws663b-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-client.jar");
+ return new JBossWSTestSetup(JBWS663WrappedBoundTestCase.class, "jaxrpc-jbws663wb.war, jaxrpc-jbws663wb-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-client.jar");
+ return new JBossWSTestSetup(JBWS663WrappedUnboundTestCase.class, "jaxrpc-jbws663w.war, jaxrpc-jbws663w-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -48,7 +48,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-client.jar");
+ return new JBossWSTestSetup(JBWS68TestCase.class, "jaxrpc-jbws68.war, jaxrpc-jbws68-client.jar");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -57,7 +57,7 @@
suite.addTest(new JBWS70TestCase("testSetVersion"));
suite.addTest(new JBWS70TestCase("testGetVersion"));
- return JBossWSTestSetup.newTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-client.jar");
+ return new JBossWSTestSetup(suite, "jaxrpc-jbws70.war, jaxrpc-jbws70-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-client.jar");
+ return new JBossWSTestSetup(JBWS706TestCase.class, "jaxrpc-jbws706.war, jaxrpc-jbws706-client.jar");
}
public void testEndpoint() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -58,7 +58,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-client.jar");
+ return new JBossWSTestSetup(JBWS707TestCase.class, "jaxrpc-jbws707.war, jaxrpc-jbws707-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-client.jar");
+ return new JBossWSTestSetup(JBWS71TestCase.class, "jaxrpc-jbws71.war, jaxrpc-jbws71-client.jar");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-client.jar");
+ return new JBossWSTestSetup(JBWS710TestCase.class, "jaxrpc-jbws710.war, jaxrpc-jbws710-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -46,7 +46,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-client.jar");
+ return new JBossWSTestSetup(JBWS720TestCase.class, "jaxrpc-jbws720.war, jaxrpc-jbws720-client.jar");
}
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -52,7 +52,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar");
+ return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar");
}
public void testRoleSecuredWSDLAccess() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -45,7 +45,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-client.jar");
+ return new JBossWSTestSetup(JBWS732TestCase.class, "jaxrpc-jbws732.war, jaxrpc-jbws732-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -26,11 +26,8 @@
import org.jboss.wsf.spi.test.JBossWSTest;
-
-
/**
- * Multiple schema imports with the same namespace
- * http://jira.jboss.com/jira/browse/JBWS-751
+ * [JBWS-751] Multiple schema imports with the same namespace
*
* @author Thomas.Diesler(a)jboss.org
* @since 16-Mar-2006
@@ -39,10 +36,9 @@
{
private static ITranHistory port;
- /** Deploy the test */
// public static Test suite() throws Exception
// {
-// return JBossWSTestSetup.newTestSetup(JBWS751TestCase.class, "jaxrpc-jbws751.war, jaxrpc-jbws751-client.jar");
+// return new JBossWSTestSetup(JBWS751TestCase.class, "jaxrpc-jbws751.war, jaxrpc-jbws751-client.jar");
// }
public void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -44,7 +44,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS772TestCase.class, "jaxrpc-jbws772.ear");
+ return new JBossWSTestSetup(JBWS772TestCase.class, "jaxrpc-jbws772.ear");
}
public void testEndpointAccess() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -50,7 +50,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-client.jar");
+ return new JBossWSTestSetup(JBWS775TestCase.class, "jaxrpc-jbws775.war, jaxrpc-jbws775-client.jar");
}
public void testEndpointAccess() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -43,7 +43,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-client.jar");
+ return new JBossWSTestSetup(JBWS79TestCase.class, "jaxrpc-jbws79.war, jaxrpc-jbws79-client.jar");
}
/** Test endpoint one
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/JBWS801TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -57,7 +57,7 @@
/** Deploy the test ear */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS801TestCase.class, "jaxrpc-jbws801.war");
+ return new JBossWSTestSetup(JBWS801TestCase.class, "jaxrpc-jbws801.war");
}
public void testLargeFile() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -47,7 +47,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar");
+ return new JBossWSTestSetup(JBWS807TestCase.class, "jaxrpc-jbws807.war, jaxrpc-jbws807-client.jar");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -67,7 +67,7 @@
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-client.jar");
+ return new JBossWSTestSetup(JBWS812TestCase.class, "jaxrpc-jbws812.war, jaxrpc-jbws812-client.jar");
}
/** Send the raw bytes via an HttpURLConnection
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-client.jar");
+ return new JBossWSTestSetup(JBWS82TestCase.class, "jaxrpc-jbws82.war, jaxrpc-jbws82-client.jar");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -42,7 +42,7 @@
/** Deploy the test */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-client.jar");
+ return new JBossWSTestSetup(JBWS83TestCase.class, "jaxrpc-jbws83.war, jaxrpc-jbws83-client.jar");
}
/**
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -54,7 +54,7 @@
/** Deploy the test ear */
public static Test suite() throws Exception
{
- return JBossWSTestSetup.newTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-client.jar");
+ return new JBossWSTestSetup(JBWS84TestCase.class, "jaxrpc-jbws84.war, jaxrpc-jbws84-client.jar");
}
/** Use the JBoss generated dynamic proxy send the SOAP message.
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws950/JBWS950TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -48,7 +48,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS950TestCase.class, "jaxrpc-jbws950.war");
+ return new JBossWSTestSetup(JBWS950TestCase.class, "jaxrpc-jbws950.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws956/JBWS956TestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -48,7 +48,7 @@
public static Test suite()
{
- return JBossWSTestSetup.newTestSetup(JBWS956TestCase.class, "jaxrpc-jbws956.war");
+ return new JBossWSTestSetup(JBWS956TestCase.class, "jaxrpc-jbws956.war");
}
protected void setUp() throws Exception
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-06-29 17:17:12 UTC (rev 3771)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2007-07-01 19:29:13 UTC (rev 3772)
@@ -47,7 +47,7 @@
/** Deploy the test ear */
public static Test suite() thro