[jboss-svn-commits] JBL Code SVN: r24834 - in labs/jbossesb/branches/JBESB_4_4_GA_CP: product/etc/schemas/xml and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 20 13:42:02 EST 2009
Author: kevin.conner at jboss.com
Date: 2009-01-20 13:42:02 -0500 (Tue, 20 Jan 2009)
New Revision: 24834
Removed:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingContext.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingHandler.java
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/ProgrammersGuide.odt
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/META-INF/jboss-esb.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbm-service.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbmq-service.xml
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUtil.java
Log:
Remove modifications for JBESB-2025
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/etc/schemas/xml/jbossesb-1.0.1.xsd 2009-01-20 18:42:02 UTC (rev 24834)
@@ -371,7 +371,6 @@
<xsd:attribute name="faultXsd" type="xsd:string" />
<xsd:attribute name="webservice" type="xsd:boolean" default="true"/>
<xsd:attribute name="validate" type="xsd:boolean" default="false"/>
- <xsd:attribute name="addressing" type="xsd:boolean" default="false"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="action">
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingContext.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingContext.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingContext.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -1,44 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.internal.soa.esb.webservice;
-
-import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
-
-
-/**
- * This is the addressing context for the current thread.
- * @author kevin
- */
-public class AddressingContext
-{
- private static final ThreadLocal<SOAPAddressingProperties> CONTEXT = new ThreadLocal<SOAPAddressingProperties>() ;
-
- public static SOAPAddressingProperties getAddressingProperties()
- {
- return CONTEXT.get() ;
- }
-
- public static void setAddressingProperties(final SOAPAddressingProperties addressingProperties)
- {
- CONTEXT.set(addressingProperties) ;
- }
-}
Deleted: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingHandler.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingHandler.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/AddressingHandler.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -1,91 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.internal.soa.esb.webservice;
-
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.addressing.JAXWSAConstants;
-import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.MessageContext.Scope;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-
-/**
- * The addressing handler for capturing the current
- * @author kevin
- */
-public class AddressingHandler implements SOAPHandler<SOAPMessageContext>
-{
- public Set<QName> getHeaders()
- {
- return null;
- }
-
- public void close(final MessageContext context)
- {
- }
-
- public boolean handleFault(final SOAPMessageContext context)
- {
- return true;
- }
-
- public boolean handleMessage(final SOAPMessageContext context)
- {
- final Boolean outbound = (Boolean)context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY) ;
- if (outbound == null)
- {
- throw new IllegalStateException("Cannot obtain required property: " + MessageContext.MESSAGE_OUTBOUND_PROPERTY) ;
- }
-
- if (outbound)
- {
- return handleResponse(context) ;
- }
- else
- {
- return handleRequest(context) ;
- }
- }
-
- private boolean handleRequest(final SOAPMessageContext context)
- {
- final SOAPAddressingProperties props = (SOAPAddressingProperties) context.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND) ;
- AddressingContext.setAddressingProperties(props) ;
-
- return true ;
- }
-
- private boolean handleResponse(final SOAPMessageContext context)
- {
- final SOAPAddressingProperties props = AddressingContext.getAddressingProperties() ;
- if (props != null)
- {
- context.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, props) ;
- context.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION) ;
- }
- return true ;
- }
-}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/BaseWebService.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -38,8 +38,6 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.ws.Provider;
import javax.xml.ws.WebServiceException;
-import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
import org.apache.log4j.Logger;
import org.jboss.soa.esb.client.ServiceInvoker;
@@ -69,26 +67,20 @@
private static final boolean RETURN_STACK_TRACES ;
private static final Logger LOGGER = Logger.getLogger(BaseWebService.class);
- private static AddressingBuilder ADDRESSING_BUILDER = AddressingBuilder.getAddressingBuilder() ;
-
protected final ServiceInvoker serviceInvoker ;
- protected final MessagePayloadProxy requestProxy ;
- protected final MessagePayloadProxy responseProxy ;
- protected final String action ;
+ protected MessagePayloadProxy requestProxy ;
+ protected MessagePayloadProxy responseProxy ;
- protected BaseWebService(final String category, final String name, final String requestLocation, final String responseLocation, final String action)
+ protected BaseWebService(final String category, final String name, final String requestLocation, final String responseLocation)
throws MessageDeliverException
{
serviceInvoker = new ServiceInvoker(category, name) ;
requestProxy = new MessagePayloadProxy(null, requestLocation) ;
responseProxy = new MessagePayloadProxy(responseLocation, null) ;
- this.action = action ;
}
public SOAPMessage invoke(final SOAPMessage request)
{
- final SOAPAddressingProperties soapIncomingProps = AddressingContext.getAddressingProperties() ;
-
final Message esbReq = MessageFactory.getInstance().getMessage() ;
try
{
@@ -136,24 +128,10 @@
false, false, true);
final SOAPMessage response = javax.xml.soap.MessageFactory.newInstance().createMessage();
response.getSOAPBody().addDocument(respDoc) ;
- if (soapIncomingProps == null)
- {
- AddressingContext.setAddressingProperties(null) ;
- }
- else
- {
- final SOAPAddressingProperties soapOutgoingProps = (SOAPAddressingProperties) ADDRESSING_BUILDER.newAddressingProperties() ;
- if (action != null)
- {
- soapOutgoingProps.setAction(ADDRESSING_BUILDER.newURI(action)) ;
- }
- AddressingContext.setAddressingProperties(soapOutgoingProps) ;
- }
return response ;
}
else
{
- AddressingContext.setAddressingProperties(null) ;
// We should be able to return null here but this causes JBossWS to NPE.
return javax.xml.soap.MessageFactory.newInstance().createMessage();
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -258,7 +258,7 @@
Operation op = (Operation) portType.getOperations().get(0);
bop.setOperation(op);
SOAPOperation soapOperation = new SOAPOperationImpl() ;
- soapOperation.setSoapActionURI(serviceInfo.getResponseAction()) ;
+ soapOperation.setSoapActionURI(serviceInfo.getAction()) ;
bop.addExtensibilityElement(soapOperation) ;
if (op.getInput() != null) {
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBServiceEndpointInfo.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -48,11 +48,9 @@
private final String className ;
private final String namespace ;
private final boolean isOneWay ;
- private final String requestAction ;
- private final String responseAction ;
+ private final String action ;
private final String requestLocation ;
private final String responseLocation ;
- private final boolean addressing ;
public ESBServiceEndpointInfo(final Service service)
throws UnsupportedEncodingException {
@@ -72,8 +70,7 @@
packageName = "esb.ws." + serviceCategory + "." + serviceName ;
className = packageName + ".Implementation" ;
namespace = "http://soa.jboss.org/" + URLEncoder.encode(service.getCategory(), DEFAULT_ENCODING) ;
- requestAction = namespace + "/" + operationName ;
- responseAction = requestAction + "Resp" ;
+ action = namespace + "/" + operationName ;
final Actions actions = service.getActions() ;
if (actions != null)
@@ -92,14 +89,12 @@
}
requestLocation = actions.getRequestLocation() ;
responseLocation = actions.getResponseLocation() ;
- addressing = actions.getAddressing() ;
}
else
{
isOneWay = false ;
requestLocation = null ;
responseLocation = null ;
- addressing = false ;
}
}
@@ -155,14 +150,10 @@
return namespace ;
}
- public String getRequestAction() {
- return requestAction ;
+ public String getAction() {
+ return action ;
}
- public String getResponseAction() {
- return responseAction ;
- }
-
public boolean isOneWay() {
return isOneWay ;
}
@@ -175,10 +166,6 @@
return responseLocation ;
}
- public boolean isAddressing() {
- return addressing ;
- }
-
static
{
DEFAULT_ENCODING = AccessController.doPrivileged(new PrivilegedAction<String>() {
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JAXWSProviderClassGenerator.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -52,7 +52,7 @@
}
}
- public byte[] generate(final String category, final String service, final ESBServiceEndpointInfo epInfo, final boolean includeHandlers)
+ public byte[] generate(final String category, final String service, final ESBServiceEndpointInfo epInfo)
throws WebServicePublishException {
try {
pool.get(epInfo.getClassName());
@@ -100,20 +100,10 @@
annotation2.addMemberValue("value", enumValue);
attribute.addAnnotation(annotation2);
- if (includeHandlers)
- {
- final Annotation handlerChainAnnotation = new Annotation("javax.jws.HandlerChain", constantPool) ;
- final StringMemberValue handlerValue = new StringMemberValue(constantPool) ;
- handlerValue.setValue("esb-jaxws-handlers.xml") ;
- handlerChainAnnotation.addMemberValue("file", handlerValue) ;
- attribute.addAnnotation(handlerChainAnnotation) ;
- }
-
seiClass.getClassFile().addAttribute(attribute);
final String constructorStr = "super(\"" +category + "\",\"" + service + "\"," +
- getParamValue(epInfo.getRequestLocation()) + "," + getParamValue(epInfo.getResponseLocation()) + ", \"" +
- epInfo.getResponseAction() + "\");" ;
+ getParamValue(epInfo.getRequestLocation()) + "," + getParamValue(epInfo.getResponseLocation()) + ");" ;
CtConstructor defaultConstructor = new CtConstructor(null, seiClass) ;
defaultConstructor.setBody(constructorStr) ;
seiClass.addConstructor(defaultConstructor) ;
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/OneWayBaseWebService.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -30,10 +30,10 @@
*/
public class OneWayBaseWebService extends BaseWebService
{
- protected OneWayBaseWebService(final String category, final String name, final String requestLocation, final String responseLocation, final String action)
+ protected OneWayBaseWebService(final String category, final String name, final String requestLocation, final String responseLocation)
throws MessageDeliverException
{
- super(category, name, requestLocation, responseLocation, action) ;
+ super(category, name, requestLocation, responseLocation) ;
}
@Override
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/webservice/RequestResponseBaseWebService.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -40,10 +40,10 @@
private static final long TIMEOUT ;
private static final Logger LOGGER = Logger.getLogger(RequestResponseBaseWebService.class) ;
- protected RequestResponseBaseWebService(final String category, final String name, final String requestLocation, final String responseLocation, final String action)
+ protected RequestResponseBaseWebService(final String category, final String name, final String requestLocation, final String responseLocation)
throws MessageDeliverException
{
- super(category, name, requestLocation, responseLocation, action) ;
+ super(category, name, requestLocation, responseLocation) ;
}
@Override
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -49,12 +49,7 @@
import org.jboss.deployment.SubDeployerSupport;
import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
import org.jboss.internal.soa.esb.util.XMLHelper;
-import org.jboss.internal.soa.esb.webservice.AddressingHandler;
-import org.jboss.internal.soa.esb.webservice.ESBContractGenerator;
-import org.jboss.internal.soa.esb.webservice.ESBResponseFilter;
-import org.jboss.internal.soa.esb.webservice.ESBServiceContractPublisher;
-import org.jboss.internal.soa.esb.webservice.ESBServiceEndpointInfo;
-import org.jboss.internal.soa.esb.webservice.JAXWSProviderClassGenerator;
+import org.jboss.internal.soa.esb.webservice.*;
import org.jboss.logging.Logger;
import org.jboss.metadata.MetaData;
import org.jboss.metadata.XmlFileLoader;
@@ -95,21 +90,6 @@
private static final String PREFIX_CANONICAL_NAME = "jboss.esb:deployment=" ;
private static final String ESB_ARTIFACT_NAME = "jbossesb.esb" ;
- private final String HANDLER_CHAIN_PREFIX = "<?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>" ;
- private final String HANDLER_CHAIN_POSTFIX = "</handler-chain></handler-chains>" ;
- private final String HANDLER_PREFIX = "<handler><handler-name>" ;
- private final String HANDLER_MIDDLE = "</handler-name><handler-class>" ;
- private final String HANDLER_POSTFIX = "</handler-class></handler>" ;
-
- private final String WSADDR_NAME = "WSAddressing Handler" ;
- private final String WSADDR_HANDLER = "org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler" ;
-
- private final String WSADDR_CONTEXT_NAME = "WSAddressing Context Handler" ;
- private final String WSADDR_CONTEXT_HANDLER = AddressingHandler.class.getName() ;
-
/**
* Default CTOR used to set default values to the Suffixes and RelativeOrder
* attributes. Those are read at subdeployer registration time by the MainDeployer
@@ -526,24 +506,15 @@
final String wsdl = ESBContractGenerator.generateWSDL(service, serviceInfo) ;
addFile(zos, serviceInfo.getWSDLFileName(), wsdl) ;
- final String handlers = getHandlers(serviceInfo) ;
- final boolean includeHandlers = (handlers != null) ;
- if (includeHandlers)
- {
- final String wsHandlerName = "WEB-INF/classes/" + serviceInfo.getPackageName().replace('.', '/') + "/esb-jaxws-handlers.xml" ;
- addFile(zos, wsHandlerName, handlers) ;
- }
-
final byte[] wsClass = generator.generate(service.getCategory(),
- service.getName(), serviceInfo, includeHandlers) ;
+ service.getName(), serviceInfo) ;
final String wsClassName = serviceInfo.getClassName().replace('.', '/') + ".class" ;
addFile(zos, "WEB-INF/classes/" + wsClassName, wsClass) ;
// Filter...
// At the moment we only need the filter to overcome a bug in JBossWS re In-Only endpoints, so
- // we only include for one way services
- if(serviceInfo.isOneWay())
- {
+ // we only include for one way services...
+ if(mep == MepType.ONE_WAY) {
String filterName = serviceInfo.getServletName() + "_Filter";
filterDefinitions.append("<filter><filter-name>") ;
@@ -726,26 +697,4 @@
{
esbNames.remove(deploymentName) ;
}
-
- private String getHandlers(final ESBServiceEndpointInfo serviceInfo)
- {
- final String result ;
-
- if (!serviceInfo.isAddressing())
- {
- result = null ;
- }
- else
- {
- final StringBuilder sb = new StringBuilder(HANDLER_CHAIN_PREFIX) ;
- if (serviceInfo.isAddressing())
- {
- sb.append(HANDLER_PREFIX).append(WSADDR_CONTEXT_NAME).append(HANDLER_MIDDLE).append(WSADDR_CONTEXT_HANDLER).append(HANDLER_POSTFIX) ;
- sb.append(HANDLER_PREFIX).append(WSADDR_NAME).append(HANDLER_MIDDLE).append(WSADDR_HANDLER).append(HANDLER_POSTFIX) ;
- }
- sb.append(HANDLER_CHAIN_POSTFIX) ;
- result = sb.toString() ;
- }
- return result ;
- }
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/META-INF/jboss-esb.xml 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/META-INF/jboss-esb.xml 2009-01-20 18:42:02 UTC (rev 24834)
@@ -8,9 +8,6 @@
<jms-bus busid="ebws_channel2">
<jms-message-filter dest-type="QUEUE" dest-name="queue/ebws2"/>
</jms-bus>
- <jms-bus busid="ebws_channel3">
- <jms-message-filter dest-type="QUEUE" dest-name="queue/ebws3"/>
- </jms-bus>
</jms-jca-provider>
</providers>
@@ -31,13 +28,5 @@
<action name="logAction" class="org.jboss.soa.esb.server.ebws.LogMessageAction"/>
</actions>
</service>
- <service category="TestEBWS" name="addressing" description="EBWS addressing service">
- <listeners>
- <jms-listener name="JBPM-ESBListener" busidref="ebws_channel3" maxThreads="1"/>
- </listeners>
- <actions inXsd='/request.xsd' outXsd='/response.xsd' validate='true' requestLocation='REQUEST_LOCATION' responseLocation='RESPONSE_LOCATION' addressing='true'>
- <action name="logAction" class="org.jboss.soa.esb.server.ebws.LogMessageAction"/>
- </actions>
- </service>
</services>
</jbossesb>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbm-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbm-service.xml 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbm-service.xml 2009-01-20 18:42:02 UTC (rev 24834)
@@ -24,16 +24,4 @@
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
<depends>jboss.messaging:service=PostOffice</depends>
</mbean>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.qa.junit.destination:service=Queue,name=ebws3"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.qa.junit.destination:service=Queue,name=ebws3_reply"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
</server>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbmq-service.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbmq-service.xml 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/resources/server/ebws/esb-jbmq-service.xml 2009-01-20 18:42:02 UTC (rev 24834)
@@ -24,16 +24,4 @@
jboss.mq:service=DestinationManager
</depends>
</mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.qa.junit.destination:service=Queue,name=ebws3">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.qa.junit.destination:service=Queue,name=ebws3_reply">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
</server>
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUnitTest.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -135,16 +135,6 @@
runSoapRequestTest(EBWSUtil.ALTERNATE_SOAP_ENDPOINT) ;
}
- /**
- * Test for normal valid response through SOAP with addressing.
- * @throws Exception for any failures.
- */
- public void testNormalSoapAddressingRequest()
- throws Exception
- {
- runSoapAddressingRequestTest(EBWSUtil.NORMAL_SOAP_ADDRESSING_ENDPOINT) ;
- }
-
private void runRequestResponseTest(final String requestLocation, final String responseLocation, final String name)
throws Exception
{
@@ -257,27 +247,6 @@
assertTrue("Response log message", StringUtils.compareXMLContent(EBWSUtil.VALID_RESPONSE, logs[1])) ;
}
- private void runSoapAddressingRequestTest(final String endpoint)
- throws Exception
- {
- final HttpClient httpClient = new HttpClient() ;
- final PostMethod postMethod = new PostMethod(endpoint) ;
- final StringRequestEntity request = new StringRequestEntity(EBWSUtil.SOAP_ADDRESSING_REQUEST) ;
- postMethod.setRequestEntity(request) ;
-
- httpClient.executeMethod(postMethod) ;
- final String response = postMethod.getResponseBodyAsString() ;
- System.out.println("Response is " + response) ;
- assertNotNull("XML response", response) ;
- assertTrue("XML response", response.contains("http://soa.jboss.org/TestEBWS/addressingOpResp")) ;
-
- final String[] logs = waitForMessages(2) ;
- assertNotNull("Log message", logs) ;
- assertEquals("Log count", 2, logs.length) ;
- assertTrue("Request log message", StringUtils.compareXMLContent(EBWSUtil.VALID_REQUEST, logs[0])) ;
- assertTrue("Response log message", StringUtils.compareXMLContent(EBWSUtil.VALID_RESPONSE, logs[1])) ;
- }
-
/**
* Create the test suite.
* @return The suite representing this test case.
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUtil.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUtil.java 2009-01-20 17:44:45 UTC (rev 24833)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/qa/junit/src/org/jboss/soa/esb/server/ebws/EBWSUtil.java 2009-01-20 18:42:02 UTC (rev 24834)
@@ -50,21 +50,9 @@
public static final String SOAP_RESPONSE = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
"<soap:Header/><soap:Body>" + VALID_RESPONSE + "</soap:Body></soap:Envelope>" ;
-
- public static final String SOAP_ADDRESSING_REQUEST = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
- "<soap:Header xmlns:wsa=\"http://www.w3.org/2005/08/addressing\">" +
- "<wsa:MessageID>urn:esb:1234567</wsa:MessageID>" +
- "<wsa:To>http://example.com/To</wsa:To>" +
- "<wsa:Action>http://example.com/Action</wsa:Action>" +
- "</soap:Header>" +
- "<soap:Body>" + VALID_REQUEST + "</soap:Body></soap:Envelope>" ;
- public static final String SOAP_ADDRESSING_RESPONSE = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
- "<soap:Header/><soap:Body>" + VALID_RESPONSE + "</soap:Body></soap:Envelope>" ;
-
public static final String NORMAL_SOAP_ENDPOINT = "http://127.0.0.1:8080/ebws-test/TestEBWS/normal" ;
public static final String ALTERNATE_SOAP_ENDPOINT = "http://127.0.0.1:8080/ebws-test/TestEBWS/alternate" ;
- public static final String NORMAL_SOAP_ADDRESSING_ENDPOINT = "http://127.0.0.1:8080/ebws-test/TestEBWS/addressing" ;
public static EBWSServerMBean getEBWSServerMBean()
throws MalformedObjectNameException
More information about the jboss-svn-commits
mailing list