JBossWS SVN: r11973 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: jaxws/samples/wseventing and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-13 02:02:32 -0400 (Tue, 13 Apr 2010)
New Revision: 11973
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java
Log:
[JBWS-2991] fixing JAXWS test cases
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/EchoImpl.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.interop.nov2007.wsaSoap12;
-import org.jboss.ws.annotation.EndpointConfig;
-
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
@@ -30,6 +28,7 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.Action;
import javax.xml.ws.BindingType;
+import javax.xml.ws.soap.Addressing;
/**
* @author Alessio Soldano, alessio.soldano(a)jboss.com
@@ -43,7 +42,7 @@
portName = "CustomBinding_Echo1"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@EndpointConfig(configName = "Standard SOAP 1.2 WSAddressing Endpoint")
+@Addressing
@BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
public class EchoImpl implements Echo {
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsaSoap12/NotifyImpl.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.ws.interop.nov2007.wsaSoap12;
-import org.jboss.ws.annotation.EndpointConfig;
-
import javax.jws.WebMethod;
import javax.jws.Oneway;
import javax.jws.WebParam;
@@ -30,6 +28,7 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.Action;
import javax.xml.ws.BindingType;
+import javax.xml.ws.soap.Addressing;
/**
* @author Alessio Soldano, alessio.soldano(a)jboss.com
@@ -43,7 +42,7 @@
portName = "CustomBinding_Notify1"
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@EndpointConfig(configName = "Standard SOAP 1.2 WSAddressing Endpoint")
+@Addressing
@BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
public class NotifyImpl implements Notify {
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonManagementEndpoint.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -22,9 +22,9 @@
package org.jboss.test.ws.jaxws.samples.wseventing;
import javax.jws.WebService;
+import javax.xml.ws.soap.Addressing;
import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.extensions.eventing.jaxws.AbstractSubscriptionManagerEndpoint;
/**
@@ -37,7 +37,7 @@
targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing",
wsdlLocation = "/WEB-INF/wsdl/sysmon.wsdl",
endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint")
-@EndpointConfig(configName = "Standard WSAddressing Endpoint")
+@Addressing
public class SysmonManagementEndpoint extends AbstractSubscriptionManagerEndpoint {
private static final Logger log = Logger.getLogger(SysmonManagementEndpoint.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonRegistrationEndpoint.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -22,9 +22,9 @@
package org.jboss.test.ws.jaxws.samples.wseventing;
import javax.jws.WebService;
+import javax.xml.ws.soap.Addressing;
import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.extensions.eventing.jaxws.AbstractEventSourceEndpoint;
/**
@@ -37,7 +37,7 @@
targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing",
wsdlLocation = "/WEB-INF/wsdl/sysmon.wsdl",
endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint")
-@EndpointConfig(configName = "Standard WSAddressing Endpoint")
+@Addressing
public class SysmonRegistrationEndpoint extends AbstractEventSourceEndpoint {
private static final Logger log = Logger.getLogger(SysmonRegistrationEndpoint.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -28,13 +28,13 @@
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.addressing.AddressingBuilder;
-import javax.xml.ws.addressing.AddressingException;
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
+import javax.xml.ws.soap.SOAPFaultException;
+import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
/**
* Test the SOAPAddressingProperties
@@ -158,7 +158,7 @@
props.readHeaders(message);
fail("ERRORNOUS_XML should cause a parsing exception due to missing wsa:Action value");
}
- catch (AddressingException e)
+ catch (SOAPFaultException e)
{
// expected an exception
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomEventSource.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -22,9 +22,9 @@
package org.jboss.test.ws.jaxws.wseventing;
import javax.jws.WebService;
+import javax.xml.ws.soap.Addressing;
import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.extensions.eventing.jaxws.AbstractEventSourceEndpoint;
/**
@@ -37,7 +37,7 @@
targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing",
wsdlLocation = "/WEB-INF/wsdl/windreport.wsdl",
endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint")
-@EndpointConfig(configName = "Standard WSAddressing Endpoint")
+@Addressing
public class CustomEventSource extends AbstractEventSourceEndpoint {
private static final Logger log = Logger.getLogger(CustomEventSource.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/CustomSubscriptionManager.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -22,9 +22,9 @@
package org.jboss.test.ws.jaxws.wseventing;
import javax.jws.WebService;
+import javax.xml.ws.soap.Addressing;
import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
import org.jboss.ws.extensions.eventing.jaxws.AbstractSubscriptionManagerEndpoint;
/**
@@ -37,7 +37,7 @@
targetNamespace = "http://schemas.xmlsoap.org/ws/2004/08/eventing",
wsdlLocation = "/WEB-INF/wsdl/windreport.wsdl",
endpointInterface = "org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint")
-@EndpointConfig(configName = "Standard WSAddressing Endpoint")
+@Addressing
public class CustomSubscriptionManager extends AbstractSubscriptionManagerEndpoint {
private static final Logger log = Logger.getLogger(CustomSubscriptionManager.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java 2010-04-13 05:58:30 UTC (rev 11972)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java 2010-04-13 06:02:32 UTC (rev 11973)
@@ -31,7 +31,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
import java.io.IOException;
import java.net.URI;
14 years, 8 months
- 1
- 0
JBossWS SVN: r11972 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: extensions/addressing/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-13 01:58:30 -0400 (Tue, 13 Apr 2010)
New Revision: 11972
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
Log:
[JBWS-2991] respect @AddressingFeature attributes
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2010-04-13 02:26:53 UTC (rev 11971)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2010-04-13 05:58:30 UTC (rev 11972)
@@ -36,8 +36,11 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.addressing.AddressingBuilder;
import javax.xml.ws.addressing.AddressingException;
+import javax.xml.ws.addressing.AttributedURI;
+import javax.xml.ws.addressing.EndpointReference;
import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
@@ -61,142 +64,196 @@
* @author Heiko.Braun(a)jboss.com
* @since 24-Nov-2005
*/
+@SuppressWarnings("unchecked")
public class WSAddressingClientHandler extends GenericSOAPHandler
{
- // Provide logging
- private static Logger log = Logger.getLogger(WSAddressingClientHandler.class);
+ // Provide logging
+ private static Logger log = Logger.getLogger(WSAddressingClientHandler.class);
- private static AddressingBuilder ADDR_BUILDER;
- private static AddressingConstantsImpl ADDR_CONSTANTS;
- private static Set<QName> HEADERS = new HashSet<QName>();
+ private static AddressingBuilder ADDR_BUILDER;
- static
- {
- ADDR_CONSTANTS = new AddressingConstantsImpl();
- ADDR_BUILDER = AddressingBuilder.getAddressingBuilder();
+ private static AddressingConstantsImpl ADDR_CONSTANTS;
- HEADERS.add( ADDR_CONSTANTS.getActionQName());
- HEADERS.add( ADDR_CONSTANTS.getToQName());
- }
+ private static Set<QName> HEADERS = new HashSet<QName>();
- public Set getHeaders()
- {
- return Collections.unmodifiableSet(HEADERS);
- }
+ static
+ {
+ ADDR_CONSTANTS = new AddressingConstantsImpl();
+ ADDR_BUILDER = AddressingBuilder.getAddressingBuilder();
- protected boolean handleOutbound(MessageContext msgContext)
- {
- log.debug("handleOutbound");
+ HEADERS.add(ADDR_CONSTANTS.getActionQName());
+ HEADERS.add(ADDR_CONSTANTS.getToQName());
+ }
- SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES);
+ public Set getHeaders()
+ {
+ return Collections.unmodifiableSet(HEADERS);
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ log.debug("handleOutbound");
+
+ SOAPAddressingProperties addrProps = (SOAPAddressingProperties) msgContext
+ .get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES);
if (addrProps != null)
{
msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps);
msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION);
}
-
- addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+
+ addrProps = (SOAPAddressingProperties) msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
if (addrProps == null)
{
// supply default addressing properties
- addrProps = (SOAPAddressingPropertiesImpl)ADDR_BUILDER.newAddressingProperties();
+ addrProps = (SOAPAddressingPropertiesImpl) ADDR_BUILDER.newAddressingProperties();
msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps);
msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, Scope.APPLICATION);
}
-
+
+ // Add required wsa:Action
if (addrProps.getAction() == null)
{
- try
- {
- OperationMetaData opMetaData = ((CommonMessageContext)msgContext).getOperationMetaData();
- if (msgContext.get(BindingProvider.SOAPACTION_URI_PROPERTY) != null)
- {
- addrProps.setAction(ADDR_BUILDER.newURI(msgContext.get(BindingProvider.SOAPACTION_URI_PROPERTY).toString()));
- }
- else
- {
- AddressingOpMetaExt addressingMD = (AddressingOpMetaExt)opMetaData.getExtension(ADDR_CONSTANTS.getNamespaceURI());
- if (addressingMD == null)
- throw new IllegalStateException("Addressing Meta Data not available");
+ addrProps.setAction(this.getAction(msgContext));
+ }
- String action = addressingMD.getInboundAction();
- if (action == null) action = opMetaData.getJavaName();
- addrProps.setAction(ADDR_BUILDER.newURI(action));
- }
- }
- catch (URISyntaxException ex)
- {
- // ignore
- }
- }
-
- //Add optional messageID
+ // Add optional wsa:MessageID
if (addrProps.getMessageID() == null)
{
addrProps.setMessageID(AddressingClientUtil.createMessageID());
}
-
- SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- addrProps.writeHeaders(soapMessage);
+ // Add optional wsa:To
+ if (addrProps.getTo() == null)
+ {
+ addrProps.setTo(this.getAddress(msgContext));
+ }
- return true;
- }
+ // Add optional wsa:ReplyTo
+ if (addrProps.getReplyTo() == null)
+ {
+ addrProps.setReplyTo(this.newAnonymousURI());
+ }
- protected boolean handleInbound(MessageContext msgContext)
- {
- log.debug("handleInbound");
+ SOAPMessage soapMessage = ((SOAPMessageContext) msgContext).getMessage();
+ addrProps.writeHeaders(soapMessage);
- try
- {
- SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- if (soapMessage.getSOAPPart().getEnvelope() != null)
- {
- SOAPAddressingBuilder builder = (SOAPAddressingBuilder)SOAPAddressingBuilder.getAddressingBuilder();
- SOAPAddressingProperties addrProps = (SOAPAddressingProperties)builder.newAddressingProperties();
- CommonMessageContext commonMsgContext = (CommonMessageContext)msgContext;
- ClientEndpointMetaData serverMetaData = (ClientEndpointMetaData)commonMsgContext.getEndpointMetaData();
- AddressingFeature addrFeature = serverMetaData.getFeature(AddressingFeature.class);
- if (addrFeature != null && addrFeature.isRequired())
- {
- try
- {
- soapMessage.setProperty("isRequired", true);
- }
- catch (Exception e)
- {
- //ignore
- }
-
- }
- addrProps.readHeaders(soapMessage);
+ return true;
+ }
+
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ log.debug("handleInbound");
+
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext) msgContext).getMessage();
+ if (soapMessage.getSOAPPart().getEnvelope() != null)
+ {
+ SOAPAddressingBuilder builder = (SOAPAddressingBuilder) SOAPAddressingBuilder.getAddressingBuilder();
+ SOAPAddressingProperties addrProps = (SOAPAddressingProperties) builder.newAddressingProperties();
+ if (this.isAddressingRequired(msgContext))
+ {
+ try
+ {
+ soapMessage.setProperty("isRequired", true);
+ }
+ catch (Exception e)
+ {
+ //ignore
+ }
+
+ }
+ addrProps.readHeaders(soapMessage);
msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addrProps);
msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, Scope.APPLICATION);
msgContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND, addrProps);
msgContext.setScope(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION);
- msgContext.put(MessageContext.REFERENCE_PARAMETERS, convertToElementList(addrProps.getReferenceParameters().getElements()));
+ msgContext.put(MessageContext.REFERENCE_PARAMETERS, convertToElementList(addrProps.getReferenceParameters()
+ .getElements()));
msgContext.setScope(MessageContext.REFERENCE_PARAMETERS, Scope.APPLICATION);
- }
- }
- catch (SOAPException ex)
- {
- throw new AddressingException("Cannot handle response", ex);
- }
+ }
+ }
+ catch (SOAPException ex)
+ {
+ throw new AddressingException("Cannot handle response", ex);
+ }
- return true;
- }
-
- private static List<Element> convertToElementList(List<Object> objects)
+ return true;
+ }
+
+ private static List<Element> convertToElementList(List<Object> objects)
{
- if (objects == null) return null;
+ if (objects == null)
+ return null;
List<Element> elements = new LinkedList<Element>();
for (Object o : objects)
{
if (o instanceof Element)
{
- elements.add((Element)o);
+ elements.add((Element) o);
}
}
return elements;
}
+
+ private AttributedURI getAction(final MessageContext msgContext)
+ {
+ String action = null;
+
+ if (msgContext.get(BindingProvider.SOAPACTION_URI_PROPERTY) != null)
+ action = msgContext.get(BindingProvider.SOAPACTION_URI_PROPERTY).toString();
+
+ OperationMetaData operationMD = ((CommonMessageContext) msgContext).getOperationMetaData();
+ if (operationMD != null)
+ {
+ AddressingOpMetaExt addressingMD = (AddressingOpMetaExt)
+ operationMD.getExtension(ADDR_CONSTANTS.getNamespaceURI());
+
+ action = addressingMD.getInboundAction();
+ if (action == null)
+ action = operationMD.getJavaName();
+ }
+
+ return this.newURI(action);
+ }
+
+ private AttributedURI getAddress(final MessageContext msgContext)
+ {
+ final OperationMetaData operationMD = ((CommonMessageContext) msgContext).getOperationMetaData();
+ if (operationMD != null)
+ {
+ final ClientEndpointMetaData endpointMD = (ClientEndpointMetaData) operationMD.getEndpointMetaData();
+
+ return this.newURI(endpointMD.getEndpointAddress());
+ }
+
+ return null;
+ }
+
+ private AttributedURI newURI(final String uri)
+ {
+ try
+ {
+ return ADDR_BUILDER.newURI(uri);
+ }
+ catch (URISyntaxException e)
+ {
+ throw new WebServiceException(e.getMessage(), e);
+ }
+ }
+
+ private EndpointReference newAnonymousURI()
+ {
+ return ADDR_BUILDER.newEndpointReference(this.newURI(ADDR_CONSTANTS.getAnonymousURI()).getURI());
+ }
+
+ private boolean isAddressingRequired(final MessageContext msgContext)
+ {
+ CommonMessageContext commonMsgContext = (CommonMessageContext)msgContext;
+ ClientEndpointMetaData serverMetaData = (ClientEndpointMetaData)commonMsgContext.getEndpointMetaData();
+ AddressingFeature addrFeature = serverMetaData.getFeature(AddressingFeature.class);
+
+ return addrFeature != null && addrFeature.isRequired();
+ }
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2010-04-13 02:26:53 UTC (rev 11971)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2010-04-13 05:58:30 UTC (rev 11972)
@@ -29,6 +29,7 @@
import org.jboss.ws.metadata.umdm.FaultMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.wsf.common.addressing.AddressingConstants;
import org.jboss.wsf.common.handler.GenericSOAPHandler;
import org.w3c.dom.Element;
@@ -63,6 +64,7 @@
* @author Heiko.Braun(a)jboss.com
* @since 24-Nov-2005
*/
+@SuppressWarnings("unchecked")
public class WSAddressingServerHandler extends GenericSOAPHandler
{
// Provide logging
@@ -90,12 +92,25 @@
{
if(log.isDebugEnabled()) log.debug("handleInbound");
+// if (!this.isAddressingEnabled(msgContext))
+// {
+// try
+// {
+// SOAPFault fault = new SOAPFaultImpl();
+// fault.setFaultCode(AddressingConstants.Core.Faults.MESSAGEADDRESSINGHEADERREQUIRED_QNAME);
+// fault.setFaultString("A required header representing a Message Addressing Property is not present");
+// throw new SOAPFaultException(fault);
+// }
+// catch (SOAPException e)
+// {
+// throw new WebServiceException(e);
+// }
+// }
+
SOAPAddressingProperties addrProps = (SOAPAddressingProperties)ADDR_BUILDER.newAddressingProperties();
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
CommonMessageContext commonMsgContext = (CommonMessageContext)msgContext;
- ServerEndpointMetaData serverMetaData = (ServerEndpointMetaData)commonMsgContext.getEndpointMetaData();
- AddressingFeature addrFeature = serverMetaData.getFeature(AddressingFeature.class);
- if (addrFeature != null && addrFeature.isRequired())
+ if (this.isAddressingRequired(msgContext))
{
try
{
@@ -108,38 +123,41 @@
}
addrProps.readHeaders(soapMessage);
- msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, addrProps);
- msgContext.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION);
- msgContext.put(MessageContext.REFERENCE_PARAMETERS, convertToElementList(addrProps.getReferenceParameters().getElements()));
- msgContext.setScope(MessageContext.REFERENCE_PARAMETERS, Scope.APPLICATION);
-
- //check if soap action matches wsa action
- String[] soapActions = commonMsgContext.getMessageAbstraction().getMimeHeaders().getHeader("SOAPAction");
- if (soapActions != null && soapActions.length > 0)
+ if (addrProps.getAction() != null)
{
- String soapAction = soapActions[0];
- if (!soapAction.equals("\"\"") && addrProps.getAction() != null)
- {
- String wsaAction = addrProps.getAction().getURI().toString();
- // R1109 The value of the SOAPAction HTTP header field in a HTTP request MESSAGE MUST be a quoted string.
- if (!soapAction.equals(wsaAction) && !soapAction.equals("\"" + wsaAction + "\""))
- {
- try
- {
- SOAPFault fault = new SOAPFaultImpl();
- fault.setFaultCode(new QName(ADDR_CONSTANTS.getNamespaceURI(), "ActionMismatch"));
- fault.setFaultString("Mismatch between soap action:" + soapAction + " and wsa action:\""
- + addrProps.getAction().getURI() + "\"");
- Detail detail = fault.addDetail();
- detail.addDetailEntry(new QName(ADDR_CONSTANTS.getNamespaceURI(), "ProblemAction"));
- throw new SOAPFaultException(fault);
- }
- catch (SOAPException e)
- {
- throw new WebServiceException(e);
- }
- }
- }
+ msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, addrProps);
+ msgContext.setScope(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND, Scope.APPLICATION);
+ msgContext.put(MessageContext.REFERENCE_PARAMETERS, convertToElementList(addrProps.getReferenceParameters().getElements()));
+ msgContext.setScope(MessageContext.REFERENCE_PARAMETERS, Scope.APPLICATION);
+
+ //check if soap action matches wsa action
+ String[] soapActions = commonMsgContext.getMessageAbstraction().getMimeHeaders().getHeader("SOAPAction");
+ if (soapActions != null && soapActions.length > 0)
+ {
+ String soapAction = soapActions[0];
+ if (!soapAction.equals("\"\"") && addrProps.getAction() != null)
+ {
+ String wsaAction = addrProps.getAction().getURI().toString();
+ // R1109 The value of the SOAPAction HTTP header field in a HTTP request MESSAGE MUST be a quoted string.
+ if (!soapAction.equals(wsaAction) && !soapAction.equals("\"" + wsaAction + "\""))
+ {
+ try
+ {
+ SOAPFault fault = new SOAPFaultImpl();
+ fault.setFaultCode(new QName(ADDR_CONSTANTS.getNamespaceURI(), "ActionMismatch"));
+ fault.setFaultString("Mismatch between soap action:" + soapAction + " and wsa action:\""
+ + addrProps.getAction().getURI() + "\"");
+ Detail detail = fault.addDetail();
+ detail.addDetailEntry(new QName(ADDR_CONSTANTS.getNamespaceURI(), "ProblemAction"));
+ throw new SOAPFaultException(fault);
+ }
+ catch (SOAPException e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+ }
+ }
}
return true;
}
@@ -161,7 +179,13 @@
protected boolean handleOutbound(MessageContext msgContext)
{
if(log.isDebugEnabled()) log.debug("handleOutbound");
- handleResponseOrFault(msgContext, false);
+ final boolean isAddressingEnabled = this.isAddressingEnabled(msgContext);
+ final boolean isAddressingRequest = this.isAddressingRequest(msgContext);
+
+ if (isAddressingEnabled && isAddressingRequest)
+ {
+ handleResponseOrFault(msgContext, false);
+ }
return true;
}
@@ -172,7 +196,14 @@
public boolean handleFault(MessageContext msgContext)
{
if(log.isDebugEnabled()) log.debug("handleFault");
- handleResponseOrFault(msgContext, true);
+ final boolean isAddressingEnabled = this.isAddressingEnabled(msgContext);
+ final boolean isAddressingRequest = this.isAddressingRequest(msgContext);
+
+ if (isAddressingEnabled && isAddressingRequest)
+ {
+ handleResponseOrFault(msgContext, true);
+ }
+
return true;
}
@@ -239,12 +270,30 @@
return ADDR_CONSTANTS.getDefaultFaultAction();
}
- /* check wsa formal constraints */
- private void validateRequest(SOAPAddressingProperties addrProps)
+ private boolean isAddressingRequired(final MessageContext msgContext)
{
- // If wsa:ReplyTo is supplied and the message lacks a [message id] property, the processor MUST fault.
- if (addrProps.getReplyTo() != null && addrProps.getMessageID() == null)
- throw new IllegalArgumentException("wsa:MessageId is required when wsa:ReplyTo is supplied");
-
+ final AddressingFeature addrFeature = this.getAddressingFeature(msgContext);
+
+ return addrFeature != null && addrFeature.isEnabled() && addrFeature.isRequired();
}
+
+ private boolean isAddressingEnabled(final MessageContext msgContext)
+ {
+ final AddressingFeature addrFeature = this.getAddressingFeature(msgContext);
+
+ return addrFeature != null && addrFeature.isEnabled();
+ }
+
+ private AddressingFeature getAddressingFeature(final MessageContext msgContext)
+ {
+ final CommonMessageContext commonMsgContext = (CommonMessageContext)msgContext;
+ final ServerEndpointMetaData serverMetaData = (ServerEndpointMetaData)commonMsgContext.getEndpointMetaData();
+
+ return serverMetaData.getFeature(AddressingFeature.class);
+ }
+
+ private boolean isAddressingRequest(final MessageContext msgContext)
+ {
+ return msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND) != null;
+ }
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2010-04-13 02:26:53 UTC (rev 11971)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2010-04-13 05:58:30 UTC (rev 11972)
@@ -33,21 +33,24 @@
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.addressing.AddressingConstants;
import javax.xml.ws.addressing.AddressingException;
import javax.xml.ws.addressing.AttributedURI;
-import javax.xml.ws.addressing.MapRequiredException;
import javax.xml.ws.addressing.ReferenceParameters;
import javax.xml.ws.addressing.Relationship;
import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
+import javax.xml.ws.soap.SOAPFaultException;
import org.jboss.logging.Logger;
import org.jboss.ws.core.soap.NameImpl;
import org.jboss.ws.core.soap.SOAPFactoryImpl;
+import org.jboss.ws.core.soap.SOAPFaultImpl;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.EndpointReferenceImpl;
@@ -80,13 +83,28 @@
private String getRequiredHeaderContent(SOAPHeader soapHeader, QName qname)
{
Element element = DOMUtils.getFirstChildElement(soapHeader, qname);
- if(null == element) throw new MapRequiredException(qname);
+ if(null == element) throwAddressingHeaderMissing();
String value = DOMUtils.getTextContent(element);
- if(null == value || value.equals("")) throw new MapRequiredException(qname);
+ if(null == value || value.equals("")) throwAddressingHeaderMissing();
return value;
}
+
+ private void throwAddressingHeaderMissing()
+ {
+ try
+ {
+ SOAPFault fault = new SOAPFaultImpl();
+ fault.setFaultCode(org.jboss.wsf.common.addressing.AddressingConstants.Core.Faults.MESSAGEADDRESSINGHEADERREQUIRED_QNAME);
+ fault.setFaultString("A required header representing a Message Addressing Property is not present");
+ throw new SOAPFaultException(fault);
+ }
+ catch (SOAPException e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
private String getOptionalHeaderContent(SOAPHeader soapHeader, QName qname)
{
@@ -154,7 +172,7 @@
{
//check the action header only if the required value is true
String action = getRequiredHeaderContent(soapHeader, ADDR.getActionQName());
- setAction(builder.newURI(action));
+ setAction(builder.newURI(action));
}
else
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-04-13 02:26:53 UTC (rev 11971)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-04-13 05:58:30 UTC (rev 11972)
@@ -586,16 +586,11 @@
if (webMethodAction != null)
return webMethodAction;
- if (endpointMD.isFeatureEnabled(AddressingFeature.class))
- {
- String tns = endpointMD.getPortTypeName().getNamespaceURI();
- String portTypeName = endpointMD.getPortTypeName().getLocalPart();
- String opName = operationMD.getQName().getLocalPart();
+ String tns = this.getEndpointNamespace(endpointMD);
+ String portTypeName = endpointMD.getPortTypeName().getLocalPart();
+ String opName = operationMD.getQName().getLocalPart();
- return tns + portTypeName + "/" + opName + "Request";
- }
-
- return null;
+ return tns + portTypeName + "/" + opName + "Request";
}
/*
@@ -614,16 +609,11 @@
if ((actionAnn != null) && (!"".equals(actionAnn.output())))
return actionAnn.output();
- if (endpointMD.isFeatureEnabled(AddressingFeature.class))
- {
- String tns = endpointMD.getPortTypeName().getNamespaceURI();
- String portTypeName = endpointMD.getPortTypeName().getLocalPart();
- String opName = operationMD.getQName().getLocalPart();
+ String tns = this.getEndpointNamespace(endpointMD);
+ String portTypeName = endpointMD.getPortTypeName().getLocalPart();
+ String opName = operationMD.getQName().getLocalPart();
- return tns + portTypeName + "/" + opName + "Response";
- }
-
- return null;
+ return tns + portTypeName + "/" + opName + "Response";
}
/*
@@ -657,18 +647,22 @@
if ((faultActionAnn != null) && (!"".equals(faultActionAnn.value())))
return faultActionAnn.value();
- if (endpointMD.isFeatureEnabled(AddressingFeature.class))
- {
- String tns = endpointMD.getPortTypeName().getNamespaceURI();
- String portTypeName = endpointMD.getPortTypeName().getLocalPart();
- String opName = operationMD.getQName().getLocalPart();
- int dotIndex = faultBeanName.lastIndexOf('.');
- String excetionClassName = dotIndex == -1 ? faultBeanName : faultBeanName.substring(dotIndex + 1);
+ String tns = this.getEndpointNamespace(endpointMD);
+ String portTypeName = endpointMD.getPortTypeName().getLocalPart();
+ String opName = operationMD.getQName().getLocalPart();
+ int dotIndex = faultBeanName.lastIndexOf('.');
+ String excetionClassName = dotIndex == -1 ? faultBeanName : faultBeanName.substring(dotIndex + 1);
- return tns + portTypeName + "/" + opName + "/Fault/" + excetionClassName;
- }
+ return tns + portTypeName + "/" + opName + "/Fault/" + excetionClassName;
+ }
+
+ private String getEndpointNamespace(final EndpointMetaData endpointMD)
+ {
+ String namespace = endpointMD.getPortTypeName().getNamespaceURI();
+ if (!namespace.endsWith("/"))
+ namespace += "/";
- return null;
+ return namespace;
}
/**
14 years, 8 months
- 1
- 0
JBossWS SVN: r11971 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-12 22:26:53 -0400 (Mon, 12 Apr 2010)
New Revision: 11971
Added:
stack/cxf/branches/jms-integration/
Log:
Create branch for jms integration
Copied: stack/cxf/branches/jms-integration (from rev 11970, stack/cxf/trunk)
14 years, 8 months
- 1
- 0
JBossWS SVN: r11970 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-12 22:24:19 -0400 (Mon, 12 Apr 2010)
New Revision: 11970
Added:
container/jboss50/branches/jbossws-jboss510-jms-integration/
Log:
create branch for jmsintegration
Copied: container/jboss50/branches/jbossws-jboss510-jms-integration (from rev 11969, container/jboss50/branches/jbossws-jboss510)
14 years, 8 months
- 1
- 0
JBossWS SVN: r11969 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-12 22:15:26 -0400 (Mon, 12 Apr 2010)
New Revision: 11969
Added:
spi/branches/jms-integration/
Log:
Create branch jms endpoint deployment
Copied: spi/branches/jms-integration (from rev 11968, spi/trunk)
14 years, 8 months
- 1
- 0
JBossWS SVN: r11968 - stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-09 05:43:10 -0400 (Fri, 09 Apr 2010)
New Revision: 11968
Modified:
stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
Log:
[JBPAPP-4071]:Added the missing close tag deleted by accident when close IDE
Modified: stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2010-04-09 09:11:35 UTC (rev 11967)
+++ stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2010-04-09 09:43:10 UTC (rev 11968)
@@ -395,4 +395,5 @@
{
Object readFrom(InputStream in);
void writeTo(Object obj, OutputStream out);
- }
\ No newline at end of file
+ }
+}
\ No newline at end of file
14 years, 8 months
- 1
- 0
JBossWS SVN: r11967 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-09 05:11:35 -0400 (Fri, 09 Apr 2010)
New Revision: 11967
Added:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/jbossws.spring.handlers
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers
stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
[JBWS-2995] Providing custom NamespaceHandlerResolver, removing duplicate Spring mappings and just providing our own customizations
Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/jbossws.spring.handlers
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/jbossws.spring.handlers (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/jbossws.spring.handlers 2010-04-09 09:11:35 UTC (rev 11967)
@@ -0,0 +1 @@
+http\://cxf.apache.org/jaxws=org.jboss.wsf.stack.cxf.spring.handler.JaxwsNamespaceHandler
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers 2010-04-09 07:14:25 UTC (rev 11966)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers 2010-04-09 09:11:35 UTC (rev 11967)
@@ -1,281 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler
-http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler
-http\://cxf.apache.org/jaxws=org.jboss.wsf.stack.cxf.spring.handler.JaxwsNamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/jaxrs=org.apache.cxf.jaxrs.spring.NamespaceHandler
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler
-http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
-http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
-http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas 2010-04-09 07:14:25 UTC (rev 11966)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas 2010-04-09 09:11:35 UTC (rev 11967)
@@ -1,318 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
-http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
-
-http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd
-http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd
-http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/bindings/object.xsd=schemas/bindings/object.xsd
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/jaxrs.xsd=schemas/jaxrs.xsd
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd
-http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd
-http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd
-http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
-http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd
-http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
-http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
-http\://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd=schemas/xmldsig-core-schema.xsd
-
-
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd
-http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd
-http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-04-09 07:14:25 UTC (rev 11966)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-04-09 09:11:35 UTC (rev 11967)
@@ -42,6 +42,7 @@
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
+import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
@@ -211,6 +212,7 @@
GenericApplicationContext childCtx = new GenericApplicationContext(ctx);
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx);
reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
+ reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver());
reader.loadBeanDefinitions(new InputStreamResource(is));
childCtx.refresh();
return childCtx;
Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/handler/NamespaceHandlerResolver.java 2010-04-09 09:11:35 UTC (rev 11967)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.cxf.spring.handler;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.jboss.logging.Logger;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.FatalBeanException;
+import org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver;
+import org.springframework.beans.factory.xml.NamespaceHandler;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
+import org.springframework.util.ClassUtils;
+
+/**
+ * A custom namespace handler resolver that first try resolving using
+ * the jbossws.spring.handlers configuration, eventually falling back
+ * to the Spring default namespace handler resolver when nothing is
+ * found.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 09-Apr-2010
+ *
+ */
+public class NamespaceHandlerResolver extends DefaultNamespaceHandlerResolver
+{
+ public static final String JBOSSWS_HANDLER_MAPPINGS_LOCATION = "META-INF/jbossws.spring.handlers";
+
+ private static final Logger logger = Logger.getLogger(NamespaceHandlerResolver.class);
+
+ private ClassLoader loader;
+
+ private Map<Object, Object> jbosswsHandlerMappings;
+
+ public NamespaceHandlerResolver()
+ {
+ super();
+ }
+
+ public NamespaceHandlerResolver(ClassLoader classLoader)
+ {
+ super(classLoader);
+ }
+
+ public NamespaceHandlerResolver(ClassLoader classLoader, String handlerMappingsLocation)
+ {
+ super(classLoader, handlerMappingsLocation);
+ this.loader = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
+ }
+
+ public NamespaceHandler resolve(String namespaceUri)
+ {
+ NamespaceHandler jbosswsHandler = null;
+ try
+ {
+ jbosswsHandler = resolveInternal(namespaceUri);
+ }
+ catch (Throwable t)
+ {
+ if (logger.isTraceEnabled())
+ logger.trace("Unable to resolve JBossWS specific handler for namespace '" + namespaceUri
+ + "'; trying default namespace resolution...", t);
+ }
+ return jbosswsHandler != null ? jbosswsHandler : super.resolve(namespaceUri);
+ }
+
+ private NamespaceHandler resolveInternal(String namespaceUri)
+ {
+ Map<Object, Object> handlerMappings = getHandlerMappings();
+ Object handlerOrClassName = handlerMappings.get(namespaceUri);
+ if (handlerOrClassName == null)
+ {
+ return null;
+ }
+ else if (handlerOrClassName instanceof NamespaceHandler)
+ {
+ return (NamespaceHandler) handlerOrClassName;
+ }
+ else
+ {
+ String className = (String) handlerOrClassName;
+ try
+ {
+ Class<?> handlerClass = ClassUtils.forName(className, this.loader);
+ if (!NamespaceHandler.class.isAssignableFrom(handlerClass))
+ {
+ throw new FatalBeanException("Class [" + className + "] for namespace [" + namespaceUri
+ + "] does not implement the [" + NamespaceHandler.class.getName() + "] interface");
+ }
+ NamespaceHandler namespaceHandler = (NamespaceHandler) BeanUtils.instantiateClass(handlerClass);
+ namespaceHandler.init();
+ handlerMappings.put(namespaceUri, namespaceHandler);
+ return namespaceHandler;
+ }
+ catch (ClassNotFoundException ex)
+ {
+ throw new FatalBeanException("NamespaceHandler class [" + className + "] for namespace [" + namespaceUri
+ + "] not found", ex);
+ }
+ catch (LinkageError err)
+ {
+ throw new FatalBeanException("Invalid NamespaceHandler class [" + className + "] for namespace ["
+ + namespaceUri + "]: problem with handler class file or dependent class", err);
+ }
+ }
+ }
+
+ /**
+ * Load the specified NamespaceHandler mappings lazily.
+ */
+ private Map<Object, Object> getHandlerMappings()
+ {
+ if (this.jbosswsHandlerMappings == null)
+ {
+ try
+ {
+ Properties mappings = PropertiesLoaderUtils.loadAllProperties(JBOSSWS_HANDLER_MAPPINGS_LOCATION,
+ this.loader);
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Loaded mappings [" + mappings + "]");
+ }
+ this.jbosswsHandlerMappings = new HashMap<Object, Object>(mappings);
+ }
+ catch (IOException ex)
+ {
+ IllegalStateException ise = new IllegalStateException(
+ "Unable to load NamespaceHandler mappings from location [" + JBOSSWS_HANDLER_MAPPINGS_LOCATION + "]");
+ ise.initCause(ex);
+ throw ise;
+ }
+ }
+ return this.jbosswsHandlerMappings;
+ }
+}
14 years, 8 months
- 1
- 0
JBossWS SVN: r11966 - stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-09 03:14:25 -0400 (Fri, 09 Apr 2010)
New Revision: 11966
Modified:
stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
Log:
[JBPAPP-4071]:removed Sun's JVM proprietary API
Modified: stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
===================================================================
--- stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2010-04-09 07:11:50 UTC (rev 11965)
+++ stack/native/tags/jbossws-native-2.0.1.SP2_CP08/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2010-04-09 07:14:25 UTC (rev 11966)
@@ -1,39 +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.
-*/
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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;
-// $Id$
-
import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
import javax.mail.internet.ContentType;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
@@ -45,10 +46,6 @@
import org.jboss.wsf.common.IOUtils;
import org.jboss.wsf.common.JavaUtils;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageDecoder;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-
/**
* Generic mime utility class.
*
@@ -223,15 +220,18 @@
{
public Object readFrom(InputStream in) {
Object converted = null;
+
try
{
- JPEGImageDecoder dec = JPEGCodec.createJPEGDecoder(in);
- BufferedImage bim = dec.decodeAsBufferedImage();
+ ImageReader decoder = ImageIO.getImageReadersByFormatName("JPEG").next();
+ ImageInputStream iis = ImageIO.createImageInputStream(in);
+ decoder.setInput(iis);
+ BufferedImage bim = decoder.read(0);
converted = bim;
}
catch (Exception e)
{
- // ignore
+ e.printStackTrace();
}
return converted;
@@ -240,10 +240,12 @@
public void writeTo(Object obj, OutputStream out) {
if(obj instanceof BufferedImage)
{
- JPEGImageEncoder enc = JPEGCodec.createJPEGEncoder(out);
+ ImageWriter encoder = ImageIO.getImageWritersByFormatName("JPEG").next();
try
{
- enc.encode((BufferedImage)obj);
+ ImageOutputStream ios = ImageIO.createImageOutputStream(out);
+ encoder.setOutput(ios);
+ encoder.write((BufferedImage)obj);
}
catch (IOException e)
{
@@ -291,17 +293,12 @@
Object converted = null;
try
{
- BufferedReader br = new BufferedReader(new InputStreamReader(in));
- StringBuilder sb = new StringBuilder();
- String line = null;
-
- while ((line = br.readLine()) != null) {
- sb.append(line + "\n");
+ StringBuilder out = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = in.read(b)) != -1;) {
+ out.append(new String(b, 0, n));
}
-
- br.close();
-
- converted = sb.toString();
+ converted = out.toString();
}
catch (IOException e)
{
@@ -398,7 +395,4 @@
{
Object readFrom(InputStream in);
void writeTo(Object obj, OutputStream out);
- }
-
-
-}
+ }
\ No newline at end of file
14 years, 8 months
- 1
- 0
JBossWS SVN: r11965 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-04-09 03:11:50 -0400 (Fri, 09 Apr 2010)
New Revision: 11965
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
Log:
[JBPAPP-4071]:removed the Sun's proprietary APIs
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2010-04-08 10:40:29 UTC (rev 11964)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2010-04-09 07:11:50 UTC (rev 11965)
@@ -1,39 +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.
-*/
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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;
-// $Id$
-
import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
import javax.mail.internet.ContentType;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
@@ -45,10 +46,6 @@
import org.jboss.wsf.common.IOUtils;
import org.jboss.wsf.common.JavaUtils;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageDecoder;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-
/**
* Generic mime utility class.
*
@@ -223,15 +220,18 @@
{
public Object readFrom(InputStream in) {
Object converted = null;
+
try
{
- JPEGImageDecoder dec = JPEGCodec.createJPEGDecoder(in);
- BufferedImage bim = dec.decodeAsBufferedImage();
+ ImageReader decoder = ImageIO.getImageReadersByFormatName("JPEG").next();
+ ImageInputStream iis = ImageIO.createImageInputStream(in);
+ decoder.setInput(iis);
+ BufferedImage bim = decoder.read(0);
converted = bim;
}
catch (Exception e)
{
- // ignore
+ e.printStackTrace();
}
return converted;
@@ -240,10 +240,12 @@
public void writeTo(Object obj, OutputStream out) {
if(obj instanceof BufferedImage)
{
- JPEGImageEncoder enc = JPEGCodec.createJPEGEncoder(out);
+ ImageWriter encoder = ImageIO.getImageWritersByFormatName("JPEG").next();
try
{
- enc.encode((BufferedImage)obj);
+ ImageOutputStream ios = ImageIO.createImageOutputStream(out);
+ encoder.setOutput(ios);
+ encoder.write((BufferedImage)obj);
}
catch (IOException e)
{
@@ -291,17 +293,12 @@
Object converted = null;
try
{
- BufferedReader br = new BufferedReader(new InputStreamReader(in));
- StringBuilder sb = new StringBuilder();
- String line = null;
-
- while ((line = br.readLine()) != null) {
- sb.append(line + "\n");
+ StringBuilder out = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = in.read(b)) != -1;) {
+ out.append(new String(b, 0, n));
}
-
- br.close();
-
- converted = sb.toString();
+ converted = out.toString();
}
catch (IOException e)
{
@@ -401,4 +398,4 @@
}
-}
+}
\ No newline at end of file
14 years, 8 months
- 1
- 0
JBossWS SVN: r11964 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-08 06:40:29 -0400 (Thu, 08 Apr 2010)
New Revision: 11964
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
Log:
[JBWS-2923] Updating *-default.conf files for undeploying libs from common/lib
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-04-08 10:29:20 UTC (rev 11963)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/all-deploy.conf 2010-04-08 10:40:29 UTC (rev 11964)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api!
.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar server/all/deployers/jbossws.deployer/wscommons-policy.jar server/all/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jb!
ossws.deployer/xmlsec.jar server/all/deployers/jbossws.deploye!
r/META-I
NF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wsc!
ommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/all/deploy/jbossws.sar server/all/deploy/jbossws-console.war server/all/deploy/juddi-service.sar server/all/deployers/jbossws.deployer/FastInfoset.jar server/all/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/all/deployers/jbossws.deployer/jbossws-native-core.jar server/all/deployers/jbossws.deployer/jbossws-native-factories.jar server/all/deployers/jbossws.deployer/jbossws-native-services.jar server/all/deployers/jbossws.deployer/jettison.jar server/all/deployers/jbossws.deployer/netty.jar!
server/all/deployers/jbossws.deployer/wscommons-policy.jar se!
rver/all
/deployers/jbossws.deployer/policy.jar server/all/deployers/jbossws.deployer/wsdl4j.jar server/all/deployers/jbossws.deployer/xmlsec.jar server/all/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/all/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-04-08 10:29:20 UTC (rev 11963)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2010-04-08 10:40:29 UTC (rev 11964)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api!
.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jbossws-native-factories.jar server/default/deployers/jbossws.deployer/jbossws-native-services.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/netty.jar server/default/deployers/jbossws.deployer/wscommons-policy.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers!
/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.!
deployer
/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wsc!
ommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/default/deploy/jbossws.sar server/default/deploy/jbossws-console.war server/default/deploy/juddi-service.sar server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jbossws-native-factories.jar server/default/deployers/jbossws.deployer/jbossws-native-services.jar server/default/deployers/jbossws.deployer/jettison.jar server/defa!
ult/deployers/jbossws.deployer/netty.jar server/default/deploy!
ers/jbos
sws.deployer/wscommons-policy.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-04-08 10:29:20 UTC (rev 11963)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/standard-deploy.conf 2010-04-08 10:40:29 UTC (rev 11964)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api!
.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar server/standard/deployers/jbossws.deployer/netty.jar server/standard/deployers/jbossws.deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/policy.jar server/stand!
ard/deployers/jbossws.deployer/wsdl4j.jar server/standard/depl!
oyers/jb
ossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-native-services.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/netty.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/netty.jar common/lib/wsc!
ommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar common/lib/commons-beanutils.jar lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar lib/endorsed/jaxws-api.jar server/standard/deploy/jbossws.sar server/standard/deploy/jbossws-console.war server/standard/deploy/juddi-service.sar server/standard/deployers/jbossws.deployer/FastInfoset.jar server/standard/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/standard/deployers/jbossws.deployer/jbossws-native-core.jar server/standard/deployers/jbossws.deployer/jbossws-native-factories.jar server/standard/deployers/jbossws.deployer/jbossws-native-services.jar server/standard/deployers/jbossws.deployer/jettison.jar se!
rver/standard/deployers/jbossws.deployer/netty.jar server/stan!
dard/dep
loyers/jbossws.deployer/wscommons-policy.jar server/standard/deployers/jbossws.deployer/policy.jar server/standard/deployers/jbossws.deployer/wsdl4j.jar server/standard/deployers/jbossws.deployer/xmlsec.jar server/standard/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml server/standard/deployers/jbossws.deployer/META-INF/standard-*-config.xml
14 years, 8 months
- 1
- 0