Author: richard.opalka(a)jboss.com
Date: 2010-11-18 08:14:38 -0500 (Thu, 18 Nov 2010)
New Revision: 13294
Removed:
framework/trunk/testsuite/test/java/org/w3/
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
Log:
[JBWS-3161] move service ref type detection to the callers logic
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java
===================================================================
---
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-11-18
13:09:32 UTC (rev 13293)
+++
framework/trunk/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2010-11-18
13:14:38 UTC (rev 13294)
@@ -44,19 +44,14 @@
{
throw new IllegalStateException("VFSRoot must be provided");
}
- final Type type = this.getServiceRefType(serviceRefMD);
+ if (serviceRefMD.getType() == null)
+ {
+ throw new IllegalStateException("Service reference type must be
provided");
+ }
- return this.getBinder(type).createReferenceable(serviceRefMD);
+ return this.getBinder(serviceRefMD.getType()).createReferenceable(serviceRefMD);
}
- private Type getServiceRefType(final UnifiedServiceRefMetaData serviceRefMD)
- {
- final boolean isJAXRPC = serviceRefMD.getMappingFile() != null
- ||
"javax.xml.rpc.Service".equals(serviceRefMD.getServiceInterface());
-
- return isJAXRPC ? Type.JAXRPC : Type.JAXWS;
- }
-
private ServiceRefBinder getBinder(final Type type)
{
final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
Show replies by date