[jbossws-commits] JBossWS SVN: r17002 - in spi/trunk: src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref and 1 other directories.

Author: richard.opalka(a)jboss.com Date: 2012-11-16 08:50:10 -0500 (Fri, 16 Nov 2012) New Revision: 17002 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java Modified: spi/trunk/ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java Log: [JBWS-3565] WS ref optimization Property changes on: spi/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /spi/branches/JBWS-3286:14506 /spi/branches/asoldano:14017-14042 /spi/branches/ropalka_JBWS-3550:16742 + /spi/branches/JBWS-3286:14506 /spi/branches/asoldano:14017-14042 /spi/branches/ropalka:16962-17001 /spi/branches/ropalka_JBWS-3550:16742 Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -1,71 +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.wsf.spi.metadata.j2ee.serviceref; - -import org.jboss.wsf.spi.serviceref.ServiceRefElement; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 06-May-2004 - */ -public class UnifiedCallPropertyMetaData extends ServiceRefElement -{ - // The required <prop-name> element - private String propName; - // The required <prop-value> element - private String propValue; - - public UnifiedCallPropertyMetaData(String propName, String propValue) - { - this.propName = propName; - this.propValue = propValue; - } - - public UnifiedCallPropertyMetaData() - { - } - - public String getPropName() - { - return propName; - } - - public void setPropName(String paramName) - { - this.propName = paramName; - } - - public String getPropValue() - { - return propValue; - } - - public void setPropValue(String paramValue) - { - this.propValue = paramValue; - } - - public String toString() - { - return "[name=" + propName + ",value=" + propValue + "]"; - } -} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -21,19 +21,19 @@ */ package org.jboss.wsf.spi.metadata.j2ee.serviceref; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.xml.namespace.QName; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; - /** The unified metadata data for a handler chain element * * @author Thomas.Diesler(a)jboss.org */ -public class UnifiedHandlerChainMetaData extends ServiceRefElement +public class UnifiedHandlerChainMetaData implements Serializable { + private static final long serialVersionUID = 1L; private QName serviceNamePattern; private QName portNamePattern; private String protocolBindings; @@ -41,11 +41,6 @@ private boolean excluded; private String id; - @Deprecated - public UnifiedHandlerChainMetaData(UnifiedHandlerChainsMetaData handlerChains) - { - } - public UnifiedHandlerChainMetaData() { } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -21,26 +21,20 @@ */ package org.jboss.wsf.spi.metadata.j2ee.serviceref; +import java.io.Serializable; import java.util.LinkedList; import java.util.List; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; - /** The unified metadata data for a handler chains element * * @author Thomas.Diesler(a)jboss.org */ -public class UnifiedHandlerChainsMetaData extends ServiceRefElement +public class UnifiedHandlerChainsMetaData implements Serializable { - private HandlerType handlerType; + private static final long serialVersionUID = 1L; + private List<UnifiedHandlerChainMetaData> handlerChains = new LinkedList<UnifiedHandlerChainMetaData>(); - public UnifiedHandlerChainsMetaData(HandlerType handlerType) - { - this.handlerType = handlerType; - } - public UnifiedHandlerChainsMetaData() { } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.spi.metadata.j2ee.serviceref; +import java.io.Serializable; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -28,15 +29,15 @@ import javax.xml.namespace.QName; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; - /** * The unified metadata data for a handler element * * @author Thomas.Diesler(a)jboss.org */ -public class UnifiedHandlerMetaData extends ServiceRefElement +public class UnifiedHandlerMetaData implements Serializable { + private static final long serialVersionUID = 1L; + public enum HandlerType { PRE, ENDPOINT, POST, ALL Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -21,14 +21,15 @@ */ package org.jboss.wsf.spi.metadata.j2ee.serviceref; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; +import java.io.Serializable; /** * @author Thomas.Diesler(a)jboss.org * @since 06-May-2004 */ -public class UnifiedInitParamMetaData extends ServiceRefElement +public class UnifiedInitParamMetaData implements Serializable { + private static final long serialVersionUID = 1L; // The required <param-name> element private String paramName; // The required <param-value> element Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -21,23 +21,22 @@ */ package org.jboss.wsf.spi.metadata.j2ee.serviceref; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.xml.namespace.QName; import org.jboss.wsf.spi.Messages; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; /** The metadata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml. * * @author Thomas.Diesler(a)jboss.org * @author alessio.soldano(a)jboss.com */ -public class UnifiedPortComponentRefMetaData extends ServiceRefElement +public class UnifiedPortComponentRefMetaData implements Serializable { - private static final long serialVersionUID = 8622309745808960649L; - + private static final long serialVersionUID = 1L; // The parent service-ref private UnifiedServiceRefMetaData serviceRefMetaData; @@ -47,8 +46,6 @@ private String portComponentLink; // The optional <port-qname> element private QName portQName; - // Arbitrary proxy properties given by <call-property> - private List<UnifiedCallPropertyMetaData> callProperties = new ArrayList<UnifiedCallPropertyMetaData>(2); // Arbitrary proxy properties given by <stub-property> private List<UnifiedStubPropertyMetaData> stubProperties = new ArrayList<UnifiedStubPropertyMetaData>(2); // The optional JBossWS config-name @@ -192,21 +189,6 @@ this.portQName = portQName; } - public List<UnifiedCallPropertyMetaData> getCallProperties() - { - return callProperties; - } - - public void setCallProperties(List<UnifiedCallPropertyMetaData> callProps) - { - callProperties = callProps; - } - - public void addCallProperty(UnifiedCallPropertyMetaData callProp) - { - callProperties.add(callProp); - } - public List<UnifiedStubPropertyMetaData> getStubProperties() { return stubProperties; @@ -275,7 +257,6 @@ str.append("\n respectBindingAnnotationSpecified=" + respectBindingAnnotationSpecified); str.append("\n respectBindingEnabled=" + respectBindingEnabled); str.append("\n portComponentLink=" + portComponentLink); - str.append("\n callProperties=" + callProperties); str.append("\n stubProperties=" + stubProperties); str.append("\n configName=" + configName); str.append("\n configFile=" + configFile); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -23,15 +23,7 @@ import static org.jboss.wsf.spi.Messages.MESSAGES; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.OutputStream; +import java.io.Serializable; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -42,10 +34,7 @@ import org.jboss.wsf.spi.Loggers; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.WritableUnifiedVirtualFile; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; -import org.jboss.wsf.spi.serviceref.ServiceRefHandler; -import org.jboss.wsf.spi.util.URLLoaderAdapter; +import org.jboss.wsf.spi.serviceref.ServiceRefType; /** * The metadata from service-ref element in web.xml, ejb-jar.xml, and @@ -55,16 +44,15 @@ * @author alessio.soldano(a)jboss.com * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public final class UnifiedServiceRefMetaData extends ServiceRefElement +public final class UnifiedServiceRefMetaData implements Serializable { - private static final long serialVersionUID = -926464174132493955L; - + private static final long serialVersionUID = 1L; private transient UnifiedVirtualFile vfsRoot; - - // Standard properties - + + // Standard properties + // Service reference type - either JAX-RPC or JAXWS - private ServiceRefHandler.Type type; + private ServiceRefType type; // The required <service-ref-name> element private String serviceRefName; // The JAXRPC required <service-interface> element @@ -94,8 +82,6 @@ private String wsdlOverride; // The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor private String handlerChain; - // Arbitrary proxy properties given by <call-property> - private List<UnifiedCallPropertyMetaData> callProperties = new ArrayList<UnifiedCallPropertyMetaData>(2); // @Addressing annotation metadata private boolean isAddressingAnnotationSpecified; private boolean addressingEnabled; @@ -117,7 +103,7 @@ public UnifiedServiceRefMetaData() { } - + public void setAddressingAnnotationSpecified(final boolean isAddressingAnnotationSpecified) { this.isAddressingAnnotationSpecified = isAddressingAnnotationSpecified; } @@ -205,12 +191,12 @@ this.vfsRoot = vfsRoot; } - public ServiceRefHandler.Type getType() + public ServiceRefType getType() { return type; } - public void setType(ServiceRefHandler.Type type) + public void setType(ServiceRefType type) { this.type = type; } @@ -238,16 +224,19 @@ public URL getMappingLocation() { URL mappingURL = null; - if (mappingFile != null) - { - try - { - mappingURL = vfsRoot.findChild(mappingFile).toURL(); - } - catch (Exception e) - { - throw MESSAGES.cannotFindFile(e, mappingFile); - } + if (mappingFile != null) { + if (vfsRoot != null) { + try + { + mappingURL = vfsRoot.findChild(mappingFile).toURL(); + } + catch (Exception e) + { + throw MESSAGES.cannotFindFile(e, mappingFile); + } + } else { + mappingURL = Thread.currentThread().getContextClassLoader().getResource(mappingFile); + } } return mappingURL; } @@ -349,14 +338,18 @@ } catch (MalformedURLException e1) { - try - { - wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL(); + if (vfsRoot != null) { + try + { + wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL(); + } + catch (Exception e) + { + throw MESSAGES.cannotFindFile(e, wsdlOverride); + } + } else { + wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlOverride); } - catch (Exception e) - { - throw MESSAGES.cannotFindFile(e, wsdlOverride); - } } } @@ -368,17 +361,20 @@ } catch (MalformedURLException e1) { - try - { - wsdlLocation = vfsRoot.findChild(wsdlFile).toURL(); + if (vfsRoot != null) { + try + { + wsdlLocation = vfsRoot.findChild(wsdlFile).toURL(); + } + catch (Exception e) + { + throw MESSAGES.cannotFindFile(e, wsdlFile); + } + } else { + wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlFile); } - catch (Exception e) - { - throw MESSAGES.cannotFindFile(e, wsdlFile); - } } } - return wsdlLocation; } @@ -412,21 +408,6 @@ this.wsdlOverride = wsdlOverride; } - public List<UnifiedCallPropertyMetaData> getCallProperties() - { - return callProperties; - } - - public void setCallProperties(List<UnifiedCallPropertyMetaData> callProps) - { - callProperties = callProps; - } - - public void addCallProperty(UnifiedCallPropertyMetaData callProp) - { - callProperties.add(callProp); - } - public UnifiedHandlerChainsMetaData getHandlerChains() { return handlerChains; @@ -447,76 +428,6 @@ this.handlerChain = handlerChain; } - private void writeObject(ObjectOutputStream out) throws IOException - { - out.defaultWriteObject(); - out.writeObject(vfsRoot); - if (vfsRoot instanceof WritableUnifiedVirtualFile) - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ((WritableUnifiedVirtualFile)vfsRoot).writeContent(bos, new WritableUnifiedVirtualFile.NameFilter() { - public boolean accept(String fileName) - { - boolean result = fileName.contains("META-INF"); - result = result || fileName.endsWith(".wsdl"); - result = result || fileName.endsWith(".xsd"); - result = result || fileName.endsWith(".xml"); - return result; - } - }); - out.writeObject(bos.toByteArray()); - out.writeObject(vfsRoot.getName()); - } - } - - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException - { - in.defaultReadObject(); - UnifiedVirtualFile obj = (UnifiedVirtualFile)in.readObject(); - if (obj.toURL() == null && (obj instanceof WritableUnifiedVirtualFile)) - { - //the virtual file has been created in a different VM (or is even pointing to a different filesystem), try getting the serialized contents - byte[] bytes = (byte[])in.readObject(); - String vfName = (String)in.readObject(); - ByteArrayInputStream bis = new ByteArrayInputStream(bytes); - File tempFile = File.createTempFile("jbossws-vf-", "-" + vfName); - tempFile.deleteOnExit(); - FileOutputStream fos = new FileOutputStream(tempFile); - copyStreamAndClose(fos, bis); - this.vfsRoot = new URLLoaderAdapter(tempFile.toURI().toURL()); - } - else - { - this.vfsRoot = (UnifiedVirtualFile)obj; - } - } - - private static void copyStreamAndClose(OutputStream outs, InputStream ins) throws IOException - { - try - { - byte[] bytes = new byte[1024]; - int r = ins.read(bytes); - while (r > 0) - { - outs.write(bytes, 0, r); - r = ins.read(bytes); - } - } - catch (IOException e) - { - throw e; - } - finally{ - try { - ins.close(); - } catch (Exception e) {} - try { - outs.close(); - } catch (Exception e) {} - } - } - public String toString() { StringBuilder str = new StringBuilder(); @@ -532,7 +443,6 @@ str.append("\n mappingFile=" + mappingFile); str.append("\n configName=" + configName); str.append("\n configFile=" + configFile); - str.append("\n callProperties=" + callProperties); str.append("\n addressingAnnotationSpecified=" + isAddressingAnnotationSpecified); str.append("\n addressingEnabled=" + addressingEnabled); str.append("\n addressingRequired=" + addressingRequired); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -21,14 +21,15 @@ */ package org.jboss.wsf.spi.metadata.j2ee.serviceref; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; +import java.io.Serializable; /** * @author Thomas.Diesler(a)jboss.org * @since 06-May-2004 */ -public class UnifiedStubPropertyMetaData extends ServiceRefElement +public class UnifiedStubPropertyMetaData implements Serializable { + private static final long serialVersionUID = 1L; // The required <prop-name> element private String propName; // The required <prop-value> element Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -1,36 +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.wsf.spi.serviceref; - -import javax.naming.Referenceable; - -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -/** - * Creates a ServiceReferenceable and binds it to JNDI. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public interface ServiceRefBinder -{ - Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRef); -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -1,32 +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.wsf.spi.serviceref; - -import org.jboss.wsf.spi.SPIView; - -/** - * @author Thomas.Diesler(a)jboss.com - */ -public interface ServiceRefBinderFactory extends SPIView -{ - ServiceRefBinder newServiceRefBinder(ServiceRefHandler.Type type); -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -1,34 +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.wsf.spi.serviceref; - -import java.io.Serializable; - -/** - * A marker for all <service-ref> related objects. - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-Mar-2007 - */ -public abstract class ServiceRefElement implements Serializable -{ -} Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java (from rev 17001, spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -0,0 +1,34 @@ +/* + * 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.wsf.spi.serviceref; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * Creates service ref instance. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public interface ServiceRefFactory +{ + Object newServiceRef(final UnifiedServiceRefMetaData serviceRef); +} Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java (from rev 17001, spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -0,0 +1,32 @@ +/* + * 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.wsf.spi.serviceref; + +import org.jboss.wsf.spi.SPIView; + +/** + * @author Thomas.Diesler(a)jboss.com + */ +public interface ServiceRefFactoryFactory extends SPIView +{ + ServiceRefFactory newServiceRefFactory(); +} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -1,41 +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.wsf.spi.serviceref; - -import javax.naming.Referenceable; - -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -/** - * An implementation of this interface handles all service-ref binding concerns. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public interface ServiceRefHandler -{ - enum Type - { - JAXRPC, JAXWS - }; - - Referenceable createReferenceable(UnifiedServiceRefMetaData serviceRefUMDM); -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java 2012-11-15 13:55:24 UTC (rev 17001) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -1,29 +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.wsf.spi.serviceref; - -import org.jboss.wsf.spi.SPIView; - -public interface ServiceRefHandlerFactory extends SPIView -{ - ServiceRefHandler getServiceRefHandler(); -} Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java (from rev 17001, spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java 2012-11-16 13:50:10 UTC (rev 17002) @@ -0,0 +1,32 @@ +/* + * 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.wsf.spi.serviceref; + +/** + * Creates a ServiceReferenceable and binds it to JNDI. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public enum ServiceRefType +{ + JAXRPC, JAXWS +}