March 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2609 - in trunk: integration-jboss42/src/java/org/jboss/ws/integration/jboss42 and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-13 14:20:48 -0400 (Tue, 13 Mar 2007) New Revision: 2609 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml Removed: trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/jaxws-handlers.xml Modified: trunk/build/version.properties trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerMDB.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/HandlerDelegate.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java Log: Implement jaxws handler lifecycle close(), @PostConstruct Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/build/version.properties 2007-03-13 18:20:48 UTC (rev 2609) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-1.2 -version.id=2.0.0.DEV -repository.id=snapshot +version.id=2.0.0.CR5 +repository.id=2.0.0.CR5 implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws Modified: trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java =================================================================== --- trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB21.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -148,13 +148,13 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public Object createServiceEndpoint(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) + public Object createServiceEndpointInstance(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) { return null; } /** Invoke an instance of the SEI implementation bean */ - public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception + public void invokeServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception { log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); @@ -195,7 +195,7 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public void destroyServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl) + public void destroyServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl) { // do nothing } @@ -219,6 +219,13 @@ } /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ + public void closeHandlerChain(ServiceEndpointInfo seInfo) + { + if (type == HandlerType.PRE) + handlerDelegate.closeHandlerChain(seInfo); + } + + /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ public boolean callFaultHandlerChain(ServiceEndpointInfo seInfo, HandlerType type, Exception ex) { if (type == HandlerType.PRE) @@ -256,6 +263,13 @@ } /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ + public void closeHandlerChain(HandlerType type) + { + if (type != HandlerType.PRE) + handlerDelegate.closeHandlerChain(seInfo); + } + + /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ public boolean callFaultHandlerChain(HandlerType type, Exception ex) { if (type == HandlerType.PRE) @@ -263,6 +277,5 @@ else return handlerDelegate.callFaultHandlerChain(seInfo, type, ex); } - } } Modified: trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java =================================================================== --- trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -87,13 +87,13 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public Object createServiceEndpoint(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) + public Object createServiceEndpointInstance(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) { return null; } /** Invoke an instance of the SEI implementation bean */ - public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception + public void invokeServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception { log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); try @@ -122,7 +122,7 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public void destroyServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl) + public void destroyServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl) { // do nothing } Modified: trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerMDB.java =================================================================== --- trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerMDB.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceEndpointInvokerMDB.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -58,13 +58,13 @@ /** Create an instance of the SEI implementation bean if necessary */ - public Object createServiceEndpoint(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) throws InstantiationException, IllegalAccessException + public Object createServiceEndpointInstance(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) throws InstantiationException, IllegalAccessException { return ThreadLocalAssociation.localInvokerMDBAssoc().get(); } /** Invoke an instance of the SEI implementation bean */ - public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception + public void invokeServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception { log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); try @@ -89,7 +89,7 @@ } /** Destroy an instance of the SEI implementation bean if necessary */ - public void destroyServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl) + public void destroyServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl) { } } Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -148,13 +148,13 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public Object createServiceEndpoint(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) + public Object createServiceEndpointInstance(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) { return null; } /** Invoke an instance of the SEI implementation bean */ - public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception + public void invokeServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception { log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); @@ -195,7 +195,7 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public void destroyServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl) + public void destroyServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl) { // do nothing } Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -97,13 +97,13 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public Object createServiceEndpoint(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) + public Object createServiceEndpointInstance(ServiceEndpointInfo seInfo, Object endpointContext, Class seiImplClass) { return null; } /** Invoke an instance of the SEI implementation bean */ - public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object beanInstance, EndpointInvocation epInv) throws SOAPFaultException, Exception + public void invokeServiceEndpointInstance(ServiceEndpointInfo seInfo, Object beanInstance, EndpointInvocation epInv) throws SOAPFaultException, Exception { log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); @@ -137,7 +137,7 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public void destroyServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl) + public void destroyServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl) { // do nothing } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/CommonClient.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -212,6 +212,8 @@ protected abstract boolean callResponseHandlerChain(QName portName, HandlerType type); + protected abstract void closeHandlerChain(QName portName, HandlerType type); + protected abstract void setInboundContextProperties(); protected abstract void setOutboundContextProperties(); @@ -335,6 +337,7 @@ handlerPass = handlerPass && callResponseHandlerChain(portName, HandlerType.ENDPOINT); handlerPass = handlerPass && callResponseHandlerChain(portName, HandlerType.PRE); + closeHandlerChain(portName, HandlerType.ALL); // BP-1.0 R1027 if (handlerPass) Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -555,6 +555,12 @@ return status; } + @Override + protected void closeHandlerChain(QName portName, HandlerType type) + { + // nothing to do for JAXRPC + } + /** Generate or update the XSD schema for all parameters and the return. * This should only be done when the Call is unconfigured, hence there is no WSDL */ Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -90,7 +90,7 @@ */ public HandlerChainBaseImpl(List<HandlerInfo> infos, Set<String> roles) { - if(log.isDebugEnabled()) log.debug("Create a handler chain for roles: " + roles); + log.debug("Create a handler chain for roles: " + roles); addHandlersToChain(infos, roles); } @@ -109,8 +109,6 @@ /** * Initialize the a handler chain with the given handlers infos - * - * @throws javax.xml.rpc.JAXRPCException If any error during initialization */ private void addHandlersToChain(List<HandlerInfo> infos, Set<String> roleSet) { @@ -159,7 +157,7 @@ */ public void init(Map config) { - if(log.isDebugEnabled()) log.debug("init: [config=" + config + "]"); + log.debug("init: [config=" + config + "]"); for (int i = 0; i < handlers.size(); i++) { HandlerEntry entry = (HandlerEntry)handlers.get(i); @@ -177,7 +175,7 @@ */ public void destroy() { - if(log.isDebugEnabled()) log.debug("destroy"); + log.debug("destroy"); for (int i = 0; i < handlers.size(); i++) { HandlerEntry entry = (HandlerEntry)handlers.get(i); @@ -217,7 +215,7 @@ public void setRoles(String[] soapActorNames) { List<String> newRoles = Arrays.asList(soapActorNames); - if(log.isDebugEnabled()) log.debug("setRoles: " + newRoles); + log.debug("setRoles: " + newRoles); roles.clear(); roles.addAll(newRoles); @@ -246,7 +244,7 @@ if (handlers.size() > 0) { - if(log.isDebugEnabled()) log.debug("Enter: handleRequest"); + log.debug("Enter: handleRequest"); SOAPMessageContextJAXRPC jaxrpcContext = (SOAPMessageContextJAXRPC)msgContext; jaxrpcContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -295,7 +293,7 @@ falseIndex = (handlerIndex - 1); jaxrpcContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - if(log.isDebugEnabled()) log.debug("Exit: handleRequest with status: " + doNext); + log.debug("Exit: handleRequest with status: " + doNext); } } @@ -328,7 +326,7 @@ if (handlers.size() > 0) { - if(log.isDebugEnabled()) log.debug("Enter: handleResponse"); + log.debug("Enter: handleResponse"); SOAPMessageContextJAXRPC jaxrpcContext = (SOAPMessageContextJAXRPC)msgContext; jaxrpcContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -377,7 +375,7 @@ falseIndex = (handlerIndex - 1); jaxrpcContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - if(log.isDebugEnabled()) log.debug("Exit: handleResponse with status: " + doNext); + log.debug("Exit: handleResponse with status: " + doNext); } } @@ -400,7 +398,7 @@ if (handlers.size() > 0) { - if(log.isDebugEnabled()) log.debug("Enter: handleFault"); + log.debug("Enter: handleFault"); SOAPMessageContextJAXRPC jaxrpcContext = (SOAPMessageContextJAXRPC)msgContext; jaxrpcContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -415,14 +413,14 @@ for (; doNext && handlerIndex >= 0; handlerIndex--) { currHandler = ((HandlerEntry)handlers.get(handlerIndex)).getHandler(); - if(log.isDebugEnabled()) log.debug("Handle fault: " + currHandler); + log.debug("Handle fault: " + currHandler); doNext = currHandler.handleFault(msgContext); } } finally { jaxrpcContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - if(log.isDebugEnabled()) log.debug("Exit: handleFault with status: " + doNext); + log.debug("Exit: handleFault with status: " + doNext); } } @@ -465,7 +463,7 @@ HandlerEntry entry = (HandlerEntry)handlers.get(i); if (entry.handler.getState() == HandlerWrapper.DOES_NOT_EXIST) { - if(log.isDebugEnabled()) log.debug("Replacing dirty handler: " + entry.handler); + log.debug("Replacing dirty handler: " + entry.handler); try { HandlerWrapper handler = new HandlerWrapper((Handler)entry.info.getHandlerClass().newInstance()); @@ -576,7 +574,7 @@ if (type == null) { - if(log.isDebugEnabled()) log.debug("Using handler type default: " + HandlerType.ENDPOINT); + log.debug("Using handler type default: " + HandlerType.ENDPOINT); type = HandlerType.ENDPOINT; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -65,6 +65,11 @@ { } + public void closeHandlerChain(ServiceEndpointInfo seInfo) + { + // nothing to do for JAXRPC + } + public boolean callRequestHandlerChain(ServiceEndpointInfo seInfo, HandlerType type) { SOAPMessageContextJAXRPC msgContext = (SOAPMessageContextJAXRPC)MessageContextAssociation.peekMessageContext(); @@ -196,5 +201,4 @@ handlerChain.init(null); } } - } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -152,6 +152,14 @@ } @Override + protected void closeHandlerChain(QName portName, HandlerType type) + { + BindingExt binding = (BindingExt)getBindingProvider().getBinding(); + HandlerChainExecutor executor = new HandlerChainExecutor(epMetaData, binding.getHandlerChain(type)); + executor.close(); + } + + @Override protected void setInboundContextProperties() { // Mark the message context as outbound Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -63,8 +63,8 @@ public HandlerChainExecutor(EndpointMetaData epMetaData, List<Handler> handlerList) { this.epMetaData = epMetaData; - - if(log.isDebugEnabled()) log.debug("Create a handler executor: " + handlerList); + + log.debug("Create a handler executor: " + handlerList); for (Handler handler : handlerList) { handlers.add(handler); @@ -76,10 +76,12 @@ */ public void close() { - if(log.isDebugEnabled()) log.debug("close"); - for (Handler handler : handlers) + log.debug("close"); + int handlerIndex = handlers.size() - 1; + for (; handlerIndex >= 0; handlerIndex--) { - handler.close(null); + Handler currHandler = handlers.get(handlerIndex); + currHandler.close(null); } } @@ -89,7 +91,7 @@ if (handlers.size() > 0) { - if(log.isDebugEnabled()) log.debug("Enter: handleRequest"); + log.debug("Enter: handleRequest"); SOAPMessageContextJAXWS soapContext = (SOAPMessageContextJAXWS)msgContext; soapContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -130,7 +132,7 @@ falseIndex = (handlerIndex - 1); soapContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - if(log.isDebugEnabled()) log.debug("Exit: handleRequest with status: " + doNext); + log.debug("Exit: handleRequest with status: " + doNext); } } @@ -146,7 +148,7 @@ if (handlers.size() > 0) { - if(log.isDebugEnabled()) log.debug("Enter: handleResponse"); + log.debug("Enter: handleResponse"); int handlerIndex = handlers.size() - 1; if (falseIndex != -1) @@ -187,7 +189,7 @@ falseIndex = (handlerIndex - 1); soapContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - if(log.isDebugEnabled()) log.debug("Exit: handleResponse with status: " + doNext); + log.debug("Exit: handleResponse with status: " + doNext); } } @@ -200,7 +202,7 @@ if (handlers.size() > 0) { - if(log.isDebugEnabled()) log.debug("Enter: handleFault"); + log.debug("Enter: handleFault"); SOAPMessageContextJAXWS soapContext = (SOAPMessageContextJAXWS)msgContext; soapContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -241,7 +243,7 @@ falseIndex = (handlerIndex - 1); soapContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - if(log.isDebugEnabled()) log.debug("Exit: handleFault with status: " + doNext); + log.debug("Exit: handleFault with status: " + doNext); } } @@ -269,7 +271,7 @@ { if (epMetaData.getStyle() == Style.RPC) throw new WebServiceException("Cannot use logical handler with RPC"); - + handlerContext = new LogicalMessageContextImpl(soapContext); } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -51,7 +51,7 @@ public boolean callRequestHandlerChain(ServiceEndpointInfo seInfo, HandlerType type) { - if(log.isDebugEnabled()) log.debug("callRequestHandlerChain: " + type); + log.debug("callRequestHandlerChain: " + type); SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext(); EndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); @@ -59,6 +59,7 @@ if (epMetaData.isHandlersInitialized() == false) { initResolverChain(epMetaData); + epMetaData.setHandlersInitialized(true); } List<Handler> handlerChain = getHandlerChain(epMetaData, type); @@ -68,7 +69,7 @@ public boolean callResponseHandlerChain(ServiceEndpointInfo seInfo, HandlerType type) { - if(log.isDebugEnabled()) log.debug("callResponseHandlerChain: " + type); + log.debug("callResponseHandlerChain: " + type); SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext(); ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); List<Handler> handlerChain = getHandlerChain(epMetaData, type); @@ -76,9 +77,22 @@ return status; } + public void closeHandlerChain(ServiceEndpointInfo seInfo) + { + log.debug("closeHandlerChain"); + EndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); + + List<Handler> handlerChain = getHandlerChain(epMetaData, HandlerType.POST); + new HandlerChainExecutor(epMetaData, handlerChain).close(); + handlerChain = getHandlerChain(epMetaData, HandlerType.ENDPOINT); + new HandlerChainExecutor(epMetaData, handlerChain).close(); + handlerChain = getHandlerChain(epMetaData, HandlerType.PRE); + new HandlerChainExecutor(epMetaData, handlerChain).close(); + } + public boolean callFaultHandlerChain(ServiceEndpointInfo seInfo, HandlerType type, Exception ex) { - if(log.isDebugEnabled()) log.debug("callFaultHandlerChain: " + type); + log.debug("callFaultHandlerChain: " + type); SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext(); ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); List<Handler> handlerChain = getHandlerChain(epMetaData, type); Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -23,6 +23,9 @@ // $Id$ +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -30,6 +33,8 @@ import java.util.Map; import java.util.Set; +import javax.annotation.PostConstruct; +import javax.annotation.Resource; import javax.xml.namespace.QName; import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.HandlerResolver; @@ -39,6 +44,7 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; @@ -74,7 +80,7 @@ public List<Handler> getHandlerChain(PortInfo info, HandlerType type) { - if(log.isDebugEnabled()) log.debug("getHandlerChain: [type=" + type + ",info=" + info + "]"); + log.debug("getHandlerChain: [type=" + type + ",info=" + info + "]"); List<Handler> unsortedChain = new ArrayList<Handler>(); @@ -89,7 +95,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(null, null, bindingID)); if (list != null) { - if(log.isDebugEnabled()) log.debug("add protocol handlers: " + list); + log.debug("add protocol handlers: " + list); unsortedChain.addAll(list); } } @@ -99,7 +105,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(serviceName, null, null)); if (list != null) { - if(log.isDebugEnabled()) log.debug("add service handlers: " + list); + log.debug("add service handlers: " + list); unsortedChain.addAll(list); } } @@ -109,7 +115,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(null, portName, null)); if (list != null) { - if(log.isDebugEnabled()) log.debug("add port handlers: " + list); + log.debug("add port handlers: " + list); unsortedChain.addAll(list); } } @@ -117,7 +123,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(null, null, null)); if (list != null) { - if(log.isDebugEnabled()) log.debug("add general handlers: " + list); + log.debug("add general handlers: " + list); unsortedChain.addAll(list); } @@ -139,10 +145,9 @@ public void initHandlerChain(EndpointMetaData epMetaData, HandlerType type) { - if(log.isDebugEnabled()) log.debug("initHandlerChain: " + type); + log.debug("initHandlerChain: " + type); // clear all exisisting handler to avoid double registration - if(log.isDebugEnabled()) log.debug("Clear handler map: " + jaxwsHandlers); Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type); handlerMap.clear(); @@ -165,6 +170,12 @@ if (handler instanceof GenericSOAPHandler) ((GenericSOAPHandler)handler).setHeaders(soapHeaders); + + // Inject resources + injectResources(handler); + + // Call @PostConstruct + callPostConstruct(handler); List<PortInfo> infos = getPortInfos(epMetaData, jaxwsMetaData); for (PortInfo info : infos) @@ -183,6 +194,33 @@ } } + private void injectResources(Handler handler) + { + Class<? extends Handler> handlerClass = handler.getClass(); + for (Field field : handlerClass.getFields()) + { + if (field.isAnnotationPresent(Resource.class)) + throw new NotImplementedException("@Resource not implemented for handler: " + handlerClass.getName()); + } + for (Method method : handlerClass.getMethods()) + { + if (method.isAnnotationPresent(Resource.class)) + throw new NotImplementedException("@Resource not implemented for handler: " + handlerClass.getName()); + } + } + + private void callPostConstruct(Handler handler) throws Exception + { + Class<? extends Handler> handlerClass = handler.getClass(); + for (Method method : handlerClass.getMethods()) + { + if (method.isAnnotationPresent(PostConstruct.class)) + { + method.invoke(handler, new Object[]{}); + } + } + } + private List<PortInfo> getPortInfos(EndpointMetaData epMetaData, HandlerMetaDataJAXWS handlerMetaData) { String protocols = handlerMetaData.getProtocolBindings(); @@ -286,7 +324,7 @@ private boolean addHandler(PortInfo info, Handler handler, HandlerType type) { - if(log.isDebugEnabled()) log.debug("addHandler: " + info + ":" + handler); + log.debug("addHandler: " + info + ":" + handler); Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type); List<Handler> handlerList = handlerMap.get(info); @@ -308,6 +346,9 @@ handlerMap = jaxwsHandlers; else if (type == HandlerType.POST) handlerMap = postHandlers; + else + throw new IllegalArgumentException("Illegal handler type: " + type); + return handlerMap; } } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -92,14 +92,13 @@ protected abstract Class loadServiceEndpoint(ServiceEndpointInfo seInfo) throws ClassNotFoundException; /** Create the instance of the SEI implementation bean if necessary */ - protected abstract Object createServiceEndpoint(ServiceEndpointInfo seInfo, Object context, Class seiImplClass) throws IllegalAccessException, - InstantiationException; + protected abstract Object createServiceEndpointInstance(ServiceEndpointInfo seInfo, Object context, Class seiImplClass) throws Exception; /** Invoke the instance of the SEI implementation bean */ - protected abstract void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception; + protected abstract void invokeServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws Exception; /** Destroy the instance of the SEI implementation bean if necessary */ - protected abstract void destroyServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl); + protected abstract void destroyServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl); public boolean callRequestHandlerChain(ServiceEndpointInfo seInfo, HandlerType type) { @@ -111,6 +110,11 @@ return handlerDelegate.callResponseHandlerChain(seInfo, type); } + public void closeHandlerChain(ServiceEndpointInfo seInfo) + { + handlerDelegate.closeHandlerChain(seInfo); + } + public boolean callFaultHandlerChain(ServiceEndpointInfo seInfo, HandlerType type, Exception ex) { return handlerDelegate.callFaultHandlerChain(seInfo, type, ex); @@ -127,7 +131,7 @@ Class seImpl = loadServiceEndpoint(seInfo); // Create an instance of the endpoint implementation bean - Object seInstance = createServiceEndpoint(seInfo, context, seImpl); + Object seInstance = createServiceEndpointInstance(seInfo, context, seImpl); try { @@ -160,7 +164,8 @@ // Check if protocol handlers modified the payload if (((SOAPBodyImpl)reqMessage.getSOAPBody()).isModifiedFromSource()) { - if(log.isDebugEnabled()) log.debug("Handler modified body payload, unbind message again"); + if (log.isDebugEnabled()) + log.debug("Handler modified body payload, unbind message again"); epInv = binding.unbindRequestMessage(opMetaData, reqMessage); } @@ -170,7 +175,7 @@ msgContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); try { - invokeServiceEndpoint(seInfo, seInstance, epInv); + invokeServiceEndpointInstance(seInfo, seInstance, epInv); } finally { @@ -183,8 +188,8 @@ if (epMetaData.getType() == EndpointMetaData.Type.JAXWS) msgContext.setProperty(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE); - if(binding instanceof CommonSOAPBinding) - XOPContext.setMTOMEnabled( ((CommonSOAPBinding)binding).isMTOMEnabled()); + if (binding instanceof CommonSOAPBinding) + XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); // Bind the response message SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv); @@ -197,6 +202,7 @@ handlersPass = callResponseHandlerChain(seInfo, HandlerType.POST); handlersPass = handlersPass && callResponseHandlerChain(seInfo, HandlerType.ENDPOINT); handlersPass = handlersPass && callResponseHandlerChain(seInfo, HandlerType.PRE); + closeHandlerChain(seInfo); } SOAPMessage resMessage = msgContext.getSOAPMessage(); @@ -213,6 +219,7 @@ boolean handlersPass = callFaultHandlerChain(seInfo, HandlerType.POST, ex); handlersPass = handlersPass && callFaultHandlerChain(seInfo, HandlerType.ENDPOINT, ex); handlersPass = handlersPass && callFaultHandlerChain(seInfo, HandlerType.PRE, ex); + closeHandlerChain(seInfo); } catch (Exception subEx) { @@ -222,13 +229,14 @@ } finally { - destroyServiceEndpoint(seInfo, seInstance); + destroyServiceEndpointInstance(seInfo, seInstance); } } protected CommonMessageContext processPivot(CommonMessageContext requestContext) { - if(log.isDebugEnabled()) log.debug("Begin response processing"); + if (log.isDebugEnabled()) + log.debug("Begin response processing"); // TODO: implement return requestContext; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/HandlerDelegate.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/HandlerDelegate.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/HandlerDelegate.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -25,8 +25,7 @@ import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; -/** An implementation of handles invocations on the endpoint - * +/** * @author Thomas.Diesler(a)jboss.org * @since 19-Jan-2005 */ @@ -37,4 +36,6 @@ public boolean callResponseHandlerChain(ServiceEndpointInfo seInfo, HandlerType type); public boolean callFaultHandlerChain(ServiceEndpointInfo seInfo, HandlerType type, Exception ex); + + public void closeHandlerChain(ServiceEndpointInfo seInfo); } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -33,8 +33,8 @@ public interface ServiceEndpointInvoker { /** Initialize the service endpoint */ - public void initServiceEndpoint(ServiceEndpointInfo seInfo); + void initServiceEndpoint(ServiceEndpointInfo seInfo); /** Invoke the the service endpoint */ - public SOAPMessage invoke(ServiceEndpointInfo seInfo, Object endpointContext) throws Exception; + SOAPMessage invoke(ServiceEndpointInfo seInfo, Object endpointContext) throws Exception; } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -64,7 +64,7 @@ } /** Create an instance of the SEI implementation bean if necessary */ - public Object createServiceEndpoint(ServiceEndpointInfo seInfo, Object context, Class seiImplClass) throws IllegalAccessException, InstantiationException + public Object createServiceEndpointInstance(ServiceEndpointInfo seInfo, Object context, Class seiImplClass) throws IllegalAccessException, InstantiationException { Object seiImpl = seiImplClass.newInstance(); if (seiImpl instanceof ServiceLifecycle && context != null) @@ -84,7 +84,7 @@ } /** Invoke an instance of the SEI implementation bean */ - public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws SOAPFaultException, Exception + public void invokeServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws SOAPFaultException, Exception { if(log.isDebugEnabled()) log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); try @@ -111,7 +111,7 @@ } /** Destroy an instance of the SEI implementation bean if necessary */ - public void destroyServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl) + public void destroyServiceEndpointInstance(ServiceEndpointInfo seInfo, Object seiImpl) { if (seiImpl instanceof ServiceLifecycle) { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -37,25 +37,52 @@ * Test JAXWS handler lifecycle * * @author Thomas.Diesler(a)jboss.org - * @since 12-Aug-2006 + * @since 13-MAr-2007 */ public class HandlerLifecycleTestCase extends JBossWSTest { + private static SOAPEndpoint port; + public static Test suite() { return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war"); } + public void setUp() throws Exception + { + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerlifecycle?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "SOAPEndpointService"); + Service service = Service.create(wsdlURL, serviceName); + port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); + } + } + public void testClientAccess() throws Exception { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerlifecycle?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "SOAPEndpointService"); - Service service = Service.create(wsdlURL, serviceName); - SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); - String retStr = port.echo("hello"); - - StringBuffer expStr = new StringBuffer("hello:ServerHandler:endpoint:ServerHandler"); + StringBuffer expStr = new StringBuffer("hello:InBound:ServerHandler:endpoint:OutBound:ServerHandler"); assertEquals(expStr.toString(), retStr); } + + public void testPostConstruct() throws Exception + { + String retStr = port.getPostConstruct(); + assertEquals("PostConstruct:ServerHandler", retStr); + } + + /* Not Implemented + public void testPreDestroy() throws Exception + { + String retStr = port.getPreDestroy(); + assertEquals("PreDestroy:ServerHandler", retStr); + } + */ + + public void testClose() throws Exception + { + String retStr = port.getClose(); + assertEquals("Close:ServerHandler", retStr); + } } Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -21,6 +21,8 @@ */ package org.jboss.test.ws.jaxws.handlerlifecycle; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; @@ -28,34 +30,68 @@ import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPMessageContext; +import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; public class LifecycleHandler extends GenericSOAPHandler { + private static Logger log = Logger.getLogger(LifecycleHandler.class); + + static String postConstructMsg; + static String preDestroyMsg; + static String closeMsg; + + public LifecycleHandler() + { + log.info("new LifecycleHandler"); + } + @Override public boolean handleOutbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + log.info("handleOutbound: " + this); + return appendHandlerName(msgContext, "OutBound:" + getHandlerName()); } - + @Override public boolean handleInbound(MessageContext msgContext) { - return appendHandlerName(msgContext); + log.info("handleInbound: " + this); + return appendHandlerName(msgContext, "InBound:" + getHandlerName()); } - private boolean appendHandlerName(MessageContext msgContext) + @PostConstruct + public void postConstruct() { + log.info("postConstruct: " + this); + postConstructMsg = "PostConstruct:" + getHandlerName(); + } + + @PreDestroy + public void preDestroy() + { + log.info("preDestroy: " + this); + preDestroyMsg = "PreDestroy:" + getHandlerName(); + } + + public void close(MessageContext messageContext) + { + log.info("close: " + this); + closeMsg = "Close:" + getHandlerName(); + } + + private boolean appendHandlerName(MessageContext msgContext, String handlerMsg) + { try { SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); - String value = soapElement.getValue(); - - String handlerName = getHandlerName(); - soapElement.setValue(value + ":" + handlerName); - + if (soapElement.getElementQName().getLocalPart().startsWith("echo")) + { + soapElement = (SOAPElement)soapElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + ":" + handlerMsg); + } return true; } catch (SOAPException ex) Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -31,4 +31,13 @@ { @WebMethod public String echo(String msg); + + @WebMethod + public String getPostConstruct(); + + @WebMethod + public String getPreDestroy(); + + @WebMethod + public String getClose(); } Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2007-03-13 18:20:48 UTC (rev 2609) @@ -44,4 +44,25 @@ log.info("echo: " + msg); return msg + ":endpoint"; } + + @WebMethod + public String getPostConstruct() + { + log.info("getPostConstruct: " + LifecycleHandler.postConstructMsg); + return LifecycleHandler.postConstructMsg; + } + + @WebMethod + public String getPreDestroy() + { + log.info("getPreDestroy: " + LifecycleHandler.preDestroyMsg); + return LifecycleHandler.postConstructMsg; + } + + @WebMethod + public String getClose() + { + log.info("getClose: " + LifecycleHandler.closeMsg); + return LifecycleHandler.closeMsg; + } } Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml (from rev 2607, trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/jaxws-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml 2007-03-13 18:20:48 UTC (rev 2609) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> LogHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.handlerchain.LogHandler </handler-class> + <init-param> + <param-name>logCategory</param-name> + <param-value>MyService</param-value> + </init-param> + </handler> + <handler> + <handler-name> AuthorizationHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.handlerchain.AuthorizationHandler </handler-class> + <soap-role>SecurityProvider</soap-role> + </handler> + <handler> + <handler-name> RoutingHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.handlerchain.RoutingHandler </handler-class> + </handler> + </handler-chain> +</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/jaxws-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/jaxws-handlers.xml 2007-03-13 15:14:03 UTC (rev 2608) +++ trunk/jbossws-tests/src/resources/jaxws/samples/handlerchain/jaxws-handlers.xml 2007-03-13 18:20:48 UTC (rev 2609) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> LogHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.handlerchain.LogHandler </handler-class> - <init-param> - <param-name>logCategory</param-name> - <param-value>MyService</param-value> - </init-param> - </handler> - <handler> - <handler-name> AuthorizationHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.handlerchain.AuthorizationHandler </handler-class> - <soap-role>SecurityProvider</soap-role> - </handler> - <handler> - <handler-name> RoutingHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.handlerchain.RoutingHandler </handler-class> - </handler> - </handler-chain> -</handler-chains> \ No newline at end of file

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2608 - in trunk/jbossws-tests/src/resources/jaxws: handlerlifecycle and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-13 11:14:03 -0400 (Tue, 13 Mar 2007) New Revision: 2608 Added: trunk/jbossws-tests/src/resources/jaxws/handlerlifecycle/ trunk/jbossws-tests/src/resources/jaxws/handlerlifecycle/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/handlerlifecycle/WEB-INF/web.xml Log: Add handler lifecycle test case Added: trunk/jbossws-tests/src/resources/jaxws/handlerlifecycle/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/handlerlifecycle/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/handlerlifecycle/WEB-INF/web.xml 2007-03-13 15:14:03 UTC (rev 2608) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.handlerlifecycle.SOAPEndpointBean</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Property changes on: trunk/jbossws-tests/src/resources/jaxws/handlerlifecycle/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2607 - in trunk: jbossws-tests and 15 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-13 11:10:18 -0400 (Tue, 13 Mar 2007) New Revision: 2607 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml Removed: trunk/jbossws-tests/src/resources/jaxws/handlerscope/META-INF/ trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/ant-import/build-samples-jaxws.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java Log: Add handler lifecycle test case Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -169,7 +169,7 @@ return; URL fileURL = null; - if(log.isDebugEnabled()) log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); + log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); // Try the filename as URL try @@ -205,8 +205,16 @@ // Try the filename relative to class if (fileURL == null) { + String filepath = filename; String packagePath = wsClass.getPackage().getName().replace('.', '/'); - fileURL = epMetaData.getClassLoader().getResource(packagePath + "/" + filename); + String resourcePath = packagePath + "/" + filepath; + while (filepath.startsWith("../")) + { + packagePath = packagePath.substring(0, packagePath.lastIndexOf("/")); + filepath = filepath.substring(3); + resourcePath = packagePath + "/" + filepath; + } + fileURL = epMetaData.getClassLoader().getResource(resourcePath); } if (fileURL == null) Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -122,16 +122,24 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/> + </classes> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF"> - <include name="jaxws-server-handlers.xml"/> - </webinf> </war>  Modified: trunk/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -56,8 +56,6 @@ </war>  - <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/samples/handlerchain" - file="${tests.output.dir}/resources/jaxws/samples/handlerchain/jaxws-handlers.xml"/> <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> @@ -132,10 +130,8 @@ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF"> - <include name="jaxws-server-source-handlers.xml"/> - </webinf> </war> <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> @@ -147,10 +143,8 @@ <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF"> - <include name="jaxws-server-jaxb-handlers.xml"/> - </webinf> </war>  @@ -192,10 +186,10 @@ <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> <include name="wsdl/*"/> - <include name="jaxws-handler.xml"/> </metainf> </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> @@ -389,10 +383,8 @@ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF"> - <include name="jaxws-handlers.xml"/> - </webinf> </war>  Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/build.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -395,6 +395,14 @@ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> +  + <copy todir="${tests.output.dir}/classes"> + <fileset dir="${tests.java.dir}"> + <include name="**/*.xml"/> + </fileset> + </copy> + +  <copy todir="${tests.output.dir}/resources"> <fileset dir="${tests.resources.dir}"> <include name="**/*.wsdl"/> Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,61 @@ +/* + * 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.test.ws.jaxws.handlerlifecycle; + +// $Id$ + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test JAXWS handler lifecycle + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Aug-2006 + */ +public class HandlerLifecycleTestCase extends JBossWSTest +{ + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war"); + } + + public void testClientAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-handlerlifecycle?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/jaxws/handlerlifecycle", "SOAPEndpointService"); + Service service = Service.create(wsdlURL, serviceName); + SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); + + String retStr = port.echo("hello"); + + StringBuffer expStr = new StringBuffer("hello:ServerHandler:endpoint:ServerHandler"); + assertEquals(expStr.toString(), retStr); + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,66 @@ +/* + * 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.test.ws.jaxws.handlerlifecycle; + +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; + +public class LifecycleHandler extends GenericSOAPHandler +{ + @Override + public boolean handleOutbound(MessageContext msgContext) + { + return appendHandlerName(msgContext); + } + + @Override + public boolean handleInbound(MessageContext msgContext) + { + return appendHandlerName(msgContext); + } + + private boolean appendHandlerName(MessageContext msgContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + soapElement = (SOAPElement)soapElement.getChildElements().next(); + String value = soapElement.getValue(); + + String handlerName = getHandlerName(); + soapElement.setValue(value + ":" + handlerName); + + return true; + } + catch (SOAPException ex) + { + throw new WebServiceException(ex); + } + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,34 @@ +/* + * 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.test.ws.jaxws.handlerlifecycle; + +//$Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +public interface SOAPEndpoint +{ + @WebMethod + public String echo(String msg); +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,47 @@ +/* + * 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.test.ws.jaxws.handlerlifecycle; + +// $Id$ + +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.logging.Logger; + +@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/handlerlifecycle") +@HandlerChain(file = "jaxws-server-handlers.xml") +@SOAPBinding(style = Style.RPC) +public class SOAPEndpointBean +{ + private static Logger log = Logger.getLogger(SOAPEndpointBean.class); + + @WebMethod + public String echo(String msg) + { + log.info("echo: " + msg); + return msg + ":endpoint"; + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <handler> + <handler-name> ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerlifecycle.LifecycleHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -30,7 +30,7 @@ @WebService @BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") -@HandlerChain(file = "resources/jaxws/handlerscope/META-INF/jaxws-client-handlers.xml") +@HandlerChain(file = "jaxws-client-handlers.xml") public interface SOAPEndpoint { @WebMethod Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -34,7 +34,7 @@ @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/handlerscope") @BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") // SOAP-1.2 -@HandlerChain(file = "WEB-INF/jaxws-server-handlers.xml") +@HandlerChain(file = "jaxws-server-handlers.xml") @SOAPBinding(style = Style.RPC) public class SOAPEndpointBean { Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/handlerscope/META-INF/jaxws-client-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-client-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP12ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAPClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> + <handler> + <handler-name> ServiceClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> + <handler> + <handler-name> ServiceWildcardClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:InvalidService</service-name-pattern> + <handler> + <handler-name> InvalidServiceClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> + <handler> + <handler-name> PortWildcardClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:InvalidPort</port-name-pattern> + <handler> + <handler-name> InvalidPortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> GeneralClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP12ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> + <handler> + <handler-name> SOAPServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> + <handler> + <handler-name> ServiceServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> + <handler> + <handler-name> ServiceWildcardServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <service-name-pattern>ns1:InvalidService</service-name-pattern> + <handler> + <handler-name> InvalidServiceServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> + <handler> + <handler-name> PortWildcardServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:InvalidPort</port-name-pattern> + <handler> + <handler-name> InvalidPortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> GeneralServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -32,7 +32,7 @@ import javax.xml.ws.ResponseWrapper; @WebService() -@HandlerChain(file = "resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml") +@HandlerChain(file = "jaxws-client-jaxb-handlers.xml") public interface SOAPEndpointJAXB { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler") -@HandlerChain(file = "WEB-INF/jaxws-server-jaxb-handlers.xml") +@HandlerChain(file = "jaxws-server-jaxb-handlers.xml") public class SOAPEndpointJAXBImpl { private static Logger log = Logger.getLogger(SOAPEndpointJAXBImpl.class); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -32,7 +32,7 @@ import javax.xml.ws.ResponseWrapper; @WebService() -@HandlerChain(file = "resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml") +@HandlerChain(file = "jaxws-client-source-handlers.xml") public interface SOAPEndpointSource { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/samples/logicalhandler") -@HandlerChain(file = "WEB-INF/jaxws-server-source-handlers.xml") +@HandlerChain(file = "jaxws-server-source-handlers.xml") public class SOAPEndpointSourceImpl { private static Logger log = Logger.getLogger(SOAPEndpointSourceImpl.class); Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-client-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortClientHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml (from rev 2606, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml (from rev 2606, trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name> SOAP11ServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <handler> + <handler-name> LogicalServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> + </handler> + </handler-chain> + + <handler-chain> + <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> + <handler> + <handler-name> PortServerHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -42,7 +42,7 @@ */ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.OrderMgmt", name="OrderMgmt", serviceName = "OrderMgmtService") -@HandlerChain(file = "META-INF/jaxws-handler.xml") +@HandlerChain(file = "jaxws-handler.xml") public class OrderMgmtBean implements OrderMgmt { private static final Logger log = Logger.getLogger(OrderMgmtBean.class); Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -30,7 +30,7 @@ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification", name="CCVerification") -@HandlerChain(file = "META-INF/jaxws-handler.xml") +@HandlerChain(file = "../jaxws-handler.xml") public class CCVerificationBean implements CCVerification { private static final Logger log = Logger.getLogger(CCVerificationBean.class); Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>SOAPMessageTrace</handler-name> + <handler-class>org.jboss.test.ws.jaxws.samples.retail.handler.SOAPMessageTrace</handler-class> + </handler> + </handler-chain> + +</handler-chains> \ No newline at end of file Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -27,7 +27,7 @@ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt", name="ProfileMgmt", serviceName = "ProfileMgmtService") -@HandlerChain(file = "META-INF/jaxws-handler.xml") +@HandlerChain(file = "../jaxws-handler.xml") public class ProfileMgmtBean implements ProfileMgmt { public DiscountResponse getCustomerDiscount(DiscountRequest request) { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2007-03-13 15:10:18 UTC (rev 2607) @@ -48,7 +48,7 @@ */ @WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService") @EndpointConfig(configName = "Standard WSAddressing Endpoint") -@HandlerChain(file = "WEB-INF/jaxws-handlers.xml") +@HandlerChain(file = "jaxws-handlers.xml") @SOAPBinding(style = SOAPBinding.Style.RPC) public class StatefulEndpointImpl implements StatefulEndpoint { Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml (from rev 2604, trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <protocol-bindings>##SOAP11_HTTP</protocol-bindings> + <handler> + <handler-name>Application Server Handler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServerHandler</handler-class> + </handler> + </handler-chain> +</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/handlerscope/WEB-INF/jaxws-server-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP12ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP ##SOAP12_HTTP</protocol-bindings> - <handler> - <handler-name> SOAPServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointService</service-name-pattern> - <handler> - <handler-name> ServiceServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:SOAPEndpointSer*</service-name-pattern> - <handler> - <handler-name> ServiceWildcardServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <service-name-pattern>ns1:InvalidService</service-name-pattern> - <handler> - <handler-name> InvalidServiceServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPo*</port-name-pattern> - <handler> - <handler-name> PortWildcardServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:InvalidPort</port-name-pattern> - <handler> - <handler-name> InvalidPortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> GeneralServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.handlerscope.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/META-INF/jaxws-client-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortClientHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-jaxb-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalJAXBHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/logicalhandler/WEB-INF/jaxws-server-source-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/samples/logicalhandler" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name> SOAP11ServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <handler> - <handler-name> LogicalServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.LogicalSourceHandler </handler-class> - </handler> - </handler-chain> - - <handler-chain> - <port-name-pattern>ns1:SOAPEndpointPort</port-name-pattern> - <handler> - <handler-name> PortServerHandler </handler-name> - <handler-class> org.jboss.test.ws.jaxws.samples.logicalhandler.ProtocolHandler </handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/retail/META-INF/jaxws-handler.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name>SOAPMessageTrace</handler-name> - <handler-class>org.jboss.test.ws.jaxws.samples.retail.handler.SOAPMessageTrace</handler-class> - </handler> - </handler-chain> - -</handler-chains> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2007-03-13 10:59:34 UTC (rev 2606) +++ trunk/jbossws-tests/src/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2007-03-13 15:10:18 UTC (rev 2607) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> - <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name>Application Server Handler</handler-name> - <handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServerHandler</handler-class> - </handler> - </handler-chain> -</handler-chains> \ No newline at end of file

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2606 - in trunk/jbossws-core/src/java/org/jboss/ws: core/soap and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alex.guizar(a)jboss.com Date: 2007-03-13 06:59:34 -0400 (Tue, 13 Mar 2007) New Revision: 2606 Modified: trunk/jbossws-core/src/java/org/jboss/ws/Constants.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java Log: JBCTS-467 reimplemented attribute accessor methods to be compatible with both SOAP 1.1 and SOAP 1.2 Modified: trunk/jbossws-core/src/java/org/jboss/ws/Constants.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/Constants.java 2007-03-13 10:56:57 UTC (rev 2605) +++ trunk/jbossws-core/src/java/org/jboss/ws/Constants.java 2007-03-13 10:59:34 UTC (rev 2606) @@ -135,8 +135,6 @@ /** SOAP-1.1 attributes */ static final String SOAP11_ATTR_ACTOR = "actor"; - static final String SOAP12_ATTR_ROLE = "role"; - static final String SOAP12_ATTR_RELAY = "relay"; static final String SOAP11_ATTR_MUST_UNDERSTAND = "mustUnderstand"; /** SOAP-1.1 fault codes */ @@ -155,6 +153,10 @@ static final QName SOAP11_FAULTACTOR = new QName("faultactor"); static final QName SOAP11_DETAIL = new QName("detail"); + /** SOAP-1.2 attributes */ + static final String SOAP12_ATTR_ROLE = "role"; + static final String SOAP12_ATTR_RELAY = "relay"; + /**SOAP-1.2 elements */ static final QName SOAP12_CODE = new QName(NS_SOAP12_ENV, "Code", PREFIX_ENV); static final QName SOAP12_VALUE = new QName(NS_SOAP12_ENV, "Value", PREFIX_ENV); @@ -299,7 +301,6 @@ static final QName WSDL_ATTRIBUTE_WSA_ACTION = new QName(URI_WS_ADDRESSING, "Action"); static final QName WSDL_ATTRIBUTE_WSE_EVENTSOURCE = new QName(URI_WS_EVENTING, "EventSource"); - /** WSDL-2.0 exchange patterns */ static final String WSDL20_PATTERN_IN_ONLY = "http://www.w3.org/2004/08/wsdl/in-only"; Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-03-13 10:56:57 UTC (rev 2605) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderElementImpl.java 2007-03-13 10:59:34 UTC (rev 2606) @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.List; +import javax.xml.namespace.QName; import javax.xml.soap.Name; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPEnvelope; @@ -36,6 +37,8 @@ import javax.xml.soap.SOAPHeaderElement; import org.jboss.ws.Constants; +import org.jboss.ws.core.utils.DOMUtils; +import org.w3c.dom.Attr; /** * An object representing the contents in the SOAP header part of the SOAP envelope. @@ -53,6 +56,11 @@ super(name); } + public SOAPHeaderElementImpl(QName qname) + { + super(qname); + } + public SOAPHeaderElementImpl(SOAPElementImpl element) { super(element); @@ -60,58 +68,82 @@ public String getRole() { - String envURI = Constants.NS_SOAP12_ENV; - String attr = getAttributeNS(envURI, Constants.SOAP12_ATTR_ROLE); - return attr; + final String headerURI = getParentElement().getNamespaceURI(); + + if (Constants.NS_SOAP11_ENV.equals(headerURI)) + throw new UnsupportedOperationException("SOAP 1.1 does not support the concept of Role"); + + Attr roleAttr = getAttributeNodeNS(headerURI, Constants.SOAP12_ATTR_ROLE); + return roleAttr != null ? roleAttr.getValue() : null; } public void setRole(String roleURI) { - String envURI = Constants.NS_SOAP12_ENV; - String qualifiedName = Constants.PREFIX_ENV + ":" + Constants.SOAP12_ATTR_ROLE; - setAttributeNS(envURI, qualifiedName, roleURI); + final SOAPElement header = getParentElement(); + final String headerURI = header.getNamespaceURI(); + + if (Constants.NS_SOAP11_ENV.equals(headerURI)) + throw new UnsupportedOperationException("SOAP 1.1 does not support the concept of Role"); + + setAttributeNS(headerURI, header.getPrefix() + ":" + Constants.SOAP12_ATTR_ROLE, roleURI); } public boolean getRelay() { - String envURI = Constants.NS_SOAP12_ENV; - String attr = getAttributeNS(envURI, Constants.SOAP12_ATTR_RELAY); - return "true".equals(attr); + final String headerURI = getParentElement().getNamespaceURI(); + + if (Constants.NS_SOAP11_ENV.equals(headerURI)) + throw new UnsupportedOperationException("SOAP 1.1 does not support the concept of Role"); + + return DOMUtils.getAttributeValueAsBoolean(this, new QName(headerURI, Constants.SOAP12_ATTR_RELAY)); } public void setRelay(boolean relay) { - String envURI = Constants.NS_SOAP12_ENV; - String qualifiedName = Constants.PREFIX_ENV + ":" + Constants.SOAP12_ATTR_RELAY; - setAttributeNS(envURI, qualifiedName, new Boolean(relay).toString()); + final SOAPElement header = getParentElement(); + final String headerURI = header.getNamespaceURI(); + + if (Constants.NS_SOAP11_ENV.equals(headerURI)) + throw new UnsupportedOperationException("SOAP 1.1 does not support the concept of Role"); + + setAttributeNS(headerURI, header.getPrefix() + ":" + Constants.SOAP12_ATTR_RELAY, Boolean.toString(relay)); } public String getActor() { - String envURI = Constants.NS_SOAP11_ENV; - String attr = getAttributeNS(envURI, Constants.SOAP11_ATTR_ACTOR); - return attr; + final String headerURI = getParentElement().getNamespaceURI(); + + if (!Constants.NS_SOAP11_ENV.equals(headerURI)) + return getRole(); + + Attr actorAttr = getAttributeNodeNS(headerURI, Constants.SOAP11_ATTR_ACTOR); + return actorAttr != null ? actorAttr.getValue() : null; } - public boolean getMustUnderstand() + public void setActor(String actorURI) { - String envURI = Constants.NS_SOAP11_ENV; - String attr = getAttributeNS(envURI, Constants.SOAP11_ATTR_MUST_UNDERSTAND); - return "1".equals(attr); + final SOAPElement header = getParentElement(); + final String headerURI = header.getNamespaceURI(); + + if (Constants.NS_SOAP11_ENV.equals(headerURI)) + setAttributeNS(headerURI, header.getPrefix() + ":" + Constants.SOAP11_ATTR_ACTOR, actorURI); + else + setRole(actorURI); } - public void setActor(String actorURI) + public boolean getMustUnderstand() { - String envURI = Constants.NS_SOAP11_ENV; - String qualifiedName = Constants.PREFIX_ENV + ":" + Constants.SOAP11_ATTR_ACTOR; - setAttributeNS(envURI, qualifiedName, actorURI); + final String headerURI = getParentElement().getNamespaceURI(); + + return DOMUtils.getAttributeValueAsBoolean(this, new QName(headerURI, Constants.SOAP11_ATTR_MUST_UNDERSTAND)); } public void setMustUnderstand(boolean mustUnderstand) { - String envURI = Constants.NS_SOAP11_ENV; - String qualifiedName = Constants.PREFIX_ENV + ":" + Constants.SOAP11_ATTR_MUST_UNDERSTAND; - setAttributeNS(envURI, qualifiedName, mustUnderstand ? "1" : "0"); + final SOAPElement header = getParentElement(); + final String headerURI = header.getNamespaceURI(); + + setAttributeNS(headerURI, header.getPrefix() + ":" + Constants.SOAP11_ATTR_MUST_UNDERSTAND, mustUnderstand ? "1" : "0"); } public void setParentElement(SOAPElement parent) throws SOAPException

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2605 - in trunk/jbossws-core/src/java/org/jboss/ws/core: utils and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alex.guizar(a)jboss.com Date: 2007-03-13 06:56:57 -0400 (Tue, 13 Mar 2007) New Revision: 2605 Added: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/SAAJUtils.java Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java Log: JBCTS-499 implemented SAAJ 1.3 methods in SOAPHeader Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java 2007-03-12 22:16:25 UTC (rev 2604) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/DetailImpl.java 2007-03-13 10:56:57 UTC (rev 2605) @@ -35,7 +35,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.utils.DOMUtils; -import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -123,15 +122,6 @@ } @Override - public Node appendChild(Node newChild) throws DOMException - { - if (newChild instanceof SOAPElementImpl && !(newChild instanceof DetailEntry)) - newChild = convertToDetailEntry((SOAPElementImpl) newChild); - - return super.appendChild(newChild); - } - - @Override public SOAPElement addChildElement(SOAPElement child) throws SOAPException { if (!(child instanceof DetailEntry)) Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-03-12 22:16:25 UTC (rev 2604) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2007-03-13 10:56:57 UTC (rev 2605) @@ -39,6 +39,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.core.utils.DOMWriter; +import org.jboss.ws.core.utils.SAAJUtils; import org.jboss.xb.QNameBuilder; import org.w3c.dom.Attr; @@ -201,46 +202,9 @@ private static void setCode(SOAPElement codeElement, QName code) throws SOAPException { - String nsURI = code.getNamespaceURI(); - String prefix = code.getPrefix(); - if (prefix.length() == 0) - { - // no given prefix, find prefix currently associated to given URI - prefix = getNamespacePrefix(codeElement, nsURI); - if (prefix == null) - { - // no prefix currently associated to given URI, declare namespace locally - prefix = "codeNS"; - codeElement.addNamespaceDeclaration(prefix, nsURI); - } - } - // verify given prefix is associated to given URI - else if (!nsURI.equals(codeElement.getNamespaceURI(prefix))) - { - // prefix is associated with other/no URI, declare namespace locally - codeElement.addNamespaceDeclaration(prefix, nsURI); - } - - codeElement.setValue(prefix + ":" + code.getLocalPart()); + SAAJUtils.setQualifiedElementValue(codeElement, code); } - /** - * Returns the prefix of the namespace that has the given URI. - * @param nsURI the URI of the namespace to search for - * @return the prefix of the namespace or <code>null</code> if not found - */ - private static String getNamespacePrefix(SOAPElement element, String nsURI) - { - Iterator it = element.getVisibleNamespacePrefixes(); - while (it.hasNext()) - { - String prefix = (String)it.next(); - if (nsURI.equals(element.getNamespaceURI(prefix))) - return prefix; - } - return null; - } - private static SOAPElement addChildValueElement(SOAPElement codeElement) throws SOAPException { return codeElement.addChildElement("Value", codeElement.getPrefix(), codeElement.getNamespaceURI()); Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-03-12 22:16:25 UTC (rev 2604) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-03-13 10:56:57 UTC (rev 2605) @@ -22,6 +22,8 @@ package org.jboss.ws.core.soap; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import javax.xml.namespace.QName; @@ -32,8 +34,8 @@ import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.Text; -import org.jboss.util.NotImplementedException; import org.jboss.ws.Constants; +import org.jboss.ws.core.utils.SAAJUtils; import org.w3c.dom.DOMException; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Node; @@ -99,25 +101,28 @@ */ public SOAPHeaderElement addHeaderElement(Name name) throws SOAPException { - if (name == null || name.getURI().length() == 0 || name.getPrefix().length() == 0) + if (name == null) throw new SOAPException("Invalid SOAPHeaderElement name: " + name); + return addHeaderElement(((NameImpl)name).toQName()); + } + + public SOAPHeaderElement addHeaderElement(QName name) throws SOAPException + { + if (name == null || name.getNamespaceURI().length() == 0 || name.getPrefix().length() == 0) + throw new SOAPException("Invalid SOAPHeaderElement name: " + name); + SOAPHeaderElementImpl headerElement = new SOAPHeaderElementImpl(name); addChildElement(headerElement); return headerElement; } - - public SOAPHeaderElement addHeaderElement(QName qname) throws SOAPException - { - return addHeaderElement(new NameImpl(qname)); - } /** Returns an Iterator over all the SOAPHeaderElement objects in this SOAPHeader object. */ public Iterator examineAllHeaderElements() { // make a defensive copy - ArrayList list = new ArrayList(); + ArrayList<SOAPHeaderElement> list = new ArrayList<SOAPHeaderElement>(); Iterator it = getChildElements(); while (it.hasNext()) { @@ -135,7 +140,7 @@ throw new IllegalArgumentException("Invalid actor: " + actor); // make a defensive copy - ArrayList list = new ArrayList(); + ArrayList<SOAPHeaderElement> list = new ArrayList<SOAPHeaderElement>(); Iterator it = getChildElements(); while (it.hasNext()) { @@ -155,7 +160,7 @@ throw new IllegalArgumentException("Invalid actor: " + actor); // make a defensive copy - ArrayList list = new ArrayList(); + ArrayList<SOAPHeaderElement> list = new ArrayList<SOAPHeaderElement>(); Iterator it = getChildElements(); while (it.hasNext()) { @@ -169,7 +174,7 @@ public Iterator extractAllHeaderElements() { // make a defensive copy - ArrayList list = new ArrayList(); + ArrayList<SOAPHeaderElement> list = new ArrayList<SOAPHeaderElement>(); Iterator it = getChildElements(); while (it.hasNext()) { @@ -186,7 +191,7 @@ throw new IllegalArgumentException("Invalid actor: " + actor); // make a defensive copy - ArrayList list = new ArrayList(); + ArrayList<SOAPHeaderElement> list = new ArrayList<SOAPHeaderElement>(); Iterator it = getChildElements(); while (it.hasNext()) { @@ -226,25 +231,57 @@ public SOAPHeaderElement addNotUnderstoodHeaderElement(QName qname) throws SOAPException { - //TODO: SAAJ 1.3 - throw new NotImplementedException(); + if (Constants.NS_SOAP11_ENV.equals(getNamespaceURI())) + throw new UnsupportedOperationException("SOAP 1.1 Header does not support the concept of NotUnderstood"); + + // create NotUnderstood header block + QName notUnderstoodName = new QName(getNamespaceURI(), "NotUnderstood", getPrefix()); + SOAPHeaderElement notUnderstoodElement = addHeaderElement(notUnderstoodName); + + // set qname attribute + SAAJUtils.setQualifiedAttributeValue(notUnderstoodElement, "qname", qname); + + return notUnderstoodElement; } - public SOAPHeaderElement addUpgradeHeaderElement(Iterator soapURIs) throws SOAPException + public SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSoapUris) throws SOAPException { - //TODO: SAAJ 1.3 - throw new NotImplementedException(); + if (supportedSoapUris == null) + throw new SOAPException("list of supported URIs cannot be null"); + + if (!supportedSoapUris.hasNext()) + throw new SOAPException("list of supported URIs cannot be empty"); + + final String namespaceURI = getNamespaceURI(); + final String prefix = getPrefix(); + + // create Upgrade header block + QName upgradeName = new QName(namespaceURI, "Upgrade", prefix); + SOAPHeaderElement upgradeElement = addHeaderElement(upgradeName); + + while (supportedSoapUris.hasNext()) + { + String soapUri = (String)supportedSoapUris.next(); + + SOAPElement supportedElement = upgradeElement.addChildElement("SupportedEnvelope", prefix, namespaceURI); + SAAJUtils.setQualifiedAttributeValue(supportedElement, "qname", new QName(soapUri, "Envelope")); + } + return upgradeElement; } - public SOAPHeaderElement addUpgradeHeaderElement(String[] soapURIs) throws SOAPException + public SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris) throws SOAPException { - //TODO: SAAJ 1.3 - throw new NotImplementedException(); + if (supportedSoapUris == null) + throw new SOAPException("list of supported URIs cannot be null"); + + return addUpgradeHeaderElement(Arrays.asList(supportedSoapUris).iterator()); } - public SOAPHeaderElement addUpgradeHeaderElement(String soapURI) throws SOAPException + public SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri) throws SOAPException { - //TODO: SAAJ 1.3 - throw new NotImplementedException(); + if (supportedSoapUri == null) + throw new SOAPException("supported URI cannot be null"); + + return addUpgradeHeaderElement(Collections.singletonList(supportedSoapUri).iterator()); } } \ No newline at end of file Added: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/SAAJUtils.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/SAAJUtils.java (rev 0) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/SAAJUtils.java 2007-03-13 10:56:57 UTC (rev 2605) @@ -0,0 +1,95 @@ +/* + * 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.core.utils; + +import java.util.Iterator; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; + +/** + * SAAJ utilities. + * @author <a href="mailto:alex.guizar@jboss.com">Alejandro Guizar</a> + * @version $Revision$ + */ +public class SAAJUtils +{ + /** Set the qname value to the given element. + * @param value a namespace qualified name; its namespace name MUST NOT be empty + */ + public static void setQualifiedElementValue(SOAPElement element, QName value) throws SOAPException + { + String prefix = ensureNamespaceDeclared(element, value.getPrefix(), value.getNamespaceURI()); + element.setValue(prefix + ':' + value.getLocalPart()); + } + + /** Set the qname value to the specified attribute of the given element. + * @param value a namespace qualified name; its namespace name MUST NOT be empty + */ + public static void setQualifiedAttributeValue(SOAPElement element, String attributeName, QName value) throws SOAPException + { + String prefix = ensureNamespaceDeclared(element, value.getPrefix(), value.getNamespaceURI()); + element.setAttribute(attributeName, prefix + ':' + value.getLocalPart()); + } + + /** Ensures the given namespace is declared in the scope of the given element. + */ + private static String ensureNamespaceDeclared(SOAPElement element, String prefix, String nsURI) throws SOAPException + { + if (prefix.length() == 0) + { + // no given prefix, find prefix currently associated to given URI + prefix = getNamespacePrefix(element, nsURI); + if (prefix == null) + { + // no prefix currently associated to given URI, declare namespace locally + prefix = "valueNS"; + element.addNamespaceDeclaration(prefix, nsURI); + } + } + // verify given prefix is associated to given URI + else if (!nsURI.equals(element.getNamespaceURI(prefix))) + { + // prefix is associated with other/no URI, declare namespace locally + element.addNamespaceDeclaration(prefix, nsURI); + } + return prefix; + } + + /** + * Returns the prefix of the namespace that has the given URI. + * @param nsURI the URI of the namespace to search for + * @return the prefix of the namespace or <code>null</code> if not found + */ + public static String getNamespacePrefix(SOAPElement element, String nsURI) + { + Iterator it = element.getVisibleNamespacePrefixes(); + while (it.hasNext()) + { + String prefix = (String)it.next(); + if (nsURI.equals(element.getNamespaceURI(prefix))) + return prefix; + } + return null; + } +} Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/SAAJUtils.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2604 - trunk/build/etc/component-info.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-12 18:16:25 -0400 (Mon, 12 Mar 2007) New Revision: 2604 Added: trunk/build/etc/component-info/integration-jboss50.xml Log: Use a repository entry per IL Added: trunk/build/etc/component-info/integration-jboss50.xml =================================================================== --- trunk/build/etc/component-info/integration-jboss50.xml (rev 0) +++ trunk/build/etc/component-info/integration-jboss50.xml 2007-03-12 22:16:25 UTC (rev 2604) @@ -0,0 +1,29 @@ +<project name="jboss/jbossws-jboss50"> + + <component id="jboss/jbossws-jboss50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws50.sar"/> + <artifact id="jbossws50-deployer.zip"/> + + <import componentref="jboss/jbossws"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting@"/> + </import> + + <export> + </export> + + </component> + +</project> Property changes on: trunk/build/etc/component-info/integration-jboss50.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2603 - in trunk: build/dist and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-12 18:15:59 -0400 (Mon, 12 Mar 2007) New Revision: 2603 Added: trunk/build/etc/component-info/ trunk/build/etc/component-info/jbossws-core.xml Removed: trunk/build/etc/jbossws-component-info.xml trunk/build/etc/jbossws-component-info14.xml Modified: trunk/build/ant-import/build-deploy.xml trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/dist/ant.properties.example trunk/integration-jboss40/build.xml trunk/integration-jboss42/build.xml trunk/integration-jboss50/build.xml trunk/integration-tomcat/build.xml trunk/jbossws-core/build.xml trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml Log: Use a repository entry per IL Modified: trunk/build/ant-import/build-deploy.xml =================================================================== --- trunk/build/ant-import/build-deploy.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/ant-import/build-deploy.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -46,7 +46,7 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat"/> <include name="*.sh"/> </fileset> @@ -94,7 +94,7 @@ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <copy todir="${jboss42.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat"/> <include name="*.sh"/> </fileset> @@ -139,7 +139,7 @@ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat" /> <include name="*.sh" /> </fileset> @@ -188,7 +188,7 @@ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> <copy todir="${jboss40.home}/bin" overwrite="true"> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat" /> <include name="*.sh" /> </fileset> Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/ant-import/build-release.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -42,13 +42,15 @@ <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14" description="Release to jboss.local.repository"> -  - <property name="jbossws.repository.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> - <mkdir dir="${jbossws.repository.dir}/lib"/> +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> <delete> - <fileset dir="${jbossws.repository.dir}/lib"/> + <fileset dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> + <fileset dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> </delete> - <copy todir="${jbossws.repository.dir}/lib" overwrite="true"> + <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-integration.jar"/> <include name="jbossws-client.jar"/> @@ -57,48 +59,25 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> - <fileset dir="${jboss50.output.lib.dir}"> - <include name="jbossws50.sar"/> - <include name="jbossws50-deployer.zip"/> - </fileset> -  </copy> - <copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-core.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> -  + <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws50.sar"/> + <include name="jbossws50-deployer.zip"/> </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws40-jdk14.sar"/> - <include name="jbossws14-client.jar"/> - <include name="jboss-jaxws14.jar"/> - </fileset> </copy> - <copy tofile="${jbossws14.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info14.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/integration-jboss50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - --> </target> @@ -114,14 +93,6 @@ <property name="portal.userguide" value="${portal.freezone}/user-guide"/> <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/> -  -  <copy todir="${portal.downloads}" overwrite="true"> <fileset dir="${build.output.dir}"> @@ -144,6 +115,7 @@ <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc" description="Build the binary distribution"> + <property name="install.bin.dir" value="${build.bin.dist}/install/bin"/> <property name="install.etc.dir" value="${build.bin.dist}/install/etc"/> <property name="install.core.dir" value="${build.bin.dist}/install/jbossws-core"/> <property name="install.jboss40.dir" value="${build.bin.dist}/install/integration-jboss40"/> @@ -160,7 +132,7 @@ <mkdir dir="${install.tomcat.dir}"/> <mkdir dir="${install.thirdparty.dir}"/> - <copy todir="${build.bin.dist}" file="${etc.dir}/JBossORG-EULA.txt" overwrite="true"/> + <copy todir="${build.bin.dist}" file="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> <fileset dir="${build.dir}/dist"/> <filterset> @@ -175,22 +147,20 @@  <copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/> -  - <copy todir="${install.etc.dir}"> - <fileset dir="${etc.dir}"> +  + <copy todir="${install.bin.dir}"> + <fileset dir="${build.etc.dir}"> <include name="*.bat"/> <include name="*.sh"/> </fileset> </copy> -  + <copy todir="${install.etc.dir}"> + <fileset dir="${build.etc.dir}"> + <include name="JBossORG-EULA.txt"/> + </fileset> </copy> - <copy todir="${build.bin.dist}/docs" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/pdf"/> - </copy> - -->  <copy todir="${install.core.dir}" overwrite="true"> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/ant-import/build-setup.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -31,8 +31,7 @@ <property name="core.dir" value="${basedir}/../jbossws-core"/> <property name="tests.dir" value="${basedir}/../jbossws-tests"/> - <property name="etc.dir" value="${build.dir}/output/etc"/> - <property name="docs.userguide.dir" value="${docs.dir}/user-guide/project"/> + <property name="build.etc.dir" value="${build.dir}/output/etc"/> <property name="thirdparty.dir" value="${build.dir}/thirdparty"/> <property name="jboss50.lib" value="${jboss50.home}/lib"/> Modified: trunk/build/dist/ant.properties.example =================================================================== --- trunk/build/dist/ant.properties.example 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/dist/ant.properties.example 2007-03-12 22:15:59 UTC (rev 2603) @@ -5,7 +5,7 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1 +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server instance Added: trunk/build/etc/component-info/jbossws-core.xml =================================================================== --- trunk/build/etc/component-info/jbossws-core.xml (rev 0) +++ trunk/build/etc/component-info/jbossws-core.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -0,0 +1,44 @@ +<project name="jboss/jbossws"> + + <component id="jboss/jbossws" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-integration.jar"/> + <artifact id="jbossws-client.jar"/> + <artifact id="jbossws-core.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + <compatible version="@apache-xmlsec@-brew"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + <compatible version="@ibm-wsdl4j@-brew"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + <compatible version="@javassist@-brew"/> + </import> + <import componentref="jbpm/bpel"> + <compatible version="@jbpm-bpel@"/> + </import> + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> + + <export> + <include input="jbossws-integration.jar"/> + <include input="jbossws-core.jar"/> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> Property changes on: trunk/build/etc/component-info/jbossws-core.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/etc/jbossws-component-info.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -1,56 +0,0 @@ -<project name="jboss/jbossws-component-info"> - - <component id="jboss/jbossws" licenseType="lgpl" version="@repository.id@" description="JBossWS an implementation of J2EE Web Services"> - - <artifact id="jbossws-integration.jar"/> - <artifact id="jbossws-client.jar"/> - <artifact id="jbossws-core.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - -  - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - <compatible version="@apache-xmlsec@-brew"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - <compatible version="@javassist@-brew"/> - </import> - <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting@"/> - </import> - <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> - </import> - - <export> - <include input="jbossws-integration.jar"/> - <include input="jbossws-core.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> Deleted: trunk/build/etc/jbossws-component-info14.xml =================================================================== --- trunk/build/etc/jbossws-component-info14.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/build/etc/jbossws-component-info14.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -1,48 +0,0 @@ -<project name="jboss/jbossws-component-info"> - - <component id="jboss/jbossws14" licenseType="lgpl" version="@repository.id@" - description="JBossWS an implementation of J2EE Web Services - Retrotranslated"> - - <artifact id="jbossws14-client.jar"/> - <artifact id="jboss-jaxws14.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-saaj.jar"/> - - <artifact id="jbossws40-jdk14.sar"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - </import> - <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> - </import> - <import componentref="jboss/jbossretro"> - <compatible version="@jboss-jbossretro@"/> - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="1.4.3.GA"/> - <compatible version="@jboss-remoting@"/> - </import> - - <export> - <include input="jbossws14-client.jar"/> - <include input="jboss-jaxws14.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> \ No newline at end of file Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-jboss40/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -149,7 +149,7 @@  <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> <include name="org/jboss/ws/integration/jboss40/**"/> @@ -169,7 +169,7 @@ </war>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws-jboss40-integration.jar"/> <include name="jbossws-context.war"/> @@ -209,7 +209,7 @@  <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> </fileset> @@ -221,7 +221,7 @@  <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="javax/jws/**"/> <include name="javax/xml/ws/**"/> @@ -229,7 +229,7 @@ </jar>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> <include name="org/jboss/ws/integration/jboss40/**"/> @@ -238,7 +238,7 @@ </jar>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/rpc/**"/> <include name="javax/xml/soap/**"/> @@ -256,7 +256,7 @@ <include name="schema/**"/> <include name="dtd/**"/> </fileset> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="wstools.sh"/> <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> @@ -269,7 +269,7 @@ file="${jboss40.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/>  - <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-jboss40-integration.jar"/> <include name="jbossws-context.war"/> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-jboss42/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -99,7 +99,7 @@  <mkdir dir="${jboss42.output.lib.dir}"/> - <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss42.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> @@ -118,7 +118,7 @@ </war>  - <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss42.output.lib.dir}"> <include name="jbossws-jboss42-integration.jar"/> <include name="jbossws-context.war"/> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-jboss50/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -76,7 +76,7 @@  <mkdir dir="${jboss50.output.lib.dir}"/> - <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss50.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> @@ -95,7 +95,7 @@ </war>  - <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/integration-tomcat/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -77,7 +77,7 @@  <mkdir dir="${tomcat.output.lib.dir}"/> - <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${tomcat.output.classes.dir}"> <include name="org/jboss/ws/integration/tomcat/**"/> </fileset> @@ -127,7 +127,7 @@ <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/stax-api.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/> <unjar dest="${tomcat.output.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/> - <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${tomcat.output.lib.dir}/build"/> </jar> <delete dir="${tomcat.output.lib.dir}/build"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/jbossws-core/build.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -72,8 +72,8 @@  <target name="core-compile-etc" depends="core-init"> - <mkdir dir="${etc.dir}"/> - <copy todir="${etc.dir}" filtering="yes" overwrite="yes"> + <mkdir dir="${build.etc.dir}"/> + <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${build.dir}/etc"/> <filterset> <filter token="java.vm.version" value="${java.vm.version}"/> @@ -102,7 +102,7 @@  <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/rpc/**"/> </fileset> @@ -110,7 +110,7 @@  <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/soap/**"/> </fileset> @@ -119,7 +119,7 @@  <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="javax/annotation/**"/> <include name="javax/jws/**"/> @@ -130,7 +130,7 @@  <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> @@ -143,14 +143,14 @@  <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jbossws-integration.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/integration/**"/> </fileset> </jar>  - <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/**"/> </fileset> @@ -162,14 +162,14 @@ <include name="schema/**"/> <include name="dtd/**"/> </fileset> - <fileset dir="${etc.dir}"> + <fileset dir="${build.etc.dir}"> <include name="wsprovide.bat"/> <include name="wsconsume.bat"/> <include name="wsrunclient.bat"/> <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> </fileset> - <zipfileset dir="${etc.dir}" filemode="755"> + <zipfileset dir="${build.etc.dir}" filemode="755"> <include name="wsprovide.sh"/> <include name="wsconsume.sh"/> <include name="wsrunclient.sh"/> Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-12 22:15:59 UTC (rev 2603) @@ -105,7 +105,7 @@ { // The service-ref-type is JAXWS specific String serviceRefType = serviceRef.getServiceRefType(); - if (serviceRefType != null) + if (serviceRefType != null || serviceRef.getAnnotatedElement() != null) return Type.JAXWS; String siName = serviceRef.getServiceInterface(); @@ -123,7 +123,7 @@ } catch (ClassNotFoundException e) { - throw new NamingException("Cannot load service-endpoint-interface: " + siName); + throw new NamingException("Cannot load <service-interface>: " + siName); } if (javax.xml.ws.Service.class.isAssignableFrom(siClass)) Modified: trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-03-12 17:10:29 UTC (rev 2602) +++ trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-03-12 22:15:59 UTC (rev 2603) @@ -124,6 +124,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionService.class"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF"> <include name="application-client.xml"/>

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2602 - in trunk: jbossws-core/src/java/org/jboss/ws/core/jaxws/client and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-12 13:10:29 -0400 (Mon, 12 Mar 2007) New Revision: 2602 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java Removed: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/webservices.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/application-client.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ejb-jar.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml Log: Add more jaxws <service-ref> tests Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -24,6 +24,8 @@ // $Id$ import java.lang.reflect.AnnotatedElement; +import java.net.URL; +import java.net.URLClassLoader; import javax.naming.Context; import javax.naming.NamingException; @@ -36,6 +38,7 @@ import org.jboss.ws.integration.ServiceRefMetaData; import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -70,7 +73,7 @@ serviceRef.setVfsRoot(vfsRoot); try { - if (isServiceRefJaxRpc(serviceRef)) + if (getServiceRefType(serviceRef) == Type.JAXRPC) { ServiceRefHandlerJAXRPC handler = new ServiceRefHandlerJAXRPC(); handler.setupServiceRef(encCtx, encName, serviceRef); @@ -98,10 +101,36 @@ objectFactory.setValue(ref, navigator, namespaceURI, localName, value); } - private boolean isServiceRefJaxRpc(UnifiedServiceRefMetaData serviceRef) + private Type getServiceRefType(UnifiedServiceRefMetaData serviceRef) throws NamingException { - // The <service-interface> is a required element - // for JAXRPC and not defined for JAXWS - return serviceRef.getServiceInterface() != null; + // The service-ref-type is JAXWS specific + String serviceRefType = serviceRef.getServiceRefType(); + if (serviceRefType != null) + return Type.JAXWS; + + String siName = serviceRef.getServiceInterface(); + if (siName == null) + throw new IllegalStateException("<service-interface> cannot be null"); + + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + URL rootURL = serviceRef.getVfsRoot().toURL(); + URLClassLoader loader = new URLClassLoader(new URL[] {rootURL}, ctxLoader); + + Class siClass; + try + { + siClass = loader.loadClass(siName); + } + catch (ClassNotFoundException e) + { + throw new NamingException("Cannot load service-endpoint-interface: " + siName); + } + + if (javax.xml.ws.Service.class.isAssignableFrom(siClass)) + return Type.JAXWS; + else if (javax.xml.rpc.Service.class.isAssignableFrom(siClass)) + return Type.JAXRPC; + else + throw new IllegalStateException("Illegal service interface: " + siName); } } Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -104,7 +104,7 @@ if (Service.class.getName().equals(targetClassName)) targetClassName = serviceImplClass; - if(log.isDebugEnabled()) log.debug("[name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); + log.debug("[name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); // Load the service class ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -113,7 +113,11 @@ if (serviceImplClass == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) serviceImplClass = targetClass.getName(); - // #3 Use javax.xml.ws.Service + // #3 Use <service-interface> + if (serviceImplClass == null && serviceRef.getServiceInterface() != null) + serviceImplClass = serviceRef.getServiceInterface(); + + // #4 Use javax.xml.ws.Service if (serviceImplClass == null) serviceImplClass = Service.class.getName(); Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -238,6 +238,40 @@ <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/> </classes> </war> + <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/ApplicationClient.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/EJBClient.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/EJBRemote.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> + <include name="ejb-jar.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar>  <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -0,0 +1,72 @@ +/* + * 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.test.ws.jaxws.serviceref; + +import java.rmi.RemoteException; +import java.util.ArrayList; + +import javax.ejb.Remote; +import javax.ejb.Stateless; +import javax.naming.InitialContext; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +import org.jboss.annotation.ejb.RemoteBinding; +import org.jboss.logging.Logger; + +(a)Remote(EJBRemote.class) +@RemoteBinding(jndiBinding = "/ejb/EJBClient") +@Stateless + +public class EJBClient +{ + // Provide logging + private static Logger log = Logger.getLogger(EJBClient.class); + + public String echo(String inStr) throws RemoteException + { + log.info("echo: " + inStr); + + ArrayList ports = new ArrayList(); + try + { + InitialContext iniCtx = new InitialContext(); + ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + } + catch (Exception ex) + { + log.error("Cannot add port", ex); + throw new WebServiceException(ex); + } + + for (int i = 0; i < ports.size(); i++) + { + TestEndpoint port = (TestEndpoint)ports.get(i); + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + } + + return inStr; + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -0,0 +1,28 @@ +/* + * 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.test.ws.jaxws.serviceref; + + +public interface EJBRemote +{ + String echo(String input); +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -47,7 +47,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxws-serviceref.war"); //ant , jaxws-serviceref-client.jar"); + return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-client.jar"); } public void testWSDLAccess() throws MalformedURLException Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -0,0 +1,85 @@ +/* + * 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.test.ws.jaxws.serviceref; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JAXRPC <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefEJBTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefEJBTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-ejb-client.jar"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://serviceref.jaxws.ws.test.jboss.org/", "TestEndpointService"); + Service service = Service.create(wsdlURL, qname); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + + public void testEJBClient() throws Exception + { + InitialContext iniCtx = getInitialContext(); + EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("/ejb/EJBClient"); + + String helloWorld = "Hello World!"; + Object retObj = ejbRemote.echo(helloWorld); + assertEquals(helloWorld, retObj); + + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -0,0 +1,82 @@ +/* + * 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.test.ws.jaxws.serviceref; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + +/** + * Test the jaxws <service-ref> + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefServletTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-serviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(ServiceRefServletTestCase.class, "jaxws-serviceref.war, jaxws-serviceref-servlet-client.war"); + } + + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new File("resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://serviceref.jaxws.ws.test.jboss.org/", "TestEndpointService"); + Service service = Service.create(wsdlURL, qname); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello World!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testServletClient() throws Exception + { + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + String retStr = br.readLine(); + assertEquals("HelloWorld", retStr); + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java 2007-03-12 17:10:29 UTC (rev 2602) @@ -0,0 +1,70 @@ +/* + * 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.test.ws.jaxws.serviceref; + +import java.io.IOException; +import java.util.ArrayList; + +import javax.naming.InitialContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +import org.jboss.logging.Logger; + +public class ServletClient extends HttpServlet +{ + // Provide logging + private static Logger log = Logger.getLogger(ServletClient.class); + + protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + String inStr = req.getParameter("echo"); + log.info("doGet: " + inStr); + + ArrayList ports = new ArrayList(); + try + { + InitialContext iniCtx = new InitialContext(); + ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + } + catch (Exception ex) + { + log.error("Cannot add port", ex); + throw new WebServiceException(ex); + } + + for (int i = 0; i < ports.size(); i++) + { + TestEndpoint port = (TestEndpoint)ports.get(i); + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + } + + res.getWriter().print(inStr); + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/application-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/application-client.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/application-client.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -1,30 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> - <display-name>JAXRPC simple tests</display-name> + <display-name>jaxws simple tests</display-name> <service-ref> <service-ref-name>service1</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> + <service-interface>javax.xml.ws.Service</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> </service-ref> <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxws.serviceref.TestEndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> </service-ref> </application-client> Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ejb-jar.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ejb-jar.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -1,37 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" - version="2.1"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/ejb-jar_3_0.xsd" + version="3.0"> <enterprise-beans> <session> - <ejb-name>ejb/EJBClient</ejb-name> - <home>org.jboss.test.ws.jaxrpc.serviceref.EJBRemoteHome</home> - <remote>org.jboss.test.ws.jaxrpc.serviceref.EJBRemote</remote> - <ejb-class>org.jboss.test.ws.jaxrpc.serviceref.EJBClient</ejb-class> + <ejb-name>EJBClient</ejb-name> + <remote>org.jboss.test.ws.jaxws.serviceref.EJBRemote</remote> + <ejb-class>org.jboss.test.ws.jaxws.serviceref.EJBClient</ejb-class> <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> <service-ref> <service-ref-name>service1</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> + <service-interface>javax.xml.ws.Service</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> </service-ref> - + <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxws.serviceref.TestEndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> </service-ref> </session> Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-03-12 17:10:29 UTC (rev 2602) @@ -1,14 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echo'> - <part name='String_1' type='xsd:string'/> - </message> +<definitions name='TestEndpointService' targetNamespace='http://serviceref.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://serviceref.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types></types> <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> + <part name='return' type='xsd:string'/> </message> + <message name='TestEndpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> + <operation name='echo' parameterOrder='arg0'> <input message='tns:TestEndpoint_echo'/> <output message='tns:TestEndpoint_echoResponse'/> </operation> @@ -18,16 +17,16 @@ <operation name='echo'> <soap:operation soapAction=''/> <input> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + <soap:body namespace='http://serviceref.jaxws.ws.test.jboss.org/' use='literal'/> </input> <output> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + <soap:body namespace='http://serviceref.jaxws.ws.test.jboss.org/' use='literal'/> </output> </operation> </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-serviceref'/> + <soap:address location='http://@jbosstest.host.name@:8080/jaxws-serviceref'/> </port> </service> </definitions> \ No newline at end of file Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.serviceref.TestEndpointImpl</servlet-class> </servlet> <servlet-mapping> Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/webservices.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/webservices.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.ws/wsref' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestEndpointService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"> <servlet> <servlet-name>ServletClient</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.ServletClient</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.serviceref.ServletClient</servlet-class> </servlet> <servlet-mapping> @@ -15,22 +15,14 @@ <service-ref> <service-ref-name>service1</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> + <service-interface>javax.xml.ws.Service</service-interface> <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> </service-ref> <service-ref> <service-ref-name>service2</service-ref-name> - <service-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointService</service-interface> + <service-interface>org.jboss.test.ws.jaxws.serviceref.TestEndpointService</service-interface> <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> - </port-component-ref> </service-ref> </web-app> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <java-wsdl> - <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> - <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 14:34:08 UTC (rev 2601) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 17:10:29 UTC (rev 2602) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> - -</configuration> \ No newline at end of file

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2601 - in trunk/jbossws-tests/src/resources/jaxws: serviceref and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-12 10:34:08 -0400 (Mon, 12 Mar 2007) New Revision: 2601 Added: trunk/jbossws-tests/src/resources/jaxws/serviceref/ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml Removed: trunk/jbossws-tests/src/resources/jaxws/serviceref/ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml Log: Initial test for jaxws <service-ref> Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref (from rev 2596, trunk/jbossws-tests/src/resources/jaxrpc/serviceref) Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/WEB-INF) Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 14:34:08 UTC (rev 2601) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <java-wsdl> - <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> - <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-java-wsdl.xml) =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 14:34:08 UTC (rev 2601) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <java-wsdl> + <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> + <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 14:34:08 UTC (rev 2601) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> - -</configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-wsdl-java.xml) =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 14:34:08 UTC (rev 2601) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> + +</configuration> \ No newline at end of file

