[jbossws-commits] JBossWS SVN: r1643 - in trunk/src: main/java/org/jboss/ws/integration/jboss50 main/java/org/jboss/ws/metadata/builder/jaxrpc main/java/org/jboss/ws/metadata/builder/jaxws main/java/org/jboss/ws/metadata/config main/java/org/jboss/ws/metadata/config/binding main/java/org/jboss/ws/metadata/config/jaxrpc main/java/org/jboss/ws/metadata/config/jaxws main/java/org/jboss/ws/metadata/umdm test/java/org/jboss/test/ws/common/config

Author: heiko.braun(a)jboss.com Date: 2006-12-14 06:57:37 -0500 (Thu, 14 Dec 2006) New Revision: 1643 Added: trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/src/main/java/org/jboss/ws/metadata/config/binding/ trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ClientConfigJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/EndpointConfigJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ClientConfigJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/EndpointConfigJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java Removed: trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java trunk/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java trunk/src/main/java/org/jboss/ws/metadata/config/WSEndpointProperty.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSClientConfigJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigRootJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSClientConfigJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigRootJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java Log: Cleanup config package Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -31,7 +31,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; -import org.jboss.ws.metadata.config.WSCommonConfig; +import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; @@ -72,7 +72,7 @@ sepMetaData.clearHandlers(); // Add pre handlers - WSCommonConfig sepConfig = sepMetaData.getEndpointConfig(); + CommonConfig sepConfig = sepMetaData.getEndpointConfig(); sepMetaData.addHandlers(sepConfig.getHandlers(sepMetaData, HandlerType.PRE)); // Restore the endpoint handlers Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -32,7 +32,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.metadata.config.jaxrpc.WSClientConfigJAXRPC; +import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; @@ -219,7 +219,7 @@ private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData) { // Add pre handlers - WSClientConfigJAXRPC jaxrpcConfig = (WSClientConfigJAXRPC)epMetaData.getEndpointConfig(); + ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)epMetaData.getEndpointConfig(); epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.PRE)); // Setup the endpoint handlers Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; +import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; @@ -221,7 +221,7 @@ setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping); // Add pre handlers - WSEndpointConfigJAXRPC jaxrpcConfig = (WSEndpointConfigJAXRPC)sepMetaData.getEndpointConfig(); + EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)sepMetaData.getEndpointConfig(); sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE)); // Setup the endpoint handlers Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -27,7 +27,7 @@ import javax.xml.ws.BindingType; import org.jboss.logging.Logger; -import org.jboss.ws.metadata.config.jaxws.WSClientConfigJAXWS; +import org.jboss.ws.metadata.config.jaxws.ClientConfigJAXWS; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; @@ -64,7 +64,7 @@ epMetaData.clearHandlers(); // Add pre handlers - WSClientConfigJAXWS jaxwsConfig = (WSClientConfigJAXWS)epMetaData.getEndpointConfig(); + ClientConfigJAXWS jaxwsConfig = (ClientConfigJAXWS)epMetaData.getEndpointConfig(); epMetaData.addHandlers(jaxwsConfig.getHandlers(epMetaData, HandlerType.PRE)); // Process an optional @HandlerChain annotation Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -74,7 +74,7 @@ import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.acessor.JAXBAccessor; import org.jboss.ws.metadata.builder.MetaDataBuilder; -import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS; +import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainFactory; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; @@ -1028,7 +1028,7 @@ log.warn("@SOAPMessageHandlers is deprecated as of JAX-WS 2.0 with no replacement."); // Add pre handlers - WSEndpointConfigJAXWS jaxrpcConfig = (WSEndpointConfigJAXWS)sepMetaData.getEndpointConfig(); + EndpointConfigJAXWS jaxrpcConfig = (EndpointConfigJAXWS)sepMetaData.getEndpointConfig(); sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE)); // Process an optional @HandlerChain annotation Copied: trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java (from rev 1642, trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,115 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config; + +//$Id$ + +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.List; + +/** + * A common configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public abstract class CommonConfig +{ + private String configName; + 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 getFeature(URI type) { + return features.contains(type); + } + + public boolean getFeature(String uri) + { + return getFeature(nameToURI(uri)); + } + + public void setFeature(String type, boolean enabled) { + + if(enabled) { + features.add(nameToURI(type)); + } + else + features.remove(nameToURI(type)); + } + + 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; + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java (from rev 1642, trunk/src/main/java/org/jboss/ws/metadata/config/WSEndpointProperty.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/WSEndpointProperty.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,12 @@ +package org.jboss.ws.metadata.config; + +import java.net.URI; + +public class EndpointProperty +{ + public final static String MTOM_THRESHOLD = "http://org.jboss.ws/mtom#threshold"; + + public URI name; + public String value; + +} \ No newline at end of file Copied: trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java (from rev 1642, trunk/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config; + +//$Id$ + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; +import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; +import org.jboss.xb.binding.JBossXBException; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.w3c.dom.Element; + +import java.io.IOException; +import java.net.URL; + +/** + * A factory for the JBossWS endpoint/client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class JBossWSConfigFactory +{ + // provide logging + 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"; + + // Hide constructor + private JBossWSConfigFactory() + { + } + + /** Create a new instance of the factory + */ + public static JBossWSConfigFactory newInstance() + { + return new JBossWSConfigFactory(); + } + + public Object parse(URL configURL) throws IOException, JBossXBException + { + log.debug("parse: " + configURL); + + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + unmarshaller.setValidation(true); + unmarshaller.setSchemaValidation(true); + + Object wsConfig; + String nsURI = getNamespaceURI(configURL); + if (URN_JAXRPC_CONFIG.equals(nsURI)) + { + wsConfig = unmarshaller.unmarshal(configURL.openStream(), new OMFactoryJAXRPC(), null); + } + else if (URN_JAXWS_CONFIG.equals(nsURI)) + { + wsConfig = unmarshaller.unmarshal(configURL.openStream(), new OMFactoryJAXWS(), null); + } + else + { + throw new WSException("Invalid config namespace: " + nsURI); + } + + return wsConfig; + } + + private String getNamespaceURI(URL configURL) + { + try + { + Element root = DOMUtils.parse(configURL.openStream()); + return root.getNamespaceURI(); + } + catch (IOException ex) + { + throw new WSException(ex); + } + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/WSCommonConfig.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,115 +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.metadata.config; - -//$Id$ - -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.List; - -/** - * A common configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public abstract class WSCommonConfig -{ - private String configName; - private List<URI> features = new ArrayList<URI>(); - private List<WSEndpointProperty> properties = new ArrayList<WSEndpointProperty>(); - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public abstract List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type); - - public boolean getFeature(URI type) { - return features.contains(type); - } - - public boolean getFeature(String uri) - { - return getFeature(nameToURI(uri)); - } - - public void setFeature(String type, boolean enabled) { - - if(enabled) { - features.add(nameToURI(type)); - } - else - features.remove(nameToURI(type)); - } - - public void addProperty(String name, String value) - { - WSEndpointProperty p = new WSEndpointProperty(); - p.name = nameToURI(name); - p.value = value; - properties.add(p); - } - - public String getProperty(String name) - { - String value = null; - URI uri = nameToURI(name); - - for(WSEndpointProperty wsp : properties) - { - if(wsp.name.equals(uri)) - { - value = wsp.value; - break; - } - } - return value; - } - - public List<WSEndpointProperty> 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; - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/WSConfigFactory.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.config; - -//$Id$ - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.DOMUtils; -import org.jboss.ws.metadata.config.jaxrpc.WSConfigFactoryJAXRPC; -import org.jboss.ws.metadata.config.jaxws.WSConfigFactoryJAXWS; -import org.jboss.xb.binding.JBossXBException; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.w3c.dom.Element; - -import java.io.IOException; -import java.net.URL; - -/** - * A factory for the JBossWS endpoint/client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigFactory -{ - // provide logging - private final Logger log = Logger.getLogger(WSConfigFactory.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"; - - // Hide constructor - private WSConfigFactory() - { - } - - /** Create a new instance of the factory - */ - public static WSConfigFactory newInstance() - { - return new WSConfigFactory(); - } - - public Object parse(URL configURL) throws IOException, JBossXBException - { - log.debug("parse: " + configURL); - - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - unmarshaller.setValidation(true); - unmarshaller.setSchemaValidation(true); - - Object wsConfig; - String nsURI = getNamespaceURI(configURL); - if (URN_JAXRPC_CONFIG.equals(nsURI)) - { - wsConfig = unmarshaller.unmarshal(configURL.openStream(), new WSConfigFactoryJAXRPC(), null); - } - else if (URN_JAXWS_CONFIG.equals(nsURI)) - { - wsConfig = unmarshaller.unmarshal(configURL.openStream(), new WSConfigFactoryJAXWS(), null); - } - else - { - throw new WSException("Invalid config namespace: " + nsURI); - } - - return wsConfig; - } - - private String getNamespaceURI(URL configURL) - { - try - { - Element root = DOMUtils.parse(configURL.openStream()); - return root.getNamespaceURI(); - } - catch (IOException ex) - { - throw new WSException(ex); - } - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/WSEndpointProperty.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/WSEndpointProperty.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/WSEndpointProperty.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,12 +0,0 @@ -package org.jboss.ws.metadata.config; - -import java.net.URI; - -public class WSEndpointProperty -{ - public final static String MTOM_THRESHOLD = "http://org.jboss.ws/mtom#threshold"; - - public URI name; - public String value; - -} \ No newline at end of file Copied: trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java (from rev 1642, trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,180 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.binding; + +//$Id$ + +import org.jboss.logging.Logger; +import org.jboss.ws.metadata.config.EndpointProperty; +import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC; +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.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +import java.util.List; + +/** + * ObjectModelFactory for JAXRPC configurations. + * + * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.org + * @since 18-Dec-2005 + */ +public class OMFactoryJAXRPC implements ObjectModelFactory +{ + // provide logging + private final Logger log = Logger.getLogger(OMFactoryJAXRPC.class); + + public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs) + { + return new ConfigRootJAXRPC(); + } + + public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName) + { + return root; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(ConfigRootJAXRPC config, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSConfig newChild: " + localName); + if ("endpoint-config".equals(localName)) + { + EndpointConfigJAXRPC wsEndpointConfig = new EndpointConfigJAXRPC(); + config.getEndpointConfig().add(wsEndpointConfig); + return wsEndpointConfig; + } + if ("client-config".equals(localName)) + { + ClientConfigJAXRPC clientConfig = new ClientConfigJAXRPC(); + 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(CommonConfigJAXRPC 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(CommonConfigJAXRPC commonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("CommonConfig newChild: " + localName); + + if ("pre-handler-chain".equals(localName)) + { + HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null); + commonConfig.setPreHandlerChain(preHandlerChain); + return preHandlerChain; + } + if ("post-handler-chain".equals(localName)) + { + HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null); + commonConfig.setPostHandlerChain(postHandlerChain); + return postHandlerChain; + } + return null; + } + + /** + * Called when parsing of a new element started. + */ + public Object newChild(HandlerChainMetaData handlerChainMetaData, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + log.trace("WSHandlerChainConfig newChild: " + localName); + if ("handler".equals(localName)) + { + UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData); + List<UnifiedHandlerMetaData> handlers = handlerChainMetaData.getHandlers(); + handlers.add(handler); + return handler; + } + return null; + } + + /** + * 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); + else if (localName.equals("soap-header")) + handler.addSoapHeader(navigator.resolveQName(value)); + else if (localName.equals("soap-role")) + handler.addSoapRole(value); + else if (localName.equals("port-name")) + handler.addPortName(value); + } + + /** + * Called when a new simple child element with text value was read from the XML content. + */ + public void setValue(HandlerInitParam 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); + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java (from rev 1642, trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,140 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.binding; + +//$Id$ + +import org.jboss.logging.Logger; +import org.jboss.ws.metadata.config.EndpointProperty; +import org.jboss.ws.metadata.config.jaxws.*; +import org.jboss.ws.metadata.jsr181.HandlerChainFactory; +import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * ObjectModelFactory for JAXRPC configurations. + * + * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.org + * @since 18-Dec-2005 + */ +public class OMFactoryJAXWS extends HandlerChainFactory +{ + // 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; + } + + return null; + } + + /** + * 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)) + { + HandlerChainMetaData handlerChain = new HandlerChainMetaData(null); + handlerChains.getHandlerChains().add(handlerChain); + return handlerChain; + } + return null; + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ClientConfigJAXRPC.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSClientConfigJAXRPC.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSClientConfigJAXRPC.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ClientConfigJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxrpc; + + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class ClientConfigJAXRPC extends CommonConfigJAXRPC +{ +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ClientConfigJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxrpc; + +import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; + +import java.util.ArrayList; +import java.util.List; + + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public abstract class CommonConfigJAXRPC extends CommonConfig +{ + private HandlerChainMetaData preHandlerChain; + private HandlerChainMetaData postHandlerChain; + + public HandlerChainMetaData getPostHandlerChain() + { + return postHandlerChain; + } + + public void setPostHandlerChain(HandlerChainMetaData postHandlerChain) + { + this.postHandlerChain = postHandlerChain; + } + + public HandlerChainMetaData getPreHandlerChain() + { + return preHandlerChain; + } + + public void setPreHandlerChain(HandlerChainMetaData preHandlerChain) + { + this.preHandlerChain = preHandlerChain; + } + + @Override + public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) + { + List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); + + HandlerChainMetaData 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) + { + for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) + { + handlers.add(uhmd.getHandlerMetaDataJAXRPC(epMetaData, type)); + } + } + + return handlers; + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigRootJAXRPC.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigRootJAXRPC.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,94 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxrpc; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A JBossWS configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class ConfigRootJAXRPC +{ + private List<ClientConfigJAXRPC> clientConfigList = new ArrayList<ClientConfigJAXRPC>(); + private List<EndpointConfigJAXRPC> endpointConfigList = new ArrayList<EndpointConfigJAXRPC>(); + + public List<ClientConfigJAXRPC> getClientConfig() + { + return clientConfigList; + } + + public void setClientConfig(List<ClientConfigJAXRPC> clientConfig) + { + this.clientConfigList = clientConfig; + } + + public List<EndpointConfigJAXRPC> getEndpointConfig() + { + return endpointConfigList; + } + + public void setEndpointConfig(List<EndpointConfigJAXRPC> endpointConfig) + { + this.endpointConfigList = endpointConfig; + } + + public ClientConfigJAXRPC getClientConfigByName(String configName) + { + ClientConfigJAXRPC config = null; + for(ClientConfigJAXRPC aux : clientConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && clientConfigList.size() == 1) + config = clientConfigList.get(0); + + return config; + } + + public EndpointConfigJAXRPC getEndpointConfigByName(String configName) + { + EndpointConfigJAXRPC config = null; + for(EndpointConfigJAXRPC aux : endpointConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && endpointConfigList.size() == 1) + config = endpointConfigList.get(0); + + return config; + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/EndpointConfigJAXRPC.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/EndpointConfigJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxrpc; + + + +// $Id$ + +/** + * A JBossWS endpoint configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class EndpointConfigJAXRPC extends CommonConfigJAXRPC +{ +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/EndpointConfigJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSClientConfigJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSClientConfigJAXRPC.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSClientConfigJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,35 +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.metadata.config.jaxrpc; - - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSClientConfigJAXRPC extends WSCommonConfigJAXRPC -{ -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,91 +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.metadata.config.jaxrpc; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.metadata.config.WSCommonConfig; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public abstract class WSCommonConfigJAXRPC extends WSCommonConfig -{ - private HandlerChainMetaData preHandlerChain; - private HandlerChainMetaData postHandlerChain; - - public HandlerChainMetaData getPostHandlerChain() - { - return postHandlerChain; - } - - public void setPostHandlerChain(HandlerChainMetaData postHandlerChain) - { - this.postHandlerChain = postHandlerChain; - } - - public HandlerChainMetaData getPreHandlerChain() - { - return preHandlerChain; - } - - public void setPreHandlerChain(HandlerChainMetaData preHandlerChain) - { - this.preHandlerChain = preHandlerChain; - } - - @Override - public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) - { - List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - - HandlerChainMetaData 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) - { - for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) - { - handlers.add(uhmd.getHandlerMetaDataJAXRPC(epMetaData, type)); - } - } - - return handlers; - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,175 +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.metadata.config.jaxrpc; - -//$Id$ - -import java.util.List; - -import org.jboss.logging.Logger; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.config.WSEndpointProperty; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * A factory for the JBossWS endpoint/client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigFactoryJAXRPC implements ObjectModelFactory -{ - // provide logging - private final Logger log = Logger.getLogger(WSConfigFactoryJAXRPC.class); - - public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs) - { - return new WSConfigRootJAXRPC(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName) - { - return root; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSConfigRootJAXRPC wsConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSConfig newChild: " + localName); - if ("endpoint-config".equals(localName)) - { - WSEndpointConfigJAXRPC wsEndpointConfig = new WSEndpointConfigJAXRPC(); - wsConfig.getEndpointConfig().add(wsEndpointConfig); - return wsEndpointConfig; - } - if ("client-config".equals(localName)) - { - WSClientConfigJAXRPC wsClientConfig = new WSClientConfigJAXRPC(); - wsConfig.getClientConfig().add(wsClientConfig); - return wsClientConfig; - } - return null; - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(WSCommonConfigJAXRPC wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (log.isTraceEnabled()) - log.trace("WSCommonConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("config-name")) - wsCommonConfig.setConfigName(value); - if(localName.equals("feature")) - wsCommonConfig.setFeature(value, true); - - if("property-name".equals(localName)) - { - wsCommonConfig.addProperty(value, null); - } - else if("property-value".equals(localName)) - { - int lastEntry = wsCommonConfig.getProperties().isEmpty() ? 0 : wsCommonConfig.getProperties().size()-1; - WSEndpointProperty p = wsCommonConfig.getProperties().get(lastEntry); - p.value = value; - } - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSCommonConfigJAXRPC wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSCommonConfig newChild: " + localName); - - if ("pre-handler-chain".equals(localName)) - { - HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null); - wsCommonConfig.setPreHandlerChain(preHandlerChain); - return preHandlerChain; - } - if ("post-handler-chain".equals(localName)) - { - HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null); - wsCommonConfig.setPostHandlerChain(postHandlerChain); - return postHandlerChain; - } - return null; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(HandlerChainMetaData handlerChainMetaData, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSHandlerChainConfig newChild: " + localName); - if ("handler".equals(localName)) - { - UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData); - List<UnifiedHandlerMetaData> handlers = handlerChainMetaData.getHandlers(); - handlers.add(handler); - return handler; - } - return null; - } - - /** - * 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); - else if (localName.equals("soap-header")) - handler.addSoapHeader(navigator.resolveQName(value)); - else if (localName.equals("soap-role")) - handler.addSoapRole(value); - else if (localName.equals("port-name")) - handler.addPortName(value); - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(HandlerInitParam 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); - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigRootJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigRootJAXRPC.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigRootJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,94 +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.metadata.config.jaxrpc; - -import java.util.ArrayList; -import java.util.List; - - -/** - * A JBossWS configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigRootJAXRPC -{ - private List<WSClientConfigJAXRPC> clientConfigList = new ArrayList<WSClientConfigJAXRPC>(); - private List<WSEndpointConfigJAXRPC> endpointConfigList = new ArrayList<WSEndpointConfigJAXRPC>(); - - public List<WSClientConfigJAXRPC> getClientConfig() - { - return clientConfigList; - } - - public void setClientConfig(List<WSClientConfigJAXRPC> clientConfig) - { - this.clientConfigList = clientConfig; - } - - public List<WSEndpointConfigJAXRPC> getEndpointConfig() - { - return endpointConfigList; - } - - public void setEndpointConfig(List<WSEndpointConfigJAXRPC> endpointConfig) - { - this.endpointConfigList = endpointConfig; - } - - public WSClientConfigJAXRPC getClientConfigByName(String configName) - { - WSClientConfigJAXRPC config = null; - for(WSClientConfigJAXRPC aux : clientConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && clientConfigList.size() == 1) - config = clientConfigList.get(0); - - return config; - } - - public WSEndpointConfigJAXRPC getEndpointConfigByName(String configName) - { - WSEndpointConfigJAXRPC config = null; - for(WSEndpointConfigJAXRPC aux : endpointConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && endpointConfigList.size() == 1) - config = endpointConfigList.get(0); - - return config; - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.metadata.config.jaxrpc; - - - -// $Id$ - -/** - * A JBossWS endpoint configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSEndpointConfigJAXRPC extends WSCommonConfigJAXRPC -{ -} Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ClientConfigJAXWS.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSClientConfigJAXWS.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSClientConfigJAXWS.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ClientConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxws; + + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class ClientConfigJAXWS extends CommonConfigJAXWS +{ +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ClientConfigJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java (from rev 1642, trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxws; + +import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; + +import java.util.ArrayList; +import java.util.List; + +// $Id$ + +/** + * A JBossWS client configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public abstract class CommonConfigJAXWS extends CommonConfig +{ + private HandlerChainsConfigJAXWS preHandlerChains; + private HandlerChainsConfigJAXWS postHandlerChains; + + public HandlerChainsConfigJAXWS getPostHandlerChains() + { + return postHandlerChains; + } + + public void setPostHandlerChains(HandlerChainsConfigJAXWS postHandlerChain) + { + this.postHandlerChains = postHandlerChain; + } + + public HandlerChainsConfigJAXWS getPreHandlerChains() + { + return preHandlerChains; + } + + public void setPreHandlerChains(HandlerChainsConfigJAXWS preHandlerChains) + { + this.preHandlerChains = preHandlerChains; + } + + public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) + { + List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); + + HandlerChainsConfigJAXWS handlerChains; + if (type == HandlerType.PRE) + handlerChains = getPreHandlerChains(); + else if (type == HandlerType.POST) + handlerChains = getPostHandlerChains(); + else throw new IllegalArgumentException("Invalid handler type: " + type); + + if (handlerChains != null) + { + for (HandlerChainMetaData handlerChainMetaData : handlerChains.getHandlerChains()) + { + for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers()) + { + handlers.add(uhmd.getHandlerMetaDataJAXWS(epMetaData, type)); + } + } + } + + return handlers; + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigRootJAXWS.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigRootJAXWS.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,94 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxws; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A JBossWS configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class ConfigRootJAXWS +{ + private List<ClientConfigJAXWS> clientConfigList = new ArrayList<ClientConfigJAXWS>(); + private List<EndpointConfigJAXWS> endpointConfigList = new ArrayList<EndpointConfigJAXWS>(); + + public List<ClientConfigJAXWS> getClientConfig() + { + return clientConfigList; + } + + public void setClientConfig(List<ClientConfigJAXWS> clientConfig) + { + this.clientConfigList = clientConfig; + } + + public List<EndpointConfigJAXWS> getEndpointConfig() + { + return endpointConfigList; + } + + public void setEndpointConfig(List<EndpointConfigJAXWS> endpointConfig) + { + this.endpointConfigList = endpointConfig; + } + + public ClientConfigJAXWS getClientConfigByName(String configName) + { + ClientConfigJAXWS config = null; + for(ClientConfigJAXWS aux : clientConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && clientConfigList.size() == 1) + config = clientConfigList.get(0); + + return config; + } + + public EndpointConfigJAXWS getEndpointConfigByName(String configName) + { + EndpointConfigJAXWS config = null; + for(EndpointConfigJAXWS aux : endpointConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && endpointConfigList.size() == 1) + config = endpointConfigList.get(0); + + return config; + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/EndpointConfigJAXWS.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/EndpointConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxws; + + +// $Id$ + +/** + * A JBossWS endpoint configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class EndpointConfigJAXWS extends CommonConfigJAXWS +{ +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/EndpointConfigJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java (from rev 1640, trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-14 01:38:28 UTC (rev 1640) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config.jaxws; + +import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; + +import java.util.ArrayList; +import java.util.List; + + +/** + * A JBossWS handler chains configuration + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2005 + */ +public class HandlerChainsConfigJAXWS +{ + private List<HandlerChainMetaData> chains = new ArrayList<HandlerChainMetaData>(); + + public HandlerChainsConfigJAXWS() + { + } + + public List<HandlerChainMetaData> getHandlerChains() + { + return chains; + } +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSClientConfigJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSClientConfigJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSClientConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,35 +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.metadata.config.jaxws; - - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSClientConfigJAXWS extends WSCommonConfigJAXWS -{ -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,93 +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.metadata.config.jaxws; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.net.URI; - -import org.jboss.ws.metadata.config.WSCommonConfig; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - -// $Id$ - -/** - * A JBossWS client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public abstract class WSCommonConfigJAXWS extends WSCommonConfig -{ - private WSHandlerChainsConfigJAXWS preHandlerChains; - private WSHandlerChainsConfigJAXWS postHandlerChains; - - public WSHandlerChainsConfigJAXWS getPostHandlerChains() - { - return postHandlerChains; - } - - public void setPostHandlerChains(WSHandlerChainsConfigJAXWS postHandlerChain) - { - this.postHandlerChains = postHandlerChain; - } - - public WSHandlerChainsConfigJAXWS getPreHandlerChains() - { - return preHandlerChains; - } - - public void setPreHandlerChains(WSHandlerChainsConfigJAXWS preHandlerChains) - { - this.preHandlerChains = preHandlerChains; - } - - public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) - { - List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - - WSHandlerChainsConfigJAXWS handlerChains; - if (type == HandlerType.PRE) - handlerChains = getPreHandlerChains(); - else if (type == HandlerType.POST) - handlerChains = getPostHandlerChains(); - else throw new IllegalArgumentException("Invalid handler type: " + type); - - if (handlerChains != null) - { - for (HandlerChainMetaData handlerChainMetaData : handlerChains.getHandlerChains()) - { - for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers()) - { - handlers.add(uhmd.getHandlerMetaDataJAXWS(epMetaData, type)); - } - } - } - - return handlers; - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,138 +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.metadata.config.jaxws; - -//$Id$ - -import org.jboss.logging.Logger; -import org.jboss.ws.metadata.jsr181.HandlerChainFactory; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.config.WSEndpointProperty; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * A factory for the JBossWS endpoint/client configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigFactoryJAXWS extends HandlerChainFactory -{ - // provide logging - private final Logger log = Logger.getLogger(WSConfigFactoryJAXWS.class); - - public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs) - { - return new WSConfigRootJAXWS(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName) - { - return root; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSConfigRootJAXWS wsConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSConfig newChild: " + localName); - if ("endpoint-config".equals(localName)) - { - WSEndpointConfigJAXWS wsEndpointConfig = new WSEndpointConfigJAXWS(); - wsConfig.getEndpointConfig().add(wsEndpointConfig); - return wsEndpointConfig; - } - if ("client-config".equals(localName)) - { - WSClientConfigJAXWS wsClientConfig = new WSClientConfigJAXWS(); - wsConfig.getClientConfig().add(wsClientConfig); - return wsClientConfig; - } - return null; - } - - /** - * Called when a new simple child element with text value was read from the XML content. - */ - public void setValue(WSCommonConfigJAXWS wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (log.isTraceEnabled()) - log.trace("WSCommonConfig setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); - - if (localName.equals("config-name")) - wsCommonConfig.setConfigName(value); - if(localName.equals("feature")) - wsCommonConfig.setFeature(value, true); - - if("property-name".equals(localName)) - { - wsCommonConfig.addProperty(value, null); - } - else if("property-value".equals(localName)) - { - int lastEntry = wsCommonConfig.getProperties().isEmpty() ? 0 : wsCommonConfig.getProperties().size()-1; - WSEndpointProperty p = wsCommonConfig.getProperties().get(lastEntry); - p.value = value; - } - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSCommonConfigJAXWS wsCommonConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSCommonConfig newChild: " + localName); - - if ("pre-handler-chains".equals(localName)) - { - WSHandlerChainsConfigJAXWS preHandlerChains = new WSHandlerChainsConfigJAXWS(); - wsCommonConfig.setPreHandlerChains(preHandlerChains); - return preHandlerChains; - } - if ("post-handler-chains".equals(localName)) - { - WSHandlerChainsConfigJAXWS postHandlerChains = new WSHandlerChainsConfigJAXWS(); - wsCommonConfig.setPostHandlerChains(postHandlerChains); - return postHandlerChains; - } - - return null; - } - - /** - * Called when parsing of a new element started. - */ - public Object newChild(WSHandlerChainsConfigJAXWS wsHandlerChains, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - log.trace("WSHandlerChainsConfig newChild: " + localName); - - if ("handler-chain".equals(localName)) - { - HandlerChainMetaData handlerChain = new HandlerChainMetaData(null); - wsHandlerChains.getHandlerChains().add(handlerChain); - return handlerChain; - } - return null; - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigRootJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigRootJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigRootJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,94 +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.metadata.config.jaxws; - -import java.util.ArrayList; -import java.util.List; - - -/** - * A JBossWS configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSConfigRootJAXWS -{ - private List<WSClientConfigJAXWS> clientConfigList = new ArrayList<WSClientConfigJAXWS>(); - private List<WSEndpointConfigJAXWS> endpointConfigList = new ArrayList<WSEndpointConfigJAXWS>(); - - public List<WSClientConfigJAXWS> getClientConfig() - { - return clientConfigList; - } - - public void setClientConfig(List<WSClientConfigJAXWS> clientConfig) - { - this.clientConfigList = clientConfig; - } - - public List<WSEndpointConfigJAXWS> getEndpointConfig() - { - return endpointConfigList; - } - - public void setEndpointConfig(List<WSEndpointConfigJAXWS> endpointConfig) - { - this.endpointConfigList = endpointConfig; - } - - public WSClientConfigJAXWS getClientConfigByName(String configName) - { - WSClientConfigJAXWS config = null; - for(WSClientConfigJAXWS aux : clientConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && clientConfigList.size() == 1) - config = clientConfigList.get(0); - - return config; - } - - public WSEndpointConfigJAXWS getEndpointConfigByName(String configName) - { - WSEndpointConfigJAXWS config = null; - for(WSEndpointConfigJAXWS aux : endpointConfigList) - { - if (aux.getConfigName().equals(configName)) - { - config = aux; - break; - } - } - - if (config == null && endpointConfigList.size() == 1) - config = endpointConfigList.get(0); - - return config; - } -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,35 +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.metadata.config.jaxws; - - -// $Id$ - -/** - * A JBossWS endpoint configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSEndpointConfigJAXWS extends WSCommonConfigJAXWS -{ -} Deleted: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,48 +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.metadata.config.jaxws; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; - - -/** - * A JBossWS handler chains configuration - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2005 - */ -public class WSHandlerChainsConfigJAXWS -{ - private List<HandlerChainMetaData> chains = new ArrayList<HandlerChainMetaData>(); - - public WSHandlerChainsConfigJAXWS() - { - } - - public List<HandlerChainMetaData> getHandlerChains() - { - return chains; - } -} Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -30,9 +30,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.metadata.config.WSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; +import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; +import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** @@ -114,7 +114,7 @@ Object wsConfig; try { - WSConfigFactory factory = WSConfigFactory.newInstance(); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); wsConfig = factory.parse(configURL); } catch (RuntimeException rte) @@ -127,15 +127,15 @@ } // Get the client config - if (wsConfig instanceof WSConfigRootJAXRPC) + if (wsConfig instanceof ConfigRootJAXRPC) { - endpointConfig = ((WSConfigRootJAXRPC)wsConfig).getClientConfigByName(configName); + endpointConfig = ((ConfigRootJAXRPC)wsConfig).getClientConfigByName(configName); if (endpointConfig == null) throw new WSException("Cannot obtain client config: " + configName); } else { - endpointConfig = ((WSConfigRootJAXWS)wsConfig).getClientConfigByName(configName); + endpointConfig = ((ConfigRootJAXWS)wsConfig).getClientConfigByName(configName); if (endpointConfig == null) throw new WSException("Cannot obtain client config: " + configName); } Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -36,7 +36,7 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.config.WSCommonConfig; +import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import javax.jws.soap.SOAPBinding.ParameterStyle; @@ -66,7 +66,7 @@ private ServiceMetaData serviceMetaData; // The REQUIRED endpoint config - protected WSCommonConfig endpointConfig; + protected CommonConfig endpointConfig; // The REQUIRED name private QName portName; Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -25,10 +25,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.metadata.config.WSCommonConfig; -import org.jboss.ws.metadata.config.WSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS; +import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; +import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; +import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import javax.management.ObjectName; @@ -185,7 +185,7 @@ } @Override - public WSCommonConfig getEndpointConfig() + public CommonConfig getEndpointConfig() { if (endpointConfig == null) { @@ -235,7 +235,7 @@ Object wsConfig; try { - WSConfigFactory factory = WSConfigFactory.newInstance(); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); wsConfig = factory.parse(configURL); } catch (RuntimeException rte) @@ -248,15 +248,15 @@ } // Get the endpoint config - if (wsConfig instanceof WSConfigRootJAXRPC) + if (wsConfig instanceof ConfigRootJAXRPC) { - endpointConfig = ((WSConfigRootJAXRPC)wsConfig).getEndpointConfigByName(configName); + endpointConfig = ((ConfigRootJAXRPC)wsConfig).getEndpointConfigByName(configName); if (endpointConfig == null) throw new WSException("Cannot obtain endpoint config: " + configName); } else { - endpointConfig = ((WSConfigRootJAXWS)wsConfig).getEndpointConfigByName(configName); + endpointConfig = ((ConfigRootJAXWS)wsConfig).getEndpointConfigByName(configName); if (endpointConfig == null) throw new WSException("Cannot obtain endpoint config: " + configName); } Copied: trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java (from rev 1642, trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java) =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.common.config; + +import java.io.File; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; +import org.jboss.ws.metadata.config.EndpointProperty; +import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; +import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; +import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; +import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; +import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; + +/** + * Test parsing of the JBossWS config + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Dec-2004 + */ +public class ConfigFactoryTestCase extends JBossWSTest +{ + + public void testJAXRPCObjectModelFactory() throws Exception + { + File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); + assertTrue(confFile.exists()); + + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURL()); + + assertNotNull("Null config", config); + + assertEquals(2, config.getEndpointConfig().size()); + EndpointConfigJAXRPC epc1 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(0); + EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(1); + + assertEquals("Standard Endpoint", epc1.getConfigName()); + assertNull(epc1.getPreHandlerChain()); + assertNull(epc1.getPostHandlerChain()); + + assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); + HandlerChainMetaData preChain = epc2.getPreHandlerChain(); + assertEquals(1, preChain.getHandlers().size()); + UnifiedHandlerMetaData h1 = (UnifiedHandlerMetaData)preChain.getHandlers().get(0); + assertEquals("WSSecurityHandlerInbound", h1.getHandlerName()); + assertEquals("org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound", h1.getHandlerClass()); + } + + public void testFeatures() throws Exception + { + File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); + assertTrue(confFile.exists()); + + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); + assertNotNull("Null config", config); + + EndpointConfigJAXWS epConfig = config.getEndpointConfig().get(1); + assertTrue("Feature not set" , epConfig.getFeature("http://org.jboss.ws/mtom")); + + // disable feature + epConfig.setFeature("http://org.jboss.ws/mtom", false); + assertFalse("Feature still set", epConfig.getFeature("http://org.jboss.ws/mtom")); + + } + + public void testProperties() throws Exception + { + File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); + assertTrue(confFile.exists()); + + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); + assertNotNull("Null config", config); + + EndpointConfigJAXWS epConfig = config.getEndpointConfig().get(1); + String value = epConfig.getProperty(EndpointProperty.MTOM_THRESHOLD); + assertNotNull("Property does not exist", value); + assertEquals("Wrong property valule", value, "5000"); + } +} Property changes on: trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java 2006-12-14 11:39:46 UTC (rev 1642) +++ trunk/src/test/java/org/jboss/test/ws/common/config/WSConfigTestCase.java 2006-12-14 11:57:37 UTC (rev 1643) @@ -1,112 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.common.config; - -import java.io.File; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.metadata.config.WSConfigFactory; -import org.jboss.ws.metadata.config.WSEndpointProperty; -import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS; -import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS; -import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; - -/** - * Test parsing of the JBossWS config - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Dec-2004 - */ -public class WSConfigTestCase extends JBossWSTest -{ - public void testParseWithSchemaBinding() throws Exception - { - File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); - assertTrue(confFile.exists()); - - WSConfigFactory factory = WSConfigFactory.newInstance(); - //WSConfig wsConfig = factory.parseWithSchemaBinding(confFile.toURL()); - //assertJAXRPCConfig(wsConfig); - } - - public void testJAXRPCObjectModelFactory() throws Exception - { - File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); - assertTrue(confFile.exists()); - - WSConfigFactory factory = WSConfigFactory.newInstance(); - WSConfigRootJAXRPC wsConfig = (WSConfigRootJAXRPC)factory.parse(confFile.toURL()); - - assertNotNull("Null wsConfig", wsConfig); - - assertEquals(2, wsConfig.getEndpointConfig().size()); - WSEndpointConfigJAXRPC epc1 = (WSEndpointConfigJAXRPC)wsConfig.getEndpointConfig().get(0); - WSEndpointConfigJAXRPC epc2 = (WSEndpointConfigJAXRPC)wsConfig.getEndpointConfig().get(1); - - assertEquals("Standard Endpoint", epc1.getConfigName()); - assertNull(epc1.getPreHandlerChain()); - assertNull(epc1.getPostHandlerChain()); - - assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); - HandlerChainMetaData preChain = epc2.getPreHandlerChain(); - assertEquals(1, preChain.getHandlers().size()); - UnifiedHandlerMetaData h1 = (UnifiedHandlerMetaData)preChain.getHandlers().get(0); - assertEquals("WSSecurityHandlerInbound", h1.getHandlerName()); - assertEquals("org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound", h1.getHandlerClass()); - } - - public void testFeatures() throws Exception - { - File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); - assertTrue(confFile.exists()); - - WSConfigFactory factory = WSConfigFactory.newInstance(); - WSConfigRootJAXWS wsConfig = (WSConfigRootJAXWS)factory.parse(confFile.toURL()); - assertNotNull("Null wsConfig", wsConfig); - - WSEndpointConfigJAXWS epConfig = wsConfig.getEndpointConfig().get(1); - assertTrue("Feature not set" , epConfig.getFeature("http://org.jboss.ws/mtom")); - - // disable feature - epConfig.setFeature("http://org.jboss.ws/mtom", false); - assertFalse("Feature still set", epConfig.getFeature("http://org.jboss.ws/mtom")); - - } - - public void testProperties() throws Exception - { - File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); - assertTrue(confFile.exists()); - - WSConfigFactory factory = WSConfigFactory.newInstance(); - WSConfigRootJAXWS wsConfig = (WSConfigRootJAXWS)factory.parse(confFile.toURL()); - assertNotNull("Null wsConfig", wsConfig); - - WSEndpointConfigJAXWS epConfig = wsConfig.getEndpointConfig().get(1); - String value = epConfig.getProperty(WSEndpointProperty.MTOM_THRESHOLD); - assertNotNull("Property does not exist", value); - assertEquals("Wrong property valule", value, "5000"); - } -}