JBossWS SVN: r14225 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 06:50:15 -0400 (Tue, 03 May 2011)
New Revision: 14225
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml
Log:
[JBWS-3282][JBWS-3285] Update EndpointMetaData and configuration testcase to new stack agnostic configurations
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2011-05-03 10:48:29 UTC (rev 14224)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2011-05-03 10:50:15 UTC (rev 14225)
@@ -64,12 +64,9 @@
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
-import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
import org.jboss.ws.metadata.accessor.AccessorFactory;
import org.jboss.ws.metadata.accessor.AccessorFactoryCreator;
import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator;
-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;
@@ -78,6 +75,7 @@
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.binding.JAXBBindingCustomization;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.config.CommonConfig;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -915,62 +913,12 @@
log.debug("Create new config [name=" + configName + ",file=" + configFile + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(getClassLoader());
- List<RMPortConfig> rmPortMetaData = null;
- if (base != null)
- {
- rmPortMetaData = backupRMMD(base.getConfig());
- }
CommonConfig config = factory.getConfig(getRootFile(), configName, configFile);
- propagateRMMD(rmPortMetaData, config);
toInitialise.setConfig(config);
toInitialise.configHandlerMetaData();
}
- private List<RMPortConfig> backupRMMD(CommonConfig config)
- {
- if ((config != null) && (config.getRMMetaData() != null))
- return config.getRMMetaData().getPorts();
-
- return null;
- }
-
- private void propagateRMMD(List<RMPortConfig> backedUpMD, CommonConfig config)
- {
- if ((backedUpMD != null) && (backedUpMD.size() > 0))
- {
- if (config.getRMMetaData() == null)
- {
- config.setRMMetaData(new RMConfig());
- config.getRMMetaData().getPorts().addAll(backedUpMD);
- }
- else
- {
- // RM policy specified in config file will be always used
- List<RMPortConfig> ports = config.getRMMetaData().getPorts();
- for (RMPortConfig portMD : backedUpMD)
- {
- QName portName = portMD.getPortName();
- if (!contains(ports, portName))
- {
- ports.add(portMD);
- }
- }
- }
- }
- }
-
- private boolean contains(List<RMPortConfig> ports, QName portName)
- {
- for (RMPortConfig pMD : ports)
- {
- if (pMD.getPortName().equals(portName))
- return true;
- }
-
- return false;
- }
-
public List<Class> getRegisteredTypes()
{
return Collections.unmodifiableList(registeredTypes);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2011-05-03 10:48:29 UTC (rev 14224)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2011-05-03 10:50:15 UTC (rev 14225)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -22,21 +22,14 @@
package org.jboss.test.ws.common.config;
import java.io.File;
-import java.util.List;
-import javax.xml.namespace.QName;
-
-import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig;
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
-import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig;
-import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
-import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
import org.jboss.ws.metadata.config.JBossWSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC;
import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC;
import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC;
-import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS;
-import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS;
+import org.jboss.wsf.spi.metadata.config.ConfigRoot;
+import org.jboss.wsf.spi.metadata.config.EndpointConfig;
+import org.jboss.wsf.spi.metadata.config.Feature;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.wsf.test.JBossWSTest;
@@ -83,14 +76,14 @@
assertTrue(confFile.exists());
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURI().toURL());
+ ConfigRoot config = (ConfigRoot)factory.parse(confFile.toURI().toURL());
assertNotNull("Null config", config);
- EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard MTOM Endpoint");
+ EndpointConfig epConfig = (EndpointConfig)config.getConfigByName("Standard MTOM Endpoint");
assertTrue("Feature not set", epConfig.hasFeature("http://org.jboss.ws/mtom"));
// disable feature
- epConfig.setFeature("http://org.jboss.ws/mtom", false);
+ epConfig.setFeature(new Feature("http://org.jboss.ws/mtom"), false);
assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom"));
}
@@ -116,43 +109,12 @@
assertTrue(confFile.exists());
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURI().toURL());
+ ConfigRoot config = (ConfigRoot)factory.parse(confFile.toURI().toURL());
assertNotNull("Null config", config);
- EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard WSSecurity Endpoint");
+ EndpointConfig epConfig = (EndpointConfig)config.getConfigByName("Standard WSSecurity Endpoint");
String value = epConfig.getProperty("http://org.jboss.ws/mtom#threshold");
assertNotNull("Property does not exist", value);
assertEquals("Wrong property valule", value, "5000");
}
-
- public void testWSRMConfiguration() throws Exception
- {
- File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml");
- assertTrue(confFile.exists());
-
- JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
- ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURI().toURL());
- EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard WSRM Endpoint");
- RMConfig wsrmConfig = epConfig.getRMMetaData();
- assertNotNull(wsrmConfig);
- RMDeliveryAssuranceConfig deliveryAssurance = wsrmConfig.getDeliveryAssurance();
- assertEquals(deliveryAssurance.getInOrder(), "true");
- assertEquals(deliveryAssurance.getQuality(), "AtLeastOnce");
- List<RMPortConfig> ports = wsrmConfig.getPorts();
- RMPortConfig port1 = ports.get(0);
- assertEquals(port1.getPortName(), new QName("http://custom/namespace/", "Port1"));
- assertEquals(port1.getDeliveryAssurance().getInOrder(), "false");
- assertEquals(port1.getDeliveryAssurance().getQuality(), "AtMostOnce");
- RMPortConfig port2 = ports.get(1);
- assertEquals(port2.getPortName(), new QName("http://custom/namespace/", "Port2"));
- assertEquals(port2.getDeliveryAssurance().getInOrder(), "true");
- assertEquals(port2.getDeliveryAssurance().getQuality(), "ExactlyOnce");
- RMBackPortsServerConfig backportsServer = wsrmConfig.getBackPortsServer();
- assertEquals(backportsServer.getHost(), "realhostname.realdomain");
- assertEquals(backportsServer.getPort(), "9999");
- RMMessageRetransmissionConfig messageRetransmission = wsrmConfig.getMessageRetransmission();
- assertEquals(messageRetransmission.getCountOfAttempts(), 50);
- assertEquals(messageRetransmission.getRetransmissionInterval(), 10);
- assertEquals(messageRetransmission.getMessageTimeout(), 3);
- }
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2011-05-03 10:48:29 UTC (rev 14224)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2011-05-03 10:50:15 UTC (rev 14225)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jaxws-config xmlns="urn:jboss:jaxws-config:2.0"
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd">
<endpoint-config>
<config-name>Standard Endpoint</config-name>
@@ -12,7 +12,7 @@
<endpoint-config>
<config-name>Standard MTOM Endpoint</config-name>
- <feature>http://org.jboss.ws/mtom</feature>
+ <feature><feature-name>http://org.jboss.ws/mtom</feature-name></feature>
</endpoint-config>
@@ -30,7 +30,7 @@
</javaee:handler-chain>
</pre-handler-chains>
- <feature>http://org.jboss.ws/mtom</feature>
+ <feature><feature-name>http://org.jboss.ws/mtom</feature-name></feature>
<property>
<property-name>http://org.jboss.ws/mtom#threshold</property-name>
@@ -39,21 +39,4 @@
</endpoint-config>
- <endpoint-config>
-
- <config-name>Standard WSRM Endpoint</config-name>
- <reliable-messaging>
- <delivery-assurance inOrder="true" quality="AtLeastOnce"/>
- <backports-server host="realhostname.realdomain" port="9999"/>
- <message-retransmission attempts="50" interval="10" timeout="3"/>
- <port name="{http://custom/namespace/}Port1">
- <delivery-assurance inOrder="false" quality="AtMostOnce"/>
- </port>
- <port name="{http://custom/namespace/}Port2">
- <delivery-assurance inOrder="true" quality="ExactlyOnce"/>
- </port>
- </reliable-messaging>
-
- </endpoint-config>
-
</jaxws-config>
13 years, 8 months
- 1
- 0
JBossWS SVN: r14224 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/client/transport and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 06:48:29 -0400 (Tue, 03 May 2011)
New Revision: 14224
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/jaxws/
Modified:
stack/native/trunk/modules/client/pom.xml
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java
stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml
stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/META-INF/jaxws-client-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/WEB-INF/jaxws-endpoint-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml
Log:
[JBWS-3282] Update jbossws-native to use new client/endpoint configurations (urn:jboss:jbossws-jaxws-config:4.0) and the corresponding parser for jaxws. Also update jaxrpc configurations to be an extension of the stack agnostic common configuration metadata.
Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/client/pom.xml 2011-05-03 10:48:29 UTC (rev 14224)
@@ -47,7 +47,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jbossws-api.jar jbossws-spi.jar jbossws-common.jar jbossws-common-tools.jar jbossws-native-core.jar jbossws-native-factories.jar jbossws-native-services.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+ <Class-Path>jbossws-api.jar jbossws-spi.jar jbossws-common.jar jbossws-common-tools.jar jbossws-native-core.jar jbossws-native-factories.jar jbossws-native-services.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar wstx.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -62,9 +62,9 @@
import org.jboss.ws.core.client.transport.WSResponseHandler.Result;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.feature.FastInfosetFeature;
-import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.config.EndpointProperty;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.wsf.spi.metadata.config.CommonConfig;
/**
* A http client using Netty
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,125 +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.ws.metadata.config;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-
-/**
- * A common configuration
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 18-Dec-2005
- */
-public abstract class CommonConfig
-{
- private String configName;
- private RMConfig wsrmCfg;
- private List<URI> features = new ArrayList<URI>();
- private List<EndpointProperty> properties = new ArrayList<EndpointProperty>();
-
- public String getConfigName()
- {
- return configName;
- }
-
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
- public abstract List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type);
-
- public boolean hasFeature(URI type) {
- return features.contains(type);
- }
-
- public boolean hasFeature(String uri)
- {
- return hasFeature(nameToURI(uri));
- }
-
- public void setFeature(String type, boolean enabled) {
-
- if(enabled) {
- features.add(nameToURI(type));
- }
- else
- features.remove(nameToURI(type));
- }
-
- public void setRMMetaData(RMConfig wsrmCfg)
- {
- this.wsrmCfg = wsrmCfg;
- }
-
- public RMConfig getRMMetaData()
- {
- return this.wsrmCfg;
- }
-
- public void addProperty(String name, String value)
- {
- EndpointProperty p = new EndpointProperty();
- p.name = nameToURI(name);
- p.value = value;
- properties.add(p);
- }
-
- public String getProperty(String name)
- {
- String value = null;
- URI uri = nameToURI(name);
-
- for(EndpointProperty wsp : properties)
- {
- if(wsp.name.equals(uri))
- {
- value = wsp.value;
- break;
- }
- }
- return value;
- }
-
- public List<EndpointProperty> getProperties() {
- return properties;
- }
-
- private static URI nameToURI(String name)
- {
- URI uri = null;
- try {
- uri = new URI(name);
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException(e.getMessage());
- }
- return uri;
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -32,13 +32,14 @@
import org.jboss.ws.core.utils.DelegateClassLoader;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC;
-import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS;
import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC;
-import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.config.CommonConfig;
+import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser;
+import org.jboss.wsf.spi.metadata.config.ConfigRoot;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
@@ -56,7 +57,7 @@
private final Logger log = Logger.getLogger(JBossWSConfigFactory.class);
private static String URN_JAXRPC_CONFIG = "urn:jboss:jaxrpc-config:2.0";
- private static String URN_JAXWS_CONFIG = "urn:jboss:jaxws-config:2.0";
+ private static String URN_JAXWS_CONFIG = "urn:jboss:jbossws-jaxws-config:4.0";
private ClassLoader loader;
@@ -102,7 +103,7 @@
}
else if (URN_JAXWS_CONFIG.equals(nsURI))
{
- wsConfig = unmarshaller.unmarshal(is, new OMFactoryJAXWS(), null);
+ wsConfig = ConfigMetaDataParser.parse(is);
}
else
{
@@ -173,7 +174,7 @@
}
else
{
- config = ((ConfigRootJAXWS)configRoot).getConfigByName(configName);
+ config = ((ConfigRoot)configRoot).getConfigByName(configName);
}
if (config == null)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -99,7 +99,7 @@
else if("property-value".equals(localName))
{
int lastEntry = commonConfig.getProperties().isEmpty() ? 0 : commonConfig.getProperties().size()-1;
- EndpointProperty p = commonConfig.getProperties().get(lastEntry);
+ EndpointProperty p = commonConfig.getAllProperties().get(lastEntry);
p.value = value;
}
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,368 +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.ws.metadata.config.binding;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.config.EndpointProperty;
-import org.jboss.ws.metadata.config.jaxws.ClientConfigJAXWS;
-import org.jboss.ws.metadata.config.jaxws.CommonConfigJAXWS;
-import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS;
-import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS;
-import org.jboss.ws.metadata.config.jaxws.HandlerChainsConfigJAXWS;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-import org.jboss.ws.extensions.wsrm.config.RMBackPortsServerConfig;
-import org.jboss.ws.extensions.wsrm.config.RMDeliveryAssuranceConfig;
-import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
-import org.jboss.ws.extensions.wsrm.config.RMConfig;
-import org.jboss.ws.extensions.wsrm.config.RMPortConfig;
-
-/**
- * ObjectModelFactory for JAXWS configurations.
- * @deprecated This is to be replaced by a stax based configuration parser
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.org
- * @since 18-Dec-2005
- */
-@Deprecated
-public class OMFactoryJAXWS implements ObjectModelFactory
-{
- // provide logging
- private final Logger log = Logger.getLogger(OMFactoryJAXWS.class);
-
- public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs)
- {
- return new ConfigRootJAXWS();
- }
-
- public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName)
- {
- return root;
- }
-
- /**
- * Called when parsing of a new element started.
- */
- public Object newChild(ConfigRootJAXWS config, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- log.trace("WSConfig newChild: " + localName);
- if ("endpoint-config".equals(localName))
- {
- EndpointConfigJAXWS wsEndpointConfig = new EndpointConfigJAXWS();
- config.getEndpointConfig().add(wsEndpointConfig);
- return wsEndpointConfig;
- }
- if ("client-config".equals(localName))
- {
- ClientConfigJAXWS clientConfig = new ClientConfigJAXWS();
- config.getClientConfig().add(clientConfig);
- return clientConfig;
- }
- return null;
- }
-
- /**
- * Called when a new simple child element with text value was read from the XML content.
- */
- public void setValue(CommonConfigJAXWS commonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
- {
- if (log.isTraceEnabled())
- log.trace("CommonConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
-
- if (localName.equals("config-name"))
- commonConfig.setConfigName(value);
- if(localName.equals("feature"))
- commonConfig.setFeature(value, true);
-
- if("property-name".equals(localName))
- {
- commonConfig.addProperty(value, null);
- }
- else if("property-value".equals(localName))
- {
- int lastEntry = commonConfig.getProperties().isEmpty() ? 0 : commonConfig.getProperties().size()-1;
- EndpointProperty p = commonConfig.getProperties().get(lastEntry);
- p.value = value;
- }
- }
-
- /**
- * Called when parsing of a new element started.
- */
- public Object newChild(CommonConfigJAXWS commonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- log.trace("CommonConfig newChild: " + localName);
-
- if ("pre-handler-chains".equals(localName))
- {
- HandlerChainsConfigJAXWS preHandlerChains = new HandlerChainsConfigJAXWS();
- commonConfig.setPreHandlerChains(preHandlerChains);
- return preHandlerChains;
- }
- if ("post-handler-chains".equals(localName))
- {
- HandlerChainsConfigJAXWS postHandlerChains = new HandlerChainsConfigJAXWS();
- commonConfig.setPostHandlerChains(postHandlerChains);
- return postHandlerChains;
- }
- if ("reliable-messaging".equals(localName))
- {
- RMConfig wsrmCfg = new RMConfig();
- commonConfig.setRMMetaData(wsrmCfg);
- return wsrmCfg;
- }
-
- return null;
- }
-
- public Object newChild(RMConfig wsrmConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- int countOfAttributes = attrs.getLength();
-
- if (localName.equals("delivery-assurance"))
- {
- RMDeliveryAssuranceConfig deliveryAssurance = getDeliveryAssurance(attrs);
- wsrmConfig.setDeliveryAssurance(deliveryAssurance);
- return deliveryAssurance;
- }
- if (localName.equals("message-retransmission"))
- {
- int interval = 0, attempts = 0, timeout=0;
- for (int i = 0; i < countOfAttributes; i++)
- {
- String attrLocalName = attrs.getLocalName(i);
- if (attrLocalName.equals("interval"))
- interval = Integer.valueOf(attrs.getValue(i));
- if (attrLocalName.equals("attempts"))
- attempts = Integer.valueOf(attrs.getValue(i));
- if (attrLocalName.equals("timeout"))
- timeout = Integer.valueOf(attrs.getValue(i));
- }
-
- RMMessageRetransmissionConfig retransmissionConfig = new RMMessageRetransmissionConfig();
- retransmissionConfig.setCountOfAttempts(attempts);
- retransmissionConfig.setRetransmissionInterval(interval);
- retransmissionConfig.setMessageTimeout(timeout);
- wsrmConfig.setMessageRetransmission(retransmissionConfig);
- return retransmissionConfig;
- }
- if (localName.equals("backports-server"))
- {
- String host = null, port = null;
- for (int i = 0; i < countOfAttributes && (host == null || port == null); i++)
- {
- String attrLocalName = attrs.getLocalName(i);
- if (attrLocalName.equals("host"))
- host = attrs.getValue(i);
- if (attrLocalName.equals("port"))
- port = attrs.getValue(i);
- }
-
- RMBackPortsServerConfig backportsServer = new RMBackPortsServerConfig();
- backportsServer.setHost(host);
- backportsServer.setPort(port);
- wsrmConfig.setBackPortsServer(backportsServer);
- return backportsServer;
- }
- if (localName.equals("port"))
- {
- String portName = null;
- for (int i = 0; i < countOfAttributes; i++)
- {
- if (attrs.getLocalName(i).equals("name"))
- {
- portName = attrs.getValue(i);
- break;
- }
- }
- RMPortConfig port = new RMPortConfig();
- port.setPortName(QName.valueOf(portName));
- wsrmConfig.getPorts().add(port);
- return port;
- }
-
- return null;
- }
-
- public Object newChild(RMPortConfig port, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- if (localName.equals("delivery-assurance"))
- {
- RMDeliveryAssuranceConfig deliveryAssurance = getDeliveryAssurance(attrs);
- port.setDeliveryAssurance(deliveryAssurance);
- return deliveryAssurance;
- }
-
- return null;
- }
-
- private RMDeliveryAssuranceConfig getDeliveryAssurance(Attributes attrs)
- {
- String inOrder = null, quality = null;
- for (int i = 0; i < attrs.getLength() && (inOrder == null || quality == null); i++)
- {
- String attrLocalName = attrs.getLocalName(i);
- if (attrLocalName.equals("inOrder"))
- inOrder = attrs.getValue(i);
- if (attrLocalName.equals("quality"))
- quality = attrs.getValue(i);
- }
- RMDeliveryAssuranceConfig deliveryAssurance = new RMDeliveryAssuranceConfig();
- deliveryAssurance.setQuality(quality);
- deliveryAssurance.setInOrder(inOrder);
- return deliveryAssurance;
- }
-
- /**
- * Called when parsing of a new element started.
- */
- public Object newChild(HandlerChainsConfigJAXWS handlerChains, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- log.trace("WSHandlerChainsConfig newChild: " + localName);
-
- if ("handler-chain".equals(localName))
- {
- UnifiedHandlerChainMetaData handlerChain = new UnifiedHandlerChainMetaData(null);
- handlerChains.getHandlerChains().add(handlerChain);
- return handlerChain;
- }
- return null;
- }
-
- //here below are methods that used to be inherited from import org.jboss.wsf.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory
- //which is not in this class' type hierarchy any more given it has been deprecated in jbossws-spi in order to remove JBossXB dependency
-
- /**
- * Called when parsing of a new element started.
- */
- public Object newChild(UnifiedHandlerChainsMetaData handlerConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- if ("handler-chain".equals(localName))
- return new UnifiedHandlerChainMetaData(handlerConfig);
- else return null;
- }
-
- /**
- * Called when parsing character is complete.
- */
- public void addChild(UnifiedHandlerChainsMetaData handlerConfig, UnifiedHandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI,
- String localName)
- {
- if (!handlerChain.isExcluded()) handlerConfig.addHandlerChain(handlerChain);
- }
-
- /**
- * Called when parsing of a new element started.
- */
- public Object newChild(UnifiedHandlerChainMetaData chainConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- if ("handler".equals(localName))
- return new UnifiedHandlerMetaData(chainConfig);
- else return null;
- }
-
- /**
- * Called when parsing character is complete.
- */
- public void addChild(UnifiedHandlerChainMetaData handlerConfig, UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName)
- {
- handlerConfig.addHandler(handler);
- }
-
- /**
- * Called when parsing of a new element started.
- */
- public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- if ("init-param".equals(localName))
- return new UnifiedInitParamMetaData();
- else return null;
- }
-
- /**
- * Called when parsing character is complete.
- */
- public void addChild(UnifiedHandlerMetaData handler, UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName)
- {
- handler.addInitParam(param);
- }
-
- /**
- * Called when a new simple child element with text value was read from the XML content.
- */
- public void setValue(UnifiedHandlerChainMetaData handlerChain, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
- {
- if (log.isTraceEnabled())
- log.trace("UnifiedHandlerChainMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
- try
- {
- if (localName.equals("protocol-bindings"))
- handlerChain.setProtocolBindings(value);
- else if (localName.equals("service-name-pattern"))
- handlerChain.setServiceNamePattern(navigator.resolveQName(value));
- else if (localName.equals("port-name-pattern"))
- handlerChain.setPortNamePattern(navigator.resolveQName(value));
- }
- catch (java.lang.IllegalStateException ex)
- {
- log.warn("Could not get " + localName + " value : "
- + ex.getMessage() + ", this handler chain will be ingored");
- handlerChain.setExcluded(true);
- }
- }
-
- /**
- * Called when a new simple child element with text value was read from the XML content.
- */
- public void setValue(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
- {
- if (log.isTraceEnabled())
- log.trace("UnifiedHandlerMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
-
- if (localName.equals("handler-name"))
- handler.setHandlerName(value);
- else if (localName.equals("handler-class"))
- handler.setHandlerClass(value);
- }
-
- /**
- * Called when a new simple child element with text value was read from the XML content.
- */
- public void setValue(UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
- {
- if (log.isTraceEnabled())
- log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
-
- if (localName.equals("param-name"))
- param.setParamName(value);
- else if (localName.equals("param-value"))
- param.setParamValue(value);
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -21,16 +21,15 @@
*/
package org.jboss.ws.metadata.config.jaxrpc;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.ws.metadata.config.CommonConfig;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
+import org.jboss.ws.metadata.config.EndpointProperty;
+import org.jboss.wsf.spi.metadata.config.AbstractCommonConfig;
+import org.jboss.wsf.spi.metadata.config.Feature;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
* A JBossWS client configuration
@@ -38,53 +37,112 @@
* @author Thomas.Diesler(a)jboss.org
* @since 18-Dec-2005
*/
-public abstract class CommonConfigJAXRPC extends CommonConfig
+public abstract class CommonConfigJAXRPC extends AbstractCommonConfig
{
- private UnifiedHandlerChainMetaData preHandlerChain;
- private UnifiedHandlerChainMetaData postHandlerChain;
-
+ private List<EndpointProperty> properties = new ArrayList<EndpointProperty>();
+
public UnifiedHandlerChainMetaData getPostHandlerChain()
{
- return postHandlerChain;
+ //adapt the jbossws-spi common config to this legacy jaxrpc one
+ List<UnifiedHandlerChainMetaData> chains = getPostHandlerChains();
+ if (chains != null && !chains.isEmpty())
+ {
+ return chains.get(0);
+ }
+ else
+ {
+ return null;
+ }
}
public void setPostHandlerChain(UnifiedHandlerChainMetaData postHandlerChain)
{
- this.postHandlerChain = postHandlerChain;
+ //adapt the jbossws-spi common config to this legacy jaxrpc one
+ List<UnifiedHandlerChainMetaData> chains = new ArrayList<UnifiedHandlerChainMetaData>(1);
+ chains.add(postHandlerChain);
+ setPostHandlerChains(chains);
}
public UnifiedHandlerChainMetaData getPreHandlerChain()
{
- return preHandlerChain;
+ //adapt the jbossws-spi common config to this legacy jaxrpc one
+ List<UnifiedHandlerChainMetaData> chains = getPreHandlerChains();
+ if (chains != null && !chains.isEmpty())
+ {
+ return chains.get(0);
+ }
+ else
+ {
+ return null;
+ }
}
public void setPreHandlerChain(UnifiedHandlerChainMetaData preHandlerChain)
{
- this.preHandlerChain = preHandlerChain;
+ //adapt the jbossws-spi common config to this legacy jaxrpc one
+ List<UnifiedHandlerChainMetaData> chains = new ArrayList<UnifiedHandlerChainMetaData>(1);
+ chains.add(preHandlerChain);
+ setPreHandlerChains(chains);
}
+ public boolean hasFeature(URI type) {
+ return hasFeature(type.toString());
+ }
+
+ public boolean hasFeature(String uri)
+ {
+ return super.hasFeature(uri);
+ //return hasFeature(nameToURI(uri));
+ }
+
+ public void setFeature(String type, boolean enabled) {
+ super.setFeature(new Feature(type), enabled);
+ }
+
@Override
- public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type)
+ public void setProperty(String name, String value)
{
- List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>();
-
- UnifiedHandlerChainMetaData handlerChain;
- if (type == HandlerType.PRE)
- handlerChain = getPreHandlerChain();
- else if (type == HandlerType.POST)
- handlerChain = getPostHandlerChain();
- else
- throw new IllegalArgumentException("Invalid handler type: " + type);
-
- if (handlerChain != null)
+ addProperty(name, value);
+ }
+
+ public void addProperty(String name, String value)
+ {
+ EndpointProperty p = new EndpointProperty();
+ p.name = nameToURI(name);
+ p.value = value;
+ properties.add(p);
+ //keep common config in synch
+ super.setProperty(name, value);
+ }
+
+ public String getProperty(String name)
+ {
+ String value = null;
+ URI uri = nameToURI(name);
+
+ for (EndpointProperty wsp : properties)
{
- for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
+ if (wsp.name.equals(uri))
{
- HandlerMetaDataJAXRPC hmd = HandlerMetaDataJAXRPC.newInstance(uhmd, type);
- handlers.add(hmd);
+ value = wsp.value;
+ break;
}
}
-
- return handlers;
+ return value;
}
+
+ public List<EndpointProperty> getAllProperties() {
+ return properties;
+ }
+
+ private static URI nameToURI(String name)
+ {
+ URI uri = null;
+ try {
+ uri = new URI(name);
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException(e.getMessage());
+ }
+ return uri;
+ }
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -25,7 +25,10 @@
import java.util.List;
import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.config.CommonConfig;
+import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC;
+import org.jboss.wsf.spi.metadata.config.CommonConfig;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
@@ -110,8 +113,8 @@
List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT);
clearHandlers();
- List<HandlerMetaData> preHandlers = config.getHandlers(epMetaData, HandlerType.PRE);
- List<HandlerMetaData> postHandlers = config.getHandlers(epMetaData, HandlerType.POST);
+ List<HandlerMetaData> preHandlers = getHandlers(epMetaData, HandlerType.PRE);
+ List<HandlerMetaData> postHandlers = getHandlers(epMetaData, HandlerType.POST);
addHandlers(preHandlers);
addHandlers(sepHandlers);
@@ -124,6 +127,26 @@
log.debug("Added " + postHandlers.size() + " POST handlers");
}
}
+
+ private List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type)
+ {
+ List<UnifiedHandlerChainMetaData> handlerChains = config.getHandlers(type);
+ boolean isJAXRPCConfig = (config instanceof CommonConfigJAXRPC);
+ List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>();
+ if (handlerChains != null)
+ {
+ for (UnifiedHandlerChainMetaData handlerChain : handlerChains)
+ {
+ for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
+ {
+ HandlerMetaData hmd = isJAXRPCConfig ? HandlerMetaDataJAXRPC.newInstance(uhmd, type) : HandlerMetaDataJAXWS.newInstance(uhmd, type);
+ hmd.setEndpointMetaData(epMetaData);
+ handlers.add(hmd);
+ }
+ }
+ }
+ return handlers;
+ }
public EndpointMetaData getEndpointMetaData()
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2011-05-03 10:48:29 UTC (rev 14224)
@@ -39,10 +39,10 @@
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
-import org.jboss.ws.metadata.config.CommonConfig;
import org.jboss.ws.metadata.config.Configurable;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.config.CommonConfig;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 schema/jaxws-config_2_0.xsd">
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jaxws-config_2_0.xsd">
<client-config>
<config-name>Standard Client</config-name>
- <feature>http://org.jboss.ws/dispatch/validate</feature>
+ <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature>
<property>
<property-name>http://org.jboss.ws/http#chunksize</property-name>
<property-value>2048</property-value>
@@ -14,7 +14,7 @@
<client-config>
<config-name>HTTP 1.0 Client</config-name>
- <feature>http://org.jboss.ws/dispatch/validate</feature>
+ <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature>
</client-config>
<client-config>
Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 schema/jaxws-config_2_0.xsd">
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jaxws-config_2_0.xsd">
<endpoint-config>
<config-name>Standard Endpoint</config-name>
@@ -22,7 +22,7 @@
-->
<endpoint-config>
<config-name>.NET friendly Endpoint</config-name>
- <feature>http://org.jboss.ws/binding/wsdl/dotnet</feature>
+ <feature><feature-name>http://org.jboss.ws/binding/wsdl/dotnet</feature-name></feature>
</endpoint-config>
<endpoint-config>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/META-INF/jaxws-client-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/META-INF/jaxws-client-config.xml 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/META-INF/jaxws-client-config.xml 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd">
<client-config>
<config-name> Custom Client Config </config-name>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/WEB-INF/jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/WEB-INF/jaxws-endpoint-config.xml 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/WEB-INF/jaxws-endpoint-config.xml 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd">
<client-config>
<config-name> Custom Server Config </config-name>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<jaxws-config
- xmlns="urn:jboss:jaxws-config:2.0"
+ xmlns="urn:jboss:jbossws-jaxws-config:4.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd">
<client-config>
<config-name>JBWS2187 Config</config-name>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2011-05-03 10:42:20 UTC (rev 14223)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2011-05-03 10:48:29 UTC (rev 14224)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd">
<client-config>
<config-name>Custom Server Config</config-name>
13 years, 8 months
- 1
- 0
JBossWS SVN: r14223 - stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 06:42:20 -0400 (Tue, 03 May 2011)
New Revision: 14223
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wsrm/
Log:
[JBWS-3285] Removing ws-rm from native
13 years, 8 months
- 1
- 0
JBossWS SVN: r14222 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws: samples and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 06:41:20 -0400 (Tue, 03 May 2011)
New Revision: 14222
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/
Log:
[JBWS-3285] Removing ws-rm from native
13 years, 8 months
- 1
- 0
JBossWS SVN: r14221 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 06:40:36 -0400 (Tue, 03 May 2011)
New Revision: 14221
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/
Log:
[JBWS-3285] Removing ws-rm from native
13 years, 8 months
- 1
- 0
JBossWS SVN: r14220 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/client and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 06:35:13 -0400 (Tue, 03 May 2011)
New Revision: 14220
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
Log:
[JBWS-3285] Remove ws-reliable messaging impl from native stack
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -57,7 +57,6 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -387,15 +386,8 @@
// Get the return object
Object retObj = null;
- boolean isWsrmMessage = msgContext.get(RMConstant.REQUEST_CONTEXT) != null;
- boolean wsrmOneWay = false;
- if (isWsrmMessage)
+ if (oneway == false && handlerPass)
{
- Boolean temp = (Boolean)((Map<String, Object>)msgContext.get(RMConstant.REQUEST_CONTEXT)).get(RMConstant.ONE_WAY_OPERATION);
- wsrmOneWay = (temp == null) ? Boolean.FALSE : temp.booleanValue();
- }
- if ((oneway == false && handlerPass) || (isWsrmMessage && (wsrmOneWay == false)))
- {
// Verify
if (binding instanceof CommonSOAPBinding)
((CommonSOAPBinding)binding).checkMustUnderstand(opMetaData);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -23,8 +23,6 @@
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -72,8 +70,6 @@
import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
import org.jboss.ws.core.soap.attachment.CIDGenerator;
import org.jboss.ws.core.utils.MimeUtils;
-import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
@@ -171,35 +167,21 @@
SOAPElement soapBodyElement = soapBody;
if (style == Style.RPC)
{
- boolean serialize = true;
+ QName opQName = opMetaData.getQName();
+ Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
- if (opMetaData.getEndpointMetaData().getConfig().getRMMetaData() != null)
- {
- // RM hack to JAX-RPC serialization
- if (RMHelper.isRMOperation(opMetaData.getQName()))
- {
- serialize = false;
- }
- }
+ if (debugEnabled)
+ log.debug("Create RPC body element: " + opName);
- if (serialize)
- {
- QName opQName = opMetaData.getQName();
- Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
+ soapBodyElement = new SOAPBodyElementRpc(opName);
+ soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
- if (debugEnabled)
- log.debug("Create RPC body element: " + opName);
-
- soapBodyElement = new SOAPBodyElementRpc(opName);
- soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
-
- // Add soap encodingStyle
- if (opMetaData.getUse() == Use.ENCODED)
- {
- String envURI = soapEnvelope.getNamespaceURI();
- String envPrefix = soapEnvelope.getPrefix();
- soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC);
- }
+ // Add soap encodingStyle
+ if (opMetaData.getUse() == Use.ENCODED)
+ {
+ String envURI = soapEnvelope.getNamespaceURI();
+ String envPrefix = soapEnvelope.getPrefix();
+ soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC);
}
}
@@ -322,14 +304,11 @@
}
}
- if (RMHelper.isRMOperation(opMetaData.getQName()) == false) // RM hack
- {
- if (payloadParent == null)
- throw new SOAPException("Cannot find RPC element in");
+ if (payloadParent == null)
+ throw new SOAPException("Cannot find RPC element in");
- QName elName = payloadParent.getElementQName();
- elName = namespaceRegistry.registerQName(elName);
- }
+ QName elName = payloadParent.getElementQName();
+ elName = namespaceRegistry.registerQName(elName);
}
int numParameters = 0;
@@ -360,20 +339,17 @@
}
}
- if (RMHelper.isRMOperation(opMetaData.getQName()) == false)
+ // Verify the numer of parameters matches the actual message payload
+ int numChildElements = 0;
+ Iterator itElements = payloadParent.getChildElements();
+ while (itElements.hasNext())
{
- // Verify the numer of parameters matches the actual message payload
- int numChildElements = 0;
- Iterator itElements = payloadParent.getChildElements();
- while (itElements.hasNext())
- {
- Node node = (Node)itElements.next();
- if (node instanceof SOAPElement)
- numChildElements++;
- }
- if (numChildElements != numParameters)
- throw new WSException("Invalid number of payload elements: " + numChildElements);
+ Node node = (Node)itElements.next();
+ if (node instanceof SOAPElement)
+ numChildElements++;
}
+ if (numChildElements != numParameters)
+ throw new WSException("Invalid number of payload elements: " + numChildElements);
}
// Generic message endpoint
@@ -423,8 +399,7 @@
// R2714 For one-way operations, an INSTANCE MUST NOT return a HTTP response that contains a SOAP envelope.
// Specifically, the HTTP response entity-body must be empty.
- boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null;
- if (opMetaData.isOneWay() && (false == isWsrmMessage))
+ if (opMetaData.isOneWay())
{
resMessage.getSOAPPart().setContent(null);
return resMessage;
@@ -443,19 +418,16 @@
{
QName opQName = opMetaData.getResponseName();
- if (false == RMHelper.isRMOperation(opQName)) // RM hack
- {
- Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
- soapBodyElement = new SOAPBodyElementRpc(opName);
- soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
+ Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
+ soapBodyElement = new SOAPBodyElementRpc(opName);
+ soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement);
- // Add soap encodingStyle
- if (opMetaData.getUse() == Use.ENCODED)
- {
- String envURI = soapEnvelope.getNamespaceURI();
- String envPrefix = soapEnvelope.getPrefix();
- soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC);
- }
+ // Add soap encodingStyle
+ if (opMetaData.getUse() == Use.ENCODED)
+ {
+ String envURI = soapEnvelope.getNamespaceURI();
+ String envPrefix = soapEnvelope.getPrefix();
+ soapBodyElement.setAttributeNS(envURI, envPrefix + ":encodingStyle", Constants.URI_SOAP11_ENC);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -35,9 +35,6 @@
import org.jboss.ws.core.MessageTrace;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.client.transport.NettyClient;
-import org.jboss.ws.extensions.wsrm.transport.RMChannel;
-import org.jboss.ws.extensions.wsrm.transport.RMMetadata;
-import org.jboss.ws.extensions.wsrm.transport.RMTransportHelper;
/**
* SOAPConnection implementation.
@@ -61,8 +58,6 @@
private boolean closed;
private Integer chunkSize;
- private static final RMChannel RM_CHANNEL = RMChannel.getInstance();
-
public HTTPRemotingConnection()
{
@@ -126,39 +121,20 @@
callProps.put(StubExt.PROPERTY_CHUNKED_ENCODING_SIZE, 0);
}
- if (RMTransportHelper.isRMMessage(callProps))
+ NettyClient client = new NettyClient(getMarshaller(), getUnmarshaller());
+ if (chunkSize != null)
{
- try
- {
- Map<String, Object> additionalHeaders = new HashMap<String, Object>();
- populateHeaders(reqMessage, additionalHeaders);
- RMMetadata rmMetadata = new RMMetadata(targetAddress, getMarshaller(), getUnmarshaller(), callProps, additionalHeaders);
- return RM_CHANNEL.send(reqMessage, rmMetadata);
- }
- catch (Throwable t)
- {
- IOException io = new IOException();
- io.initCause(t);
- throw io;
- }
+ client.setChunkSize(chunkSize);
}
- else
- {
- NettyClient client = new NettyClient(getMarshaller(), getUnmarshaller());
- if (chunkSize != null)
- {
- client.setChunkSize(chunkSize);
- }
-
- Map<String, Object> additionalHeaders = new HashMap<String, Object>();
- populateHeaders(reqMessage, additionalHeaders);
- //Trace the outgoing message
- MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
- MessageAbstraction resMessage = (MessageAbstraction)client.invoke(reqMessage, targetAddress, oneway, additionalHeaders, callProps);
- //Trace the incoming response message
- MessageTrace.traceMessage("Incoming Response Message", resMessage);
- return resMessage;
- }
+
+ Map<String, Object> additionalHeaders = new HashMap<String, Object>();
+ populateHeaders(reqMessage, additionalHeaders);
+ //Trace the outgoing message
+ MessageTrace.traceMessage("Outgoing Request Message", reqMessage);
+ MessageAbstraction resMessage = (MessageAbstraction)client.invoke(reqMessage, targetAddress, oneway, additionalHeaders, callProps);
+ //Trace the incoming response message
+ MessageTrace.traceMessage("Incoming Response Message", resMessage);
+ return resMessage;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -21,11 +21,9 @@
*/
package org.jboss.ws.core.jaxws.client;
-import java.net.URI;
import java.rmi.RemoteException;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -37,9 +35,6 @@
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.handler.MessageContext;
@@ -62,20 +57,6 @@
import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.extensions.addressing.AddressingClientUtil;
-import org.jboss.ws.extensions.wsrm.RMAddressingConstants;
-import org.jboss.ws.extensions.wsrm.RMClientSequence;
-import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.api.RMException;
-import org.jboss.ws.extensions.wsrm.common.RMHelper;
-import org.jboss.ws.extensions.wsrm.protocol.RMConstants;
-import org.jboss.ws.extensions.wsrm.protocol.RMProvider;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMAckRequested;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMCreateSequenceResponse;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMSequence;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMSequenceAcknowledgement;
-import org.jboss.ws.extensions.wsrm.protocol.spi.RMSerializable;
-import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareClientEndpointMetaDataAdapter;
@@ -89,7 +70,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 04-Jul-2006
*/
-public class ClientImpl extends CommonClient implements org.jboss.ws.extensions.wsrm.api.RMProvider, BindingProvider, FeatureAwareEndpointMetaData
+public class ClientImpl extends CommonClient implements BindingProvider, FeatureAwareEndpointMetaData
{
private static Logger log = Logger.getLogger(ClientImpl.class);
@@ -103,19 +84,6 @@
private Map<HandlerType, HandlerChainExecutor> executorMap = new HashMap<HandlerType, HandlerChainExecutor>();
private static HandlerType[] HANDLER_TYPES = new HandlerType[] { HandlerType.PRE, HandlerType.ENDPOINT, HandlerType.POST };
- // WS-RM sequence associated with the proxy
- private RMClientSequence wsrmSequence;
-
- public final void setWSRMSequence(RMClientSequence wsrmSequence)
- {
- this.wsrmSequence = wsrmSequence;
- }
-
- public final RMClientSequence getWSRMSequence()
- {
- return this.wsrmSequence;
- }
-
public ClientImpl(EndpointMetaData epMetaData, HandlerResolver handlerResolver)
{
super(epMetaData);
@@ -268,33 +236,6 @@
// request context is copied to the message context with a scope of HANDLER.
Map<String, Object> reqContext = getBindingProvider().getRequestContext();
- if (this.wsrmSequence != null)
- {
- if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
- {
- if (this.wsrmSequence.getBackPort() != null)
- {
- // rewrite ReplyTo to use client addressable back port
- Map<String, Object> requestContext = getBindingProvider().getRequestContext();
- AddressingProperties addressingProps = (AddressingProperties)requestContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
- addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(this.wsrmSequence.getBackPort()));
- }
- Map<String, Object> rmRequestContext = new HashMap<String, Object>();
- List<QName> outMsgs = new LinkedList<QName>();
- wsrmSequence.newMessageNumber();
- outMsgs.add(RMProvider.get().getConstants().getSequenceQName());
- outMsgs.add(RMProvider.get().getConstants().getAckRequestedQName());
- if (wsrmSequence.isAckRequested())
- {
- // piggy backing
- outMsgs.add(RMProvider.get().getConstants().getSequenceAcknowledgementQName());
- }
- rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
- rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, wsrmSequence);
- reqContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
- }
- }
-
msgContext.putAll(reqContext);
try
@@ -319,34 +260,6 @@
{
msgContext = MessageContextAssociation.peekMessageContext();
- if (this.wsrmSequence != null)
- {
- if (RMConstant.PROTOCOL_OPERATION_QNAMES.contains(opName) == false)
- {
- Map<String, Object> wsrmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT);
- if (wsrmResCtx != null)
- {
- RMConstants wsrmConstants = RMProvider.get().getConstants();
- Map<QName, RMSerializable> mapping = (Map<QName, RMSerializable>)wsrmResCtx.get(RMConstant.PROTOCOL_MESSAGES_MAPPING);
- QName seq = wsrmConstants.getSequenceQName();
- if (mapping.keySet().contains(seq))
- {
- RMHelper.handleSequenceHeader((RMSequence)mapping.get(seq), this.wsrmSequence);
- }
- QName seqAck = wsrmConstants.getSequenceAcknowledgementQName();
- if (mapping.keySet().contains(seqAck))
- {
- RMHelper.handleSequenceAcknowledgementHeader((RMSequenceAcknowledgement)mapping.get(seqAck), this.wsrmSequence);
- }
- QName ackReq = wsrmConstants.getAckRequestedQName();
- if (mapping.keySet().contains(ackReq))
- {
- RMHelper.handleAckRequestedHeader((RMAckRequested)mapping.get(ackReq), this.wsrmSequence);
- }
- }
- }
- }
-
// Copy the inbound msg properties to the binding's response context
resContext.putAll(msgContext);
}
@@ -539,73 +452,6 @@
return Boolean.TRUE.equals(bool);
}
- ///////////////////
- // WS-RM support //
- ///////////////////
- @SuppressWarnings("unchecked")
- public void createSequence() throws RMException
- {
- if (this.wsrmSequence != null)
- throw new IllegalStateException("Sequence already registered with proxy instance");
-
- try
- {
- // set up addressing data
- RMClientSequence candidateSequence = new RMClientSequence(this.epConfigMetaData.getConfig().getRMMetaData());
- String address = getEndpointMetaData().getEndpointAddress();
- String action = RMAddressingConstants.CREATE_SEQUENCE_WSA_ACTION;
- AddressingProperties addressingProps = null;
- URI backPort = candidateSequence.getBackPort();
- if (backPort != null)
- {
- addressingProps = AddressingClientUtil.createDefaultProps(action, address);
- addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(backPort));
- }
- else
- {
- addressingProps = AddressingClientUtil.createAnonymousProps(action, address);
- }
- Map requestContext = getBindingProvider().getRequestContext();
- requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps);
- // set up wsrm request context
- QName createSequenceQN = RMProvider.get().getConstants().getCreateSequenceQName();
- Map rmRequestContext = new HashMap();
- List outMsgs = new LinkedList();
- outMsgs.add(createSequenceQN);
- rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
- rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, candidateSequence);
- requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
- // invoke stub method
- invoke(createSequenceQN, new Object[] {}, getBindingProvider().getResponseContext());
- // read WSRM sequence id from response context
- Map rmResponseContext = (Map)getBindingProvider().getResponseContext().get(RMConstant.RESPONSE_CONTEXT);
- RMCreateSequenceResponse createSequenceResponse = ((RMCreateSequenceResponse)((Map)rmResponseContext.get(RMConstant.PROTOCOL_MESSAGES_MAPPING)).get(RMProvider
- .get().getConstants().getCreateSequenceResponseQName()));
- String outboundId = createSequenceResponse.getIdentifier();
- candidateSequence.setClient(this);
- candidateSequence.setOutboundId(outboundId);
- candidateSequence.setBehavior(createSequenceResponse.getIncompleteSequenceBehavior());
- candidateSequence.setDuration(RMHelper.durationToLong(createSequenceResponse.getExpires()));
- this.wsrmSequence = candidateSequence;
- }
- catch (Exception e)
- {
- throw new RMException("Unable to create WSRM sequence", e);
- }
- }
-
- public void closeSequence()
- {
- try
- {
- this.wsrmSequence.close();
- }
- finally
- {
- this.wsrmSequence = null;
- }
- }
-
//////////////////////////////////////////
// FeatureAwareEndpointMetaData support //
//////////////////////////////////////////
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -47,7 +47,6 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.StubExt;
-import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -92,7 +91,6 @@
this.executor = executor;
this.stubMethods = new ArrayList(Arrays.asList(BindingProvider.class.getMethods()));
this.stubMethods.addAll(Arrays.asList(StubExt.class.getMethods()));
- this.stubMethods.addAll(Arrays.asList(RMProvider.class.getMethods()));
this.stubMethods.addAll(Arrays.asList(FeatureAwareEndpointMetaData.class.getMethods()));
this.objectMethods = Arrays.asList(Object.class.getMethods());
}
@@ -172,12 +170,6 @@
private Object invoke(QName opName, Object[] args, Class retType, Map<String, Object> resContext) throws RemoteException
{
- boolean rmDetected = this.client.getEndpointConfigMetaData().getConfig().getRMMetaData() != null;
- boolean rmActivated = client.getWSRMSequence() != null;
- if (rmDetected && !rmActivated)
- {
- client.createSequence();
- }
Object retObj = client.invoke(opName, args, resContext);
if (retObj != null)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -65,7 +65,6 @@
import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil;
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
import org.jboss.ws.core.utils.DelegateClassLoader;
-import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder;
import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
@@ -413,7 +412,7 @@
T proxy;
try
{
- proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, RMProvider.class, BindingProvider.class, StubExt.class, FeatureAwareEndpointMetaData.class }, handler);
+ proxy = (T)Proxy.newProxyInstance(cl, new Class[] { seiClass, BindingProvider.class, StubExt.class, FeatureAwareEndpointMetaData.class }, handler);
}
catch (RuntimeException rte)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -63,7 +63,6 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -273,8 +272,7 @@
msgContext.setMessageAbstraction(resMessage);
}
- boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null;
- if ((oneway == false) || (isWsrmMessage)) // RM hack
+ if (oneway == false)
{
// call the response handler chain, removing the fault type entry will not call handleFault for that chain
handlersPass = callResponseHandlerChain(sepMetaData, handlerType[2]);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
*
@@ -99,8 +99,7 @@
if (soapBodyElement == null)
{
- boolean wsrmDisabled = epMetaData.getConfig().getRMMetaData() == null;
- if ((epMetaData.getStyle() == Style.RPC) && (wsrmDisabled)) // RM hack
+ if (epMetaData.getStyle() == Style.RPC)
throw new SOAPException("Empty SOAP body with no child element not supported for RPC");
// [JBWS-1125] Support empty soap body elements
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -40,8 +40,6 @@
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAlternative;
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion;
import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy;
-import org.jboss.ws.extensions.wsrm.policy.RM10PolicyAssertionDeployer;
-import org.jboss.ws.extensions.wsrm.policy.RM11PolicyAssertionDeployer;
import org.jboss.ws.metadata.umdm.ExtensibleMetaData;
import org.jboss.wsf.common.addressing.AddressingConstants;
@@ -60,8 +58,6 @@
{
me = new PolicyDeployer();
me.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd", WSSecurityAssertionDeployer.class);
- me.domainDeployerMap.put("http://docs.oasis-open.org/ws-rx/wsrmp/200702", RM11PolicyAssertionDeployer.class);
- me.domainDeployerMap.put("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", RM10PolicyAssertionDeployer.class);
me.domainDeployerMap.put(AddressingConstants.Metadata.NS, AddressingPolicyAssertionDeployer.class);
me.domainDeployerMap.put("http://www.w3.org/2006/05/addressing/wsdl", NopAssertionDeployer.class);
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -40,7 +40,6 @@
import org.jboss.ws.core.jaxws.client.NativeServiceObjectFactoryJAXWS;
import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder;
-import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
@@ -329,12 +328,6 @@
// Eager initialization
epMetaData.eagerInitialize();
- // wsrm initialization
- if (epMetaData.getConfig().getRMMetaData() != null)
- {
- RMHelper.setupRMOperations(epMetaData);
- }
-
if (log.isDebugEnabled())
log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData());
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -36,7 +36,6 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.Use;
-import org.jboss.ws.extensions.wsrm.protocol.RMProvider;
import org.jboss.wsf.common.JavaUtils;
import org.w3c.dom.Element;
@@ -189,7 +188,7 @@
}
}
- if ((tmpMethod == null) && (epMetaData.getConfig().getRMMetaData() == null)) // RM hack
+ if (tmpMethod == null)
throw new WSException("Cannot find java method: " + javaName);
}
return tmpMethod;
@@ -484,8 +483,7 @@
}
// Report unsynchronized java method
- boolean isRMMethod = RMProvider.get().getConstants().getNamespaceURI().equals(qname.getNamespaceURI());
- if ((javaMethod == null) && (isRMMethod == false)) // RM hack
+ if (javaMethod == null)
{
StringBuilder errMsg = new StringBuilder("Cannot synchronize to any of these methods:");
for (Method method : unsynchronizedMethods)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2011-05-03 10:35:13 UTC (rev 14220)
@@ -81,7 +81,6 @@
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser;
import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer;
-import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.feature.FastInfosetFeature;
import org.jboss.ws.feature.JsonEncodingFeature;
@@ -367,10 +366,7 @@
}
}
- Map<String, Object> rmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT);
- boolean isWsrmMessage = rmResCtx != null;
- boolean isWsrmOneWay = isWsrmMessage && (Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION);
- if ((outStream != null) && (isWsrmOneWay == false)) // RM hack
+ if (outStream != null)
sendResponse(endpoint, outStream, isFault);
CommonMessageContext.cleanupAttachments(reqMsgContext);
}
Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -73,10 +73,6 @@
<property name="requires">UnifiedMetaDataModel</property>
</bean>
- <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
- <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
- </bean>
-
<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
<property name="requires">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
<property name="provides">UnifiedMetaDataModel</property>
Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -55,10 +55,6 @@
<property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
</deploymentAspect>
- <deploymentAspect class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
- <property name="requires" class="java.lang.String">StackEndpointHandler, UnifiedMetaDataModel</property>
- </deploymentAspect>
-
<deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
<property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
<property name="provides" class="java.lang.String">UnifiedMetaDataModel</property>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -928,65 +928,6 @@
</manifest>
</war>
- <!-- jaxws-wsrm -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.class" />
- <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.class" />
- <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.class" />
- <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.class" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF">
- <include name="wsrm-jaxws-endpoint-config.xml" />
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/wsdl" prefix="WEB-INF/wsdl" />
- <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/unsecure/standard-jaxws-endpoint-config.xml" prefix="META-INF" />
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
- <war warfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.class" />
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.class" />
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.class" />
- <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.class" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF">
- <include name="wsrm-jaxws-endpoint-config.xml" />
- </webinf>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/WEB-INF">
- <include name="jboss-wsse-server.xml" />
- </webinf>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity">
- <include name="wsse.keystore" />
- <include name="wsse.truststore" />
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/wsdl" prefix="WEB-INF/wsdl" />
- <zipfileset file="${tests.output.dir}/test-resources/jaxws/wsrm/WEB-INF/secure/standard-jaxws-endpoint-config.xml" prefix="META-INF" />
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-wsrm-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF">
- <include name="wsrm-jaxws-client-config.xml" />
- </metainf>
- </jar>
-
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-secured-wsrm-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/META-INF">
- <include name="wsrm-jaxws-client-config.xml" />
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/wsrm/wssecurity/META-INF">
- <include name="jboss-wsse-client.xml" />
- </metainf>
- </jar>
-
- <!-- Please add alphabetically -->
-
</target>
</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2011-05-03 10:18:22 UTC (rev 14219)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2011-05-03 10:35:13 UTC (rev 14220)
@@ -291,24 +291,6 @@
</fileset>
</jar>
- <!-- jaxws-samples-wsrm -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
- </classes>
- <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/>
- <zipfileset file="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml" prefix="META-INF"/>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-client.jar">
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/META-INF">
- <include name="wsrm-jaxws-client-config.xml"/>
- </metainf>
- </jar>
-
<!-- jaxws-samples-wssecurity-encrypt -->
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-encrypt.war"
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml">
13 years, 8 months
- 1
- 0
JBossWS SVN: r14219 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 06:18:22 -0400 (Tue, 03 May 2011)
New Revision: 14219
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java
Log:
[JBWS-3282] Making CommonConfig an interface and adding AbstractCommonConfig
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java 2011-05-03 10:18:22 UTC (rev 14219)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.metadata.config;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+
+/**
+ * A common configuration
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 29-Apr-2011
+ */
+public abstract class AbstractCommonConfig implements CommonConfig
+{
+ private String configName;
+ private Map<String, Feature> features = new HashMap<String, Feature>();
+ private Map<String, String> properties = new HashMap<String, String>();
+ private List<UnifiedHandlerChainMetaData> preHandlerChains;
+ private List<UnifiedHandlerChainMetaData> postHandlerChains;
+
+ public List<UnifiedHandlerChainMetaData> getPostHandlerChains()
+ {
+ return postHandlerChains;
+ }
+
+ public void setPostHandlerChains(List<UnifiedHandlerChainMetaData> postHandlerChain)
+ {
+ this.postHandlerChains = postHandlerChain;
+ }
+
+ public List<UnifiedHandlerChainMetaData> getPreHandlerChains()
+ {
+ return preHandlerChains;
+ }
+
+ public void setPreHandlerChains(List<UnifiedHandlerChainMetaData> preHandlerChains)
+ {
+ this.preHandlerChains = preHandlerChains;
+ }
+
+ public List<UnifiedHandlerChainMetaData> getHandlers(HandlerType type)
+ {
+ List<UnifiedHandlerChainMetaData> handlerChains;
+ if (type == HandlerType.PRE)
+ handlerChains = getPreHandlerChains();
+ else if (type == HandlerType.POST)
+ handlerChains = getPostHandlerChains();
+ else throw new IllegalArgumentException("Invalid handler type: " + type);
+ return handlerChains;
+ }
+
+ public String getConfigName()
+ {
+ return configName;
+ }
+
+ public void setConfigName(String configName)
+ {
+ this.configName = configName;
+ }
+
+ public boolean hasFeature(String name)
+ {
+ return features.containsKey(name);
+ }
+
+ public void setFeature(Feature feature, boolean enabled) {
+
+ if(enabled) {
+ features.put(feature.getName(), feature);
+ }
+ else
+ features.remove(feature.getName());
+ }
+
+ public void setProperty(String name, String value)
+ {
+ properties.put(name, value);
+ }
+
+ public String getProperty(String name)
+ {
+ return properties.get(name);
+ }
+
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java 2011-05-03 00:55:38 UTC (rev 14218)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java 2011-05-03 10:18:22 UTC (rev 14219)
@@ -27,6 +27,6 @@
* @author alessio.soldano(a)jboss.com
* @since 29-Apr-2011
*/
-public class ClientConfig extends CommonConfig
+public class ClientConfig extends AbstractCommonConfig
{
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java 2011-05-03 00:55:38 UTC (rev 14218)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java 2011-05-03 10:18:22 UTC (rev 14219)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.spi.metadata.config;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -34,80 +33,29 @@
* @author alessio.soldano(a)jboss.com
* @since 29-Apr-2011
*/
-public abstract class CommonConfig
+public interface CommonConfig
{
- private String configName;
- private Map<String, Feature> features = new HashMap<String, Feature>();
- private Map<String, String> properties = new HashMap<String, String>();
- private List<UnifiedHandlerChainMetaData> preHandlerChains;
- private List<UnifiedHandlerChainMetaData> postHandlerChains;
+ public List<UnifiedHandlerChainMetaData> getPostHandlerChains();
- public List<UnifiedHandlerChainMetaData> getPostHandlerChains()
- {
- return postHandlerChains;
- }
+ public void setPostHandlerChains(List<UnifiedHandlerChainMetaData> postHandlerChain);
- public void setPostHandlerChains(List<UnifiedHandlerChainMetaData> postHandlerChain)
- {
- this.postHandlerChains = postHandlerChain;
- }
+ public List<UnifiedHandlerChainMetaData> getPreHandlerChains();
- public List<UnifiedHandlerChainMetaData> getPreHandlerChains()
- {
- return preHandlerChains;
- }
+ public void setPreHandlerChains(List<UnifiedHandlerChainMetaData> preHandlerChains);
- public void setPreHandlerChains(List<UnifiedHandlerChainMetaData> preHandlerChains)
- {
- this.preHandlerChains = preHandlerChains;
- }
+ public List<UnifiedHandlerChainMetaData> getHandlers(HandlerType type);
- public List<UnifiedHandlerChainMetaData> getHandlers(HandlerType type)
- {
- List<UnifiedHandlerChainMetaData> handlerChains;
- if (type == HandlerType.PRE)
- handlerChains = getPreHandlerChains();
- else if (type == HandlerType.POST)
- handlerChains = getPostHandlerChains();
- else throw new IllegalArgumentException("Invalid handler type: " + type);
- return handlerChains;
- }
+ public String getConfigName();
- public String getConfigName()
- {
- return configName;
- }
+ public void setConfigName(String configName);
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
- public boolean hasFeature(String name)
- {
- return features.containsKey(name);
- }
+ public boolean hasFeature(String name);
- public void setFeature(Feature feature, boolean enabled) {
+ public void setFeature(Feature feature, boolean enabled);
- if(enabled) {
- features.put(feature.getName(), feature);
- }
- else
- features.remove(feature.getName());
- }
+ public void setProperty(String name, String value);
- public void setProperty(String name, String value)
- {
- properties.put(name, value);
- }
+ public String getProperty(String name);
- public String getProperty(String name)
- {
- return properties.get(name);
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
+ public Map<String, String> getProperties();
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java 2011-05-03 00:55:38 UTC (rev 14218)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java 2011-05-03 10:18:22 UTC (rev 14219)
@@ -27,6 +27,6 @@
* @author alessio.soldano(a)jboss.com
* @since 29-Apr-2011
*/
-public class EndpointConfig extends CommonConfig
+public class EndpointConfig extends AbstractCommonConfig
{
}
13 years, 8 months
- 1
- 0
JBossWS SVN: r14218 - thirdparty/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-05-02 20:55:38 -0400 (Mon, 02 May 2011)
New Revision: 14218
Added:
thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/
Log:
[JBPAPP-6440] one off patch branch
13 years, 8 months
- 1
- 0
JBossWS SVN: r14217 - stack/cxf/trunk/modules/testsuite/cxf-tests/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-02 09:47:53 -0400 (Mon, 02 May 2011)
New Revision: 14217
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
adding org.jboss.logging manifest dependency to the test
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-05-02 08:06:58 UTC (rev 14216)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-05-02 13:47:53 UTC (rev 14217)
@@ -141,12 +141,18 @@
<include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneEJB3Impl.class"/>
<include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoEJB3Impl.class"/>
</fileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</jar>
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3060/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/>
<include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/>
</classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
</war>
<!-- jaxws-cxf-jbws3098 -->
13 years, 8 months
- 1
- 0
JBossWS SVN: r14216 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: metadata/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-02 04:06:58 -0400 (Mon, 02 May 2011)
New Revision: 14216
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
Log:
[JBWS-3282] Fixing a NPE and considering pre/post handlers in NonSpringBusHolder
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-30 17:00:18 UTC (rev 14215)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-05-02 08:06:58 UTC (rev 14216)
@@ -95,7 +95,7 @@
endpoint.setEndpointName(dde.getPortName());
endpoint.setServiceName(dde.getServiceName());
endpoint.setWsdlLocation(dde.getWsdlLocation());
- setHandlers(endpoint, dde.getHandlers());
+ setHandlers(endpoint, dde);
if (dde.getProperties() != null)
{
Map<String, Object> props = new HashMap<String, Object>();
@@ -121,14 +121,27 @@
}
@SuppressWarnings("rawtypes")
- private static void setHandlers(EndpointImpl endpoint, List<String> handlers)
+ private static void setHandlers(EndpointImpl endpoint, DDEndpoint dde)
{
- if (handlers != null && !handlers.isEmpty())
+ List<String> handlers = new LinkedList<String>();
+ if (dde.getPreHandlers() != null)
{
+ handlers.addAll(dde.getPreHandlers());
+ }
+ if (dde.getHandlers() != null)
+ {
+ handlers.addAll(dde.getHandlers());
+ }
+ if (dde.getPostHandlers() != null)
+ {
+ handlers.addAll(dde.getPostHandlers());
+ }
+ if (!handlers.isEmpty())
+ {
List<Handler> handlerInstances = new LinkedList<Handler>();
for (String handler : handlers)
{
- handlerInstances.add((Handler)newInstance(handler));
+ handlerInstances.add((Handler) newInstance(handler));
}
endpoint.setHandlers(handlerInstances);
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2011-04-30 17:00:18 UTC (rev 14215)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2011-05-02 08:06:58 UTC (rev 14216)
@@ -308,17 +308,26 @@
if (this.handlers != null && !this.handlers.isEmpty())
{
writer.write("<jaxws:handlers>");
- for (String handler : this.preHandlers)
+ if (this.preHandlers != null)
{
- writer.write("<bean class='" + handler + "'/>");
+ for (String handler : this.preHandlers)
+ {
+ writer.write("<bean class='" + handler + "'/>");
+ }
}
- for (String handler : this.handlers)
+ if (this.handlers != null)
{
- writer.write("<bean class='" + handler + "'/>");
+ for (String handler : this.handlers)
+ {
+ writer.write("<bean class='" + handler + "'/>");
+ }
}
- for (String handler : this.postHandlers)
+ if (this.postHandlers != null)
{
- writer.write("<bean class='" + handler + "'/>");
+ for (String handler : this.postHandlers)
+ {
+ writer.write("<bean class='" + handler + "'/>");
+ }
}
writer.write("</jaxws:handlers>");
}
13 years, 8 months
- 1
- 0