17 years, 9 months

1
0
0 / 0

JBossWS SVN: r2600 - in trunk/jbossws-tests: src/java/org/jboss/test/ws/jaxws and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-03-12 10:33:20 -0400 (Mon, 12 Mar 2007) New Revision: 2600 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java trunk/jbossws-tests/src/resources/jaxws/serviceref/ trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml Removed: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ApplicationClient.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemoteHome.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpoint.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointService.java trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml Log: Initial test for jaxws <service-ref> Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-12 10:43:36 UTC (rev 2599) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -232,6 +232,13 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/> + </classes> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -333,118 +340,6 @@ </webinf> </war> -  - -  - <war warfile="${tests.output.dir}/libs/jbossws-interop-root.war" - webxml="${tests.output.dir}/resources/interop/root/WEB-INF/web.xml"> - <webinf dir="${tests.output.dir}/resources/interop/root/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/root"> - <include name="*.*"/> - </fileset> - </war> - -  - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsa10-service.war" webxml="${tests.output.dir}/resources/interop/wsa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsa/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/wsa/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/resources/interop/wsa"> - <include name="*.*"/> - </fileset> - </war> - -  -  - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/sign/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Sign-client.jar"> - <metainf dir="${tests.output.dir}/resources/interop/wsse/sign/META-INF"> - <include name="jboss-wsse-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/encrypt/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar"> - <metainf dir="${tests.output.dir}/resources/interop/wsse/encrypt/META-INF"> - <include name="jboss-wsse-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitB.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/> - <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesDocLitW.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/> - <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <war warfile="${tests.output.dir}/libs/jbossws-interop-BaseDataTypesRpcLit.war" - webxml="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/> - <include name="org/jboss/test/ws/interop/soapwsdl/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - </war> -  -  </target> Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref (from rev 2596, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref) Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ApplicationClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ApplicationClient.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,68 +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.test.ws.jaxrpc.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ApplicationClient -{ - // Provide logging - private static Logger log = Logger.getLogger(ApplicationClient.class); - - public static InitialContext encCtx; - public static String retStr; - - public static void main(String[] args) throws RemoteException - { - String inStr = args[0]; - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - retStr = inStr; - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/EJBClient.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBClient.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,93 +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.test.ws.jaxrpc.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class EJBClient implements SessionBean -{ - // Provide logging - private static Logger log = Logger.getLogger(EJBClient.class); - - private SessionContext context; - - public String echo(String inStr) throws RemoteException - { - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - InitialContext iniCtx = new InitialContext(); - ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - return inStr; - } - - // EJB Lifecycle ---------------------------------------------------------------------- - - public void setSessionContext(SessionContext context) throws EJBException, RemoteException - { - this.context = context; - } - - public void ejbCreate() - { - } - - public void ejbRemove() - { - } - - public void ejbActivate() - { - } - - public void ejbPassivate() - { - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemote.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,31 +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.test.ws.jaxrpc.serviceref; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -public interface EJBRemote extends EJBObject -{ - String echo(String input) throws RemoteException; -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemoteHome.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/EJBRemoteHome.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,32 +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.test.ws.jaxrpc.serviceref; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -public interface EJBRemoteHome extends EJBHome -{ - EJBRemote create() throws CreateException, RemoteException; -} Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefClientTestCase.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefClientTestCase.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -19,38 +19,35 @@ * 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.test.ws.jaxrpc.serviceref; +package org.jboss.test.ws.jaxws.serviceref; import java.io.File; import java.net.MalformedURLException; import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceException; -import javax.xml.rpc.ServiceFactory; +import javax.xml.ws.Service; import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; /** - * Test the JAXRPC <service-ref> + * Test the JAXWS <service-ref> * * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 + * @since 123-Mar-2007 */ public class ServiceRefClientTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-serviceref"; public static Test suite() { - return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-client.jar"); + return JBossWSTestSetup.newTestSetup(ServiceRefClientTestCase.class, "jaxws-serviceref.war"); //ant , jaxws-serviceref-client.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -63,42 +60,13 @@ public void testDynamicProxy() throws Exception { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); + URL wsdlURL = new File("resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://serviceref.jaxws.ws.test.jboss.org/", "TestEndpointService"); + Service service = Service.create(wsdlURL, qname); TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); } - - public void testDynamicProxyNeg() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = ServiceFactory.newInstance().createService(wsdlURL, qname); - try - { - TestEndpoint port = (TestEndpoint)service.getPort(java.rmi.activation.Activator.class); - fail("Expected ServiceException, but got: " + port); - } - catch (ServiceException ex) - { - // this is tested by the CTS - } - catch (Exception ex) - { - fail("Expected ServiceException, but got: " + ex); - } - } - - public void testApplicationClient() throws Exception - { - String helloWorld = "Hello World!"; - ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[] { helloWorld }); - assertEquals(helloWorld, ApplicationClient.retStr); - } } Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefEJBTestCase.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,87 +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.test.ws.jaxrpc.serviceref; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class ServiceRefEJBTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-ejb-client.jar"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testEJBClient() throws Exception - { - InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); - EJBRemote ejbRemote = ejbHome.create(); - - String helloWorld = "Hello World!"; - Object retObj = ejbRemote.echo(helloWorld); - assertEquals(helloWorld, retObj); - - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServiceRefServletTestCase.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,84 +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.test.ws.jaxrpc.serviceref; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class ServiceRefServletTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-serviceref"; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(ServiceRefServletTestCase.class, "jaxrpc-serviceref.war, jaxrpc-serviceref-servlet-client.war"); - } - - public void testWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new File("resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/serviceref/META-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - Service service = new ServiceFactoryImpl().createService(wsdlURL, qname, mappingURL); - TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); - - String helloWorld = "Hello World!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testServletClient() throws Exception - { - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String retStr = br.readLine(); - assertEquals("HelloWorld", retStr); - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServletClient.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/ServletClient.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,70 +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.test.ws.jaxrpc.serviceref; - -import java.io.IOException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ServletClient extends HttpServlet -{ - // Provide logging - private static Logger log = Logger.getLogger(ServletClient.class); - - protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - String inStr = req.getParameter("echo"); - log.info("doGet: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - InitialContext iniCtx = new InitialContext(); - ports.add((TestEndpoint)((Service)iniCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - res.getWriter().print(inStr); - } -} Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpoint.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpoint.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,31 +1,40 @@ -/* - * 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.test.ws.jaxrpc.serviceref; -import java.rmi.Remote; -import java.rmi.RemoteException; +package org.jboss.test.ws.jaxws.serviceref; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; -public interface TestEndpoint extends Remote -{ - String echo(String arg0) throws RemoteException; + +/** + * JBossWS Generated Source + * + * Generation Date: Mon Mar 12 15:09:39 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://serviceref.jaxws.ws.test.jboss.org/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + } Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,42 +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.test.ws.jaxrpc.serviceref; - -import org.jboss.logging.Logger; - -/** - * Test the JAXRPC <service-ref> - * - * @author Thomas.Diesler(a)jboss.org - * @since 23-Oct-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - // Provide logging - private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java (from rev 2599, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.java) =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -0,0 +1,50 @@ +/* + * 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.test.ws.jaxws.serviceref; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +/** + * Test the jaxws <service-ref> + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Mar-2007 + */ + +@WebService (name = "TestEndpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TestEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(TestEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointService.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.java 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/serviceref/TestEndpointService.java 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,19 +1,59 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ -//Auto Generated by jbossws - Please do not edit!!! +package org.jboss.test.ws.jaxws.serviceref; -package org.jboss.test.ws.jaxrpc.serviceref; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; -import javax.xml.rpc.ServiceException; +/** + * JBossWS Generated Source + * + * Generation Date: Mon Mar 12 15:09:39 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://serviceref.jaxws.ws.test.jboss.org/", wsdlLocation = "http://tddell:8080/jaxws-serviceref?wsdl") +public class TestEndpointService + extends Service +{ + private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; -public interface TestEndpointService extends javax.xml.rpc.Service -{ + static { + URL url = null; + try { + url = new URL("http://tddell:8080/jaxws-serviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + TESTENDPOINTSERVICE_WSDL_LOCATION = url; + } - public org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint getTestEndpointPort() throws ServiceException; + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + public TestEndpointService() { + super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://serviceref.jaxws.ws.test.jboss.org/", "TestEndpointService")); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(new QName("http://serviceref.jaxws.ws.test.jboss.org/", "TestEndpointPort"), TestEndpoint.class); + } + } Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref (from rev 2596, trunk/jbossws-tests/src/resources/jaxrpc/serviceref) Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF) Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-03-12 10:43:36 UTC (rev 2599) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echo'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </output> - </operation> - </binding> - <service name='TestEndpointService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jbosstest.host.name@:8080/jaxrpc-serviceref'/> - </port> - </service> +<definitions name='TestEndpointService' targetNamespace='http://serviceref.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://serviceref.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types></types> + <message name='TestEndpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://serviceref.jaxws.ws.test.jboss.org/' use='literal'/> + </input> + <output> + <soap:body namespace='http://serviceref.jaxws.ws.test.jboss.org/' use='literal'/> + </output> + </operation> + </binding> + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://@jbosstest.host.name@:8080/jaxws-serviceref'/> + </port> + </service> </definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/WEB-INF) Modified: trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/WEB-INF/web.xml 2007-03-12 10:43:36 UTC (rev 2599) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/WEB-INF/web.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -5,7 +5,7 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.serviceref.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.serviceref.TestEndpointImpl</servlet-class> </servlet> <servlet-mapping> Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-java-wsdl.xml 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <java-wsdl> - <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> - <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-java-wsdl.xml) =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-java-wsdl.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <java-wsdl> + <service name="TestEndpointService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint"/> + <namespaces target-namespace="http://org.jboss.ws/wsref" type-namespace="http://org.jboss.ws/wsref/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> \ No newline at end of file Deleted: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-wsdl-java.xml 2007-03-12 09:12:52 UTC (rev 2596) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> - </global> - - <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> - -</configuration> \ No newline at end of file Copied: trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml (from rev 2599, trunk/jbossws-tests/src/resources/jaxrpc/serviceref/wstools-wsdl-java.xml) =================================================================== --- trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxws/serviceref/wstools-wsdl-java.xml 2007-03-12 14:33:20 UTC (rev 2600) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.serviceref" namespace="http://org.jboss.ws/wsref"/> + </global> + + <wsdl-java location="META-INF/wsdl/TestEndpoint.wsdl"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> + +</configuration> \ No newline at end of file

17 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2007