[jbossws-commits] JBossWS SVN: r14745 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: core/jaxws/client and 3 other directories.

Author: richard.opalka(a)jboss.com Date: 2011-07-26 06:53:34 -0400 (Tue, 26 Jul 2011) New Revision: 14745 Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.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 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java Log: refactoring Native JAXWS service ref to separate package Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -22,7 +22,7 @@ package org.jboss.ws.core.client; import org.jboss.ws.core.jaxrpc.client.serviceref.NativeServiceRefBinderJAXRPC; -import org.jboss.ws.core.jaxws.client.NativeServiceRefBinderJAXWS; +import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceRefBinderJAXWS; import org.jboss.wsf.spi.serviceref.ServiceRefBinder; import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceObjectFactoryJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -1,72 +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.jaxws.client; - -import javax.xml.ws.Service; - -import org.jboss.ws.core.ConfigProvider; -import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -/** - * {@inheritDoc} - * - * @author Thomas.Diesler(a)jboss.org - * @author Richard.Opalka(a)jboss.org - * @author alessio.soldano(a)jboss.com - */ -public final class NativeServiceObjectFactoryJAXWS extends AbstractServiceObjectFactoryJAXWS -{ - private static final ThreadLocal<UnifiedServiceRefMetaData> serviceRefAssociation = new ThreadLocal<UnifiedServiceRefMetaData>(); - - public static UnifiedServiceRefMetaData getServiceRefAssociation() - { - return serviceRefAssociation.get(); - } - - @Override - protected void init(final UnifiedServiceRefMetaData serviceRefUMDM) - { - serviceRefAssociation.set(serviceRefUMDM); - } - - @Override - protected void configure(final UnifiedServiceRefMetaData serviceRefUMDM, final Service service) - { - final String configFile = serviceRefUMDM.getConfigFile(); - final String configName = serviceRefUMDM.getConfigName(); - if (service instanceof ConfigProvider) - { - final ConfigProvider cp = (ConfigProvider) service; - if (configName != null || configFile != null) - { - cp.setConfigName(configName, configFile); - } - } - } - - @Override - protected void destroy(final UnifiedServiceRefMetaData serviceRefUMDM) - { - serviceRefAssociation.set(null); - } -} Deleted: 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 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jaxws.client; - -import javax.naming.Referenceable; - -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.serviceref.ServiceRefBinder; - -/** - * Binds a JAXWS Service object to the client's ENC. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class NativeServiceRefBinderJAXWS implements ServiceRefBinder -{ - @Override - public Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRefMD) - { - return new NativeServiceReferenceableJAXWS(serviceRefMD); - } -} Deleted: 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 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceReferenceableJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -1,44 +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.jaxws.client; - -import org.jboss.ws.common.serviceref.AbstractServiceReferenceableJAXWS; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -/** - * {@inheritDoc} - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public class NativeServiceReferenceableJAXWS extends AbstractServiceReferenceableJAXWS<NativeServiceObjectFactoryJAXWS> -{ - public NativeServiceReferenceableJAXWS(final UnifiedServiceRefMetaData serviceRefMD) - { - super(serviceRefMD); - } - - @Override - protected Class<NativeServiceObjectFactoryJAXWS> getObjectFactory() - { - return NativeServiceObjectFactoryJAXWS.class; - } -} Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceObjectFactoryJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -0,0 +1,72 @@ +/* + * 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.jaxws.client.serviceref; + +import javax.xml.ws.Service; + +import org.jboss.ws.core.ConfigProvider; +import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * {@inheritDoc} + * + * @author Thomas.Diesler(a)jboss.org + * @author Richard.Opalka(a)jboss.org + * @author alessio.soldano(a)jboss.com + */ +public final class NativeServiceObjectFactoryJAXWS extends AbstractServiceObjectFactoryJAXWS +{ + private static final ThreadLocal<UnifiedServiceRefMetaData> serviceRefAssociation = new ThreadLocal<UnifiedServiceRefMetaData>(); + + public static UnifiedServiceRefMetaData getServiceRefAssociation() + { + return serviceRefAssociation.get(); + } + + @Override + protected void init(final UnifiedServiceRefMetaData serviceRefUMDM) + { + serviceRefAssociation.set(serviceRefUMDM); + } + + @Override + protected void configure(final UnifiedServiceRefMetaData serviceRefUMDM, final Service service) + { + final String configFile = serviceRefUMDM.getConfigFile(); + final String configName = serviceRefUMDM.getConfigName(); + if (service instanceof ConfigProvider) + { + final ConfigProvider cp = (ConfigProvider) service; + if (configName != null || configFile != null) + { + cp.setConfigName(configName, configFile); + } + } + } + + @Override + protected void destroy(final UnifiedServiceRefMetaData serviceRefUMDM) + { + serviceRefAssociation.set(null); + } +} Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceRefBinderJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jaxws.client.serviceref; + +import javax.naming.Referenceable; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; + +/** + * Binds a JAXWS Service object to the client's ENC. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class NativeServiceRefBinderJAXWS implements ServiceRefBinder +{ + @Override + public Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRefMD) + { + return new NativeServiceReferenceableJAXWS(serviceRefMD); + } +} Added: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java (rev 0) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/serviceref/NativeServiceReferenceableJAXWS.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -0,0 +1,44 @@ +/* + * 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.jaxws.client.serviceref; + +import org.jboss.ws.common.serviceref.AbstractServiceReferenceableJAXWS; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * {@inheritDoc} + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class NativeServiceReferenceableJAXWS extends AbstractServiceReferenceableJAXWS<NativeServiceObjectFactoryJAXWS> +{ + public NativeServiceReferenceableJAXWS(final UnifiedServiceRefMetaData serviceRefMD) + { + super(serviceRefMD); + } + + @Override + protected Class<NativeServiceObjectFactoryJAXWS> getObjectFactory() + { + return NativeServiceObjectFactoryJAXWS.class; + } +} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -64,7 +64,7 @@ import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; -import org.jboss.ws.core.jaxws.client.NativeServiceObjectFactoryJAXWS; +import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-07-26 10:46:49 UTC (rev 14744) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-07-26 10:53:34 UTC (rev 14745) @@ -41,7 +41,7 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.ResourceLoaderAdapter; -import org.jboss.ws.core.jaxws.client.NativeServiceObjectFactoryJAXWS; +import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;