JBossWS SVN: r16586 - in thirdparty/cxf/branches/cxf-2.4.8: rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-08-09 11:41:46 -0400 (Thu, 09 Aug 2012)
New Revision: 16586
Added:
thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandler.java
thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java
thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java
Removed:
thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java
thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java
Modified:
thirdparty/cxf/branches/cxf-2.4.8/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Log:
[JBPAPP-9342][JBPAPP-9464]:Back port the fix of one-way/request-response faultTo is not correctly transmitted
Modified: thirdparty/cxf/branches/cxf-2.4.8/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java 2012-08-09 07:52:21 UTC (rev 16585)
+++ thirdparty/cxf/branches/cxf-2.4.8/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -85,7 +85,12 @@
writer.writeStartElement("faultstring");
if (fault.getMessage() != null) {
- writer.writeCharacters(fault.getMessage());
+ if (message.get("forced.faultstring") != null) {
+ writer.writeCharacters((String)message.get("forced.faultstring"));
+ } else {
+ writer.writeCharacters(fault.getMessage());
+ }
+
} else {
writer.writeCharacters("Fault occurred while processing.");
}
Modified: thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java 2012-08-09 07:52:21 UTC (rev 16585)
+++ thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -53,6 +53,7 @@
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
@@ -372,22 +373,22 @@
* @param inMAPs the inbound MAPs
* @param inMessage the current message
*/
+ //CHECKSTYLE:OFF Max executable statement count limitation
public static void rebaseResponse(EndpointReferenceType reference,
AddressingProperties inMAPs,
final Message inMessage) {
String namespaceURI = inMAPs.getNamespaceURI();
- if (!retrievePartialResponseSent(inMessage)) {
- storePartialResponseSent(inMessage);
+ if (!ContextUtils.retrievePartialResponseSent(inMessage)) {
+ ContextUtils.storePartialResponseSent(inMessage);
Exchange exchange = inMessage.getExchange();
Message fullResponse = exchange.getOutMessage();
- Message partialResponse = createMessage(exchange);
+ Message partialResponse = ContextUtils.createMessage(exchange);
ensurePartialResponseMAPs(partialResponse, namespaceURI);
// ensure the inbound MAPs are available in the partial response
// message (used to determine relatesTo etc.)
- propogateReceivedMAPs(inMAPs, partialResponse);
- partialResponse.put(Message.PARTIAL_RESPONSE_MESSAGE, Boolean.TRUE);
+ ContextUtils.propogateReceivedMAPs(inMAPs, partialResponse);
Destination target = inMessage.getDestination();
if (target == null) {
return;
@@ -400,7 +401,67 @@
Conduit backChannel = target.getBackChannel(inMessage,
partialResponse,
reference);
+ Exception exception = inMessage.getContent(Exception.class);
+ //Add this to handle two way faultTo
+ //TODO:Look at how to refactor
+ if (backChannel != null && !inMessage.getExchange().isOneWay()
+ && ContextUtils.isFault(inMessage)) {
+ // send the fault message to faultTo Endpoint
+ exchange.setOutMessage(ContextUtils.createMessage(exchange));
+ exchange.put(ConduitSelector.class, new NullConduitSelector());
+ exchange.put("org.apache.cxf.http.no_io_exceptions", true);
+ Destination destination = createDecoupledDestination(exchange, reference);
+ exchange.setDestination(destination);
+
+ if (ContextUtils.retrieveAsyncPostResponseDispatch(inMessage)) {
+ DelegatingInputStream in = inMessage.getContent(DelegatingInputStream.class);
+ if (in != null) {
+ in.cacheInput();
+ }
+ inMessage.getInterceptorChain().reset();
+ //cleanup pathinfo
+ if (inMessage.get(Message.PATH_INFO) != null) {
+ inMessage.remove(Message.PATH_INFO);
+ }
+ inMessage.getInterceptorChain().doIntercept(inMessage);
+
+ }
+
+ // send the partial response to requester
+ partialResponse.put("forced.faultstring",
+ "The server sent HTTP status code :"
+ + inMessage.getExchange().get(Message.RESPONSE_CODE));
+ partialResponse.setContent(Exception.class, exception);
+ partialResponse.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
+ inMessage.get(Message.PROTOCOL_HEADERS));
+ partialResponse.put(org.apache.cxf.message.Message.ENCODING,
+ inMessage.get(Message.ENCODING));
+ partialResponse.put(ContextUtils.ACTION, inMessage.get(ContextUtils.ACTION));
+ partialResponse.put("javax.xml.ws.addressing.context.inbound",
+ inMessage.get("javax.xml.ws.addressing.context.inbound"));
+ partialResponse.put("javax.xml.ws.addressing.context.outbound",
+ inMessage.get("javax.xml.ws.addressing.context.outbound"));
+ exchange.setOutMessage(partialResponse);
+ PhaseInterceptorChain newChian = ((PhaseInterceptorChain)inMessage.getInterceptorChain())
+ .cloneChain();
+ partialResponse.setInterceptorChain(newChian);
+ exchange.setDestination(target);
+ exchange.setOneWay(false);
+ exchange.put(ConduitSelector.class,
+ new PreexistingConduitSelector(backChannel, exchange.get(Endpoint.class)));
+ if (newChian != null && !newChian.doIntercept(partialResponse)
+ && partialResponse.getContent(Exception.class) != null) {
+ if (partialResponse.getContent(Exception.class) instanceof Fault) {
+ throw (Fault)partialResponse.getContent(Exception.class);
+ } else {
+ throw new Fault(partialResponse.getContent(Exception.class));
+ }
+ }
+ return;
+ }
+
if (backChannel != null) {
+ partialResponse.put(Message.PARTIAL_RESPONSE_MESSAGE, Boolean.TRUE);
boolean robust =
MessageUtils.isTrue(inMessage.getContextualProperty(Message.ROBUST_ONEWAY));
@@ -422,12 +483,13 @@
exchange.put(BindingOperationInfo.class, boi);
}
+
// set up interceptor chains and send message
InterceptorChain chain =
fullResponse != null
? fullResponse.getInterceptorChain()
: OutgoingChainInterceptor.getOutInterceptorChain(exchange);
- exchange.setOutMessage(partialResponse);
+ exchange.setOutMessage(partialResponse);
partialResponse.setInterceptorChain(chain);
exchange.put(ConduitSelector.class,
new PreexistingConduitSelector(backChannel,
@@ -447,7 +509,7 @@
exchange.put(ConduitSelector.class, new NullConduitSelector());
if (fullResponse == null) {
- fullResponse = createMessage(exchange);
+ fullResponse = ContextUtils.createMessage(exchange);
}
exchange.setOutMessage(fullResponse);
@@ -457,7 +519,7 @@
exchange.setDestination(destination);
- if (retrieveAsyncPostResponseDispatch(inMessage)) {
+ if (ContextUtils.retrieveAsyncPostResponseDispatch(inMessage) && !robust) {
//need to suck in all the data from the input stream as
//the transport might discard any data on the stream when this
//thread unwinds or when the empty response is sent back
@@ -465,24 +527,25 @@
if (in != null) {
in.cacheInput();
}
- try {
- if (!robust) {
- // async service invocation required *after* a response
- // has been sent (i.e. to a oneway, or a partial response
- // to a decoupled twoway)
-
- // pause dispatch on current thread ...
- inMessage.getInterceptorChain().pause();
+ // async service invocation required *after* a response
+ // has been sent (i.e. to a oneway, or a partial response
+ // to a decoupled twoway)
+
+ //cleanup pathinfo
+ if (inMessage.get(Message.PATH_INFO) != null) {
+ inMessage.remove(Message.PATH_INFO);
+ }
+ // pause dispatch on current thread ...
+ inMessage.getInterceptorChain().pause();
-
- // ... and resume on executor thread
- getExecutor(inMessage).execute(new Runnable() {
- public void run() {
- inMessage.getInterceptorChain().resume();
- }
- });
- }
+ try {
+ // ... and resume on executor thread
+ getExecutor(inMessage).execute(new Runnable() {
+ public void run() {
+ inMessage.getInterceptorChain().resume();
+ }
+ });
} catch (RejectedExecutionException e) {
LOG.warning(
"Executor queue is full, use the caller thread."
@@ -496,13 +559,13 @@
}
}
}
- }
+ }
} catch (Exception e) {
LOG.log(Level.WARNING, "SERVER_TRANSPORT_REBASE_FAILURE_MSG", e);
}
}
}
-
+ //CHECKSTYLE:ON
public static Destination createDecoupledDestination(
Exchange exchange, final EndpointReferenceType reference) {
Added: thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandler.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandler.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandler.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -0,0 +1,99 @@
+/**
+ * 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.
+ */
+
+package org.apache.cxf.ws.addressing.soap;
+
+import java.util.Iterator;
+
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
+import org.apache.cxf.headers.Header;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.transport.Destination;
+import org.apache.cxf.ws.addressing.AddressingProperties;
+import org.apache.cxf.ws.addressing.ContextUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.Names;
+
+/**
+ * Utility interceptor for dealing with faults occurred during processing
+ * the one way requests with WSA FaultTo EPR pointing to a decoupled destination.
+ *
+ * Note that this interceptor is not currently installed by default.
+ * It can be installed using @InInterceptors and @OutInterceptors
+ * annotations or explicitly added to the list of interceptors.
+ */
+public class DecoupledFaultHandler extends AbstractSoapInterceptor {
+
+ public static final String WSA_ACTION = "http://schemas.xmlsoap.org/wsdl/soap/envelope/fault";
+
+ public DecoupledFaultHandler() {
+ super(Phase.PRE_PROTOCOL);
+ addBefore(MAPCodec.class.getName());
+ }
+
+ public void handleMessage(SoapMessage message) {
+ // complete
+ }
+
+ // Ideally, this code will instead be executed as part of the Fault chain
+ // but at the moment PhaseInterceptorChain needs to be tricked that this is
+ // a two way request for a fault chain be invoked
+ public void handleFault(SoapMessage message) {
+ if (!ContextUtils.isRequestor(message)) {
+
+ Exchange exchange = message.getExchange();
+ Message inMessage = exchange.getInMessage();
+ final AddressingProperties maps =
+ ContextUtils.retrieveMAPs(inMessage, false, false, true);
+
+ if (maps != null && !ContextUtils.isGenericAddress(maps.getFaultTo())) {
+ //Just keep the wsa headers to remove the not understand headers
+ Iterator<Header> iterator = message.getHeaders().iterator();
+ while (iterator.hasNext()) {
+ Header header = iterator.next();
+ if (!isWSAHeader(header)) {
+ iterator.remove();
+ }
+ }
+ exchange.setOneWay(false);
+ exchange.setOutMessage(message);
+ //manually set the action
+ message.put(ContextUtils.ACTION, WSA_ACTION);
+ Destination destination = createDecoupledDestination(
+ exchange, maps.getFaultTo());
+ exchange.setDestination(destination);
+ }
+
+ }
+ }
+
+ protected Destination createDecoupledDestination(Exchange exchange, EndpointReferenceType epr) {
+ return ContextUtils.createDecoupledDestination(exchange, epr);
+ }
+
+ private boolean isWSAHeader(Header header) {
+ if (header.getName().getNamespaceURI().startsWith(Names.WSA_NAMESPACE_NAME)) {
+ return true;
+ }
+ return false;
+ }
+}
Modified: thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java 2012-08-09 07:52:21 UTC (rev 16585)
+++ thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -78,8 +78,8 @@
private static final Logger LOG = LogUtils.getL7dLogger(MAPCodec.class);
private static final String IS_REFERENCE_PARAM_ATTR_NAME = "IsReferenceParameter";
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
- private static final String ONE_WAY_DECOUPLED_FAULT_SUPPORT =
- "org.apache.cxf.ws.addressing.oneway.decoupled_fault_support";
+ private static final String DECOUPLED_FAULT_SUPPORT =
+ "org.apache.cxf.ws.addressing.decoupled_fault_support";
/**
* REVISIT: map usage that the *same* interceptor instance
@@ -152,9 +152,9 @@
}
}
} else if (MessageUtils.getContextualBoolean(message,
- ONE_WAY_DECOUPLED_FAULT_SUPPORT,
+ DECOUPLED_FAULT_SUPPORT,
false)) {
- new OneWayDecoupledFaultHandler().handleFault(message);
+ new DecoupledFaultHandler().handleFault(message);
}
}
Deleted: thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java 2012-08-09 07:52:21 UTC (rev 16585)
+++ thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandler.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -1,100 +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.
- */
-
-package org.apache.cxf.ws.addressing.soap;
-
-import java.util.Iterator;
-
-import org.apache.cxf.binding.soap.SoapMessage;
-import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
-import org.apache.cxf.headers.Header;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.phase.Phase;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
-import org.apache.cxf.ws.addressing.ContextUtils;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.ws.addressing.Names;
-
-/**
- * Utility interceptor for dealing with faults occurred during processing
- * the one way requests with WSA FaultTo EPR pointing to a decoupled destination.
- *
- * Note that this interceptor is not currently installed by default.
- * It can be installed using @InInterceptors and @OutInterceptors
- * annotations or explicitly added to the list of interceptors.
- */
-public class OneWayDecoupledFaultHandler extends AbstractSoapInterceptor {
-
- public static final String WSA_ACTION = "http://schemas.xmlsoap.org/wsdl/soap/envelope/fault";
-
- public OneWayDecoupledFaultHandler() {
- super(Phase.PRE_PROTOCOL);
- addBefore(MAPCodec.class.getName());
- }
-
- public void handleMessage(SoapMessage message) {
- // complete
- }
-
- // Ideally, this code will instead be executed as part of the Fault chain
- // but at the moment PhaseInterceptorChain needs to be tricked that this is
- // a two way request for a fault chain be invoked
- public void handleFault(SoapMessage message) {
- if (message.getExchange().isOneWay()
- && !ContextUtils.isRequestor(message)) {
-
- Exchange exchange = message.getExchange();
- Message inMessage = exchange.getInMessage();
- final AddressingPropertiesImpl maps =
- ContextUtils.retrieveMAPs(inMessage, false, false, true);
-
- if (maps != null && !ContextUtils.isGenericAddress(maps.getFaultTo())) {
- //Just keep the wsa headers to remove the not understand headers
- Iterator<Header> iterator = message.getHeaders().iterator();
- while (iterator.hasNext()) {
- Header header = iterator.next();
- if (!isWSAHeader(header)) {
- iterator.remove();
- }
- }
- exchange.setOneWay(false);
- exchange.setOutMessage(message);
- //manually set the action
- message.put(ContextUtils.ACTION, WSA_ACTION);
- Destination destination = createDecoupledDestination(
- exchange, maps.getFaultTo());
- exchange.setDestination(destination);
- }
-
- }
- }
-
- protected Destination createDecoupledDestination(Exchange exchange, EndpointReferenceType epr) {
- return ContextUtils.createDecoupledDestination(exchange, epr);
- }
-
- private boolean isWSAHeader(Header header) {
- if (header.getName().getNamespaceURI().startsWith(Names.WSA_NAMESPACE_NAME)) {
- return true;
- }
- return false;
- }
-}
Added: thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/DecoupledFaultHandlerTest.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -0,0 +1,73 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.ws.addressing.soap;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.headers.Header;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.transport.Destination;
+import org.apache.cxf.ws.addressing.AddressingProperties;
+import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.ContextUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DecoupledFaultHandlerTest extends Assert {
+
+ @Test
+ public void testOnewayFault() {
+ DecoupledFaultHandler handler = new DecoupledFaultHandler() {
+ protected Destination createDecoupledDestination(Exchange exchange, EndpointReferenceType epr) {
+ assertEquals("http://bar", epr.getAddress().getValue());
+ return EasyMock.createMock(Destination.class);
+ }
+ };
+
+ SoapMessage message = new SoapMessage(new MessageImpl());
+ QName qname = new QName("http://cxf.apache.org/mustunderstand", "TestMU");
+ message.getHeaders().add(new Header(qname, new Object()));
+ AddressingProperties maps = new AddressingPropertiesImpl();
+
+ EndpointReferenceType faultTo = new EndpointReferenceType();
+ faultTo.setAddress(new AttributedURIType());
+ faultTo.getAddress().setValue("http://bar");
+ maps.setFaultTo(faultTo);
+ message.put(ContextUtils.getMAPProperty(false, false, false),
+ maps);
+
+ Exchange exchange = new ExchangeImpl();
+ message.setExchange(exchange);
+ exchange.setInMessage(message);
+ exchange.setOneWay(true);
+
+ handler.handleFault(message);
+ assertTrue(message.getHeaders().isEmpty());
+ assertFalse(exchange.isOneWay());
+ assertSame(message, exchange.getOutMessage());
+ assertNotNull(exchange.getDestination());
+ }
+
+}
Deleted: thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java 2012-08-09 07:52:21 UTC (rev 16585)
+++ thirdparty/cxf/branches/cxf-2.4.8/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/OneWayDecoupledFaultHandlerTest.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -1,73 +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.
- */
-package org.apache.cxf.ws.addressing.soap;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.binding.soap.SoapMessage;
-import org.apache.cxf.headers.Header;
-import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.ExchangeImpl;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.ws.addressing.AddressingProperties;
-import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
-import org.apache.cxf.ws.addressing.AttributedURIType;
-import org.apache.cxf.ws.addressing.ContextUtils;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.easymock.EasyMock;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class OneWayDecoupledFaultHandlerTest extends Assert {
-
- @Test
- public void testOnewayFault() {
- OneWayDecoupledFaultHandler handler = new OneWayDecoupledFaultHandler() {
- protected Destination createDecoupledDestination(Exchange exchange, EndpointReferenceType epr) {
- assertEquals("http://bar", epr.getAddress().getValue());
- return EasyMock.createMock(Destination.class);
- }
- };
-
- SoapMessage message = new SoapMessage(new MessageImpl());
- QName qname = new QName("http://cxf.apache.org/mustunderstand", "TestMU");
- message.getHeaders().add(new Header(qname, new Object()));
- AddressingProperties maps = new AddressingPropertiesImpl();
-
- EndpointReferenceType faultTo = new EndpointReferenceType();
- faultTo.setAddress(new AttributedURIType());
- faultTo.getAddress().setValue("http://bar");
- maps.setFaultTo(faultTo);
- message.put(ContextUtils.getMAPProperty(false, false, false),
- maps);
-
- Exchange exchange = new ExchangeImpl();
- message.setExchange(exchange);
- exchange.setInMessage(message);
- exchange.setOneWay(true);
-
- handler.handleFault(message);
- assertTrue(message.getHeaders().isEmpty());
- assertFalse(exchange.isOneWay());
- assertSame(message, exchange.getOutMessage());
- assertNotNull(exchange.getDestination());
- }
-
-}
Added: thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -0,0 +1,238 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.addr_feature;
+
+import java.io.IOException;
+import java.util.concurrent.Future;
+
+import javax.jws.WebService;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Response;
+import javax.xml.ws.soap.Addressing;
+
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.addressing.WSAddressingFeature;
+import org.apache.cxf.ws.addressing.soap.DecoupledFaultHandler;
+import org.apache.hello_world_soap_http.BadRecordLitFault;
+import org.apache.hello_world_soap_http.Greeter;
+import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
+import org.apache.hello_world_soap_http.types.BareDocumentResponse;
+import org.apache.hello_world_soap_http.types.GreetMeLaterResponse;
+import org.apache.hello_world_soap_http.types.GreetMeResponse;
+import org.apache.hello_world_soap_http.types.GreetMeSometimeResponse;
+import org.apache.hello_world_soap_http.types.SayHiResponse;
+import org.apache.hello_world_soap_http.types.TestDocLitFaultResponse;
+import org.apache.hello_world_soap_http.types.TestNillableResponse;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+
+public class FaultToEndpointServer extends AbstractBusTestServerBase {
+ static final String FAULT_PORT = allocatePort(FaultToEndpointServer.class);
+ static final String PORT = allocatePort(FaultToEndpointServer.class, 1);
+
+ EndpointImpl ep;
+ private org.eclipse.jetty.server.Server faultToserver;
+ protected void run() {
+ faultToserver = new org.eclipse.jetty.server.Server(Integer.parseInt(FAULT_PORT));
+ faultToserver.setHandler(new HelloHandler());
+ try {
+ faultToserver.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+
+ setBus(BusFactory.getDefaultBus());
+ Object implementor = new AddNumberImpl();
+ String address = "http://localhost:" + PORT + "/jaxws/add";
+
+ ep = (EndpointImpl) Endpoint.create(implementor);
+ ep.getInInterceptors().add(new DecoupledFaultHandler());
+ ep.getFeatures().add(new WSAddressingFeature());
+ ep.publish(address);
+
+ Object implementor2 = new GreeterImpl();
+ String address2 = "http://localhost:" + PORT + "/jaxws/greeter";
+ ep = (EndpointImpl) Endpoint.create(implementor2);
+ ep.getInInterceptors().add(new DecoupledFaultHandler());
+ ep.getFeatures().add(new WSAddressingFeature());
+ ep.publish(address2);
+ }
+
+ public void tearDown() throws Exception {
+ if (faultToserver != null) {
+ faultToserver.stop();
+ faultToserver.destroy();
+ faultToserver = null;
+ }
+
+ ep.stop();
+ ep = null;
+ }
+
+ public static void main(String[] args) {
+ try {
+ FaultToEndpointServer server = new FaultToEndpointServer();
+ server.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+
+
+
+
+ public static class HelloHandler extends AbstractHandler {
+ private static String faultRequestPath;
+
+ public void handle(String target, Request baseRequest, HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ response.setContentType("text/html;charset=utf-8");
+ faultRequestPath = request.getPathInfo();
+ if ("/faultTo".equals(faultRequestPath)) {
+ response.setStatus(HttpServletResponse.SC_OK);
+ } else {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ }
+ baseRequest.setHandled(true);
+ response.getWriter().println("Received");
+ }
+
+ public static String getFaultRequestPath() {
+ return faultRequestPath;
+ }
+
+ }
+
+ @WebService(serviceName = "SOAPServiceAddressing",
+ portName = "SoapPort",
+ endpointInterface = "org.apache.hello_world_soap_http.Greeter",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
+ wsdlLocation = "testutils/hello_world.wsdl")
+ @Addressing
+ public class GreeterImpl implements Greeter {
+
+ public String greetMe(String me) {
+ return "Hello " + me;
+ }
+
+ public String greetMeLater(long delay) {
+ if (delay > 0) {
+ try {
+ Thread.sleep(delay);
+ } catch (InterruptedException ex) {
+ // ignore
+ }
+ }
+ return "Hello, finally";
+ }
+
+ public void greetMeOneWay(String requestType) {
+ throw new RuntimeException("intended error");
+ }
+
+ public String sayHi() {
+ return null;
+ }
+
+ public void testDocLitFault(String faultType) throws BadRecordLitFault, NoSuchCodeLitFault {
+ }
+
+ public BareDocumentResponse testDocLitBare(String in) {
+ return null;
+ }
+
+ public String greetMeSometime(String me) {
+ return null;
+ }
+
+ public Future<?> greetMeSometimeAsync(String requestType,
+ AsyncHandler<GreetMeSometimeResponse> asyncHandler) {
+ return null;
+ }
+
+ public Response<GreetMeSometimeResponse> greetMeSometimeAsync(String requestType) {
+ return null;
+ }
+
+ public Response<TestDocLitFaultResponse> testDocLitFaultAsync(String faultType) {
+ return null;
+ }
+
+ public Response<BareDocumentResponse> testDocLitBareAsync(String bare) {
+ return null;
+ }
+
+ public Future<?> greetMeAsync(String requestType, AsyncHandler<GreetMeResponse> asyncHandler) {
+ return null;
+ }
+
+ public Response<GreetMeResponse> greetMeAsync(String requestType) {
+ return null;
+ }
+
+ public Future<?> greetMeLaterAsync(long requestType, AsyncHandler<GreetMeLaterResponse> asyncHandler) {
+ return null;
+ }
+
+ public Response<GreetMeLaterResponse> greetMeLaterAsync(long requestType) {
+ return null;
+ }
+
+ public Future<?> sayHiAsync(AsyncHandler<SayHiResponse> asyncHandler) {
+ return null;
+ }
+
+ public Response<SayHiResponse> sayHiAsync() {
+ return null;
+ }
+
+ public String testNillable(String nillElem, int intElem) {
+ return null;
+ }
+
+ public Response<TestNillableResponse> testNillableAsync(String nillElem,
+ int intElem) {
+ return null;
+ }
+
+ public Future<?> testNillableAsync(String nillElem,
+ int intElem,
+ AsyncHandler<TestNillableResponse> asyncHandler) {
+ return null;
+ }
+
+ public Future<?> testDocLitFaultAsync(String faultType,
+ AsyncHandler<TestDocLitFaultResponse> asyncHandler) {
+ return null;
+ }
+
+ }
+}
+
+
Added: thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java (rev 0)
+++ thirdparty/cxf/branches/cxf-2.4.8/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAFaultToClientServerTest.java 2012-08-09 15:41:46 UTC (rev 16586)
@@ -0,0 +1,132 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.systest.ws.addr_feature;
+
+import java.io.ByteArrayOutputStream;
+import java.net.URL;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.soap.AddressingFeature;
+
+import org.apache.cxf.systest.ws.AbstractWSATestBase;
+import org.apache.cxf.systest.ws.addr_feature.FaultToEndpointServer.HelloHandler;
+import org.apache.cxf.ws.addressing.AddressingProperties;
+import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.hello_world_soap_http.Greeter;
+import org.apache.hello_world_soap_http.SOAPService;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class WSAFaultToClientServerTest extends AbstractWSATestBase {
+
+ @Before
+ public void setUp() throws Exception {
+ createBus();
+ }
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("FaultTo server did not launch correctly", launchServer(FaultToEndpointServer.class, true));
+ }
+
+ @Test
+ public void testOneWayFaultTo() throws Exception {
+ URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
+ QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPServiceAddressing");
+
+ Greeter greeter = new SOAPService(wsdl, serviceName).getPort(Greeter.class, new AddressingFeature());
+ EndpointReferenceType faultTo = new EndpointReferenceType();
+ AddressingProperties addrProperties = new AddressingPropertiesImpl();
+ AttributedURIType epr = new AttributedURIType();
+ String faultToAddress = "http://localhost:" + FaultToEndpointServer.FAULT_PORT + "/faultTo";
+ epr.setValue(faultToAddress);
+ faultTo.setAddress(epr);
+ addrProperties.setFaultTo(faultTo);
+
+ BindingProvider provider = (BindingProvider) greeter;
+ Map<String, Object> requestContext = provider.getRequestContext();
+ requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:" + FaultToEndpointServer.PORT + "/jaxws/greeter");
+ requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addrProperties);
+
+ greeter.greetMeOneWay("test");
+ //wait for the fault request
+ int i = 2;
+ while (HelloHandler.getFaultRequestPath() == null && i > 0) {
+ Thread.sleep(500);
+ i--;
+ }
+ assertTrue("FaultTo request fpath isn't expected",
+ "/faultTo".equals(HelloHandler.getFaultRequestPath()));
+ }
+
+ @Test
+ public void testTwoWayFaultTo() throws Exception {
+ ByteArrayOutputStream input = setupInLogging();
+ AddNumbersPortType port = getTwoWayPort();
+
+ EndpointReferenceType faultTo = new EndpointReferenceType();
+ AddressingProperties addrProperties = new AddressingPropertiesImpl();
+ AttributedURIType epr = new AttributedURIType();
+ epr.setValue("http://localhost:" + FaultToEndpointServer.FAULT_PORT + "/faultTo");
+ faultTo.setAddress(epr);
+ addrProperties.setFaultTo(faultTo);
+
+ BindingProvider provider = (BindingProvider) port;
+ Map<String, Object> requestContext = provider.getRequestContext();
+ requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:" + FaultToEndpointServer.PORT + "/jaxws/add");
+ requestContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addrProperties);
+
+ try {
+ port.addNumbers(-1, -2);
+ fail("Exception is expected");
+ } catch (Exception e) {
+ //do nothing
+ }
+
+ assertTrue("The response from faultTo endpoint is expected and actual response is "
+ + new String(input.toByteArray()) ,
+ new String(input.toByteArray()).indexOf("The server sent HTTP status code :200") > -1);
+ assertTrue("WS addressing header is expected",
+ new String(input.toByteArray()).indexOf("http://www.w3.org/2005/08/addressing") > -1);
+ assertTrue("Fault deatil is expected",
+ new String(input.toByteArray()).indexOf("Negative numbers cant be added") > -1);
+ }
+
+ private AddNumbersPortType getTwoWayPort() throws Exception {
+ URL wsdl = getClass().getResource("/wsdl_systest_wsspec/add_numbers.wsdl");
+ assertNotNull("WSDL is null", wsdl);
+ QName serviceName = new QName("http://apache.org/cxf/systest/ws/addr_feature/", "AddNumbersService");
+ AddNumbersService service = new AddNumbersService(wsdl, serviceName);
+ assertNotNull("Service is null ", service);
+ AddNumbersPortType port = service.getAddNumbersPort(new AddressingFeature());
+ //updateAddressPort(port, PORT);
+ return port;
+ }
+
+
+}
12 years, 7 months
- 1
- 0
JBossWS SVN: r16584 - in stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws: common/main and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-08-08 07:45:49 -0400 (Wed, 08 Aug 2012)
New Revision: 16584
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml
Log:
sync. modules with EAP 513
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml 2012-08-08 11:45:49 UTC (rev 16584)
@@ -34,5 +34,7 @@
<module name="javax.xml.ws.api"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.modules"/>
+ <module name="org.jboss.ws.jaxws-client" services="import"/>
</dependencies>
+
</module>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-08-08 11:45:49 UTC (rev 16584)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
@@ -42,5 +46,6 @@
<module name="org.jboss.logging"/>
<module name="org.jboss.common-core"/>
<module name="org.apache.xerces" services="import"/>
+ <module name="org.jboss.jaxbintros"/>
</dependencies>
</module>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-08-08 11:45:49 UTC (rev 16584)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-core">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-08-08 11:45:49 UTC (rev 16584)
@@ -24,11 +24,11 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-services">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
-
- <dependencies>
-
- </dependencies>
</module>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml 2012-08-08 11:45:49 UTC (rev 16584)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16583 - in stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org: apache/santuario/xmlsec/main and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-08-08 06:42:20 -0400 (Wed, 08 Aug 2012)
New Revision: 16583
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/neethi/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/xmlschema/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/common/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsconsume/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsprovide/main/module.xml
Log:
[JBPAPP-9651] sync. modules with EAP 513
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/neethi/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/neethi/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/neethi/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -23,6 +23,9 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.apache.neethi">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
<resources>
<!-- Insert resources here -->
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -23,7 +23,6 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.security">
-
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/xmlschema/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/xmlschema/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/xmlschema/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -23,6 +23,9 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.xmlschema">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
<resources>
<!-- Insert resources here -->
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -23,6 +23,9 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
<resources>
<!-- Insert resources here -->
@@ -41,8 +44,8 @@
<module name="org.jboss.metadata"/>
<module name="org.jboss.staxmapper"/>
<module name="org.jboss.as.controller"/>
+ <module name="org.jboss.as.ejb3"/>
<module name="org.jboss.as.server"/>
- <module name="org.jboss.as.ejb3"/>
<module name="org.jboss.as.ee"/>
<module name="org.jboss.as.naming"/>
<module name="org.jboss.as.security"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -23,6 +23,9 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.integration">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
<resources>
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -23,10 +23,10 @@
-->
<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.jaxrpc-integration">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
- <resources>
- </resources>
-
<dependencies>
<module name="javax.api" export="true"/>
<module name="javax.wsdl4j.api" export="true"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/common/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
@@ -44,5 +48,4 @@
<module name="org.apache.xerces" services="import"/>
<module name="org.jboss.jaxbintros"/>
</dependencies>
-
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,11 +24,13 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-factories">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
- <dependencies>
-
- </dependencies>
+ <dependencies/>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-server">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-client">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-jboss-httpserver-httpspi">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/saaj-impl/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.saaj-impl">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/spi/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/common/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/common/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/common/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,6 +24,10 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.common">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<resources>
<!-- Insert resources here -->
</resources>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsconsume/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsconsume/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsconsume/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,9 +24,14 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.wsconsume">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<main-class name="org.jboss.ws.tools.cmd.WSConsume"/>
<dependencies>
+ <module name="org.jboss.logmanager" services="import"/>
<module name="org.jboss.ws.tools.common"/>
</dependencies>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsprovide/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsprovide/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/wsprovide/main/module.xml 2012-08-08 10:42:20 UTC (rev 16583)
@@ -24,9 +24,14 @@
<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.wsprovide">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
<main-class name="org.jboss.ws.tools.cmd.WSProvide"/>
<dependencies>
+ <module name="org.jboss.logmanager" services="import"/>
<module name="org.jboss.ws.tools.common"/>
</dependencies>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16582 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/resources/src/main/resources/modules/jboss710/org/apache/cxf and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-08-08 05:32:03 -0400 (Wed, 08 Aug 2012)
New Revision: 16582
Added:
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF
Log:
[JBPAPP-9651] Merged revisions 16306 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16306 | alessio.soldano(a)jboss.com | 2012-05-23 16:10:46 +0200 (Wed, 23 May 2012) | 2 lines
[JBWS-3501] Separating cxf apis from impl in org.apache.cxf AS7 module
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16412,16516,16530-16532
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16516,16530-16532
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml 2012-05-23 14:10:46 UTC (rev 16306)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -51,7 +51,6 @@
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
<module name="org.joda.time" />
- <module name="org.opensaml" />
<module name="org.springframework.spring" optional="true"/>
<module name="org.apache.cxf" export="true"/>
</dependencies>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -29,27 +29,20 @@
</resources>
<dependencies>
- <module name="asm.asm" />
+ <module name="org.apache.cxf.impl" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
<module name="javax.api" />
<module name="javax.annotation.api" />
- <module name="javax.jms.api" />
- <module name="javax.jws.api" />
<module name="javax.mail.api" />
- <module name="javax.resource.api" />
- <module name="javax.servlet.api" />
<module name="javax.wsdl4j.api" />
<module name="javax.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
- <module name="javax.xml.soap.api" />
- <module name="javax.xml.stream.api" />
- <module name="javax.xml.ws.api" />
- <module name="org.apache.commons.lang" />
<module name="org.apache.neethi" />
- <module name="org.apache.velocity" />
- <module name="org.apache.xml-resolver" />
<module name="org.apache.ws.xmlschema" />
- <module name="org.apache.ws.security" />
- <module name="org.apache.santuario.xmlsec" />
- <module name="org.springframework.spring" optional="true"/>
+ <module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2012, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -34,5 +34,6 @@
<module name="org.apache.commons.logging" />
<module name="org.apache.santuario.xmlsec" />
<module name="org.apache.xalan" />
+ <module name="org.joda.time" />
</dependencies>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -58,8 +58,8 @@
</exports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/>
- <!-- Do not import services from cxf module direclty, those need to come from jbossws -->
- <module name="org.apache.cxf" export="true">
+ <!-- Do not import services from cxf module directly, those need to come from jbossws -->
+ <module name="org.apache.cxf.impl" export="true">
<imports>
<include path="META-INF/cxf"/>
<include path="META-INF"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -29,9 +29,7 @@
<dependencies>
<module name="javax.api" export="true"/>
- <module name="javax.xml.rpc.api" export="true"/>
<module name="javax.wsdl4j.api" export="true"/>
- <module name="com.sun.xml.bind" services="export" export="true"/>
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
<module name="org.jboss.ws.common" services="import" export="true"/>
@@ -48,7 +46,6 @@
</exports>
</module>
<module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/>
- <module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
</dependencies>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -34,6 +34,7 @@
<module name="javax.xml.ws.api"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.modules"/>
+ <module name="org.jboss.ws.jaxws-client" services="import"/>
</dependencies>
</module>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -41,7 +41,7 @@
<module name="org.jboss.ws.jaxws-client" export="true" services="export" />
<!-- JBossWS configuration of Apache CXF -->
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" />
- <!-- Apache CXF - do not import services, those need to come from JBossWS -->
+ <!-- Apache CXF APIs only -->
<module name="org.apache.cxf" export="true" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -42,7 +42,7 @@
<module name="org.jboss.ws.jaxws-client" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
<!-- do not import services from cxf, those need to come from jbossws -->
- <module name="org.apache.cxf">
+ <module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF/"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -34,7 +34,7 @@
<module name="javax.annotation.api" />
<module name="javax.xml.ws.api" />
<module name="org.jboss.ws.jaxws-jboss-httpserver-httpspi" />
- <module name="org.apache.cxf" services="import">
+ <module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF/"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -38,7 +38,7 @@
<module name="org.jboss.ws.common" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
<!-- do not import services from cxf, those need to come from jbossws -->
- <module name="org.apache.cxf">
+ <module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF/"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -62,7 +62,13 @@
</copy>
<copy todir="@{targetdir}/org/apache/cxf//main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
+ <include name="**/cxf-api*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
<include name="**/cxf-*.jar"/>
+ <exclude name="**/cxf-api*.jar"/>
</fileset>
</copy>
<copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true">
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -64,7 +64,7 @@
<include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/>
</classes>
<manifest>
- <attribute name="Dependencies" value="org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- cxf impl required due to AegisDataBinding reference in endpoint impl -->
</manifest>
</war>
@@ -98,7 +98,7 @@
<include name="jbossws-cxf.xml"/>
</webinf>
<manifest>
- <attribute name="Dependencies" value="org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
</manifest>
</war>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -138,7 +138,7 @@
<include name="org/jboss/wsf/test/ClientHelper.class"/>
</classes>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.jboss.ws.cxf.jbossws-cxf-client services"/>
+ <attribute name="Dependencies" value="org.apache.ws.security,org.jboss.ws.cxf.jbossws-cxf-client services,org.apache.cxf.impl"/>
</manifest>
</war>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/ChangeRequestnterceptor.java 2012-08-08 09:32:03 UTC (rev 16582)
@@ -23,7 +23,6 @@
import java.util.List;
-import org.apache.cxf.binding.soap.interceptor.RPCInInterceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -39,7 +38,7 @@
public ChangeRequestnterceptor()
{
super(Phase.UNMARSHAL);
- addAfter(RPCInInterceptor.class.getName());
+ addAfter("org.apache.cxf.binding.soap.interceptor.RPCInInterceptor");
}
public void handleMessage(final Message message) {
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -210,7 +210,7 @@
<include name="org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.class"/>
</fileset>
<manifest>
- <attribute name="Dependencies" value="org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
</manifest>
</jar>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-08-08 09:32:03 UTC (rev 16582)
@@ -256,7 +256,7 @@
<include name="wsdl/*"/>
</webinf>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
</manifest>
</war>
@@ -275,7 +275,7 @@
<include name="wsdl/*"/>
</webinf>
<manifest>
- <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/>
+ <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment -->
</manifest>
</war>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2012-08-08 09:32:03 UTC (rev 16582)
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
-import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Message;
@@ -61,7 +61,7 @@
CachedOutputStream bos = new CachedOutputStream();
try
{
- IOUtils.copy(is, bos);
+ copy(is, bos, 4096);
bos.flush();
is.close();
message.setContent(InputStream.class, bos.getInputStream());
@@ -80,4 +80,32 @@
}
}
+ public static int copy(final InputStream input, final OutputStream output, int bufferSize) throws IOException
+ {
+ int avail = input.available();
+ if (avail > 262144)
+ {
+ avail = 262144;
+ }
+ if (avail > bufferSize)
+ {
+ bufferSize = avail;
+ }
+ final byte[] buffer = new byte[bufferSize];
+ int n = 0;
+ n = input.read(buffer);
+ int total = 0;
+ while (-1 != n)
+ {
+ if (n == 0)
+ {
+ throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
+ }
+ output.write(buffer, 0, n);
+ total += n;
+ n = input.read(buffer);
+ }
+ return total;
+ }
+
}
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF 2012-08-07 08:53:34 UTC (rev 16581)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF 2012-08-08 09:32:03 UTC (rev 16582)
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services
\ No newline at end of file
+Dependencies: org.jboss.ws.cxf.jbossws-cxf-client services,org.apache.cxf.impl
\ No newline at end of file
12 years, 7 months
- 1
- 0
JBossWS SVN: r16581 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-08-07 04:53:34 -0400 (Tue, 07 Aug 2012)
New Revision: 16581
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16513,16515 via svnmerge
.......
r16513 | richard.opalka(a)jboss.com | 2012-07-23 13:39:22 +0200 (Mon, 23 Jul 2012) | 1 line
[JBWS-2397] removing obsolete JBossWS Native specific test
.......
r16515 | richard.opalka(a)jboss.com | 2012-07-23 15:36:16 +0200 (Mon, 23 Jul 2012) | 1 line
removing native specific test
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 7 months
- 1
- 0
JBossWS SVN: r16580 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 10:37:08 -0400 (Mon, 06 Aug 2012)
New Revision: 16580
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
Log:
[JBPAPP-9361] WSConsume ignores target 2.1 option
Merged revisions 16412 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r16412 | alessio.soldano(a)jboss.com | 2012-06-19 01:12:07 +0200 (Tue, 19 Jun 2012) | 2 lines
[JBWS-3520] WSConsume ignores target 2.1 option
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16516,16530-16532
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16315,16323,16407-16408,16412,16516,16530-16532
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-08-06 14:36:09 UTC (rev 16579)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2012-08-06 14:37:08 UTC (rev 16580)
@@ -140,6 +140,29 @@
public void consume(URL wsdl)
{
List<String> args = new ArrayList<String>();
+
+ PrintStream stream = messageStream;
+ boolean verbose = false;
+ if (stream != null)
+ {
+ verbose = true;
+ }
+ else
+ {
+ stream = NullPrintStream.getInstance();
+ }
+
+ // Always set the target
+ if ("2.1".equals(target))
+ {
+ args.add("-frontend");
+ args.add("jaxws21");
+ }
+ else if (target != null && !target.equals("2.2"))
+ {
+ stream.println("Unsupported target, using default value '2.2'");
+ }
+
if (bindingFiles != null)
{
for (File file : bindingFiles)
@@ -194,15 +217,9 @@
args.add(wsdlLocation);
}
- PrintStream stream = messageStream;
- if (stream != null)
- {
+ if (verbose) {
args.add("-verbose");
}
- else
- {
- stream = NullPrintStream.getInstance();
- }
if (extension)
{
@@ -219,13 +236,6 @@
args.add(outputDir.getAbsolutePath());
}
- // Always set the target
- if (target != null)
- {
- stream.println("WSConsume (CXF) does not allow to setup the JAX-WS specification target, using the currently " +
- "configured JAX-WS version (check your JVM version and/or endorsed libs)");
- }
-
//Always generate wrapped style for reference element:CXF-1079
args.add("-allowElementReferences");
12 years, 7 months
- 1
- 0
JBossWS SVN: r16579 - shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 10:36:09 -0400 (Mon, 06 Aug 2012)
New Revision: 16579
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
Log:
[JBPAPP-9631] svn merge -r 16412:16413 https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk .
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-08-06 14:25:52 UTC (rev 16578)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2012-08-06 14:36:09 UTC (rev 16579)
@@ -27,6 +27,7 @@
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.ws.WebServiceFeature;
import java.io.*;
+import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
@@ -364,6 +365,18 @@
Class<?> sei = loader.loadClass("org.jboss.test.ws.tools.testTarget.EndpointInterface");
assertTrue("@XmlSeeAlso expected on SEI (types not referenced by the Port in the wsdl)", sei.isAnnotationPresent(XmlSeeAlso.class));
+
+ boolean featureConstructor = false;
+ for (Constructor<?> c : service.getConstructors()) {
+ for (Class<?> pt : c.getParameterTypes())
+ {
+ if (pt.isArray() && pt.getComponentType().equals(WebServiceFeature.class)) {
+ featureConstructor = true;
+ break;
+ }
+ }
+ }
+ assertFalse("Found JAXWS 2.2 constructor", featureConstructor);
}
/**
12 years, 7 months
- 1
- 0
JBossWS SVN: r16578 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 10:25:52 -0400 (Mon, 06 Aug 2012)
New Revision: 16578
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16284 via svnmerge
.......
r16284 | alessio.soldano(a)jboss.com | 2012-05-16 17:00:53 +0200 (Wed, 16 May 2012) | 2 lines
[JBWS-3497] Adding testcase for workaround
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 7 months
- 1
- 0
JBossWS SVN: r16577 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-08-06 10:23:25 -0400 (Mon, 06 Aug 2012)
New Revision: 16577
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
Log:
Blocked revisions 16316,16322,16415,16427,16479-16480 via svnmerge
.......
r16316 | jim.ma | 2012-05-25 11:36:59 +0200 (Fri, 25 May 2012) | 1 line
Temporarily exclude JBWS1666TestCase
.......
r16322 | alessio.soldano(a)jboss.com | 2012-05-25 19:16:59 +0200 (Fri, 25 May 2012) | 2 lines
Replace use of deprecated CXF MethodDispatcher class
.......
r16415 | alessio.soldano(a)jboss.com | 2012-06-19 11:20:50 +0200 (Tue, 19 Jun 2012) | 2 lines
Use current PicketBox instead of old JBossSX for compiling
.......
r16427 | alessio.soldano(a)jboss.com | 2012-07-02 19:42:46 +0200 (Mon, 02 Jul 2012) | 2 lines
Remove useless descriptor
.......
r16479 | alessio.soldano(a)jboss.com | 2012-07-17 13:05:45 +0200 (Tue, 17 Jul 2012) | 2 lines
[JBWS-3249] Removing testcase
.......
r16480 | alessio.soldano(a)jboss.com | 2012-07-17 13:12:39 +0200 (Tue, 17 Jul 2012) | 2 lines
[JBWS-3249] Removing picketlink-core dependency not needed anymore in cxf-spring-tests
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...
12 years, 7 months
- 1
- 0
JBossWS SVN: r16576 - stack/native/branches/jbossws-native-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-08-06 10:09:50 -0400 (Mon, 06 Aug 2012)
New Revision: 16576
Modified:
stack/native/branches/jbossws-native-4.0.x/
Log:
Blocked revisions 16492,16499 via svnmerge
.......
r16492 | richard.opalka(a)jboss.com | 2012-07-19 10:55:26 +0200 (Thu, 19 Jul 2012) | 1 line
[JBWS-3484] fixing AS 712 only - still waiting for pull request to be merged
.......
r16499 | richard.opalka(a)jboss.com | 2012-07-19 12:50:26 +0200 (Thu, 19 Jul 2012) | 1 line
[JBWS-3484] refactoring AS 720 integration layer
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-blocked
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...
12 years, 7 months
- 1
- 0