JBossWS SVN: r11197 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-04 12:23:37 -0500 (Fri, 04 Dec 2009)
New Revision: 11197
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
Log:
[JBWS-2849] Fixing cookies setup using headers
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-12-04 16:11:11 UTC (rev 11196)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-12-04 17:23:37 UTC (rev 11197)
@@ -47,6 +47,7 @@
import org.jboss.ws.core.client.EndpointInfo;
import org.jboss.ws.core.client.RemoteConnection;
import org.jboss.ws.core.client.RemoteConnectionFactory;
+import org.jboss.ws.core.client.transport.NettyClient;
import org.jboss.ws.core.jaxrpc.ParameterWrapping;
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.Style;
@@ -435,32 +436,36 @@
requestContext.put(SESSION_COOKIES, cookies);
}
- List<String> setCookies = new ArrayList<String>();
+ Map<String, Object> headers = (Map<String, Object>)remotingMetadata.get(NettyClient.RESPONSE_HEADERS);
+ if (headers != null)
+ {
+ List<String> setCookies = new ArrayList<String>();
- List<String> setCookies1 = (List)remotingMetadata.get("Set-Cookie");
- if (setCookies1 != null)
- setCookies.addAll(setCookies1);
+ List<String> setCookies1 = (List)headers.get("Set-Cookie");
+ if (setCookies1 != null)
+ setCookies.addAll(setCookies1);
- List<String> setCookies2 = (List)remotingMetadata.get("Set-Cookie2");
- if (setCookies2 != null)
- setCookies.addAll(setCookies2);
+ List<String> setCookies2 = (List)headers.get("Set-Cookie2");
+ if (setCookies2 != null)
+ setCookies.addAll(setCookies2);
- // TODO: The parsing here should be improved to be fully compliant with the RFC
- for (String setCookie : setCookies)
- {
- int index = setCookie.indexOf(';');
- if (index == -1)
- continue;
+ // TODO: The parsing here should be improved to be fully compliant with the RFC
+ for (String setCookie : setCookies)
+ {
+ int index = setCookie.indexOf(';');
+ if (index == -1)
+ continue;
- String pair = setCookie.substring(0, index);
- index = pair.indexOf('=');
- if (index == -1)
- continue;
+ String pair = setCookie.substring(0, index);
+ index = pair.indexOf('=');
+ if (index == -1)
+ continue;
- String name = pair.substring(0, index);
- String value = pair.substring(index + 1);
+ String name = pair.substring(0, index);
+ String value = pair.substring(index + 1);
- cookies.put(name, value);
+ cookies.put(name, value);
+ }
}
}
14 years, 9 months
- 1
- 0
JBossWS SVN: r11196 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: core/client/transport and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-04 11:11:11 -0500 (Fri, 04 Dec 2009)
New Revision: 11196
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionJMS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/UnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java
Log:
[JBWS-2849] Separating http headers from netty client props, renaming those props and refactoring marshallers/rm-stuff for using separate maps
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionJMS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionJMS.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionJMS.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -146,7 +146,7 @@
}
ByteArrayInputStream bais = new ByteArrayInputStream(responseListener.resMessage.getBytes());
- resMessage = (MessageAbstraction)getUnmarshaller().read(bais, null);
+ resMessage = (MessageAbstraction)getUnmarshaller().read(bais, null, null);
}
con.stop();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/UnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/UnMarshaller.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/UnMarshaller.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -44,5 +44,5 @@
* @return
* @throws IOException all specific i/o exceptions need to be thrown as this.
*/
- Object read(InputStream inputStream, Map<String, Object> metadata) throws IOException;
+ Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -27,6 +27,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.channels.ClosedChannelException;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -74,9 +75,10 @@
*/
public class NettyClient
{
- public static final String RESPONSE_CODE = "ResponseCode";
- public static final String RESPONSE_CODE_MESSAGE = "ResponseCodeMessage";
- public static final String PROTOCOL = "Protocol";
+ public static final String RESPONSE_CODE = "org.jboss.ws.core.client.transport.NettyClient#ResponseCode";
+ public static final String RESPONSE_CODE_MESSAGE = "org.jboss.ws.core.client.transport.NettyClient#ResponseCodeMessage";
+ public static final String PROTOCOL = "org.jboss.ws.core.client.transport.NettyClient#Protocol";
+ public static final String RESPONSE_HEADERS = "org.jboss.ws.core.client.transport.NettyClient#ResponseHeaders";
private static Logger log = Logger.getLogger(NettyClient.class);
private Marshaller marshaller;
@@ -147,6 +149,7 @@
NettyTransportHandler transport = NettyTransportHandler.getInstance(target, NettyHelper.getChannelPipelineFactory(getSSLHandler(target, callProps)));
Channel channel = null;
Map<String, Object> resHeaders = null;
+ Map<String, Object> resMetadata = null;
try
{
setActualTimeout(callProps);
@@ -186,13 +189,14 @@
throw t != null ? t : ee;
}
resHeaders = result.getResponseHeaders();
- Object resMessage = oneway ? null : unmarshaller.read(result.getResponse(), resHeaders);
+ resMetadata = result.getMetadata();
+ Object resMessage = oneway ? null : unmarshaller.read(result.getResponse(), resMetadata, resHeaders);
//Update props with response headers (required to maintain session using cookies)
callProps.clear();
- if (resHeaders != null)
- {
- callProps.putAll(resHeaders);
+ callProps.put(RESPONSE_HEADERS, resHeaders != null ? resHeaders : new HashMap<String, Object>());
+ if (resMetadata != null) {
+ callProps.putAll(resMetadata);
}
return resMessage;
@@ -233,7 +237,7 @@
{
NettyHelper.clearResponseHandler(channel);
}
- transport.finished(resHeaders);
+ transport.finished(resMetadata, resHeaders); //provide both headers and metadata to the transport to allow for proper keepAlive checks
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyTransportHandler.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -180,9 +180,9 @@
*
* @param headers The received message's headers
*/
- public void goOn(Map<String, Object> headers)
+ public void goOn(Map<String, Object> metadata, Map<String, Object> headers)
{
- checkKeepAliveHeaders(headers);
+ checkKeepAliveHeaders(metadata, headers);
}
@@ -195,9 +195,9 @@
* @param headers The received message's headers
*
*/
- public void finished(Map<String, Object> headers)
+ public void finished(Map<String, Object> metadata, Map<String, Object> headers)
{
- checkKeepAliveHeaders(headers);
+ checkKeepAliveHeaders(metadata, headers);
keepAliveConnections--;
if (keepAliveConnections > 0 && isKeepingAlive())
{
@@ -217,9 +217,9 @@
*
* @param headers The received message's headers
*/
- protected void checkKeepAliveHeaders(Map<String, Object> headers)
+ protected void checkKeepAliveHeaders(Map<String, Object> metadata, Map<String, Object> headers)
{
- if (headers == null) return;
+ if (headers == null || metadata == null) return;
keepAliveConnections = -1;
keepAliveTimeout = 0;
try
@@ -248,7 +248,7 @@
}
}
}
- else if (HttpVersion.HTTP_1_1.toString().equals(NettyHelper.getFirstHeaderAsString(headers, NettyClient.PROTOCOL)))
+ else if (HttpVersion.HTTP_1_1.toString().equals(NettyHelper.getFirstHeaderAsString(metadata, NettyClient.PROTOCOL)))
{
//Consider the only valid value for Connection in responses is "close"
keepAliveConnections = (connectionHeader == null) ? DEFAULT_KEEP_ALIVE_CONS : 1;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/WSResponseHandler.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -37,6 +37,7 @@
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.handler.codec.http.HttpVersion;
/**
* A Netty channel upstream handler that receives MessageEvent
@@ -71,10 +72,11 @@
{
HttpResponse response = (HttpResponse)e.getMessage();
+ Map<String, Object> metadata = result.getMetadata();
+ metadata.put(NettyClient.PROTOCOL, response.getProtocolVersion());
+ metadata.put(NettyClient.RESPONSE_CODE, response.getStatus().getCode());
+ metadata.put(NettyClient.RESPONSE_CODE_MESSAGE, response.getStatus().getReasonPhrase());
Map<String, Object> responseHeaders = result.getResponseHeaders();
- responseHeaders.put(NettyClient.PROTOCOL, response.getProtocolVersion());
- responseHeaders.put(NettyClient.RESPONSE_CODE, response.getStatus().getCode());
- responseHeaders.put(NettyClient.RESPONSE_CODE_MESSAGE, response.getStatus().getReasonPhrase());
for (String headerName : response.getHeaderNames())
{
responseHeaders.put(headerName, response.getHeaders(headerName));
@@ -220,12 +222,15 @@
public InputStream getResponse();
public Map<String, Object> getResponseHeaders();
+
+ public Map<String, Object> getMetadata();
}
private class ResultImpl implements Result
{
private InputStream is;
private Map<String, Object> responseHeaders = new HashMap<String, Object>();
+ private Map<String, Object> metadata = new HashMap<String, Object>();
public InputStream getResponse()
{
@@ -243,5 +248,9 @@
{
this.responseHeaders = responseHeaders;
}
+ public Map<String, Object> getMetadata()
+ {
+ return metadata;
+ }
}
}
\ No newline at end of file
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -53,7 +53,7 @@
validResponseCodes.add(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
- public Object read(InputStream inputStream, Map<String, Object> metadata) throws IOException
+ public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException
{
if (log.isTraceEnabled())
{
@@ -65,7 +65,7 @@
if (resCode != null && validResponseCodes.contains(resCode) == false)
throw new WSException("Invalid HTTP server response [" + resCode + "] - " + resMessage);
- MimeHeaders mimeHeaders = getMimeHeaders(metadata);
+ MimeHeaders mimeHeaders = getMimeHeaders(headers);
HTTPMessageImpl soapMsg = new HTTPMessageImpl(mimeHeaders, inputStream);
return soapMsg;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -43,7 +43,7 @@
// Provide logging
private static Logger log = Logger.getLogger(JsonMessageUnMarshaller.class);
- public Object read(InputStream inputStream, Map<String, Object> metadata) throws IOException
+ public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException
{
if (log.isTraceEnabled())
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -49,7 +49,7 @@
import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.soap.SOAPFaultException;
-import org.jboss.util.NotImplementedException;
+import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonClient;
import org.jboss.ws.core.CommonMessageContext;
@@ -63,8 +63,8 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.wsrm.RMAddressingConstants;
+import org.jboss.ws.extensions.wsrm.RMClientSequence;
import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.RMClientSequence;
import org.jboss.ws.extensions.wsrm.api.RMException;
import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.extensions.wsrm.protocol.RMConstants;
@@ -88,6 +88,7 @@
*/
public class ClientImpl extends CommonClient implements org.jboss.ws.extensions.wsrm.api.RMProvider, BindingProvider
{
+ private static Logger log = Logger.getLogger(ClientImpl.class);
// the associated endpoint meta data
private final ClientEndpointMetaData epMetaData;
@@ -222,11 +223,19 @@
// [JBREM-728] Improve access to HTTP response headers
Map<String, List> headers = new HashMap<String, List>();
- for (Map.Entry en : remotingMetadata.entrySet())
+ Map<String, Object> metadataHeaders = (Map<String, Object>)remotingMetadata.get(NettyClient.RESPONSE_HEADERS);
+ if (metadataHeaders != null)
{
- if (en.getKey() instanceof String && en.getValue() instanceof List)
- headers.put((String)en.getKey(), (List)en.getValue());
+ for (Map.Entry en : metadataHeaders.entrySet())
+ {
+ if (en.getKey() instanceof String && en.getValue() instanceof List)
+ headers.put((String)en.getKey(), (List)en.getValue());
+ }
}
+ else
+ {
+ log.info("Cannot find response headers");
+ }
msgContext.put(MessageContext.HTTP_RESPONSE_HEADERS, headers);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -41,7 +41,7 @@
// Provide logging
private static Logger log = Logger.getLogger(SOAPMessageUnMarshaller.class);
- public Object read(InputStream inputStream, Map<String, Object> metadata) throws IOException
+ public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException
{
if (log.isTraceEnabled())
log.trace("Read input stream with metadata=" + metadata);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -56,7 +56,7 @@
validResponseCodes.add(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
- public Object read(InputStream inputStream, Map<String, Object> metadata) throws IOException
+ public Object read(InputStream inputStream, Map<String, Object> metadata, Map<String, Object> headers) throws IOException
{
if (log.isTraceEnabled())
log.trace("Read input stream with metadata=" + metadata);
@@ -70,7 +70,7 @@
resCode = HttpServletResponse.SC_OK;
}
- String resMessage = (String)metadata.get("ResponseCodeMessage");
+ String resMessage = (String)metadata.get(NettyClient.RESPONSE_CODE_MESSAGE);
if (validResponseCodes.contains(resCode) == false)
throw new WSException("Invalid HTTP server response [" + resCode + "] - " + resMessage);
@@ -78,7 +78,7 @@
SOAPMessage soapMsg = null;
if (resCode != HttpServletResponse.SC_NO_CONTENT)
{
- MimeHeaders mimeHeaders = getMimeHeaders(metadata);
+ MimeHeaders mimeHeaders = getMimeHeaders(headers);
//[JBWS-2651] modify the ignoreParseError to false
soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, false);
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMessageAssembler.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009, 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.
*
@@ -21,12 +21,15 @@
*/
package org.jboss.ws.extensions.wsrm.transport;
-import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.*;
+import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.INVOCATION_CONTEXT;
+import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.MARSHALLER;
+import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.REMOTING_INVOCATION_CONTEXT;
+import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.SERIALIZATION_CONTEXT;
+import static org.jboss.ws.extensions.wsrm.transport.RMChannelConstants.UNMARSHALLER;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.util.Map;
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.client.Marshaller;
@@ -76,11 +79,8 @@
byte[] payload = rmResponse.getPayload();
InputStream in = (payload == null) ? null : new ByteArrayInputStream(rmResponse.getPayload());
UnMarshaller unmarshaller = (UnMarshaller)rmMetadata.getContext(SERIALIZATION_CONTEXT).get(UNMARSHALLER);
- response = (MessageAbstraction)unmarshaller.read(in, rmResponse.getMetadata().getContext(REMOTING_INVOCATION_CONTEXT));
+ response = (MessageAbstraction)unmarshaller.read(in, rmMetadata.getContext(INVOCATION_CONTEXT), rmMetadata.getContext(REMOTING_INVOCATION_CONTEXT));
}
- Map<String, Object> invocationContext = rmMetadata.getContext(INVOCATION_CONTEXT);
- invocationContext.clear();
- invocationContext.putAll(rmMetadata.getContext(REMOTING_INVOCATION_CONTEXT));
return response;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -63,12 +63,14 @@
setContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext);
}
- public RMMetadata(Map<String, Object> remotingInvocationContext)
+ public RMMetadata(Map<String, Object> invocationContext, Map<String, Object> remotingInvocationContext)
{
if (remotingInvocationContext == null)
throw new IllegalArgumentException("Remoting invocation context cannot be null");
setContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext);
+
+ setContext(RMChannelConstants.INVOCATION_CONTEXT, invocationContext);
}
void setContext(String key, Map<String, Object> ctx)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -121,7 +121,7 @@
endTime = System.currentTimeMillis();
if (result.getResponse() != null)
{
- Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT);
+ Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT);
if (remotingCtx != null)
{
if (Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(NettyClient.RESPONSE_CODE)))
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -47,10 +47,10 @@
return instance;
}
- public Object read(InputStream is, Map metadata) throws IOException
+ public Object read(InputStream is, Map<String,Object> metadata, Map<String, Object> headers) throws IOException
{
if (is == null)
- return RMMessageFactory.newMessage(null, new RMMetadata(metadata)); // TODO: investigate why is == null (WSAddressing reply-to test)
+ return RMMessageFactory.newMessage(null, new RMMetadata(metadata, headers)); // TODO: investigate why is == null (WSAddressing reply-to test)
ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
@@ -61,7 +61,7 @@
baos.write(buffer, 0, count);
count = is.read(buffer);
}
- return RMMessageFactory.newMessage(baos.toByteArray(), new RMMetadata(metadata));
+ return RMMessageFactory.newMessage(baos.toByteArray(), new RMMetadata(metadata, headers));
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java 2009-12-04 13:01:13 UTC (rev 11195)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMRequestHandlerImpl.java 2009-12-04 16:11:11 UTC (rev 11196)
@@ -78,7 +78,7 @@
try
{
String requestPath = new URL(request.getUri()).getPath();
- RMMessage message = (RMMessage)RMUnMarshaller.getInstance().read(content.readable() ? new ChannelBufferInputStream(content) : null, requestHeaders);
+ RMMessage message = (RMMessage)RMUnMarshaller.getInstance().read(content.readable() ? new ChannelBufferInputStream(content) : null, null, requestHeaders);
handle(requestPath, message);
}
catch (Throwable t)
14 years, 9 months
- 1
- 0
JBossWS SVN: r11195 - in stack/cxf/trunk/modules/server/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-04 08:01:13 -0500 (Fri, 04 Dec 2009)
New Revision: 11195
Added:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
Removed:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml
Modified:
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2835] removing workaround for AS 6.x series
Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2009-12-04 13:01:13 UTC (rev 11195)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>org.apache.cxf</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!-- The stack specific deployment aspects -->
+ <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
+ </entry>
+ </map>
+ </property>
+ <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
+ <property name="requires">EndpointAddress,JAXBIntros</property>
+ <property name="provides">StackDescriptor</property>
+ <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
+ <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
+ <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
+ <property name="requires">StackDescriptor</property>
+ <property name="provides">JmsEndpointAddress</property>
+ <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
+ <property name="requires">JmsEndpointAddress</property>
+ <property name="provides">ResourceResolver</property>
+ <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
+ <property name="provides">JAXBIntros</property>
+ <property name="relativeOrder">20</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+</deployment>
Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2009-12-04 13:01:13 UTC (rev 11195)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>org.apache.cxf</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!-- The stack specific deployment aspects -->
+ <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
+ <property name="requires">EndpointAddress,JAXBIntros</property>
+ <property name="provides">StackDescriptor</property>
+ <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
+ <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
+ </bean>
+
+ <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
+ <property name="requires">StackDescriptor</property>
+ <property name="provides">JmsEndpointAddress</property>
+ </bean>
+
+ <bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
+ <property name="requires">JmsEndpointAddress</property>
+ <property name="provides">ResourceResolver</property>
+ </bean>
+
+ <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
+ <property name="provides">JAXBIntros</property>
+ </bean>
+
+</deployment>
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-12-04 12:58:07 UTC (rev 11194)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-12-04 13:01:13 UTC (rev 11195)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>org.apache.cxf</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
- </entry>
- </map>
- </property>
- <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
- <property name="requires">EndpointAddress,JAXBIntros</property>
- <property name="provides">StackDescriptor</property>
- <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
- <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
- <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="JMSEndpointAddressDeploymentAspect" class="org.jboss.wsf.stack.cxf.JMSEndpointAddressDeploymentAspect">
- <property name="requires">StackDescriptor</property>
- <property name="provides">JmsEndpointAddress</property>
- <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="ResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.ResourceResolverDeploymentAspect">
- <property name="requires">JmsEndpointAddress</property>
- <property name="provides">ResourceResolver</property>
- <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- </bean>
-
- <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- <property name="relativeOrder">20</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
-</deployment>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-04 12:58:07 UTC (rev 11194)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-04 13:01:13 UTC (rev 11195)
@@ -17,27 +17,27 @@
<target name="main">
<copy
- file="${src.dir}/jbossws-cxf-config.xml"
+ file="${src.dir}/jbossws-cxf-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-cxf-config.xml"
+ file="${src.dir}/jbossws-cxf-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-cxf-config.xml"
+ file="${src.dir}/jbossws-cxf-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-cxf-config.xml"
+ file="${src.dir}/jbossws-cxf-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-cxf-config.xml"
+ file="${src.dir}/jbossws-cxf-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
14 years, 9 months
- 1
- 0
JBossWS SVN: r11194 - in stack/metro/trunk/modules/server/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-04 07:58:07 -0500 (Fri, 04 Dec 2009)
New Revision: 11194
Added:
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as5.xml
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml
Removed:
stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml
Modified:
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2835] removing workaround for AS 6.x series
Added: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as5.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as5.xml (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as5.xml 2009-12-04 12:58:07 UTC (rev 11194)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>javax.enterprise.resource.webservices.jaxws</value>
+ <value>com.sun</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!-- The stack specific deployment aspects -->
+ <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.metro.EndpointServlet</value>
+ </entry>
+ </map>
+ </property>
+ <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">StackDescriptor</property>
+ <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
+ <property name="requires">StackDescriptor</property>
+ <property name="provides">RuntimeModel</property>
+ <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+</deployment>
Added: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml (rev 0)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config-as6.xml 2009-12-04 12:58:07 UTC (rev 11194)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>javax.enterprise.resource.webservices.jaxws</value>
+ <value>com.sun</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!-- The stack specific deployment aspects -->
+ <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.metro.EndpointServlet</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">StackDescriptor</property>
+ </bean>
+
+ <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
+ <property name="requires">StackDescriptor</property>
+ <property name="provides">RuntimeModel</property>
+ </bean>
+
+</deployment>
Deleted: stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2009-12-04 12:57:41 UTC (rev 11193)
+++ stack/metro/trunk/modules/server/src/main/resources/jbossws-metro-config.xml 2009-12-04 12:58:07 UTC (rev 11194)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
-
- <!-- Logging redirector -->
- <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
- <property name="namespaces">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>javax.enterprise.resource.webservices.jaxws</value>
- <value>com.sun</value>
- </list>
- </property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.metro.EndpointServlet</value>
- </entry>
- </map>
- </property>
- <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">StackDescriptor</property>
- <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
- <property name="requires">StackDescriptor</property>
- <property name="provides">RuntimeModel</property>
- <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
-</deployment>
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-04 12:57:41 UTC (rev 11193)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-04 12:58:07 UTC (rev 11194)
@@ -17,27 +17,27 @@
<target name="main">
<copy
- file="${src.dir}/jbossws-metro-config.xml"
+ file="${src.dir}/jbossws-metro-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-metro-config.xml"
+ file="${src.dir}/jbossws-metro-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-metro-config.xml"
+ file="${src.dir}/jbossws-metro-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-metro-config.xml"
+ file="${src.dir}/jbossws-metro-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-metro-config.xml"
+ file="${src.dir}/jbossws-metro-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
14 years, 9 months
- 1
- 0
JBossWS SVN: r11193 - in stack/native/trunk/modules/core/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-04 07:57:41 -0500 (Fri, 04 Dec 2009)
New Revision: 11193
Added:
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
Removed:
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml
Modified:
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2835] removing workaround for AS 6.x series
Added: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml 2009-12-04 12:57:41 UTC (rev 11193)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- A subscription manager for WS-Eventing -->
+ <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!-- The stack specific deployment aspects -->
+ <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties, StackDescriptor</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
+ </entry>
+ </map>
+ </property>
+ <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">InitializedMetaDataModel</property>
+ <property name="relativeOrder">25</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="relativeOrder">26</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
+ <property name="provides">PublishedContract</property>
+ <property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
+ <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
+ <property name="relativeOrder">27</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+ <property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
+ <property name="provides">UnifiedMetaDataModel</property>
+ <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
+ <property name="provides">JAXBIntros</property>
+ <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+</deployment>
Added: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2009-12-04 12:57:41 UTC (rev 11193)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- A subscription manager for WS-Eventing -->
+ <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!-- The stack specific deployment aspects -->
+ <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties, StackDescriptor</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">InitializedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
+ <property name="provides">PublishedContract</property>
+ </bean>
+
+ <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
+ <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+ <property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
+ <property name="provides">UnifiedMetaDataModel</property>
+ </bean>
+
+ <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
+ <property name="provides">JAXBIntros</property>
+ </bean>
+
+</deployment>
Deleted: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml 2009-12-04 08:47:35 UTC (rev 11192)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml 2009-12-04 12:57:41 UTC (rev 11193)
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
-
- <!-- A subscription manager for WS-Eventing -->
- <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
- <property name="bindAddress">${jboss.bind.address}</property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties, StackDescriptor</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
- </entry>
- </map>
- </property>
- <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="provides">InitializedMetaDataModel</property>
- <property name="relativeOrder">25</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="relativeOrder">26</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
- <property name="provides">PublishedContract</property>
- <property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
- <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
- <property name="relativeOrder">27</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
- <property name="provides">UnifiedMetaDataModel</property>
- <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
-</deployment>
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-12-04 08:47:35 UTC (rev 11192)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-12-04 12:57:41 UTC (rev 11193)
@@ -17,27 +17,27 @@
<target name="main">
<copy
- file="${src.dir}/jbossws-native-config.xml"
+ file="${src.dir}/jbossws-native-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-native-config.xml"
+ file="${src.dir}/jbossws-native-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-native-config.xml"
+ file="${src.dir}/jbossws-native-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-native-config.xml"
+ file="${src.dir}/jbossws-native-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
- file="${src.dir}/jbossws-native-config.xml"
+ file="${src.dir}/jbossws-native-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
14 years, 9 months
- 1
- 0
JBossWS SVN: r11192 - in stack/cxf/trunk/modules/testsuite: src/test/resources/securityMgr/jboss-5.1.0.GA and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-12-04 03:47:35 -0500 (Fri, 04 Dec 2009)
New Revision: 11192
Added:
stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.1.0.GA/client.policy
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2692]:Added client.policy and security manager args line for surefire plugin
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-12-03 17:15:29 UTC (rev 11191)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-12-04 08:47:35 UTC (rev 11192)
@@ -445,6 +445,7 @@
<properties>
<jboss.version>5.1.0.GA</jboss.version>
<jbossws.integration.target>jboss510</jbossws.integration.target>
+ <!--security.manager.args>-Djava.home=${java.home} -Djboss.home=${jboss510.home} -Dtarget.dir=${project.build.directory} -Djava.security.debug=failure -Djava.security.manager -Djava.security.policy==${basedir}/../src/test/resources/securityMgr/jboss-${jboss.version}/client.policy -DM2_REPO=${settings.localRepository}</security.manager.args-->
</properties>
<dependencies>
<dependency>
@@ -467,6 +468,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
<testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile>
@@ -475,7 +477,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed ${security.manager.args}</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Added: stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.1.0.GA/client.policy
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.1.0.GA/client.policy (rev 0)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/securityMgr/jboss-5.1.0.GA/client.policy 2009-12-04 08:47:35 UTC (rev 11192)
@@ -0,0 +1,62 @@
+// Permissions for jbossws cxf test suite
+
+// Trusted core Java code
+grant codeBase "file:${java.home}/lib/ext/-" {
+ permission java.security.AllPermission;
+};
+
+//for javac
+grant codeBase "file:${java.home}/../lib" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${java.home}/lib/-" {
+ permission java.security.AllPermission;
+};
+
+//trust all jars in m2_repo
+grant codeBase "file:${M2_REPO}/-" {
+ permission java.security.AllPermission;
+};
+
+grant {
+ //allow surefire to read compiled class in target dir, WSConsumerTestCase javac needs execute permission
+ permission java.io.FilePermission "<<ALL FILES>>", "execute, read";
+ permission java.util.PropertyPermission "*", "read,write";
+ permission java.util.logging.LoggingPermission "control";
+ //for test
+ permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+ permission java.lang.RuntimePermission "accessDeclaredMembers";
+ permission java.net.SocketPermission "*", "connect,resolve";
+ permission java.lang.RuntimePermission "createClassLoader";
+ permission java.lang.RuntimePermission "setContextClassLoader";
+ //AsymmetricBindingClientTestCase
+ permission java.security.SecurityPermission "insertProvider.BC";
+ permission java.security.SecurityPermission "putProviderProperty.BC";
+ permission java.lang.RuntimePermission "getClassLoader";
+
+ permission java.lang.RuntimePermission "accessClassInPackage.*";
+ permission java.io.SerializablePermission "enableSubstitution";
+ permission javax.xml.ws.WebServicePermission "publishEndpoint";
+ permission java.lang.RuntimePermission "getenv.*";
+
+ permission java.io.FilePermission "${java.home}/-", "execute";
+
+ permission java.io.FilePermission "${jboss.home}/bin/-", "execute";
+
+ permission java.net.SocketPermission "*","accept,listen,resolve";
+ permission java.security.SecurityPermission "getPolicy";
+
+ permission java.io.FilePermission "${target.dir}/-", "write,delete";
+
+ //WSConsumerTestCase
+ permission java.io.FilePermission "./-", "write,delete";
+
+ permission java.io.FilePermission "/tmp/-", "write,delete";
+ permission java.lang.RuntimePermission "shutdownHooks";
+ permission java.lang.RuntimePermission "getProtectionDomain";
+};
+
+
+
+
14 years, 9 months
- 1
- 0
JBossWS SVN: r11191 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-03 12:15:29 -0500 (Thu, 03 Dec 2009)
New Revision: 11191
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
Log:
Fix mix up, it is the wsdl4j that must come from the AS client, not wss4j
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 16:37:40 UTC (rev 11190)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 17:15:29 UTC (rev 11191)
@@ -73,7 +73,7 @@
<include name="**/spring-beans.jar"/>
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
- <include name="**/wsdl4j.jar"/>
+ <include name="**/wss4j.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/asm.jar"/>
<include name="**/XmlSchema.jar"/>
@@ -81,8 +81,8 @@
<include name="${installserver}/../../client/FastInfoset.jar"/>
<!-- <include name="**/xmlsec.jar"/> -->
<include name="${installserver}/../../client/xmlsec.jar"/>
- <!-- <include name="**/wss4j.jar"/> -->
- <include name="${installserver}/../../client/wss4j.jar"/>
+ <!-- <include name="**/wsdl4j.jar"/> -->
+ <include name="${installserver}/../../client/wsdl4j.jar"/>
</patternset>
14 years, 9 months
- 1
- 0
JBossWS SVN: r11190 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-03 11:37:40 -0500 (Thu, 03 Dec 2009)
New Revision: 11190
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
Log:
Log what is being copied
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 14:47:23 UTC (rev 11189)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 16:37:40 UTC (rev 11190)
@@ -95,7 +95,7 @@
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{artifactsdir}/bin">
<patternset refid="jbossws.bin.patternset"/>
</fileset>
@@ -112,7 +112,7 @@
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
</fileset>
@@ -129,7 +129,7 @@
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.endorsed.patternset"/>
</fileset>
@@ -147,7 +147,7 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
<!-- [JBWS-2505] -->
@@ -171,7 +171,7 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.server.lib.patternset"/>
</fileset>
@@ -193,7 +193,7 @@
<include name="**/juddi-service.sar"/>
</fileset>
</unzip>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
<include name="**/juddi.jar"/>
<include name="**/scout.jar"/>
@@ -232,7 +232,7 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.service.lib.patternset"/>
</fileset>
@@ -242,7 +242,7 @@
<include name="META-INF/**"/>
</fileset>
</copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
@@ -257,7 +257,7 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!--
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
14 years, 9 months
- 1
- 0
JBossWS SVN: r11189 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-03 09:47:23 -0500 (Thu, 03 Dec 2009)
New Revision: 11189
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
Log:
Typo
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 14:20:30 UTC (rev 11188)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 14:47:23 UTC (rev 11189)
@@ -29,7 +29,7 @@
<include name="**/asm.jar"/>
<include name="**/cxf-*.jar"/>
<include name="**/commons-collections.jar"/>
- <include name="**/commons-lang.jar"/
+ <include name="**/commons-lang.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
<include name="**/jbossws-framework.jar"/>
14 years, 9 months
- 1
- 0
JBossWS SVN: r11188 - in stack/cxf/branches/jbossws-cxf-3.1.2: src/main/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-03 09:20:30 -0500 (Thu, 03 Dec 2009)
New Revision: 11188
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Use the versions from the AS cleint directory to recreate FastInfoset, xmlsec and wsdl4j in the new CXF jbossws.deploy directory, avoiding a different MD5
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 10:02:58 UTC (rev 11187)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-03 14:20:30 UTC (rev 11188)
@@ -29,7 +29,7 @@
<include name="**/asm.jar"/>
<include name="**/cxf-*.jar"/>
<include name="**/commons-collections.jar"/>
- <include name="**/commons-lang.jar"/>
+ <include name="**/commons-lang.jar"/
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
<include name="**/jbossws-framework.jar"/>
@@ -74,12 +74,15 @@
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
<include name="**/wsdl4j.jar"/>
- <include name="**/wss4j.jar"/>
<include name="**/xml-resolver.jar"/>
- <include name="**/xmlsec.jar"/>
<include name="**/asm.jar"/>
<include name="**/XmlSchema.jar"/>
- <include name="**/FastInfoset.jar"/>
+ <!-- <include name="**/FastInfoset.jar"/> -->
+ <include name="${installserver}/../../client/FastInfoset.jar"/>
+ <!-- <include name="**/xmlsec.jar"/> -->
+ <include name="${installserver}/../../client/xmlsec.jar"/>
+ <!-- <include name="**/wss4j.jar"/> -->
+ <include name="${installserver}/../../client/wss4j.jar"/>
</patternset>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-03 10:02:58 UTC (rev 11187)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-03 14:20:30 UTC (rev 11188)
@@ -38,16 +38,16 @@
<include>org.springframework:spring-beans:jar</include>
<include>org.springframework:spring-context:jar</include>
<include>org.springframework:spring-core:jar</include>
- <include>wsdl4j:wsdl4j:jar</include>
<include>xml-resolver:xml-resolver:jar</include>
<include>org.apache.ws.commons.schema:XmlSchema:jar</include>
- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
- <include>org.apache.santuario:xmlsec:jar</include>
<include>asm:asm:jar</include>
<include>apache-velocity:velocity:jar</include>
<include>commons-collections:commons-collections:jar</include>
<include>commons-lang:commons-lang:jar</include>
+ <!-- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> -->
+ <!-- <include>org.apache.santuario:xmlsec:jar</include> -->
+ <!-- <include>wsdl4j:wsdl4j:jar</include> -->
</includes>
</dependencySet>
<dependencySet>
14 years, 9 months
- 1
- 0