[jbossws-commits] JBossWS SVN: r2015 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-01-21 07:37:13 -0500 (Sun, 21 Jan 2007) New Revision: 2015 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java Removed: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceObjectFactory.java trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceReferenceable.java Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java Log: Move @WebServiceRef handling to core Fix usRef thread association Deleted: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceObjectFactory.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceObjectFactory.java 2007-01-19 16:17:19 UTC (rev 2014) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceObjectFactory.java 2007-01-21 12:37:13 UTC (rev 2015) @@ -1,296 +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. - */ -// $Id$ -package org.jboss.ws.integration.jboss50; - -// $Id$ - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Hashtable; - -import javax.naming.Context; -import javax.naming.Name; -import javax.naming.NamingException; -import javax.naming.RefAddr; -import javax.naming.Reference; -import javax.naming.spi.ObjectFactory; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.ConfigProvider; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; -import org.jboss.ws.core.jaxws.spi.ServiceDelegateImpl; -import org.jboss.ws.core.server.UnifiedVirtualFile; - -/** - * This ServiceObjectFactory reconstructs a javax.xml.ws.Service - * for a given WSDL when the webservice client does a JNDI lookup - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Oct-2004 - */ -public class ServiceObjectFactory implements ObjectFactory -{ - // provide logging - private static final Logger log = Logger.getLogger(ServiceObjectFactory.class); - - /** - * Creates an object using the location or reference information specified. - * <p/> - * - * @param obj The possibly null object containing location or reference - * information that can be used in creating an object. - * @param name The name of this object relative to <code>nameCtx</code>, - * or null if no name is specified. - * @param nameCtx The context relative to which the <code>name</code> - * parameter is specified, or null if <code>name</code> is - * relative to the default initial context. - * @param environment The possibly null environment that is used in - * creating the object. - * @return The object created; null if an object cannot be created. - * @throws Exception if this object factory encountered an exception - * while attempting to create an object, and no other object factories are - * to be tried. - * @see javax.naming.spi.NamingManager#getObjectInstance - * @see javax.naming.spi.NamingManager#getURLContext - */ - public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception - { - try - { - Reference ref = (Reference)obj; - - // Unmarshall the UnifiedServiceRef - UnifiedServiceRef usRef = unmarshallServiceRef(ref); - String serviceRefName = usRef.getServiceRefName(); - QName serviceQName = usRef.getServiceQName(); - - // Associate the UnifiedServiceRef with this thread - ServiceDelegateImpl.associateUnifiedServiceRef(usRef); - - String serviceClassName = usRef.getServiceClassName(); - if (serviceClassName == null) - serviceClassName = (String)ref.get(ServiceReferenceable.SERVICE_CLASS_NAME).getContent(); - - log.debug("Service class name: " + serviceClassName); - - // Load the service class - ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - Class serviceClass = ctxLoader.loadClass(serviceClassName); - - if (Service.class.isAssignableFrom(serviceClass) == false) - throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service"); - - // Load the target class - String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent(); - Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); - - log.debug("Target class name: " + serviceClassName); - - // Receives either a javax.xml.ws.Service or a dynamic proxy - Object target; - - // Get the URL to the wsdl - URL wsdlURL = getWsdlLocationURL(targetClass != null ? targetClass : serviceClass, usRef); - - // Generic javax.xml.ws.Service - if (serviceClass == Service.class) - { - if (wsdlURL != null) - { - target = Service.create(wsdlURL, serviceQName); - } - else - { - throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName); - } - } - // Generated javax.xml.ws.Service subclass - else - { - if (wsdlURL != null) - { - Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class }); - target = ctor.newInstance(new Object[] { wsdlURL, serviceQName }); - } - else - { - target = (Service)serviceClass.newInstance(); - } - } - - // Configure the service - configureService((Service)target, usRef); - - if (targetClassName != null && targetClassName.equals(serviceClassName) == false) - { - try - { - Object port = null; - if (serviceClass != Service.class) - { - for (Method method : serviceClass.getDeclaredMethods()) - { - String methodName = method.getName(); - Class retType = method.getReturnType(); - if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType)) - { - port = method.invoke(target, new Object[0]); - target = port; - break; - } - } - } - - if (port == null) - { - Method method = serviceClass.getMethod("getPort", new Class[] { Class.class }); - port = method.invoke(target, new Object[] { targetClass }); - target = port; - } - } - catch (InvocationTargetException ex) - { - throw ex.getTargetException(); - } - } - - return target; - } - catch (Throwable ex) - { - WSException.rethrow("Cannot create service", ex); - return null; - } - } - - private void configureService(Service service, UnifiedServiceRef usRef) - { - String configFile = usRef.getConfigFile(); - String configName = usRef.getConfigName(); - if (service instanceof ConfigProvider) - { - log.debug("Configure Service: [configName=" + configName + ",configFile=" + configFile + "]"); - - ConfigProvider cp = (ConfigProvider)service; - if (configFile != null) - cp.setConfigFile(configFile); - if (configName != null) - cp.setConfigName(configName); - } - } - - private UnifiedServiceRef unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException - { - UnifiedServiceRef sref; - RefAddr refAddr = ref.get(ServiceReferenceable.UNIFIED_SERVICE_REF); - ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); - try - { - ObjectInputStream ois = new ObjectInputStream(bais); - sref = (UnifiedServiceRef)ois.readObject(); - ois.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); - } - return sref; - } - - private URL getWsdlLocationURL(Class userClass, UnifiedServiceRef usRef) - { - UnifiedVirtualFile vfsRoot = usRef.getRootFile(); - String wsdlLocation = usRef.getWsdlLocation(); - - URL wsdlURL = null; - if (wsdlLocation != null) - { - // Try the wsdlLocation as URL - try - { - wsdlURL = new URL(wsdlLocation); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (wsdlURL == null) - { - try - { - File file = new File(wsdlLocation); - if (file.exists()) - wsdlURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (wsdlURL == null) - { - try - { - wsdlURL = vfsRoot.findChild(wsdlLocation).toURL(); - } - catch (Exception ex) - { - // ignore - } - } - - // Try the filename relative to class - if (wsdlURL == null) - { - String packagePath = userClass.getPackage().getName().replace('.', '/'); - String wsdlPath = packagePath + "/" + wsdlLocation; - try - { - wsdlURL = vfsRoot.findChild(wsdlPath).toURL(); - } - catch (Exception ex) - { - // ignore - } - } - - if (wsdlURL == null) - throw new IllegalArgumentException("Cannot get URL for: " + wsdlLocation); - } - return wsdlURL; - } -} Deleted: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceReferenceable.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceReferenceable.java 2007-01-19 16:17:19 UTC (rev 2014) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceReferenceable.java 2007-01-21 12:37:13 UTC (rev 2015) @@ -1,97 +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. - */ -// $Id$ -package org.jboss.ws.integration.jboss50; - -// $Id$ - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; - -import javax.naming.BinaryRefAddr; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.Referenceable; -import javax.naming.StringRefAddr; - -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; - -/** - * A JNDI reference to a javax.xml.ws.Service - * - * It holds the information to reconstrut the javax.xml.ws.Service - * when the client does a JNDI lookup. - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Oct-2006 - */ -public class ServiceReferenceable implements Referenceable -{ - public static final String UNIFIED_SERVICE_REF = "UNIFIED_SERVICE_REF"; - public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME"; - public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; - - private String serviceClassName; - private String targetClassName; - private UnifiedServiceRef usRef; - - public ServiceReferenceable(String serviceClassName, String targetClassName, UnifiedServiceRef usRef) - { - this.serviceClassName = serviceClassName; - this.targetClassName = targetClassName; - this.usRef = usRef; - } - - /** - * 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(), ServiceObjectFactory.class.getName(), null); - - myRef.add(new StringRefAddr(SERVICE_CLASS_NAME, serviceClassName)); - myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); - myRef.add(new BinaryRefAddr(UNIFIED_SERVICE_REF, marshall(usRef))); - - return myRef; - } - - private byte[] marshall(Object obj) throws NamingException - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); - try - { - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(obj); - oos.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot marshall object, cause: " + e.toString()); - } - return baos.toByteArray(); - } -} \ No newline at end of file Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-01-19 16:17:19 UTC (rev 2014) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-01-21 12:37:13 UTC (rev 2015) @@ -35,6 +35,7 @@ import org.jboss.util.naming.Util; import org.jboss.virtual.VirtualFile; import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxws.client.ServiceReferenceable; import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; /** Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java (from rev 2014, trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceObjectFactory.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-01-21 12:37:13 UTC (rev 2015) @@ -0,0 +1,310 @@ +/* + * 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. + */ +// $Id$ +package org.jboss.ws.core.jaxws.client; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Hashtable; + +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NamingException; +import javax.naming.RefAddr; +import javax.naming.Reference; +import javax.naming.spi.ObjectFactory; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.ConfigProvider; +import org.jboss.ws.core.server.UnifiedVirtualFile; + +/** + * This ServiceObjectFactory reconstructs a javax.xml.ws.Service + * for a given WSDL when the webservice client does a JNDI lookup + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Oct-2004 + */ +public class ServiceObjectFactory implements ObjectFactory +{ + // provide logging + private static final Logger log = Logger.getLogger(ServiceObjectFactory.class); + + // The UnifiedServiceRef association + private static ThreadLocal serviceRefAssociation = new ThreadLocal(); + + /** + * Creates an object using the location or reference information specified. + * <p/> + * + * @param obj The possibly null object containing location or reference + * information that can be used in creating an object. + * @param name The name of this object relative to <code>nameCtx</code>, + * or null if no name is specified. + * @param nameCtx The context relative to which the <code>name</code> + * parameter is specified, or null if <code>name</code> is + * relative to the default initial context. + * @param environment The possibly null environment that is used in + * creating the object. + * @return The object created; null if an object cannot be created. + * @throws Exception if this object factory encountered an exception + * while attempting to create an object, and no other object factories are + * to be tried. + * @see javax.naming.spi.NamingManager#getObjectInstance + * @see javax.naming.spi.NamingManager#getURLContext + */ + public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception + { + try + { + Reference ref = (Reference)obj; + + // Unmarshall the UnifiedServiceRef + UnifiedServiceRef usRef = unmarshallServiceRef(ref); + String serviceRefName = usRef.getServiceRefName(); + QName serviceQName = usRef.getServiceQName(); + + String serviceClassName = usRef.getServiceClassName(); + if (serviceClassName == null) + serviceClassName = (String)ref.get(ServiceReferenceable.SERVICE_CLASS_NAME).getContent(); + + log.debug("Service class name: " + serviceClassName); + + // Load the service class + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + Class serviceClass = ctxLoader.loadClass(serviceClassName); + + if (Service.class.isAssignableFrom(serviceClass) == false) + throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service"); + + // Load the target class + String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent(); + Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); + + log.debug("Target class name: " + serviceClassName); + + // Receives either a javax.xml.ws.Service or a dynamic proxy + Object target; + + // Get the URL to the wsdl + URL wsdlURL = getWsdlLocationURL(targetClass != null ? targetClass : serviceClass, usRef); + + try + { + // Associate the UnifiedServiceRef with this thread + serviceRefAssociation.set(usRef); + + // Generic javax.xml.ws.Service + if (serviceClass == Service.class) + { + if (wsdlURL != null) + { + target = Service.create(wsdlURL, serviceQName); + } + else + { + throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName); + } + } + // Generated javax.xml.ws.Service subclass + else + { + if (wsdlURL != null) + { + Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class }); + target = ctor.newInstance(new Object[] { wsdlURL, serviceQName }); + } + else + { + target = (Service)serviceClass.newInstance(); + } + } + } + finally + { + serviceRefAssociation.set(null); + } + + // Configure the service + configureService((Service)target, usRef); + + if (targetClassName != null && targetClassName.equals(serviceClassName) == false) + { + try + { + Object port = null; + if (serviceClass != Service.class) + { + for (Method method : serviceClass.getDeclaredMethods()) + { + String methodName = method.getName(); + Class retType = method.getReturnType(); + if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType)) + { + port = method.invoke(target, new Object[0]); + target = port; + break; + } + } + } + + if (port == null) + { + Method method = serviceClass.getMethod("getPort", new Class[] { Class.class }); + port = method.invoke(target, new Object[] { targetClass }); + target = port; + } + } + catch (InvocationTargetException ex) + { + throw ex.getTargetException(); + } + } + + return target; + } + catch (Throwable ex) + { + WSException.rethrow("Cannot create service", ex); + return null; + } + } + + public static UnifiedServiceRef getUnifiedServiceRefAssociation() + { + // The ServiceDelegateImpl get the usRef at ctor time + return (UnifiedServiceRef)serviceRefAssociation.get(); + } + + private void configureService(Service service, UnifiedServiceRef usRef) + { + String configFile = usRef.getConfigFile(); + String configName = usRef.getConfigName(); + if (service instanceof ConfigProvider) + { + log.debug("Configure Service: [configName=" + configName + ",configFile=" + configFile + "]"); + + ConfigProvider cp = (ConfigProvider)service; + if (configFile != null) + cp.setConfigFile(configFile); + if (configName != null) + cp.setConfigName(configName); + } + } + + private UnifiedServiceRef unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException + { + UnifiedServiceRef sref; + RefAddr refAddr = ref.get(ServiceReferenceable.UNIFIED_SERVICE_REF); + ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); + try + { + ObjectInputStream ois = new ObjectInputStream(bais); + sref = (UnifiedServiceRef)ois.readObject(); + ois.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); + } + return sref; + } + + private URL getWsdlLocationURL(Class userClass, UnifiedServiceRef usRef) + { + UnifiedVirtualFile vfsRoot = usRef.getRootFile(); + String wsdlLocation = usRef.getWsdlLocation(); + + URL wsdlURL = null; + if (wsdlLocation != null) + { + // Try the wsdlLocation as URL + try + { + wsdlURL = new URL(wsdlLocation); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (wsdlURL == null) + { + try + { + File file = new File(wsdlLocation); + if (file.exists()) + wsdlURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (wsdlURL == null) + { + try + { + wsdlURL = vfsRoot.findChild(wsdlLocation).toURL(); + } + catch (Exception ex) + { + // ignore + } + } + + // Try the filename relative to class + if (wsdlURL == null) + { + String packagePath = userClass.getPackage().getName().replace('.', '/'); + String wsdlPath = packagePath + "/" + wsdlLocation; + try + { + wsdlURL = vfsRoot.findChild(wsdlPath).toURL(); + } + catch (Exception ex) + { + // ignore + } + } + + if (wsdlURL == null) + throw new IllegalArgumentException("Cannot get URL for: " + wsdlLocation); + } + return wsdlURL; + } +} Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java (from rev 2014, trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceReferenceable.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-01-21 12:37:13 UTC (rev 2015) @@ -0,0 +1,96 @@ +/* + * 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. + */ +// $Id$ +package org.jboss.ws.core.jaxws.client; + +// $Id$ + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; + +import javax.naming.BinaryRefAddr; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; +import javax.naming.StringRefAddr; + + +/** + * A JNDI reference to a javax.xml.ws.Service + * + * It holds the information to reconstrut the javax.xml.ws.Service + * when the client does a JNDI lookup. + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Oct-2006 + */ +public class ServiceReferenceable implements Referenceable +{ + public static final String UNIFIED_SERVICE_REF = "UNIFIED_SERVICE_REF"; + public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME"; + public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; + + private String serviceClassName; + private String targetClassName; + private UnifiedServiceRef usRef; + + public ServiceReferenceable(String serviceClassName, String targetClassName, UnifiedServiceRef usRef) + { + this.serviceClassName = serviceClassName; + this.targetClassName = targetClassName; + this.usRef = usRef; + } + + /** + * 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(), ServiceObjectFactory.class.getName(), null); + + myRef.add(new StringRefAddr(SERVICE_CLASS_NAME, serviceClassName)); + myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); + myRef.add(new BinaryRefAddr(UNIFIED_SERVICE_REF, marshall(usRef))); + + return myRef; + } + + private byte[] marshall(Object obj) throws NamingException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(512); + try + { + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(obj); + oos.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot marshall object, cause: " + e.toString()); + } + return baos.toByteArray(); + } +} \ No newline at end of file Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-19 16:17:19 UTC (rev 2014) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-21 12:37:13 UTC (rev 2015) @@ -23,6 +23,28 @@ // $Id$ +import java.lang.reflect.Proxy; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import javax.jws.WebService; +import javax.xml.bind.JAXBContext; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Dispatch; +import javax.xml.ws.EndpointReference; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.handler.HandlerResolver; +import javax.xml.ws.spi.ServiceDelegate; + import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.StubExt; @@ -31,32 +53,16 @@ import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.NameValuePair; import org.jboss.ws.core.jaxws.client.PortInfo; +import org.jboss.ws.core.jaxws.client.ServiceObjectFactory; import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import javax.jws.WebService; -import javax.xml.bind.JAXBContext; -import javax.xml.namespace.QName; -import javax.xml.ws.*; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.handler.HandlerResolver; -import javax.xml.ws.spi.ServiceDelegate; -import java.lang.reflect.Proxy; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - /** * Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations. * @@ -73,10 +79,10 @@ // The executor service private static ExecutorService defaultExecutor = Executors.newCachedThreadPool(); - // The UnifiedServiceRef association - private static ThreadLocal serviceRefAssociation = new ThreadLocal(); // The service meta data that is associated with this JAXWS Service private ServiceMetaData serviceMetaData; + // The UnifiedServiceRef supplied by the ServiceObjectFactory + private UnifiedServiceRef usRef; // The handler resolver private HandlerResolver handlerResolver = new HandlerResolverImpl(); // The executor service @@ -87,6 +93,10 @@ public ServiceDelegateImpl(URL wsdlURL, QName serviceName) { + // If this Service was constructed through the ServiceObjectFactory + // this thread local association should be available + usRef = ServiceObjectFactory.getUnifiedServiceRefAssociation(); + if (wsdlURL != null) { JAXWSClientMetaDataBuilder builder = new JAXWSClientMetaDataBuilder(); @@ -100,11 +110,6 @@ } } - public static void associateUnifiedServiceRef(UnifiedServiceRef usRef) - { - serviceRefAssociation.set(usRef); - } - /** * The getPort method returns a stub. A service client uses this stub to invoke operations on the target service endpoint. * The serviceEndpointInterface specifies the service endpoint interface that is supported by the created dynamic proxy or stub instance. @@ -330,7 +335,6 @@ String seiName = epMetaData.getServiceEndpointInterfaceName(); QName portName = epMetaData.getPortName(); - UnifiedServiceRef usRef = (UnifiedServiceRef)serviceRefAssociation.get(); if(usRef == null || usRef.getPortInfos().size() == 0) { log.debug("No port configuration for: " + portName);