[jbossws-commits] JBossWS SVN: r17004 - in common/trunk: src/main/java/org/jboss/ws/common and 1 other directories.
Author: richard.opalka(a)jboss.com
Date: 2012-11-16 08:54:26 -0500 (Fri, 16 Nov 2012)
New Revision: 17004
Removed:
common/trunk/src/main/java/org/jboss/ws/common/serviceref/
Modified:
common/trunk/
common/trunk/pom.xml
common/trunk/src/main/java/org/jboss/ws/common/Messages.java
common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java
Log:
[JBWS-3565] WS ref optimization
Property changes on: common/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /common/branches/asoldano:14028-14056
/common/branches/ropalka_JBWS-3550:16756
+ /common/branches/asoldano:14028-14056
/common/branches/ropalka:16964-17003
/common/branches/ropalka_JBWS-3550:16756
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2012-11-16 13:52:59 UTC (rev 17003)
+++ common/trunk/pom.xml 2012-11-16 13:54:26 UTC (rev 17004)
@@ -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/trunk/src/main/java/org/jboss/ws/common/Messages.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/Messages.java 2012-11-16 13:52:59 UTC
(rev 17003)
+++ common/trunk/src/main/java/org/jboss/ws/common/Messages.java 2012-11-16 13:54:26 UTC
(rev 17004)
@@ -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/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-11-16
13:52:59 UTC (rev 17003)
+++ common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-11-16
13:54:26 UTC (rev 17004)
@@ -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);