Author: richard.opalka(a)jboss.com Date: 2007-12-19 12:37:59 -0500 (Wed, 19 Dec 2007) New Revision: 5359 Removed: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java Log: removing useless configuration element Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java 2007-12-19 15:45:32 UTC (rev 5358) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMConfig.java 2007-12-19 17:37:59 UTC (rev 5359) @@ -36,7 +36,6 @@ private RMProviderConfig provider; private RMBackPortsServerConfig backportsServer; private RMMessageRetransmissionConfig messageRetransmission; - private RMMessageStoreConfig messageStore; private List<RMPortConfig> ports = new LinkedList<RMPortConfig>(); public final void setMessageRetransmission(RMMessageRetransmissionConfig messageRetransmission) @@ -79,16 +78,6 @@ return this.provider; } - public final void setMessageStore(RMMessageStoreConfig messageStore) - { - this.messageStore = messageStore; - } - - public final RMMessageStoreConfig getMessageStore() - { - return this.messageStore; - } - public final List<RMPortConfig> getPorts() { return this.ports; Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java 2007-12-19 15:45:32 UTC (rev 5358) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/config/RMMessageStoreConfig.java 2007-12-19 17:37:59 UTC (rev 5359) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.extensions.wsrm.config; - -/** - * Message store metadata - * - * @author richard.opalka(a)jboss.com - */ -public final class RMMessageStoreConfig -{ - - private String id; - private String className; - private String configFile; - - public final void setId(String id) - { - if (id == null) - throw new IllegalArgumentException(); - - this.id = id; - } - - public final String getId() - { - return this.id; - } - - public final void setClassName(String className) - { - if (className == null) - throw new IllegalArgumentException(); - - this.className = className; - } - - public final String getClassName() - { - return this.className; - } - - public final void setConfigFile(String configFile) - { - if (configFile == null) - throw new IllegalArgumentException(); - - this.configFile = configFile; - } - - public final String getConfigFile() - { - return this.configFile; - } - -} Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-12-19 15:45:32 UTC (rev 5358) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-12-19 17:37:59 UTC (rev 5359) @@ -36,16 +36,12 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; -import org.jboss.ws.extensions.wsrm.RMDeliveryAssurance; -import org.jboss.ws.extensions.wsrm.RMDeliveryAssuranceFactory; 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.RMMessageStoreConfig; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; import org.jboss.ws.extensions.wsrm.config.RMProviderConfig; -import org.jboss.ws.extensions.wsrm.spi.RMProvider; /** * ObjectModelFactory for JAXRPC configurations. @@ -209,24 +205,6 @@ wsrmConfig.setProvider(provider); return provider; } - if (localName.equals("message-store")) - { - String className = null, id = null; - for (int i = 0; i < countOfAttributes && (className == null || id == null); i++) - { - String attrLocalName = attrs.getLocalName(i); - if (attrLocalName.equals("id")) - id = attrs.getValue(i); - if (attrLocalName.equals("class")) - className = attrs.getValue(i); - } - - RMMessageStoreConfig messageStore = new RMMessageStoreConfig(); - messageStore.setId(id); - messageStore.setClassName(className); - wsrmConfig.setMessageStore(messageStore); - return messageStore; - } if (localName.equals("port")) { String portName = null; @@ -276,14 +254,6 @@ return deliveryAssurance; } - public void setValue(RMMessageStoreConfig messageStore, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("config-file")) - { - messageStore.setConfigFile(value); - } - } - /** * Called when parsing of a new element started. */ Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-12-19 15:45:32 UTC (rev 5358) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-12-19 17:37:59 UTC (rev 5359) @@ -29,7 +29,6 @@ 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.RMMessageStoreConfig; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; import org.jboss.ws.extensions.wsrm.config.RMProviderConfig; @@ -143,10 +142,6 @@ assertEquals(deliveryAssurance.getQuality(), "AtLeastOnce"); RMProviderConfig provider = wsrmConfig.getProvider(); assertEquals(provider.getSpecVersion(), "http://docs.oasis-open.org/ws-rx/wsrm/200702"); - RMMessageStoreConfig messageStore = wsrmConfig.getMessageStore(); - assertEquals(messageStore.getId(), "wsrmStoreId"); - assertEquals(messageStore.getClassName(), "custom.MessageStoreImpl"); - assertEquals(messageStore.getConfigFile(), "META-INF/config.xml"); List<RMPortConfig> ports = wsrmConfig.getPorts(); RMPortConfig port1 = ports.get(0); assertEquals(port1.getPortName(), new QName("http://custom/namespace/", "Port1"));