Author: richard.opalka(a)jboss.com Date: 2010-10-26 08:48:14 -0400 (Tue, 26 Oct 2010) New Revision: 13189 Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceReferenceableJAXRPC.java Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java Log: refactoring Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java 2010-10-26 12:46:45 UTC (rev 13188) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceRefBinderJAXRPC.java 2010-10-26 12:48:14 UTC (rev 13189) @@ -36,6 +36,6 @@ @Override protected Referenceable createJAXRPCReferenceable(final UnifiedServiceRefMetaData serviceRefUMDM) { - return new ServiceReferenceable(serviceRefUMDM); + return new NativeServiceReferenceableJAXRPC(serviceRefUMDM); } } Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceReferenceableJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceReferenceableJAXRPC.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/NativeServiceReferenceableJAXRPC.java 2010-10-26 12:48:14 UTC (rev 13189) @@ -0,0 +1,182 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxrpc.client; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.net.URL; + +import javax.naming.BinaryRefAddr; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; +import javax.naming.StringRefAddr; + +import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; +import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * A JNDI reference to a javax.xml.rpc.Service + * <p/> + * It holds the information to reconstrut the javax.xml.rpc.Service + * when the client does a JNDI lookup. + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-April-2004 + */ +public class NativeServiceReferenceableJAXRPC implements Referenceable +{ + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; + public static final String SECURITY_CONFIG = "SECURITY_CONFIG"; + public static final String PORT_COMPONENT_LINK = "PORT_COMPONENT_LINK"; + public static final String PORT_COMPONENT_LINK_SERVLET = "PORT_COMPONENT_LINK_SERVLET"; + + private UnifiedServiceRefMetaData refMetaData; + private UnifiedVirtualFile vfsRoot; + + /** + * A service referenceable for a WSDL document that is part of the deployment + */ + public NativeServiceReferenceableJAXRPC(UnifiedServiceRefMetaData refMetaData) + { + this.refMetaData = refMetaData; + this.vfsRoot = refMetaData.getVfsRoot(); + } + + /** + * Retrieves the Reference of this object. + * + * @return The non-null Reference of this object. + * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. + */ + public Reference getReference() throws NamingException + { + Reference myRef = new Reference(NativeServiceReferenceableJAXRPC.class.getName(), ServiceObjectFactoryJAXRPC.class.getName(), null); + + // Add a reference to the ServiceRefMetaData and WSDLDefinitions + myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef())); + + // FIXME: JBWS-1431 Merge ws-security config with jaxrpc/jaxws config + if (getSecurityConfig() != null) + myRef.add(new BinaryRefAddr(SECURITY_CONFIG, marshallSecurityConfig())); + + // Add references to port component links + for (UnifiedPortComponentRefMetaData pcr : refMetaData.getPortComponentRefs()) + { + String pcLink = pcr.getPortComponentLink(); + if (pcLink != null) + { + myRef.add(new StringRefAddr(PORT_COMPONENT_LINK, pcLink)); + try + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + + String host = config.getWebServiceHost(); + int port = config.getWebServicePort(); + + String servletURL = "http://" + host + ":" + port + "/jbossws/pclink"; + myRef.add(new StringRefAddr(PORT_COMPONENT_LINK_SERVLET, servletURL)); + } + catch (Exception ex) + { + throw new NamingException("Cannot obtain path to PortComponentLinkServlet: " + ex); + } + } + } + + return myRef; + } + + /** Marshall the ServiceRefMetaData to an byte array + */ + private byte[] marshallServiceRef() throws NamingException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(512); + try + { + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(refMetaData); + oos.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot marshall service ref meta data, cause: " + e.toString()); + } + return baos.toByteArray(); + } + + /** Marshall the WSSecurityConfiguration to an byte array + */ + private byte[] marshallSecurityConfig() throws NamingException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(512); + try + { + WSSecurityConfiguration securityConfig = WSSecurityConfigFactory.newInstance().createConfiguration( + refMetaData.getVfsRoot(), WSSecurityOMFactory.CLIENT_RESOURCE_NAME + ); + + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(securityConfig); + oos.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot marshall security config, cause: " + e.toString()); + } + return baos.toByteArray(); + } + + private URL getSecurityConfig() + { + URL securityConfigURL = null; + try + { + UnifiedVirtualFile vfConfig = vfsRoot.findChild("WEB-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); + securityConfigURL = vfConfig.toURL(); + } + catch (IOException ex) + { + // ignore + } + try + { + UnifiedVirtualFile vfConfig = vfsRoot.findChild("META-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); + securityConfigURL = vfConfig.toURL(); + } + catch (IOException ex) + { + // ignore + } + return securityConfigURL; + } +} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2010-10-26 12:46:45 UTC (rev 13188) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2010-10-26 12:48:14 UTC (rev 13189) @@ -107,7 +107,7 @@ // Unmarshall the ServiceRefMetaData UnifiedServiceRefMetaData serviceRef = null; - RefAddr metaRefAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); + RefAddr metaRefAddr = ref.get(NativeServiceReferenceableJAXRPC.SERVICE_REF_META_DATA); ByteArrayInputStream bais = new ByteArrayInputStream((byte[])metaRefAddr.getContent()); try { @@ -124,7 +124,7 @@ // Unmarshall the WSSecurityConfiguration WSSecurityConfiguration securityConfig = null; - RefAddr wsseRefAddr = ref.get(ServiceReferenceable.SECURITY_CONFIG); + RefAddr wsseRefAddr = ref.get(NativeServiceReferenceableJAXRPC.SECURITY_CONFIG); if (wsseRefAddr != null) { bais = new ByteArrayInputStream((byte[])wsseRefAddr.getContent()); @@ -172,7 +172,7 @@ // The web service client using a port-component-link, the contet is the URL to // the PortComponentLinkServlet that will return the actual endpoint address - RefAddr pcLinkRef = ref.get(ServiceReferenceable.PORT_COMPONENT_LINK); + RefAddr pcLinkRef = ref.get(NativeServiceReferenceableJAXRPC.PORT_COMPONENT_LINK); if (pcLinkRef != null) { String pcLink = (String)pcLinkRef.getContent(); @@ -199,7 +199,7 @@ // We may be remote in the esoteric case where an appclient uses the port-comonent-link feature if (endpointAddress == null) { - String servletPath = (String)ref.get(ServiceReferenceable.PORT_COMPONENT_LINK_SERVLET).getContent(); + String servletPath = (String)ref.get(NativeServiceReferenceableJAXRPC.PORT_COMPONENT_LINK_SERVLET).getContent(); servletPath += "?pcLink=" + URLEncoder.encode(pcLink, "UTF-8"); InputStream is = new URL(servletPath).openStream(); BufferedReader br = new BufferedReader(new InputStreamReader(is)); Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2010-10-26 12:46:45 UTC (rev 13188) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2010-10-26 12:48:14 UTC (rev 13189) @@ -1,186 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxrpc.client; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; -import java.net.URL; - -import javax.naming.BinaryRefAddr; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.Referenceable; -import javax.naming.StringRefAddr; - -import org.jboss.logging.Logger; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; - -/** - * A JNDI reference to a javax.xml.rpc.Service - * <p/> - * It holds the information to reconstrut the javax.xml.rpc.Service - * when the client does a JNDI lookup. - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-April-2004 - */ -public class ServiceReferenceable implements Referenceable -{ - // provide logging - private static Logger log = Logger.getLogger(ServiceReferenceable.class); - - public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; - public static final String SECURITY_CONFIG = "SECURITY_CONFIG"; - public static final String PORT_COMPONENT_LINK = "PORT_COMPONENT_LINK"; - public static final String PORT_COMPONENT_LINK_SERVLET = "PORT_COMPONENT_LINK_SERVLET"; - - private UnifiedServiceRefMetaData refMetaData; - private UnifiedVirtualFile vfsRoot; - - /** - * A service referenceable for a WSDL document that is part of the deployment - */ - public ServiceReferenceable(UnifiedServiceRefMetaData refMetaData) - { - this.refMetaData = refMetaData; - this.vfsRoot = refMetaData.getVfsRoot(); - } - - /** - * Retrieves the Reference of this object. - * - * @return The non-null Reference of this object. - * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. - */ - public Reference getReference() throws NamingException - { - Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactoryJAXRPC.class.getName(), null); - - // Add a reference to the ServiceRefMetaData and WSDLDefinitions - myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef())); - - // FIXME: JBWS-1431 Merge ws-security config with jaxrpc/jaxws config - if (getSecurityConfig() != null) - myRef.add(new BinaryRefAddr(SECURITY_CONFIG, marshallSecurityConfig())); - - // Add references to port component links - for (UnifiedPortComponentRefMetaData pcr : refMetaData.getPortComponentRefs()) - { - String pcLink = pcr.getPortComponentLink(); - if (pcLink != null) - { - myRef.add(new StringRefAddr(PORT_COMPONENT_LINK, pcLink)); - try - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); - - String host = config.getWebServiceHost(); - int port = config.getWebServicePort(); - - String servletURL = "http://" + host + ":" + port + "/jbossws/pclink"; - myRef.add(new StringRefAddr(PORT_COMPONENT_LINK_SERVLET, servletURL)); - } - catch (Exception ex) - { - throw new NamingException("Cannot obtain path to PortComponentLinkServlet: " + ex); - } - } - } - - return myRef; - } - - /** Marshall the ServiceRefMetaData to an byte array - */ - private byte[] marshallServiceRef() throws NamingException - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); - try - { - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(refMetaData); - oos.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot marshall service ref meta data, cause: " + e.toString()); - } - return baos.toByteArray(); - } - - /** Marshall the WSSecurityConfiguration to an byte array - */ - private byte[] marshallSecurityConfig() throws NamingException - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); - try - { - WSSecurityConfiguration securityConfig = WSSecurityConfigFactory.newInstance().createConfiguration( - refMetaData.getVfsRoot(), WSSecurityOMFactory.CLIENT_RESOURCE_NAME - ); - - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(securityConfig); - oos.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot marshall security config, cause: " + e.toString()); - } - return baos.toByteArray(); - } - - private URL getSecurityConfig() - { - URL securityConfigURL = null; - try - { - UnifiedVirtualFile vfConfig = vfsRoot.findChild("WEB-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); - securityConfigURL = vfConfig.toURL(); - } - catch (IOException ex) - { - // ignore - } - try - { - UnifiedVirtualFile vfConfig = vfsRoot.findChild("META-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); - securityConfigURL = vfConfig.toURL(); - } - catch (IOException ex) - { - // ignore - } - return securityConfigURL; - } -} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2010-10-26 12:46:45 UTC (rev 13188) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2010-10-26 12:48:14 UTC (rev 13189) @@ -34,9 +34,8 @@ public final class NativeServiceRefBinderJAXWS extends AbstractServiceRefBinderJAXWS { @Override - protected Referenceable createJAXWSReferenceable(final String serviceImplClass, final String targetClassName, - final UnifiedServiceRefMetaData serviceRefUMDM) + protected Referenceable createJAXWSReferenceable(final UnifiedServiceRefMetaData serviceRefUMDM) { - return new NativeServiceReferenceableJAXWS(serviceImplClass, targetClassName, serviceRefUMDM); + return new NativeServiceReferenceableJAXWS(serviceRefUMDM); } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java 2010-10-26 12:46:45 UTC (rev 13188) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java 2010-10-26 12:48:14 UTC (rev 13189) @@ -27,15 +27,13 @@ /** * {@inheritDoc} * - * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public class NativeServiceReferenceableJAXWS extends AbstractServiceReferenceableJAXWS<NativeServiceObjectFactoryJAXWS> { - public NativeServiceReferenceableJAXWS(final String serviceImplClass, final String targetClassName, - final UnifiedServiceRefMetaData serviceRefUMDM) + public NativeServiceReferenceableJAXWS(final UnifiedServiceRefMetaData serviceRefMD) { - super(serviceImplClass, targetClassName, serviceRefUMDM); + super(serviceRefMD); } @Override