[jboss-svn-commits] JBossWS SVN: r903 - in branches/tdiesler/trunk/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/deployment main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/jaxrpc/handler main/java/org/jboss/ws/jaxws/client main/java/org/jboss/ws/jaxws/core main/java/org/jboss/ws/jaxws/handler main/java/org/jboss/ws/jaxws/spi main/java/org/jboss/ws/metadata main/java/org/jboss/ws/metadata/config/jaxrpc main/java/org/jboss/ws/metadata/config/jaxws main/java/org/jboss/ws/metadata/j2ee main/java/org/jboss/ws/metadata/jsr109 main/java/org/jboss/ws/metadata/jsr181 main/java/org/jboss/ws/metadata/wsdl main/java/org/jboss/ws/metadata/wsdl/xmlschema main/java/org/jboss/ws/metadata/wsdl/xsd main/java/org/jboss/ws/server main/java/org/jboss/ws/tools/metadata test/java/org/jboss/test/ws/samples/dynamichandler
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 6 13:21:26 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-09-06 13:20:56 -0400 (Wed, 06 Sep 2006)
New Revision: 903
Removed:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedInitParamMetaData.java
Modified:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/CommonClient.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11DefinitionFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLService.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/XSModelTypes.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HandlerDelegate.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManagerMBean.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java
Log:
Refactor handler meta data
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/CommonClient.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/CommonClient.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/CommonClient.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -54,7 +54,7 @@
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.soap.EndpointInfo;
import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.soap.SOAPBodyImpl;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -27,6 +27,7 @@
import java.net.URL;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
import javax.xml.namespace.QName;
@@ -38,6 +39,8 @@
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.jaxrpc.WSClientConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
@@ -189,7 +192,7 @@
// Init the endpoint binding
initEndpointBinding(wsdlEndpoint, epMetaData);
-
+
// Init the service encoding style
initEndpointEncodingStyle(epMetaData);
@@ -216,18 +219,25 @@
private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData)
{
+ // Add pre handlers
+ WSClientConfigJAXRPC jaxrpcConfig = (WSClientConfigJAXRPC)epMetaData.getEndpointConfig();
+ epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.PRE));
+
// Setup the endpoint handlers
if (serviceRefMetaData != null)
{
- for (UnifiedHandlerMetaData handlerMetaData : serviceRefMetaData.getHandlers())
+ for (UnifiedHandlerMetaData uhmd : serviceRefMetaData.getHandlers())
{
- List portNames = Arrays.asList(handlerMetaData.getPortNames());
+ Set<String> portNames = uhmd.getPortNames();
if (portNames.size() == 0 || portNames.contains(portName.getLocalPart()))
{
- epMetaData.addHandler(handlerMetaData);
+ epMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(epMetaData, HandlerType.ENDPOINT));
}
}
}
+
+ // Add post handlers
+ epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.POST));
}
private void setupSecurity(WSSecurityConfiguration securityConfig)
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -30,18 +30,20 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
-import org.jboss.ws.utils.DOMUtils;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
@@ -56,6 +58,7 @@
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.metadata.wsse.WSSecurityConfigurationFactory;
+import org.jboss.ws.utils.DOMUtils;
import org.w3c.dom.Element;
/**
@@ -223,15 +226,22 @@
// Setup the endpoint operations
setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping);
+ // Add pre handlers
+ WSEndpointConfigJAXRPC jaxrpcConfig = (WSEndpointConfigJAXRPC)sepMetaData.getEndpointConfig();
+ sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE));
+
// Setup the endpoint handlers
- for (UnifiedHandlerMetaData handlerMetaData : pcMetaData.getHandlers())
+ for (UnifiedHandlerMetaData uhmd : pcMetaData.getHandlers())
{
- List portNames = Arrays.asList(handlerMetaData.getPortNames());
+ Set<String> portNames = uhmd.getPortNames();
if (portNames.size() == 0 || portNames.contains(portName.getLocalPart()))
{
- sepMetaData.addHandler(handlerMetaData);
+ sepMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(sepMetaData, HandlerType.ENDPOINT));
}
}
+
+ // Add post handlers
+ sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.POST));
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -27,6 +27,8 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS;
/**
* A client side meta data builder that is based on JSR-181 annotations
@@ -42,15 +44,26 @@
public void rebuildEndpointMetaData(EndpointMetaData epMetaData, Class wsClass)
{
log.debug("START: rebuildMetaData");
-
+
+ // Process @SOAPBinding
if (wsClass.isAnnotationPresent(SOAPBinding.class))
processSOAPBinding(epMetaData, wsClass);
+ // Add pre handlers
+ WSEndpointConfigJAXWS jaxwsConfig = (WSEndpointConfigJAXWS)epMetaData.getEndpointConfig();
+ epMetaData.addHandlers(jaxwsConfig.getHandlers(epMetaData, HandlerType.PRE));
+
+ // Process an optional @HandlerChain annotation
if (wsClass.isAnnotationPresent(HandlerChain.class))
processHandlerChain(epMetaData, wsClass);
+
+ // Add post handlers
+ epMetaData.addHandlers(jaxwsConfig.getHandlers(epMetaData, HandlerType.POST));
+ // Process @WebMethod
processWebMethods(epMetaData, wsClass, true);
+ // Eager initialization
epMetaData.eagerInitialize();
log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData());
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -74,6 +74,8 @@
import org.jboss.ws.metadata.TypesMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.jsr181.HandlerChainFactory;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
@@ -164,16 +166,6 @@
boolean includeAllMethods = (wsClass == seiClass);
processWebMethods(sepMetaData, wsClass, includeAllMethods);
- // Process an optional @HandlerChain annotation
- if (sepClass.isAnnotationPresent(HandlerChain.class))
- processHandlerChain(sepMetaData, sepClass);
- else if (wsClass.isAnnotationPresent(HandlerChain.class))
- processHandlerChain(sepMetaData, wsClass);
-
- // Process an optional @SOAPMessageHandlers annotation
- if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || wsClass.isAnnotationPresent(SOAPMessageHandlers.class))
- log.warn("@SOAPMessageHandlers is deprecated as of JSR-181 2.0 with no replacement.");
-
// Process or generate WSDL
String wsdlLocation = anWebService.wsdlLocation();
processOrGenerateWSDL(wsClass, serviceMetaData, wsdlLocation, sepMetaData);
@@ -186,6 +178,23 @@
// Set the endpoint address
processPortComponent(udi, wsClass, linkName, sepMetaData);
+ // Process an optional @SOAPMessageHandlers annotation
+ if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || wsClass.isAnnotationPresent(SOAPMessageHandlers.class))
+ log.warn("@SOAPMessageHandlers is deprecated as of JSR-181 2.0 with no replacement.");
+
+ // Add pre handlers
+ WSEndpointConfigJAXWS jaxwsConfig = (WSEndpointConfigJAXWS)sepMetaData.getEndpointConfig();
+ sepMetaData.addHandlers(jaxwsConfig.getHandlers(sepMetaData, HandlerType.PRE));
+
+ // Process an optional @HandlerChain annotation
+ if (sepClass.isAnnotationPresent(HandlerChain.class))
+ processHandlerChain(sepMetaData, sepClass);
+ else if (wsClass.isAnnotationPresent(HandlerChain.class))
+ processHandlerChain(sepMetaData, wsClass);
+
+ // Add post handlers
+ sepMetaData.addHandlers(jaxwsConfig.getHandlers(sepMetaData, HandlerType.POST));
+
// init service endpoint id
ObjectName sepID = getServiceEndpointID(udi, sepMetaData);
sepMetaData.setServiceEndpointID(sepID);
@@ -533,7 +542,7 @@
try
{
- HandlerChainsMetaData handlerConfigMetaData = null;
+ HandlerChainsMetaData handlerChainsMetaData = null;
InputStream is = fileURL.openStream();
try
{
@@ -541,18 +550,19 @@
unmarshaller.setValidation(true);
unmarshaller.setSchemaValidation(true);
ObjectModelFactory factory = new HandlerChainFactory();
- handlerConfigMetaData = (HandlerChainsMetaData)unmarshaller.unmarshal(is, factory, null);
+ handlerChainsMetaData = (HandlerChainsMetaData)unmarshaller.unmarshal(is, factory, null);
}
finally
{
is.close();
}
- for (HandlerChainMetaData handlerChainMetaData : handlerConfigMetaData.getHandlerChains())
+ // Setup the endpoint handlers
+ for (HandlerChainMetaData handlerChainMetaData : handlerChainsMetaData.getHandlerChains())
{
- for (UnifiedHandlerMetaData handlerMetaData : handlerChainMetaData.getHandlers())
+ for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers())
{
- epMetaData.addHandler(handlerMetaData);
+ epMetaData.addHandler(uhmd.getHandlerMetaDataJAXWS(epMetaData, HandlerType.ENDPOINT));
}
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -23,11 +23,16 @@
// $Id: ServiceEndpointServlet.java 296 2006-05-08 19:45:49Z thomas.diesler at jboss.com $
+import java.util.List;
+
import javax.servlet.ServletContext;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.HandlerMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.WSCommonConfig;
import org.jboss.ws.server.ServiceEndpoint;
import org.jboss.ws.server.StandardEndpointServlet;
@@ -62,6 +67,21 @@
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
sepMetaData.setConfigName(configName);
sepMetaData.setConfigFile(configFile);
+
+ List<HandlerMetaData> sepHandlers = sepMetaData.getHandlers(HandlerType.ENDPOINT);
+ sepMetaData.clearHandlers();
+
+ // Add pre handlers
+ WSCommonConfig sepConfig = sepMetaData.getEndpointConfig();
+ sepMetaData.addHandlers(sepConfig.getHandlers(sepMetaData, HandlerType.PRE));
+
+ // Restore the endpoint handlers
+ sepMetaData.addHandlers(sepHandlers);
+
+ // Add post handlers
+ sepMetaData.addHandlers(sepConfig.getHandlers(sepMetaData, HandlerType.POST));
+
+ log.debug("Updated server meta data" + sepMetaData);
}
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInterceptor.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -34,7 +34,7 @@
import org.jboss.ws.jaxws.core.BindingImpl;
import org.jboss.ws.jaxws.core.BindingProviderImpl;
import org.jboss.ws.metadata.OperationMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
/**
* This Interceptor does the ws4ee handler processing.
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointInvokerEJB21.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -45,12 +45,12 @@
import org.jboss.ws.common.CommonMessageContext;
import org.jboss.ws.metadata.ServerEndpointMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.server.AbstractServiceEndpointInvoker;
import org.jboss.ws.server.ServiceEndpointInfo;
import org.jboss.ws.server.ServiceEndpointInvoker;
-import org.jboss.ws.server.AbstractServiceEndpointInvoker;
import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.utils.ObjectNameFactory;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -31,11 +31,11 @@
import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
/**
* Build container independent service ref meta data
@@ -68,17 +68,17 @@
ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
for (HandlerMetaData hmd : srmd.getHandlers())
{
- UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null, HandlerType.ENDPOINT);
+ UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null);
uhmd.setHandlerName(hmd.getHandlerName());
uhmd.setHandlerClass(hmd.getHandlerClass());
Arrays.asList(hmd.getSoapHeaders());
for (InitParamMetaData ipmd : hmd.getInitParams())
{
- UnifiedInitParamMetaData uipmd = new UnifiedInitParamMetaData();
- uipmd.setParamName(ipmd.getParamName());
- uipmd.setParamValue(ipmd.getParamValue());
- uhmd.addInitParam(uipmd);
+ HandlerInitParam ip = new HandlerInitParam();
+ ip.setParamName(ipmd.getParamName());
+ ip.setParamValue(ipmd.getParamValue());
+ uhmd.addInitParam(ip);
}
handlers.add(uhmd);
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -41,7 +41,6 @@
import javax.xml.rpc.ServiceException;
import javax.xml.rpc.Stub;
import javax.xml.rpc.encoding.SerializerFactory;
-import javax.xml.rpc.handler.HandlerChain;
import javax.xml.soap.SOAPException;
import org.jboss.logging.Logger;
@@ -57,7 +56,7 @@
import org.jboss.ws.metadata.ParameterMetaData;
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.TypesMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.utils.JavaUtils;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceObjectFactory.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -59,12 +59,13 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.ServiceMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
import org.jboss.ws.server.ServiceEndpoint;
@@ -301,27 +302,25 @@
Set<String> handlerRoles = new HashSet<String>();
ArrayList handlerInfos = new ArrayList();
- for (UnifiedHandlerMetaData uhmd : epMetaData.getHandlers(HandlerType.ALL))
+ for (HandlerMetaData handlerMetaData : epMetaData.getHandlers(HandlerType.ALL))
{
- UnifiedHandlerMetaData handlerMetaData = (UnifiedHandlerMetaData)uhmd;
- handlerRoles.addAll(handlerMetaData.getSoapRoles());
+ HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
+ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
ClassLoader cl = epMetaData.getClassLoader();
- Class hClass = cl.loadClass(handlerMetaData.getHandlerClass());
+ Class hClass = cl.loadClass(jaxrpcMetaData.getHandlerClass());
HashMap hConfig = new HashMap();
- UnifiedInitParamMetaData[] params = handlerMetaData.getInitParams();
- for (int k = 0; k < params.length; k++)
+ for (HandlerInitParam param : jaxrpcMetaData.getInitParams())
{
- UnifiedInitParamMetaData param = params[k];
hConfig.put(param.getParamName(), param.getParamValue());
}
- Set<QName> headers = handlerMetaData.getSoapHeaders();
+ Set<QName> headers = jaxrpcMetaData.getSoapHeaders();
QName[] headerArr = new QName[headers.size()];
headers.toArray(headerArr);
- hConfig.put(HandlerType.class.getName(), uhmd.getHandlerType());
+ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
log.debug("Adding client side handler to endpoint '" + portName + "': " + info);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerChainBaseImpl.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -52,7 +52,7 @@
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ParameterMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.soap.SOAPElementImpl;
import org.jboss.ws.soap.SOAPElementWriter;
import org.jboss.ws.soap.SOAPEnvelopeImpl;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/HandlerDelegateJAXRPC.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -35,10 +35,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.ServerEndpointMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
import org.jboss.ws.server.HandlerDelegate;
import org.jboss.ws.server.ServiceEndpointInfo;
import org.jboss.ws.soap.MessageContextAssociation;
@@ -141,13 +142,13 @@
List<HandlerInfo> hInfos = new ArrayList<HandlerInfo>();
ServerEndpointMetaData sepMetaData = seInfo.getServerEndpointMetaData();
- for (UnifiedHandlerMetaData uhmd : sepMetaData.getHandlers(type))
+ for (HandlerMetaData handlerMetaData : sepMetaData.getHandlers(type))
{
- UnifiedHandlerMetaData handlerMetaData = (UnifiedHandlerMetaData)uhmd;
- handlerRoles.addAll(handlerMetaData.getSoapRoles());
+ HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
+ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
Class hClass;
- String handlerClass = handlerMetaData.getHandlerClass();
+ String handlerClass = jaxrpcMetaData.getHandlerClass();
try
{
// Load the handler class using the deployments top level CL
@@ -160,18 +161,16 @@
}
HashMap<String, Object> hConfig = new HashMap<String, Object>();
- UnifiedInitParamMetaData[] params = handlerMetaData.getInitParams();
- for (int j = 0; j < params.length; j++)
+ for (HandlerInitParam param : jaxrpcMetaData.getInitParams())
{
- UnifiedInitParamMetaData param = params[j];
hConfig.put(param.getParamName(), param.getParamValue());
}
- Set<QName> headers = handlerMetaData.getSoapHeaders();
+ Set<QName> headers = jaxrpcMetaData.getSoapHeaders();
QName[] headerArr = new QName[headers.size()];
headers.toArray(headerArr);
- hConfig.put(HandlerType.class.getName(), uhmd.getHandlerType());
+ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
log.debug("Adding server side handler to service '" + sepMetaData.getQName() + "': " + info);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/handler/ServerHandlerChain.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -28,7 +28,7 @@
import javax.xml.rpc.handler.MessageContext;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
/**
* Represents a list of handlers. All elements in the
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/client/ClientImpl.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -42,7 +42,7 @@
import org.jboss.ws.jaxws.handler.PortInfoImpl;
import org.jboss.ws.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.metadata.EndpointMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.soap.MessageContextAssociation;
/**
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/core/BindingImpl.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -37,7 +37,7 @@
import org.jboss.ws.binding.EndpointInvocation;
import org.jboss.ws.binding.UnboundHeader;
import org.jboss.ws.metadata.OperationMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
/**
* The Binding interface is the base interface for JAX-WS protocol bindings.
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -33,7 +33,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.server.HandlerDelegate;
import org.jboss.ws.server.ServiceEndpointInfo;
import org.jboss.ws.soap.MessageContextAssociation;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -41,10 +41,11 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
/**
* HandlerResolver is an interface implemented by an application to get control over
@@ -130,12 +131,12 @@
public void initHandlerChain(EndpointMetaData epMetaData, HandlerType type)
{
log.debug("initHandlerChain: " + type);
- for (UnifiedHandlerMetaData uhmd : epMetaData.getHandlers(type))
+ for (HandlerMetaData handlerMetaData : epMetaData.getHandlers(type))
{
- UnifiedHandlerMetaData handlerMetaData = (UnifiedHandlerMetaData)uhmd;
- String handlerName = handlerMetaData.getHandlerName();
- String className = handlerMetaData.getHandlerClass();
- Set<QName> soapHeaders = handlerMetaData.getSoapHeaders();
+ HandlerMetaDataJAXWS jaxwsMetaData = (HandlerMetaDataJAXWS)handlerMetaData;
+ String handlerName = jaxwsMetaData.getHandlerName();
+ String className = jaxwsMetaData.getHandlerClass();
+ Set<QName> soapHeaders = jaxwsMetaData.getSoapHeaders();
try
{
@@ -150,7 +151,7 @@
if (handler instanceof GenericSOAPHandler)
((GenericSOAPHandler)handler).setHeaders(soapHeaders);
- List<PortInfo> infos = getPortInfo(epMetaData, handlerMetaData);
+ List<PortInfo> infos = getPortInfo(epMetaData, jaxwsMetaData);
for (PortInfo info : infos)
{
addHandler(info, handler);
@@ -167,7 +168,7 @@
}
}
- private List<PortInfo> getPortInfo(EndpointMetaData epMetaData, UnifiedHandlerMetaData handlerMetaData)
+ private List<PortInfo> getPortInfo(EndpointMetaData epMetaData, HandlerMetaDataJAXWS handlerMetaData)
{
String protocols = handlerMetaData.getProtocolBindings();
QName services = handlerMetaData.getServiceNamePattern();
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -55,7 +55,7 @@
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServiceMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
/**
* Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations.
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -32,14 +32,13 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.config.WSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.WSClientConfigJAXRPC;
import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC;
import org.jboss.ws.metadata.config.jaxws.WSClientConfigJAXWS;
import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS;
import org.jboss.ws.metadata.config.jaxws.WSHandlerChainsConfigJAXWS;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
/**
@@ -53,9 +52,6 @@
// provide logging
private static Logger log = Logger.getLogger(ClientEndpointMetaData.class);
- // The REWQUIRED client config
- private Object clientConfig;
-
public ClientEndpointMetaData(ServiceMetaData service, QName portName, Type type)
{
super(service, portName, type);
@@ -64,97 +60,20 @@
public void setConfigName(String configName)
{
super.setConfigName(configName);
- clientConfig = null;
+ endpointConfig = null;
}
public void setConfigFile(String configFile)
{
super.setConfigFile(configFile);
- clientConfig = null;
+ endpointConfig = null;
}
@Override
- public List<UnifiedHandlerMetaData> getHandlers(HandlerType type)
+ public Object getEndpointConfig()
{
- ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
-
- Object clientConfig = getClientConfig();
- if (clientConfig instanceof WSClientConfigJAXRPC)
+ if (endpointConfig == null)
{
- WSClientConfigJAXRPC jaxrpcConfig = (WSClientConfigJAXRPC)clientConfig;
-
- // Add pre handlers
- if (type == HandlerType.PRE || type == HandlerType.ALL)
- {
- HandlerChainMetaData preHandlerConfig = jaxrpcConfig.getPreHandlerChain();
- if (preHandlerConfig != null)
- {
- handlers.addAll(preHandlerConfig.getHandlers());
- }
- }
-
- // Add endpoint handlers
- if (type == HandlerType.ENDPOINT || type == HandlerType.ALL)
- {
- handlers.addAll(super.getHandlers(type));
- }
-
- // Add post handlers
- if (type == HandlerType.POST || type == HandlerType.ALL)
- {
- HandlerChainMetaData postHandlerConfig = jaxrpcConfig.getPostHandlerChain();
- if (postHandlerConfig != null)
- {
- handlers.addAll(postHandlerConfig.getHandlers());
- }
- }
- }
-
- // JAXWS Handlers
- else
- {
- WSClientConfigJAXWS jaxwsConfig = (WSClientConfigJAXWS)clientConfig;
-
- // Add pre handlers
- if (type == HandlerType.PRE || type == HandlerType.ALL)
- {
- WSHandlerChainsConfigJAXWS preHandlerChains = jaxwsConfig.getPreHandlerChains();
- if (preHandlerChains != null)
- {
- for (HandlerChainMetaData preHandlerChain : preHandlerChains.getHandlerChains())
- {
- handlers.addAll(preHandlerChain.getHandlers());
- }
- }
- }
-
- // Add endpoint handlers
- if (type == HandlerType.ENDPOINT || type == HandlerType.ALL)
- {
- handlers.addAll(super.getHandlers(type));
- }
-
- // Add post handlers
- if (type == HandlerType.POST || type == HandlerType.ALL)
- {
- WSHandlerChainsConfigJAXWS postHandlerChains = jaxwsConfig.getPostHandlerChains();
- if (postHandlerChains != null)
- {
- for (HandlerChainMetaData preHandlerChain : postHandlerChains.getHandlerChains())
- {
- handlers.addAll(preHandlerChain.getHandlers());
- }
- }
- }
- }
-
- return handlers;
- }
-
- private Object getClientConfig()
- {
- if (clientConfig == null)
- {
String configName = getConfigName();
if (configName == null)
{
@@ -216,26 +135,26 @@
// Get the client config
if (wsConfig instanceof WSConfigRootJAXRPC)
{
- clientConfig = ((WSConfigRootJAXRPC)wsConfig).getClientConfigByName(configName);
- if (clientConfig == null)
+ endpointConfig = ((WSConfigRootJAXRPC)wsConfig).getClientConfigByName(configName);
+ if (endpointConfig == null)
throw new WSException("Cannot obtain client config: " + configName);
}
else
{
- clientConfig = ((WSConfigRootJAXWS)wsConfig).getClientConfigByName(configName);
- if (clientConfig == null)
+ endpointConfig = ((WSConfigRootJAXWS)wsConfig).getClientConfigByName(configName);
+ if (endpointConfig == null)
throw new WSException("Cannot obtain client config: " + configName);
}
}
- return clientConfig;
+ return endpointConfig;
}
public String toString()
{
StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:");
- buffer.append("\n qname=" + getQName());
buffer.append("\n type=" + getType());
+ buffer.append("\n qname=" + getQName());
buffer.append("\n address=" + getEndpointAddress());
buffer.append("\n binding=" + getBindingId());
buffer.append("\n seiName=" + getServiceEndpointInterfaceName());
@@ -249,7 +168,7 @@
{
buffer.append("\n" + opMetaData);
}
- for (UnifiedHandlerMetaData hdlMetaData : getHandlers(HandlerType.ALL))
+ for (HandlerMetaData hdlMetaData : getHandlers(HandlerType.ALL))
{
buffer.append("\n" + hdlMetaData);
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -47,8 +47,8 @@
import org.jboss.ws.jaxws.JAXBSerializerFactory;
import org.jboss.ws.jbossxb.JBossXBDeserializerFactory;
import org.jboss.ws.jbossxb.JBossXBSerializerFactory;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.WSCommonConfig;
import org.jboss.ws.utils.JavaUtils;
/**
@@ -70,6 +70,9 @@
// The parent meta data.
private ServiceMetaData service;
+ // The REQUIRED endpoint config
+ protected WSCommonConfig endpointConfig;
+
// The REQUIRED name
private QName portName;
// The REQUIRED binding id
@@ -101,7 +104,7 @@
// The list of service meta data
private List<OperationMetaData> operations = new ArrayList<OperationMetaData>();
// The optional handlers
- private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
+ private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>();
// True if the handlers are initialized
private boolean handlersInitialized;
@@ -145,6 +148,8 @@
this.configName = configName;
}
+ public abstract Object getEndpointConfig();
+
public String getEndpointAddress()
{
return endpointAddress;
@@ -230,7 +235,7 @@
if (value != null && use != null && !use.equals(value))
throw new WSException("Mixed encoding styles not supported");
- log.debug("setEncodingStyle: " + value);
+ log.trace("setEncodingStyle: " + value);
this.use = value;
}
@@ -249,7 +254,7 @@
if (value != null && style != null && !style.equals(value))
throw new WSException("Mixed styles not supported");
- log.debug("setStyle: " + value);
+ log.trace("setStyle: " + value);
this.style = value;
}
@@ -396,8 +401,13 @@
operations.clear();
}
- public void addHandler(UnifiedHandlerMetaData handler)
+ public void addHandlers(List<HandlerMetaData> configHandlers)
{
+ handlers.addAll(configHandlers);
+ }
+
+ public void addHandler(HandlerMetaData handler)
+ {
handlers.add(handler);
}
@@ -407,12 +417,15 @@
handlersInitialized = false;
}
- public List<UnifiedHandlerMetaData> getHandlers(HandlerType type)
+ public List<HandlerMetaData> getHandlers(HandlerType type)
{
- if (type == HandlerType.PRE || type == HandlerType.POST)
- throw new IllegalArgumentException("Illegal handler type: " + type);
-
- return new ArrayList<UnifiedHandlerMetaData>(handlers);
+ List<HandlerMetaData> typeHandlers = new ArrayList<HandlerMetaData>();
+ for (HandlerMetaData hmd : handlers)
+ {
+ if (hmd.getHandlerType() == type || type == HandlerType.ALL)
+ typeHandlers.add(hmd);
+ }
+ return typeHandlers;
}
public boolean isHandlersInitialized()
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -25,23 +25,17 @@
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.WSCommonConfig;
import org.jboss.ws.metadata.config.WSConfigFactory;
import org.jboss.ws.metadata.config.jaxrpc.WSConfigRootJAXRPC;
-import org.jboss.ws.metadata.config.jaxrpc.WSEndpointConfigJAXRPC;
import org.jboss.ws.metadata.config.jaxws.WSConfigRootJAXWS;
-import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS;
-import org.jboss.ws.metadata.config.jaxws.WSHandlerChainsConfigJAXWS;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
-import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
import org.jboss.ws.server.ServiceEndpoint;
/**
@@ -60,9 +54,6 @@
public static final String SEPID_PROPERTY_CONTEXT = "context";
public static final String SEPID_PROPERTY_ENDPOINT = "endpoint";
- // The REQUIRED endpoint config
- private Object endpointConfig;
-
// The REQUIRED link name
private String linkName;
// Legacy JSR-109 port component name
@@ -166,87 +157,8 @@
}
@Override
- public List<UnifiedHandlerMetaData> getHandlers(HandlerType type)
+ public WSCommonConfig getEndpointConfig()
{
- ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
-
- Object endpointConfig = getEndpointConfig();
-
- // JAXRPC Handlers
- if (endpointConfig instanceof WSEndpointConfigJAXRPC)
- {
- WSEndpointConfigJAXRPC jaxrpcConfig = (WSEndpointConfigJAXRPC)endpointConfig;
-
- // Add pre handlers
- if (type == HandlerType.PRE || type == HandlerType.ALL)
- {
- HandlerChainMetaData preHandlerConfig = jaxrpcConfig.getPreHandlerChain();
- if (preHandlerConfig != null)
- {
- handlers.addAll(preHandlerConfig.getHandlers());
- }
- }
-
- // Add endpoint handlers
- if (type == HandlerType.ENDPOINT || type == HandlerType.ALL)
- {
- handlers.addAll(super.getHandlers(type));
- }
-
- // Add post handlers
- if (type == HandlerType.POST || type == HandlerType.ALL)
- {
- HandlerChainMetaData postHandlerConfig = jaxrpcConfig.getPostHandlerChain();
- if (postHandlerConfig != null)
- {
- handlers.addAll(postHandlerConfig.getHandlers());
- }
- }
- }
-
- // JAXWS Handlers
- else
- {
- WSEndpointConfigJAXWS jaxwsConfig = (WSEndpointConfigJAXWS)endpointConfig;
-
- // Add pre handlers
- if (type == HandlerType.PRE || type == HandlerType.ALL)
- {
- WSHandlerChainsConfigJAXWS preHandlerChains = jaxwsConfig.getPreHandlerChains();
- if (preHandlerChains != null)
- {
- for (HandlerChainMetaData preHandlerChain : preHandlerChains.getHandlerChains())
- {
- handlers.addAll(preHandlerChain.getHandlers());
- }
- }
- }
-
- // Add endpoint handlers
- if (type == HandlerType.ENDPOINT || type == HandlerType.ALL)
- {
- handlers.addAll(super.getHandlers(type));
- }
-
- // Add post handlers
- if (type == HandlerType.POST || type == HandlerType.ALL)
- {
- WSHandlerChainsConfigJAXWS postHandlerChains = jaxwsConfig.getPostHandlerChains();
- if (postHandlerChains != null)
- {
- for (HandlerChainMetaData preHandlerChain : postHandlerChains.getHandlerChains())
- {
- handlers.addAll(preHandlerChain.getHandlers());
- }
- }
- }
- }
-
- return handlers;
- }
-
- private Object getEndpointConfig()
- {
if (endpointConfig == null)
{
String configName = getConfigName();
@@ -327,8 +239,8 @@
public String toString()
{
StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:");
- buffer.append("\n qname=" + getQName());
buffer.append("\n type=" + getType());
+ buffer.append("\n qname=" + getQName());
buffer.append("\n id=" + getServiceEndpointID().getCanonicalName());
buffer.append("\n address=" + getEndpointAddress());
buffer.append("\n binding=" + getBindingId());
@@ -349,7 +261,7 @@
{
buffer.append("\n" + opMetaData);
}
- for (UnifiedHandlerMetaData hdlMetaData : getHandlers(HandlerType.ALL))
+ for (HandlerMetaData hdlMetaData : getHandlers(HandlerType.ALL))
{
buffer.append("\n" + hdlMetaData);
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSCommonConfigJAXRPC.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -21,6 +21,14 @@
*/
package org.jboss.ws.metadata.config.jaxrpc;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.WSCommonConfig;
+import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
@@ -32,22 +40,11 @@
* @author Thomas.Diesler at jboss.org
* @since 18-Dec-2005
*/
-public abstract class WSCommonConfigJAXRPC
+public abstract class WSCommonConfigJAXRPC extends WSCommonConfig
{
- private String configName;
private HandlerChainMetaData preHandlerChain;
private HandlerChainMetaData postHandlerChain;
- public String getConfigName()
- {
- return configName;
- }
-
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
public HandlerChainMetaData getPostHandlerChain()
{
return postHandlerChain;
@@ -67,4 +64,28 @@
{
this.preHandlerChain = preHandlerChain;
}
+
+ @Override
+ public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type)
+ {
+ List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>();
+
+ HandlerChainMetaData handlerChain;
+ if (type == HandlerType.PRE)
+ handlerChain = getPreHandlerChain();
+ else if (type == HandlerType.POST)
+ handlerChain = getPostHandlerChain();
+ else
+ throw new IllegalArgumentException("Invalid handler type: " + type);
+
+ if (handlerChain != null)
+ {
+ for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
+ {
+ handlers.add(uhmd.getHandlerMetaDataJAXRPC(epMetaData, type));
+ }
+ }
+
+ return handlers;
+ }
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -26,9 +26,9 @@
import java.util.List;
import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
@@ -97,13 +97,13 @@
if ("pre-handler-chain".equals(localName))
{
- HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null, HandlerType.PRE);
+ HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null);
wsCommonConfig.setPreHandlerChain(preHandlerChain);
return preHandlerChain;
}
if ("post-handler-chain".equals(localName))
{
- HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null, HandlerType.POST);
+ HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null);
wsCommonConfig.setPostHandlerChain(postHandlerChain);
return postHandlerChain;
}
@@ -118,7 +118,7 @@
log.trace("WSHandlerChainConfig newChild: " + localName);
if ("handler".equals(localName))
{
- UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData, handlerChainMetaData.getHandlerType());
+ UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData);
List<UnifiedHandlerMetaData> handlers = handlerChainMetaData.getHandlers();
handlers.add(handler);
return handler;
@@ -147,7 +147,7 @@
/**
* Called when a new simple child element with text value was read from the XML content.
*/
- public void setValue(UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (log.isTraceEnabled())
log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -21,7 +21,16 @@
*/
package org.jboss.ws.metadata.config.jaxrpc;
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
+
+
// $Id$
/**
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSCommonConfigJAXWS.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -21,6 +21,16 @@
*/
package org.jboss.ws.metadata.config.jaxws;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.config.WSCommonConfig;
+import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
+
// $Id$
/**
@@ -29,30 +39,19 @@
* @author Thomas.Diesler at jboss.org
* @since 18-Dec-2005
*/
-public abstract class WSCommonConfigJAXWS
+public abstract class WSCommonConfigJAXWS extends WSCommonConfig
{
- private String configName;
private WSHandlerChainsConfigJAXWS preHandlerChains;
- private WSHandlerChainsConfigJAXWS postHandlerChain;
+ private WSHandlerChainsConfigJAXWS postHandlerChains;
- public String getConfigName()
- {
- return configName;
- }
-
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
public WSHandlerChainsConfigJAXWS getPostHandlerChains()
{
- return postHandlerChain;
+ return postHandlerChains;
}
public void setPostHandlerChains(WSHandlerChainsConfigJAXWS postHandlerChain)
{
- this.postHandlerChain = postHandlerChain;
+ this.postHandlerChains = postHandlerChain;
}
public WSHandlerChainsConfigJAXWS getPreHandlerChains()
@@ -64,4 +63,29 @@
{
this.preHandlerChains = preHandlerChains;
}
+
+ public List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type)
+ {
+ List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>();
+
+ WSHandlerChainsConfigJAXWS handlerChains;
+ if (type == HandlerType.PRE)
+ handlerChains = getPreHandlerChains();
+ else if (type == HandlerType.POST)
+ handlerChains = getPostHandlerChains();
+ else throw new IllegalArgumentException("Invalid handler type: " + type);
+
+ if (handlerChains != null)
+ {
+ for (HandlerChainMetaData handlerChainMetaData : handlerChains.getHandlerChains())
+ {
+ for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers())
+ {
+ handlers.add(uhmd.getHandlerMetaDataJAXWS(epMetaData, type));
+ }
+ }
+ }
+
+ return handlers;
+ }
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSConfigFactoryJAXWS.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -24,7 +24,6 @@
//$Id$
import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jsr181.HandlerChainFactory;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
@@ -93,13 +92,13 @@
if ("pre-handler-chains".equals(localName))
{
- WSHandlerChainsConfigJAXWS preHandlerChains = new WSHandlerChainsConfigJAXWS(HandlerType.PRE);
+ WSHandlerChainsConfigJAXWS preHandlerChains = new WSHandlerChainsConfigJAXWS();
wsCommonConfig.setPreHandlerChains(preHandlerChains);
return preHandlerChains;
}
if ("post-handler-chains".equals(localName))
{
- WSHandlerChainsConfigJAXWS postHandlerChains = new WSHandlerChainsConfigJAXWS(HandlerType.POST);
+ WSHandlerChainsConfigJAXWS postHandlerChains = new WSHandlerChainsConfigJAXWS();
wsCommonConfig.setPostHandlerChains(postHandlerChains);
return postHandlerChains;
}
@@ -115,7 +114,7 @@
if ("handler-chain".equals(localName))
{
- HandlerChainMetaData handlerChain = new HandlerChainMetaData(null, wsHandlerChains.getHandlerType());
+ HandlerChainMetaData handlerChain = new HandlerChainMetaData(null);
wsHandlerChains.getHandlerChains().add(handlerChain);
return handlerChain;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -21,7 +21,15 @@
*/
package org.jboss.ws.metadata.config.jaxws;
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
+
// $Id$
/**
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -24,7 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
@@ -36,19 +36,12 @@
*/
public class WSHandlerChainsConfigJAXWS
{
- private HandlerType handlerType;
private List<HandlerChainMetaData> chains = new ArrayList<HandlerChainMetaData>();
- public WSHandlerChainsConfigJAXWS(HandlerType handlerType)
+ public WSHandlerChainsConfigJAXWS()
{
- this.handlerType = handlerType;
}
- public HandlerType getHandlerType()
- {
- return handlerType;
- }
-
public List<HandlerChainMetaData> getHandlerChains()
{
return chains;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -26,10 +26,16 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.xml.namespace.QName;
+import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaDataJAXRPC;
+import org.jboss.ws.metadata.HandlerMetaDataJAXWS;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
import org.jboss.ws.metadata.jsr181.HandlerChainMetaData;
/**
@@ -40,10 +46,7 @@
*/
public class UnifiedHandlerMetaData implements Serializable
{
- public enum HandlerType
- {
- PRE, ENDPOINT, POST, ALL
- };
+ private static final long serialVersionUID = -3019416564080333900L;
private HandlerChainMetaData chainConfig;
@@ -51,10 +54,8 @@
private String handlerName;
// The required <handler-class> element
private String handlerClass;
- // The required handler type
- private HandlerType handlerType;
// The optional <init-param> elements
- private ArrayList<UnifiedInitParamMetaData> initParams = new ArrayList<UnifiedInitParamMetaData>();
+ private ArrayList<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>();
// The optional <soap-header> elements
private Set<QName> soapHeaders = new HashSet<QName>();
// The optional <soap-role> elements
@@ -62,10 +63,9 @@
// The optional <port-name> elements
private Set<String> portNames = new HashSet<String>();
- public UnifiedHandlerMetaData(HandlerChainMetaData handlerChainMetaData, HandlerType type)
+ public UnifiedHandlerMetaData(HandlerChainMetaData handlerChainMetaData)
{
this.chainConfig = handlerChainMetaData;
- this.handlerType = type;
}
public void setHandlerName(String value)
@@ -88,21 +88,14 @@
return handlerClass;
}
- public HandlerType getHandlerType()
+ public void addInitParam(HandlerInitParam param)
{
- return handlerType;
- }
-
- public void addInitParam(UnifiedInitParamMetaData param)
- {
initParams.add(param);
}
- public UnifiedInitParamMetaData[] getInitParams()
+ public List<HandlerInitParam> getInitParams()
{
- UnifiedInitParamMetaData[] array = new UnifiedInitParamMetaData[initParams.size()];
- initParams.toArray(array);
- return array;
+ return initParams;
}
public void addSoapRole(String value)
@@ -145,19 +138,40 @@
portNames.add(portName);
}
- public String[] getPortNames()
+ public Set<String> getPortNames()
{
- String[] strarr = new String[portNames.size()];
- portNames.toArray(strarr);
- return strarr;
+ return portNames;
}
+
+ public HandlerMetaDataJAXRPC getHandlerMetaDataJAXRPC (EndpointMetaData epMetaData, HandlerType type)
+ {
+ HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(epMetaData, type);
+ hmd.setHandlerName(getHandlerName());
+ hmd.setHandlerClass(getHandlerClass());
+ hmd.seiInitParams(getInitParams());
+ hmd.setSoapHeaders(getSoapHeaders());
+ hmd.setSoapRoles(getSoapRoles());
+ hmd.setPortNames(getPortNames());
+ return hmd;
+ }
+ public HandlerMetaDataJAXWS getHandlerMetaDataJAXWS (EndpointMetaData epMetaData, HandlerType type)
+ {
+ HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(epMetaData, type);
+ hmd.setHandlerName(getHandlerName());
+ hmd.setHandlerClass(getHandlerClass());
+ hmd.seiInitParams(getInitParams());
+ hmd.setProtocolBindings(getProtocolBindings());
+ hmd.setServiceNamePattern(getServiceNamePattern());
+ hmd.setPortNamePattern(getPortNamePattern());
+ return hmd;
+ }
+
public String toString()
{
- StringBuffer buffer = new StringBuffer("\nHandlerMetaData:");
+ StringBuffer buffer = new StringBuffer("\nUnifiedHandlerMetaData:");
buffer.append("\n name=" + getHandlerName());
buffer.append("\n class=" + getHandlerClass());
- buffer.append("\n type=" + getHandlerType());
buffer.append("\n params=" + getInitParams());
buffer.append("\n headers=" + getSoapHeaders());
buffer.append("\n roles=" + getSoapRoles());
Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedInitParamMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedInitParamMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedInitParamMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.ws.metadata.j2ee;
-
-import java.io.Serializable;
-
-//$Id$
-
-/**
- * The container independent metdata data from handler init params
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class UnifiedInitParamMetaData implements Serializable
-{
- private static final long serialVersionUID = 6170636868961963764L;
-
- // The required <handler-name> element
- private String paramName;
- // The required <handler-class> element
- private String paramValue;
-
- public String getParamName()
- {
- return paramName;
- }
-
- public void setParamName(String paramName)
- {
- this.paramName = paramName;
- }
-
- public String getParamValue()
- {
- return paramValue;
- }
-
- public void setParamValue(String paramValue)
- {
- this.paramValue = paramValue;
- }
-
- public String toString()
- {
- return "[name=" + paramName + ",value=" + paramValue + "]";
- }
-}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesFactory.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -26,9 +26,9 @@
import java.net.URL;
import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
@@ -112,7 +112,7 @@
public Object newChild(PortComponentMetaData portComponent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("handler".equals(localName))
- return new UnifiedHandlerMetaData(null, HandlerType.ENDPOINT);
+ return new UnifiedHandlerMetaData(null);
else return null;
}
@@ -130,14 +130,14 @@
public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("init-param".equals(localName))
- return new UnifiedInitParamMetaData();
+ return new HandlerInitParam();
else return null;
}
/**
* Called when parsing character is complete.
*/
- public void addChild(UnifiedHandlerMetaData handler, UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(UnifiedHandlerMetaData handler, HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName)
{
handler.addInitParam(param);
}
@@ -199,7 +199,7 @@
/**
* Called when a new simple child element with text value was read from the XML content.
*/
- public void setValue(UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (log.isTraceEnabled())
log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainFactory.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -24,9 +24,9 @@
// $Id$
import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedInitParamMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
@@ -68,7 +68,7 @@
public Object newChild(HandlerChainsMetaData handlerConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("handler-chain".equals(localName))
- return new HandlerChainMetaData(handlerConfig, handlerConfig.getHandlerType());
+ return new HandlerChainMetaData(handlerConfig);
else
return null;
}
@@ -87,7 +87,7 @@
public Object newChild(HandlerChainMetaData chainConfig, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("handler".equals(localName))
- return new UnifiedHandlerMetaData(chainConfig, chainConfig.getHandlerType());
+ return new UnifiedHandlerMetaData(chainConfig);
else
return null;
}
@@ -106,14 +106,14 @@
public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
if ("init-param".equals(localName))
- return new UnifiedInitParamMetaData();
+ return new HandlerInitParam();
else return null;
}
/**
* Called when parsing character is complete.
*/
- public void addChild(UnifiedHandlerMetaData handler, UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName)
+ public void addChild(UnifiedHandlerMetaData handler, HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName)
{
handler.addInitParam(param);
}
@@ -151,7 +151,7 @@
/**
* Called when a new simple child element with text value was read from the XML content.
*/
- public void setValue(UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+ public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
if (log.isTraceEnabled())
log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -24,14 +24,13 @@
// $Id$
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
/**
* XML Binding element for handler-config/handler-chain elements
@@ -50,13 +49,11 @@
private String protocolBindings;
private QName serviceNamePattern;
private QName portNamePattern;
- private HandlerType handlerType;
private ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
- public HandlerChainMetaData(HandlerChainsMetaData handlerConfig, HandlerType handlerType)
+ public HandlerChainMetaData(HandlerChainsMetaData handlerConfig)
{
this.handlerChainsMetaData = handlerConfig;
- this.handlerType = handlerType;
}
public HandlerChainsMetaData getHandlerChainsMetaData()
@@ -64,11 +61,6 @@
return handlerChainsMetaData;
}
- public HandlerType getHandlerType()
- {
- return handlerType;
- }
-
public void addHandler(UnifiedHandlerMetaData handlerMetaData)
{
handlers.add(handlerMetaData);
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jsr181/HandlerChainsMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -26,7 +26,7 @@
import java.util.ArrayList;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
/**
* XML Binding root element for JSR-181 HandlerChain
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11DefinitionFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11DefinitionFactory.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11DefinitionFactory.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -87,7 +87,7 @@
if (wsdlLocation == null)
throw new IllegalArgumentException("URL cannot be null");
- log.debug("parse: " + wsdlLocation.toExternalForm());
+ log.trace("parse: " + wsdlLocation.toExternalForm());
EntityResolver entityResolver = new JBossWSEntityResolver();
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLBinding.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -74,7 +74,7 @@
public WSDLBinding(WSDLDefinitions wsdlDefinitions)
{
- log.debug("new WSDLBinding");
+ log.trace("new WSDLBinding");
this.wsdlDefinitions = wsdlDefinitions;
}
@@ -90,7 +90,7 @@
public void setName(NCName name)
{
- log.debug("setName: " + name);
+ log.trace("setName: " + name);
this.name = name;
}
@@ -107,7 +107,7 @@
public void setQName(QName qname)
{
- log.debug("setQName: " + qname);
+ log.trace("setQName: " + qname);
this.qname = qname;
}
@@ -118,7 +118,7 @@
public void setInterfaceName(QName interfaceName)
{
- log.debug("setInterfaceName: " + name);
+ log.trace("setInterfaceName: " + name);
this.interfaceName = interfaceName;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -97,7 +97,7 @@
if (wsdlLocation == null)
throw new IllegalArgumentException("URL cannot be null");
- log.debug("parse: " + wsdlLocation.toExternalForm());
+ log.trace("parse: " + wsdlLocation.toExternalForm());
EntityResolver entityResolver = new JBossWSEntityResolver();
WSDLDefinitions wsdlDefinitions = null;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLEndpoint.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -61,7 +61,7 @@
public WSDLEndpoint(WSDLService wsdlService)
{
- log.debug("new WSDLEndpoint");
+ log.trace("new WSDLEndpoint");
this.wsdlService = wsdlService;
}
@@ -122,7 +122,7 @@
public void setName(NCName name)
{
- log.debug("setName: " + name);
+ log.trace("setName: " + name);
this.name = name;
}
@@ -139,7 +139,7 @@
public void setQName(QName qname)
{
- log.debug("setQName: " + qname);
+ log.trace("setQName: " + qname);
this.qname = qname;
}
@@ -150,7 +150,7 @@
public void setBinding(QName binding)
{
- log.debug("setBinding: " + binding);
+ log.trace("setBinding: " + binding);
this.binding = binding;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterface.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -76,7 +76,7 @@
/** Construct a WSDL interface for a given WSDL definition */
public WSDLInterface(WSDLDefinitions wsdlDefinitions)
{
- log.debug("new WSDLInterface");
+ log.trace("new WSDLInterface");
this.wsdlDefinitions = wsdlDefinitions;
}
@@ -102,7 +102,7 @@
public void setName(NCName name)
{
- log.debug("setName: " + name);
+ log.trace("setName: " + name);
this.name = name;
}
@@ -119,7 +119,7 @@
public void setQName(QName qname)
{
- log.debug("setQName: " + qname);
+ log.trace("setQName: " + qname);
this.qname = qname;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLService.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLService.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLService.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -64,7 +64,7 @@
public WSDLService(WSDLDefinitions wsdlDefinitions)
{
- log.debug("new WSDLService");
+ log.trace("new WSDLService");
this.wsdlDefinitions = wsdlDefinitions;
}
@@ -80,7 +80,7 @@
public void setName(NCName name)
{
- log.debug("setName: " + name);
+ log.trace("setName: " + name);
this.name = name;
}
@@ -97,7 +97,7 @@
public void setQName(QName qname)
{
- log.debug("setQName: " + qname);
+ log.trace("setQName: " + qname);
this.qname = qname;
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/XSModelTypes.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/XSModelTypes.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/XSModelTypes.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -59,7 +59,7 @@
{
if(nsURI == null)
{
- log.debug("nsURI passed to addSchemaModel is null. Replacing Schema Model");
+ log.trace("nsURI passed to addSchemaModel is null. Replacing Schema Model");
schemaModel = schema;
}
else
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -313,7 +313,7 @@
}
else
{
- log.debug("Cannot assign XSAnnotation to null namespace");
+ log.trace("Cannot assign XSAnnotation to null namespace");
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -86,7 +86,7 @@
xsdString = strwr.toString();
}
- log.debug("serialize:\n" + xsdString);
+ log.trace("serialize:\n" + xsdString);
// Write updated xsd file
File xsdFile = SchemaUtils.getSchemaTempFile(ns);
@@ -111,7 +111,7 @@
StringWriter strwr = new StringWriter();
sutils.serialize(xsmodel, strwr);
String xsdString = strwr.toString();
- log.debug("serialize:" + xsdString);
+ log.trace("serialize:" + xsdString);
os.write(xsdString.getBytes());
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointInvoker.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -51,7 +51,7 @@
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.soap.SOAPBodyImpl;
import org.jboss.ws.soap.SOAPMessageImpl;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HandlerDelegate.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HandlerDelegate.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HandlerDelegate.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -23,7 +23,7 @@
// $Id$
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
/** An implementation of handles invocations on the endpoint
*
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -65,11 +65,11 @@
import org.jboss.ws.jaxws.handler.MessageContextJAXWS;
import org.jboss.ws.jaxws.handler.SOAPMessageContextJAXWS;
import org.jboss.ws.metadata.EndpointMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
import org.jboss.ws.metadata.ServerEndpointMetaData;
import org.jboss.ws.metadata.UnifiedMetaData;
import org.jboss.ws.metadata.EndpointMetaData.Type;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData.HandlerType;
+import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.soap.SOAPConnectionImpl;
import org.jboss.ws.utils.ThreadLocalAssociation;
@@ -498,13 +498,13 @@
/** Get the list of HandlerInfos associated with a given service endpoint
*/
- public List<UnifiedHandlerMetaData> getHandlerMetaData(ObjectName sepID)
+ public List<HandlerMetaData> getHandlerMetaData(ObjectName sepID)
{
ServiceEndpoint wsEndpoint = getServiceEndpointByID(sepID);
if (wsEndpoint == null)
throw new WSException("Cannot find service endpoint: " + sepID);
- List<UnifiedHandlerMetaData> handlers = null;
+ List<HandlerMetaData> handlers = null;
if (wsEndpoint != null)
{
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
@@ -517,7 +517,7 @@
* Dynamically change the list of handlers associated with a given service endpoint
* The endpoint is expected to be in STOPED state
*/
- public void setHandlerMetaData(ObjectName sepID, List<UnifiedHandlerMetaData> handlers)
+ public void setHandlerMetaData(ObjectName sepID, List<HandlerMetaData> handlers)
{
ServiceEndpoint wsEndpoint = getServiceEndpointByID(sepID);
if (wsEndpoint == null)
@@ -530,8 +530,9 @@
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
sepMetaData.clearHandlers();
- for (UnifiedHandlerMetaData handlerMetaData : handlers)
+ for (HandlerMetaData handlerMetaData : handlers)
{
+ handlerMetaData.setEndpointMetaData(sepMetaData);
sepMetaData.addHandler(handlerMetaData);
}
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManagerMBean.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManagerMBean.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManagerMBean.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -25,7 +25,7 @@
import javax.management.ObjectName;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
import org.jboss.ws.utils.ObjectNameFactory;
/**
@@ -49,8 +49,8 @@
boolean isAlwaysModifySOAPAddress();
void setAlwaysModifySOAPAddress(boolean modify);
- public List<UnifiedHandlerMetaData> getHandlerMetaData(ObjectName sepID);
- public void setHandlerMetaData(ObjectName sepID, List<UnifiedHandlerMetaData> handlers);
+ public List<HandlerMetaData> getHandlerMetaData(ObjectName sepID);
+ public void setHandlerMetaData(ObjectName sepID, List<HandlerMetaData> handlers);
void startServiceEndpoint(ObjectName sepID) throws Exception;
void stopServiceEndpoint(ObjectName sepID) throws Exception;
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -25,6 +25,7 @@
import javax.xml.namespace.QName;
+import org.jboss.util.NotImplementedException;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.ServiceMetaData;
@@ -40,4 +41,10 @@
{
super(service, portName, Type.JAXRPC);
}
+
+ @Override
+ public Object getEndpointConfig()
+ {
+ throw new NotImplementedException();
+ }
}
\ No newline at end of file
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java 2006-09-05 20:10:19 UTC (rev 902)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java 2006-09-06 17:20:56 UTC (rev 903)
@@ -37,7 +37,7 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.jaxrpc.ServiceExt;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
+import org.jboss.ws.metadata.HandlerMetaData;
/**
* Test dynamic handlers
@@ -101,11 +101,11 @@
ObjectName oname = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointManager");
ObjectName serviceID = new ObjectName("jboss.ws:context=jbossws-samples-dynamichandler,endpoint=TestService");
- List handlers = (List)server.invoke(oname, "getHandlerMetaData", new Object[]{serviceID}, new String[]{"javax.management.ObjectName"});
- Iterator it = handlers.iterator();
+ List<HandlerMetaData> handlers = (List<HandlerMetaData>)server.invoke(oname, "getHandlerMetaData", new Object[]{serviceID}, new String[]{"javax.management.ObjectName"});
+ Iterator<HandlerMetaData> it = handlers.iterator();
while (it.hasNext())
{
- UnifiedHandlerMetaData handlerMetaData = (UnifiedHandlerMetaData)it.next();
+ HandlerMetaData handlerMetaData = it.next();
if (handlerMetaData.getHandlerClass().equals(ServerSideHandler.class.getName()))
it.remove();
}
More information about the jboss-svn-commits
mailing list