Author: richard.opalka(a)jboss.com Date: 2012-11-13 02:53:09 -0500 (Tue, 13 Nov 2012) New Revision: 16965 Removed: common/branches/ropalka/src/main/java/org/jboss/ws/common/serviceref/ Modified: common/branches/ropalka/pom.xml common/branches/ropalka/src/main/java/org/jboss/ws/common/Messages.java common/branches/ropalka/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java Log: [JBWS-3565] WS Ref SPI clean up Modified: common/branches/ropalka/pom.xml =================================================================== --- common/branches/ropalka/pom.xml 2012-11-13 07:49:47 UTC (rev 16964) +++ common/branches/ropalka/pom.xml 2012-11-13 07:53:09 UTC (rev 16965) @@ -27,7 +27,7 @@ <!-- Properties --> <properties> - <jbossws.spi.version>2.1.0.Final</jbossws.spi.version> + <jbossws.spi.version>2.1.1-SNAPSHOT</jbossws.spi.version> <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> <jboss-logging.version>3.1.2.GA</jboss-logging.version> Modified: common/branches/ropalka/src/main/java/org/jboss/ws/common/Messages.java =================================================================== --- common/branches/ropalka/src/main/java/org/jboss/ws/common/Messages.java 2012-11-13 07:49:47 UTC (rev 16964) +++ common/branches/ropalka/src/main/java/org/jboss/ws/common/Messages.java 2012-11-13 07:53:09 UTC (rev 16965) @@ -29,7 +29,6 @@ import java.util.Collection; import javax.management.ObjectName; -import javax.naming.NamingException; import javax.xml.ws.WebServiceException; import org.jboss.logging.Cause; @@ -113,12 +112,6 @@ @Message(id = 22031, value = "Cycle detected in sub-graph: %s") IllegalStateException cycleDetectedInSubGraph(Collection<?> c); - @Message(id = 22032, value = "Cannot marshall service ref meta data") - NamingException cannotMarshallServiceRefMetaData(@Cause Throwable cause); - - @Message(id = 22033, value = "Cannot unmarshall service ref meta data") - NamingException cannotUnMarshallServiceRefMetaData(@Cause Throwable cause); - @Message(id = 22034, value = "Missing VFS root for service-ref: %s") IllegalStateException missingVFSRootInServiceRef(String serviceRefName); Modified: common/branches/ropalka/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java =================================================================== --- common/branches/ropalka/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-11-13 07:49:47 UTC (rev 16964) +++ common/branches/ropalka/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-11-13 07:53:09 UTC (rev 16965) @@ -29,7 +29,6 @@ import org.jboss.ws.common.management.DefaultEndpointRegistryFactory; import org.jboss.ws.common.management.DefaultJMSEndpointResolver; import org.jboss.ws.common.security.DefaultSecurityAdapterFactory; -import org.jboss.ws.common.serviceref.DefaultServiceRefHandlerFactory; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; @@ -37,7 +36,6 @@ import org.jboss.wsf.spi.management.EndpointMetricsFactory; import org.jboss.wsf.spi.management.EndpointRegistryFactory; import org.jboss.wsf.spi.management.JMSEndpointResolver; -import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory; /** * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> @@ -66,10 +64,6 @@ { returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class, loader); } - else if (ServiceRefHandlerFactory.class.equals(spiType)) - { - returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class, loader); - } else if (SecurityAdaptorFactory.class.equals(spiType)) { returnType = loadService(spiType, DefaultSecurityAdapterFactory.class, loader);