[jbossws-commits] JBossWS SVN: r16963 - in spi/branches/ropalka/src/main/java/org/jboss/wsf/spi: serviceref and 1 other directory.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Tue Nov 13 02:47:18 EST 2012


Author: richard.opalka at jboss.com
Date: 2012-11-13 02:47:18 -0500 (Tue, 13 Nov 2012)
New Revision: 16963

Added:
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java
Removed:
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java
Modified:
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java
Log:
[JBWS-3565] WS Ref SPI clean up

Deleted: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at 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/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at 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/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at 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/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at 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/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at 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/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at jboss.org
  * @author alessio.soldano at 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/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at jboss.com
  * @author <a href="mailto:ropalka at 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
@@ -75,6 +63,7 @@
    private String wsdlFile;
    // The optional <jaxrpc-mapping-file> element
    private String mappingFile;
+   private URL mappingURL;
    // The optional <service-qname> element
    private QName serviceQName;
    // The list <port-component-ref> elements
@@ -92,10 +81,9 @@
    private String configFile;
    // The optional URL of the actual WSDL to use, <wsdl-override> 
    private String wsdlOverride;
+   private URL wsdlLocation;
    // 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 +105,7 @@
    public UnifiedServiceRefMetaData()
    {
    }
-   
+
    public void setAddressingAnnotationSpecified(final boolean isAddressingAnnotationSpecified) {
       this.isAddressingAnnotationSpecified = isAddressingAnnotationSpecified;
    }
@@ -205,12 +193,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;
    }
@@ -232,23 +220,21 @@
 
    public void setMappingFile(String mappingFile)
    {
+      if (mappingFile != null) {
+          try
+          {
+             mappingURL = vfsRoot.findChild(mappingFile).toURL();
+          }
+          catch (Exception e)
+          {
+             throw MESSAGES.cannotFindFile(e, mappingFile);
+          }
+      }
       this.mappingFile = mappingFile;
    }
 
    public URL getMappingLocation()
    {
-      URL mappingURL = null;
-      if (mappingFile != null)
-      {
-         try
-         {
-            mappingURL = vfsRoot.findChild(mappingFile).toURL();
-         }
-         catch (Exception e)
-         {
-            throw MESSAGES.cannotFindFile(e, mappingFile);
-         }
-      }
       return mappingURL;
    }
 
@@ -336,11 +322,15 @@
    public void setWsdlFile(String wsdlFile)
    {
       this.wsdlFile = wsdlFile;
+      initWsdlLocation();
    }
+   
+   public URL getWsdlLocation() {
+       return wsdlLocation;
+   }
 
-   public URL getWsdlLocation()
+   public void initWsdlLocation()
    {
-      URL wsdlLocation = null;
       if (wsdlOverride != null)
       {
          try
@@ -378,8 +368,6 @@
             }
          }
       }
-
-      return wsdlLocation;
    }
 
    public String getConfigFile()
@@ -410,23 +398,9 @@
    public void setWsdlOverride(String wsdlOverride)
    {
       this.wsdlOverride = wsdlOverride;
+      initWsdlLocation();
    }
 
-   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 +421,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 +436,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/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at 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/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at redhat.com">Richard Opalka</a>
- */
-public interface ServiceRefBinder
-{
-   Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRef);
-}

Deleted: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at jboss.com
- */
-public interface ServiceRefBinderFactory extends SPIView
-{
-   ServiceRefBinder newServiceRefBinder(ServiceRefHandler.Type type);
-}

Deleted: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at jboss.org
- * @since 08-Mar-2007
- */
-public abstract class ServiceRefElement implements Serializable
-{
-}

Added: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java	                        (rev 0)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at redhat.com">Richard Opalka</a>
+ */
+public interface ServiceRefFactory
+{
+   Object newServiceRef(final UnifiedServiceRefMetaData serviceRef);
+}

Added: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java	                        (rev 0)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at jboss.com
+ */
+public interface ServiceRefFactoryFactory extends SPIView
+{
+   ServiceRefFactory newServiceRefFactory();
+}

Deleted: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at redhat.com">Richard Opalka</a>
- */
-public interface ServiceRefHandler
-{
-   enum Type
-   {
-      JAXRPC, JAXWS
-   };
-
-   Referenceable createReferenceable(UnifiedServiceRefMetaData serviceRefUMDM);
-}

Deleted: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java	2012-11-13 07:39:44 UTC (rev 16962)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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();
-}

Added: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java	                        (rev 0)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java	2012-11-13 07:47:18 UTC (rev 16963)
@@ -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 at redhat.com">Richard Opalka</a>
+ */
+public enum ServiceRefType
+{
+    JAXRPC, JAXWS
+}



More information about the jbossws-commits mailing list