JBossWS SVN: r5356 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/wsrm and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-19 06:16:02 -0500 (Wed, 19 Dec 2007)
New Revision: 5356
Added:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java
Removed:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMException.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
Log:
reviewed client API and removed useless RMSequence class
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -506,7 +506,7 @@
// WS-RM support //
///////////////////
@SuppressWarnings("unchecked")
- public org.jboss.ws.extensions.wsrm.api.RMSequence createSequence(boolean addressableClient) throws RMException
+ public void createSequence(boolean addressableClient) throws RMException
{
if (this.wsrmSequence != null)
throw new IllegalStateException("Sequence already registered with proxy instance");
@@ -547,12 +547,23 @@
candidateSequence.setOutboundId(outboundId);
candidateSequence.setBehavior(createSequenceResponse.getIncompleteSequenceBehavior());
candidateSequence.setDuration(RMHelper.durationToLong(createSequenceResponse.getExpires()));
- return this.wsrmSequence = candidateSequence;
+ this.wsrmSequence = candidateSequence;
}
catch (Exception e)
{
throw new RMException("Unable to create WSRM sequence", e);
}
}
-
+
+ public void closeSequence()
+ {
+ try
+ {
+ this.wsrmSequence.close();
+ }
+ finally
+ {
+ this.wsrmSequence = null;
+ }
+ }
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -60,7 +60,7 @@
* @since Oct 25, 2007
*/
@SuppressWarnings("unchecked")
-public final class RMClientSequence implements RMSequenceExt, RMUnassignedMessageListener
+public final class RMClientSequence implements RMSequence, RMUnassignedMessageListener
{
private static final Logger logger = Logger.getLogger(RMClientSequence.class);
private static final String PATH_PREFIX = "/temporary_listen_address/";
Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java (rev 0)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.wsrm;
+
+import java.util.Set;
+
+/**
+ * An extension of the standard RM sequence
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Dec 12, 2007
+ */
+public interface RMSequence
+{
+ String getOutboundId();
+ String getInboundId();
+ long newMessageNumber();
+ long getLastMessageNumber();
+ long getDuration();
+ String getAcksTo();
+ Set<Long> getReceivedInboundMessages();
+}
Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequence.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceExt.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.extensions.wsrm;
-
-import java.util.Set;
-
-import org.jboss.ws.extensions.wsrm.api.RMSequence;
-
-/**
- * An extension of the standard RM sequence
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Dec 12, 2007
- */
-public interface RMSequenceExt extends RMSequence
-{
- String getOutboundId();
- String getInboundId();
- long newMessageNumber();
- long getLastMessageNumber();
- long getDuration();
- String getAcksTo();
- Set<Long> getReceivedInboundMessages();
-}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMException.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMException.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMException.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -30,7 +30,6 @@
*
* @since Oct 22, 2007
* @see org.jboss.ws.extensions.wsrm.api.RMProvider
- * @see org.jboss.ws.extensions.wsrm.api.RMSequence
*/
public class RMException extends WebServiceException
{
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMProvider.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -27,27 +27,30 @@
* <p><blockquote><pre>
* boolean addressableClient = true;
* SEI sei = (SEI)service.getPort(SEI.class)
- * RMSequence sequence = ((RMProvider)sei).createSequence(addressableClient);
+ * ((RMProvider)sei).createSequence(addressableClient);
* ...
* sei.callMethod1();
* sei.callMethod2();
* ...
- * sequence.close();
+ * ((RMProvider)sei).closeSequence();
* </pre></blockquote></p>
*
* @author richard.opalka(a)jboss.com
*
* @since Oct 22, 2007
- * @see org.jboss.ws.extensions.wsrm.api.RMSequence
- * @see org.jboss.ws.extensions.wsrm.api.RMException
*/
public interface RMProvider
{
/**
- * Creates new WS-RM sequence
+ * Creates new WS-RM sequence and associates it with service proxy
* @param addressableClient
- * @return created sequence
- * @throws unchecked RMException if sequence creation error occurs
+ * @throws RMException if something went wrong
*/
- RMSequence createSequence(boolean addressableClient);
+ void createSequence(boolean addressableClient);
+
+ /**
+ * Close the sequence associated with service proxy
+ * @throws RMException if something went wrong
+ */
+ void closeSequence();
}
Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/api/RMSequence.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.extensions.wsrm.api;
-
-/**
- * WS-RM sequence. User can only create sequence using <b>RMProvider</b>
- * interface and close sequence using <b>RMSequence</b> interface
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 22, 2007
- * @see org.jboss.ws.extensions.wsrm.api.RMProvider
- * @see org.jboss.ws.extensions.wsrm.api.RMException
- */
-public interface RMSequence
-{
-
- /**
- * Close the sequence
- * @throws unchecked RMException if sequence termination failed
- */
- void close();
-
-}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMClientHandler.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -36,7 +36,7 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.RMSequenceExt;
+import org.jboss.ws.extensions.wsrm.RMSequence;
import org.jboss.ws.extensions.wsrm.api.RMException;
import org.jboss.ws.extensions.wsrm.spi.RMConstants;
import org.jboss.ws.extensions.wsrm.spi.RMProvider;
@@ -67,7 +67,7 @@
rmOutboundContext.put(RMConstant.WSA_MESSAGE_ID, optionalMessageId);
rmOutboundContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data);
SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage();
- RMSequenceExt sequenceImpl = (RMSequenceExt)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE);
+ RMSequence sequenceImpl = (RMSequence)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE);
// try to serialize CreateSequence to message
serialize(rmConstants.getCreateSequenceQName(), outMsgs, data, soapMessage, sequenceImpl);
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -31,7 +31,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.RMSequenceExt;
+import org.jboss.ws.extensions.wsrm.RMSequence;
import org.jboss.ws.extensions.wsrm.api.RMException;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable;
@@ -51,7 +51,7 @@
return RMConstant.PROTOCOL_OPERATION_QNAMES;
}
- protected final void serialize(QName msgQN, List<QName> outMsgs, Map<QName, RMSerializable> data, SOAPMessage soapMessage, RMSequenceExt seq)
+ protected final void serialize(QName msgQN, List<QName> outMsgs, Map<QName, RMSerializable> data, SOAPMessage soapMessage, RMSequence seq)
{
RMSerializable msg = RMHandlerHelper.prepareData(msgQN, outMsgs, seq);
if (msg != null)
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerHelper.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -26,7 +26,7 @@
import javax.xml.namespace.QName;
-import org.jboss.ws.extensions.wsrm.RMSequenceExt;
+import org.jboss.ws.extensions.wsrm.RMSequence;
import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.extensions.wsrm.spi.RMConstants;
import org.jboss.ws.extensions.wsrm.spi.RMMessageFactory;
@@ -36,7 +36,6 @@
import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequenceResponse;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequence;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMCreateSequenceResponse;
-import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMTerminateSequence;
@@ -97,7 +96,7 @@
throw new IllegalArgumentException();
}
- public static RMSerializable prepareData(QName msgQN, List<QName> outMsgs, RMSequenceExt seq)
+ public static RMSerializable prepareData(QName msgQN, List<QName> outMsgs, RMSequence seq)
{
if (outMsgs.contains(msgQN))
{
@@ -144,14 +143,14 @@
return null;
}
- private static RMSerializable newCreateSequence(RMSequenceExt seq)
+ private static RMSerializable newCreateSequence(RMSequence seq)
{
RMCreateSequence createSequence = rmFactory.newCreateSequence();
createSequence.setAcksTo(seq.getAcksTo());
return createSequence;
}
- private static RMSerializable newCreateSequenceResponse(RMSequenceExt seq)
+ private static RMSerializable newCreateSequenceResponse(RMSequence seq)
{
RMCreateSequenceResponse createSequenceResponse = rmFactory.newCreateSequenceResponse();
createSequenceResponse.setIdentifier(seq.getInboundId());
@@ -159,7 +158,7 @@
return createSequenceResponse;
}
- private static RMSerializable newCloseSequenceResponse(RMSequenceExt seq)
+ private static RMSerializable newCloseSequenceResponse(RMSequence seq)
{
// construct CloseSequenceResponse object
RMCloseSequenceResponse closeSequenceResponse = rmFactory.newCloseSequenceResponse();
@@ -167,7 +166,7 @@
return closeSequenceResponse;
}
- private static RMSerializable newCloseSequence(RMSequenceExt seq)
+ private static RMSerializable newCloseSequence(RMSequence seq)
{
// construct CloseSequenceResponse object
RMCloseSequence closeSequence = rmFactory.newCloseSequence();
@@ -179,7 +178,7 @@
return closeSequence;
}
- private static RMSerializable newTerminateSequence(RMSequenceExt seq)
+ private static RMSerializable newTerminateSequence(RMSequence seq)
{
// construct CloseSequenceResponse object
RMTerminateSequence terminateSequence = rmFactory.newTerminateSequence();
@@ -191,7 +190,7 @@
return terminateSequence;
}
- private static RMSerializable newTerminateSequenceResponse(RMSequenceExt seq)
+ private static RMSerializable newTerminateSequenceResponse(RMSequence seq)
{
// construct TerminateSequenceResponse object
RMTerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse();
@@ -199,7 +198,7 @@
return terminateSequenceResponse;
}
- private static RMSerializable newSequenceAcknowledgement(RMSequenceExt seq)
+ private static RMSerializable newSequenceAcknowledgement(RMSequence seq)
{
// construct SequenceAcknowledgement object
RMSequenceAcknowledgement sequenceAcknowledgement = rmFactory.newSequenceAcknowledgement();
@@ -224,7 +223,7 @@
return sequenceAcknowledgement;
}
- private static RMSerializable newAckRequested(RMSequenceExt seq)
+ private static RMSerializable newAckRequested(RMSequence seq)
{
// construct AckRequested object
RMAckRequested wsrmMsg = rmFactory.newAckRequested();
@@ -233,10 +232,10 @@
return wsrmMsg;
}
- private static RMSerializable newSequence(RMSequenceExt seq)
+ private static RMSerializable newSequence(RMSequence seq)
{
// construct Sequence object
- RMSequence sequence = rmFactory.newSequence();
+ org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence sequence = rmFactory.newSequence();
sequence.setIdentifier(seq.getOutboundId());
sequence.setMessageNumber(seq.newMessageNumber());
return sequence;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMServerHandler.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -36,7 +36,7 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.extensions.wsrm.RMConstant;
-import org.jboss.ws.extensions.wsrm.RMSequenceExt;
+import org.jboss.ws.extensions.wsrm.RMSequence;
import org.jboss.ws.extensions.wsrm.api.RMException;
import org.jboss.ws.extensions.wsrm.spi.RMConstants;
import org.jboss.ws.extensions.wsrm.spi.RMProvider;
@@ -67,7 +67,7 @@
rmOutboundContext.put(RMConstant.WSA_MESSAGE_ID, optionalMessageId);
rmOutboundContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data);
SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage();
- RMSequenceExt sequenceImpl = (RMSequenceExt)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE);
+ RMSequence sequenceImpl = (RMSequence)rmOutboundContext.get(RMConstant.SEQUENCE_REFERENCE);
// try to serialize CreateSequenceResponse to message
serialize(rmConstants.getCreateSequenceResponseQName(), outMsgs, data, soapMessage, sequenceImpl);
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -28,7 +28,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
-import org.jboss.ws.extensions.wsrm.RMSequenceExt;
+import org.jboss.ws.extensions.wsrm.RMSequence;
/**
* Server side implementation of the RM sequence
@@ -37,7 +37,7 @@
*
* @since Dec 12, 2007
*/
-public class RMServerSequence implements RMSequenceExt
+public class RMServerSequence implements RMSequence
{
private static final Logger logger = Logger.getLogger(RMServerSequence.class);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -29,7 +29,6 @@
import javax.xml.ws.Service;
import org.jboss.ws.extensions.wsrm.api.RMProvider;
-import org.jboss.ws.extensions.wsrm.api.RMSequence;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface;
@@ -58,14 +57,14 @@
public void testOneWayMethods() throws Exception
{
- RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable());
+ ((RMProvider)proxy).createSequence(isClientAddressable());
setAddrProps(proxy, "http://useless/action1", serviceURL);
proxy.method1();
setAddrProps(proxy, "http://useless/action2", serviceURL);
proxy.method2("Hello World");
setAddrProps(proxy, "http://useless/action3", serviceURL);
proxy.method3(new String[] {"Hello","World"});
- sequence.close();
+ ((RMProvider)proxy).closeSequence();
}
public static String getClasspath()
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -30,7 +30,6 @@
import org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface;
import org.jboss.ws.extensions.wsrm.api.RMProvider;
-import org.jboss.ws.extensions.wsrm.api.RMSequence;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -58,14 +57,14 @@
public void testOneWayMethods() throws Exception
{
- RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable());
+ ((RMProvider)proxy).createSequence(isClientAddressable());
setAddrProps(proxy, "http://useless/action1", serviceURL);
proxy.method1();
setAddrProps(proxy, "http://useless/action2", serviceURL);
proxy.method2("Hello World");
setAddrProps(proxy, "http://useless/action3", serviceURL);
proxy.method3(new String[] {"Hello","World"});
- sequence.close();
+ ((RMProvider)proxy).closeSequence();
}
public static String getClasspath()
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -39,7 +39,6 @@
import org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface;
import org.jboss.ws.extensions.wsrm.api.RMProvider;
-import org.jboss.ws.extensions.wsrm.api.RMSequence;
/**
* Reliable JBoss WebService client invoking req/res methods
@@ -150,14 +149,14 @@
private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
{
- RMSequence sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable());
+ ((RMProvider)proxyObject).createSequence(isClientAddressable());
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- sequence.close();
+ ((RMProvider)proxyObject).closeSequence();
}
public static String getClasspath()
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2007-12-18 17:57:50 UTC (rev 5355)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2007-12-19 11:16:02 UTC (rev 5356)
@@ -37,7 +37,6 @@
import org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface;
import org.jboss.ws.extensions.wsrm.api.RMProvider;
-import org.jboss.ws.extensions.wsrm.api.RMSequence;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -149,14 +148,14 @@
private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
{
- RMSequence sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable());
+ ((RMProvider)proxyObject).createSequence(isClientAddressable());
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- sequence.close();
+ ((RMProvider)proxyObject).closeSequence();
}
public static String getClasspath()
16 years, 4 months
- 1
- 0
JBossWS SVN: r5355 - in stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf: descriptor and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-18 12:57:50 -0500 (Tue, 18 Dec 2007)
New Revision: 5355
Added:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
Removed:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java
Modified:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java
Log:
Add JDK logging test case
Deleted: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java 2007-12-18 17:45:00 UTC (rev 5354)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java 2007-12-18 17:57:50 UTC (rev 5355)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.descriptor;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Test the CXF WS-descriptorMessaging
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Dec-2007
- */
-public class DescriptorCXFJSETestCase extends JBossWSTest
-{
- private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-descriptor/TestService";
- private String targetNS = "http://org.jboss.ws.jaxws.cxf/descriptor";
-
- public static Test suite()
- {
- return new JBossWSTestSetup(DescriptorCXFJSETestCase.class, "jaxws-cxf-descriptor.war");
- }
-
- public void testLegalAccess() throws Exception
- {
- URL wsdlURL = new URL(endpointURL + "?wsdl");
- QName serviceName = new QName(targetNS, "DescriptorService");
-
- Service service = Service.create(wsdlURL, serviceName);
- DescriptorEndpoint port = (DescriptorEndpoint)service.getPort(DescriptorEndpoint.class);
-
- Object retObj = port.echo("Hello");
- assertEquals("Hello", retObj);
- }
-}
\ No newline at end of file
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2007-12-18 17:45:00 UTC (rev 5354)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2007-12-18 17:57:50 UTC (rev 5355)
@@ -26,12 +26,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-/**
- * Test the CXF WS-descriptorMessaging
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Dec-2007
- */
@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public interface DescriptorEndpoint
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2007-12-18 17:45:00 UTC (rev 5354)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2007-12-18 17:57:50 UTC (rev 5355)
@@ -27,12 +27,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-/**
- * Test the CXF WS-descriptorMessaging
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Dec-2007
- */
@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class DescriptorEndpointImpl
Copied: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java (from rev 5343, stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorCXFJSETestCase.java)
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2007-12-18 17:57:50 UTC (rev 5355)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.descriptor;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test a CXF endpoint with provided jbossws-cxf.xml
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-Dec-2007
+ */
+public class DescriptorJSETestCase extends JBossWSTest
+{
+ private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-descriptor/TestService";
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/descriptor";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(DescriptorJSETestCase.class, "jaxws-cxf-descriptor.war");
+ }
+
+ public void testLegalAccess() throws Exception
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "DescriptorService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ DescriptorEndpoint port = (DescriptorEndpoint)service.getPort(DescriptorEndpoint.class);
+
+ Object retObj = port.echo("Hello");
+ assertEquals("Hello", retObj);
+ }
+}
\ No newline at end of file
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2007-12-18 17:57:50 UTC (rev 5355)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.logging;
+
+import java.util.logging.Handler;
+import java.util.logging.Logger;
+
+import org.jboss.wsf.common.log.JBossLogHandler;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test redirection of JDK logging on the client side
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 18-Dec-2007
+ */
+public class JDKLoggingTestCase extends JBossWSTest
+{
+ public void testLogging() throws Exception
+ {
+ Logger log = Logger.getLogger(JDKLoggingTestCase.class.getName());
+ assertHandlers(log);
+
+ log = Logger.getLogger(JDKLoggingTestCase.class.getName());
+ assertHandlers(log);
+
+ log.info("test message");
+ }
+
+ private void assertHandlers(Logger log)
+ {
+ int found = 0;
+ for (Handler handler : log.getHandlers())
+ {
+ if (handler instanceof JBossLogHandler)
+ found++;
+ }
+ assertEquals("Expected one jboss handler", 1, found);
+ }
+}
\ No newline at end of file
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java 2007-12-18 17:45:00 UTC (rev 5354)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpoint.java 2007-12-18 17:57:50 UTC (rev 5355)
@@ -26,12 +26,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-/**
- * Test the CXF WS-ReliableMessaging
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Dec-2007
- */
@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable", serviceName = "RMService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public interface RMEndpoint
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java 2007-12-18 17:45:00 UTC (rev 5354)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/cxf/reliable/RMEndpointImpl.java 2007-12-18 17:57:50 UTC (rev 5355)
@@ -27,12 +27,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-/**
- * Test the CXF WS-ReliableMessaging
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-Dec-2007
- */
@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/reliable", serviceName = "RMService")
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class RMEndpointImpl
16 years, 4 months
- 1
- 0
JBossWS SVN: r5354 - framework/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-18 12:45:00 -0500 (Tue, 18 Dec 2007)
New Revision: 5354
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
Add JBossLogManager
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-12-18 17:43:47 UTC (rev 5353)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-12-18 17:45:00 UTC (rev 5354)
@@ -482,6 +482,7 @@
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
<sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
+ <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.log.JBossLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
@@ -524,6 +525,7 @@
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
<sysproperty key="java.security.policy" value="${tests.output.dir}/classes/tst.policy"/>
+ <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.log.JBossLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
<sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
16 years, 4 months
- 1
- 0
JBossWS SVN: r5353 - common/trunk/src/main/java/org/jboss/wsf/common/log.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-18 12:43:47 -0500 (Tue, 18 Dec 2007)
New Revision: 5353
Added:
common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
Log:
Add JBossLogManager
Added: common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java 2007-12-18 17:43:47 UTC (rev 5353)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.common.log;
+
+// $Id$
+
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+
+/**
+ * A LogManager that adds a JBossLogHandler to every Logger
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 18-Dec-2007
+ */
+public class JBossLogManager extends LogManager
+{
+ @Override
+ public synchronized Logger getLogger(String name)
+ {
+ Logger logger = super.getLogger(name);
+ if (logger == null)
+ logger = new JBossLogger(name);
+
+ logger.addHandler(new JBossLogHandler());
+ return logger;
+ }
+
+ static class JBossLogger extends Logger
+ {
+ protected JBossLogger(String name)
+ {
+ super(name, null);
+ }
+ }
+}
\ No newline at end of file
Property changes on: common/trunk/src/main/java/org/jboss/wsf/common/log/JBossLogManager.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 4 months
- 1
- 0
JBossWS SVN: r5352 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-18 11:34:18 -0500 (Tue, 18 Dec 2007)
New Revision: 5352
Modified:
stack/native/trunk/.classpath
Log:
rollback xmlsec source code base - it was used for local debugging purposes only
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2007-12-18 16:23:37 UTC (rev 5351)
+++ stack/native/trunk/.classpath 2007-12-18 16:34:18 UTC (rev 5352)
@@ -26,7 +26,7 @@
<classpathentry kind="lib" path="thirdparty/wstx.jar"/>
<classpathentry kind="lib" path="thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/>
- <classpathentry kind="lib" path="thirdparty/xmlsec.jar" sourcepath="thirdparty/xmlsec-src.zip"/>
+ <classpathentry kind="lib" path="thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
<classpathentry kind="lib" path="thirdparty/qdox.jar"/>
<classpathentry kind="lib" path="thirdparty/policy.jar"/>
16 years, 4 months
- 1
- 0
JBossWS SVN: r5351 - in stack/native/trunk: ant-import-tests and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-18 11:23:37 -0500 (Tue, 18 Dec 2007)
New Revision: 5351
Added:
stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/
stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/META-INF/
stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/META-INF/jboss-wsse-client.xml
stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/WEB-INF/
stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/WEB-INF/jboss-wsse-server.xml
stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/wsse.keystore
stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/wsse.truststore
Removed:
stack/native/trunk/src/test/resources/jaxws/wsrm/properties/
Modified:
stack/native/trunk/.classpath
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
Log:
enabling WS-RM + WS-Security test suite
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/.classpath 2007-12-18 16:23:37 UTC (rev 5351)
@@ -26,7 +26,7 @@
<classpathentry kind="lib" path="thirdparty/wstx.jar"/>
<classpathentry kind="lib" path="thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/>
- <classpathentry kind="lib" path="thirdparty/xmlsec.jar"/>
+ <classpathentry kind="lib" path="thirdparty/xmlsec.jar" sourcepath="thirdparty/xmlsec-src.zip"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
<classpathentry kind="lib" path="thirdparty/qdox.jar"/>
<classpathentry kind="lib" path="thirdparty/policy.jar"/>
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-18 16:23:37 UTC (rev 5351)
@@ -681,6 +681,13 @@
<include name="wsrm-exactly-once-in-order-policy.xml"/>
<include name="wsrm-jaxws-endpoint-config.xml"/>
</webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity/WEB-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
</war>
<war warfile="${tests.output.dir}/libs/jaxws-wsrm-one-way-emulator.war"
@@ -713,6 +720,9 @@
<metainf dir="${tests.output.dir}/resources/jaxws/wsrm/META-INF">
<include name="wsrm-jaxws-client-config.xml"/>
</metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/wssecurity/META-INF">
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
</jar>
<!-- Please add alphabetically -->
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -23,11 +23,7 @@
import static org.jboss.test.ws.jaxws.wsrm.Helper.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.URL;
-import java.util.Properties;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -46,31 +42,15 @@
*/
public abstract class RMAbstractOneWayTest extends JBossWSTest
{
- private static final Properties props = new Properties();
- private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
- private String targetNS = "http://org.jboss.ws/jaxws/wsrm";
+ private final String serviceURL = "http://" + getServerHost() + ":8080//jaxws-wsrm/OneWayService";
private OneWayServiceIface proxy;
- static
- {
- try
- {
- props.load(
- new FileInputStream(
- new File("resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties")));
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
- }
-
@Override
protected void setUp() throws Exception
{
super.setUp();
- QName serviceName = new QName(targetNS, "OneWayService");
+ QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "OneWayService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (OneWayServiceIface)service.getPort(OneWayServiceIface.class);
@@ -90,7 +70,7 @@
public static String getClasspath()
{
- return props.getProperty("archives");
+ return "jaxws-wsrm.war, jaxws-wsrm-client.jar";
}
protected abstract boolean isClientAddressable();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -23,11 +23,7 @@
import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.URL;
-import java.util.Properties;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -46,35 +42,18 @@
*/
public abstract class RMAbstractSecuredOneWayTest extends JBossWSTest
{
- private static final Properties props = new Properties();
- private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
- private String targetNS = "http://org.jboss.ws/jaxws/wsrm";
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-secured-wsrm/SecuredOneWayService";
private SecuredOneWayServiceIface proxy;
- static
- {
- try
- {
- props.load(
- new FileInputStream(
- new File("resources/jaxws/wsrm/properties/RMAbstractSecuredOneWayTest.properties")));
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
- }
-
@Override
protected void setUp() throws Exception
{
super.setUp();
- QName serviceName = new QName(targetNS, "SecuredOneWayService");
+ QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "SecuredOneWayService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
proxy = (SecuredOneWayServiceIface)service.getPort(SecuredOneWayServiceIface.class);
- // TODO: activate WS-Security
}
public void testOneWayMethods() throws Exception
@@ -91,7 +70,7 @@
public static String getClasspath()
{
- return props.getProperty("archives");
+ return "jaxws-secured-wsrm.war, jaxws-secured-wsrm-client.jar";
}
protected abstract boolean isClientAddressable();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAnonymousOneWayTestCase.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -34,7 +34,6 @@
*/
public final class RMAnonymousOneWayTestCase extends RMAbstractOneWayTest
{
-
public static Test suite()
{
return new JBossWSTestSetup(RMAnonymousOneWayTestCase.class, getClasspath());
@@ -44,5 +43,4 @@
{
return false;
}
-
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -23,11 +23,7 @@
import static org.jboss.test.ws.jaxws.wsrm.Helper.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.URL;
-import java.util.Properties;
import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import java.util.concurrent.SynchronousQueue;
@@ -54,10 +50,8 @@
*/
public abstract class RMAbstractReqResTest extends JBossWSTest
{
- private static final String HELLO_WORLD_MSG = "Hello World";
- private static final String TARGET_NS = "http://org.jboss.ws/jaxws/wsrm";
- private static final Properties props = new Properties();
- private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
+ private static final String helloWorldMessage = "Hello World";
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-wsrm/ReqResService";
private Exception handlerException;
private boolean asyncHandlerCalled;
private ReqResServiceIface proxy;
@@ -67,20 +61,6 @@
0, 5, testWaitPeriod, testTimeUnit, new SynchronousQueue<Runnable>()
);
- static
- {
- try
- {
- props.load(
- new FileInputStream(
- new File("resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties")));
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
- }
-
private enum InvocationType
{
SYNC, ASYNC, ASYNC_FUTURE
@@ -93,7 +73,7 @@
if (proxy == null)
{
- QName serviceName = new QName(TARGET_NS, "ReqResService");
+ QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "ReqResService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
service.setExecutor(testExecutor);
@@ -118,13 +98,13 @@
private void doSynchronousInvocation() throws Exception
{
- assertEquals(proxy.echo(HELLO_WORLD_MSG), HELLO_WORLD_MSG);
+ assertEquals(proxy.echo(helloWorldMessage), helloWorldMessage);
}
private void doAsynchronousInvocation() throws Exception
{
- Response<String> response = proxy.echoAsync(HELLO_WORLD_MSG);
- assertEquals(response.get(), HELLO_WORLD_MSG); // hidden future pattern
+ Response<String> response = proxy.echoAsync(helloWorldMessage);
+ assertEquals(response.get(), helloWorldMessage); // hidden future pattern
}
private void doAsynchronousInvocationUsingFuture() throws Exception
@@ -136,7 +116,7 @@
try
{
String retStr = (String) response.get(testWaitPeriod, testTimeUnit);
- assertEquals(HELLO_WORLD_MSG, retStr);
+ assertEquals(helloWorldMessage, retStr);
asyncHandlerCalled = true;
}
catch (Exception ex)
@@ -145,7 +125,7 @@
}
}
};
- Future<?> future = proxy.echoAsync(HELLO_WORLD_MSG, handler);
+ Future<?> future = proxy.echoAsync(helloWorldMessage, handler);
future.get(testWaitPeriod, testTimeUnit);
ensureAsyncStatus();
}
@@ -182,9 +162,8 @@
public static String getClasspath()
{
- return props.getProperty("archives");
+ return "jaxws-wsrm.war, jaxws-wsrm-client.jar";
}
protected abstract boolean isClientAddressable();
-
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -23,11 +23,7 @@
import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.URL;
-import java.util.Properties;
import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import java.util.concurrent.SynchronousQueue;
@@ -53,10 +49,8 @@
*/
public abstract class RMAbstractSecuredReqResTest extends JBossWSTest
{
- private static final String HELLO_WORLD_MSG = "Hello World";
- private static final String TARGET_NS = "http://org.jboss.ws/jaxws/wsrm";
- private static final Properties props = new Properties();
- private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
+ private static final String helloWorldMessage = "Hello World";
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-secured-wsrm/SecuredReqResService";
private Exception handlerException;
private boolean asyncHandlerCalled;
private SecuredReqResServiceIface proxy;
@@ -66,20 +60,6 @@
0, 5, testWaitPeriod, testTimeUnit, new SynchronousQueue<Runnable>()
);
- static
- {
- try
- {
- props.load(
- new FileInputStream(
- new File("resources/jaxws/wsrm/properties/RMAbstractSecuredReqResTest.properties")));
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
- }
-
private enum InvocationType
{
SYNC, ASYNC, ASYNC_FUTURE
@@ -92,12 +72,11 @@
if (proxy == null)
{
- QName serviceName = new QName(TARGET_NS, "SecuredReqResService");
+ QName serviceName = new QName("http://org.jboss.ws/jaxws/wsrm", "SecuredReqResService");
URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
service.setExecutor(testExecutor);
proxy = (SecuredReqResServiceIface)service.getPort(SecuredReqResServiceIface.class);
- // TODO: activate WS-Security
}
}
@@ -118,13 +97,13 @@
private void doSynchronousInvocation() throws Exception
{
- assertEquals(proxy.echo(HELLO_WORLD_MSG), HELLO_WORLD_MSG);
+ assertEquals(proxy.echo(helloWorldMessage), helloWorldMessage);
}
private void doAsynchronousInvocation() throws Exception
{
- Response<String> response = proxy.echoAsync(HELLO_WORLD_MSG);
- assertEquals(response.get(), HELLO_WORLD_MSG); // hidden future pattern
+ Response<String> response = proxy.echoAsync(helloWorldMessage);
+ assertEquals(response.get(), helloWorldMessage); // hidden future pattern
}
private void doAsynchronousInvocationUsingFuture() throws Exception
@@ -136,7 +115,7 @@
try
{
String retStr = (String) response.get(testWaitPeriod, testTimeUnit);
- assertEquals(HELLO_WORLD_MSG, retStr);
+ assertEquals(helloWorldMessage, retStr);
asyncHandlerCalled = true;
}
catch (Exception ex)
@@ -145,7 +124,7 @@
}
}
};
- Future<?> future = proxy.echoAsync(HELLO_WORLD_MSG, handler);
+ Future<?> future = proxy.echoAsync(helloWorldMessage, handler);
future.get(testWaitPeriod, testTimeUnit);
ensureAsyncStatus();
}
@@ -182,7 +161,7 @@
public static String getClasspath()
{
- return props.getProperty("archives");
+ return "jaxws-secured-wsrm.war, jaxws-secured-wsrm-client.jar";
}
protected abstract boolean isClientAddressable();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAddressableReqResTestCase.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -34,7 +34,6 @@
*/
public final class RMAddressableReqResTestCase extends RMAbstractReqResTest
{
-
public static Test suite()
{
return new JBossWSTestSetup(RMAddressableReqResTestCase.class, getClasspath());
@@ -44,5 +43,4 @@
{
return true;
}
-
}
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -29,8 +29,7 @@
@WebService
@EndpointConfig
(
-// configName = "Secured WSRM Client", TODO: uncommented
- configName = "Standard WSRM Client",
+ configName = "Secured WSRM Client",
configFile = "META-INF/wsrm-jaxws-client-config.xml"
)
public interface SecuredOneWayServiceIface
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -49,8 +49,7 @@
)
@EndpointConfig
(
-// configName = "Secured WSRM Endpoint", TODO: uncomment
- configName = "Standard WSRM Endpoint",
+ configName = "Secured WSRM Endpoint",
configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
)
public class SecuredOneWayServiceImpl implements SecuredOneWayServiceIface
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -33,8 +33,7 @@
@WebService
@EndpointConfig
(
-// configName = "Secured WSRM Client", TODO: uncomment
- configName = "Standard WSRM Client",
+ configName = "Secured WSRM Client",
configFile = "META-INF/wsrm-jaxws-client-config.xml"
)
public interface SecuredReqResServiceIface
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2007-12-18 15:51:28 UTC (rev 5350)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2007-12-18 16:23:37 UTC (rev 5351)
@@ -47,8 +47,7 @@
)
@EndpointConfig
(
-// configName = "Standard WSRM Endpoint", TODO: uncomment
- configName = "Standard WSRM Endpoint",
+ configName = "Secured WSRM Endpoint",
configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
)
public class SecuredReqResServiceImpl
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/META-INF/jboss-wsse-client.xml 2007-12-18 16:23:37 UTC (rev 5351)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/META-INF/jboss-wsse-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/WEB-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/WEB-INF/jboss-wsse-server.xml 2007-12-18 16:23:37 UTC (rev 5351)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>WEB-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/WEB-INF/jboss-wsse-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/wsse.keystore
===================================================================
(Binary files differ)
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/wsse.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/wsse.truststore
===================================================================
(Binary files differ)
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/wssecurity/wsse.truststore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 4 months
- 1
- 0
JBossWS SVN: r5350 - in projects: jaxbintros and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-18 10:51:28 -0500 (Tue, 18 Dec 2007)
New Revision: 5350
Added:
projects/jaxbintros/trunk/
Removed:
projects/jaxbintros-trunk/
Log:
Add trunk to jaxbintros
Copied: projects/jaxbintros/trunk (from rev 5349, projects/jaxbintros-trunk)
16 years, 4 months
- 1
- 0
JBossWS SVN: r5349 - projects.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-18 10:50:58 -0500 (Tue, 18 Dec 2007)
New Revision: 5349
Added:
projects/jaxbintros/
Log:
Add trunk to jaxbintros
16 years, 4 months
- 1
- 0
JBossWS SVN: r5348 - projects.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-18 10:50:39 -0500 (Tue, 18 Dec 2007)
New Revision: 5348
Added:
projects/jaxbintros-trunk/
Removed:
projects/jaxbintros/
Log:
Add trunk to jaxbintros
Copied: projects/jaxbintros-trunk (from rev 5347, projects/jaxbintros)
16 years, 4 months
- 1
- 0
JBossWS SVN: r5347 - in stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport: backchannel and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-18 10:45:14 -0500 (Tue, 18 Dec 2007)
New Revision: 5347
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java
Log:
fix callbacks server handler so it will use our custom unmarshaller instead of default one that trims CRNLs
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java 2007-12-18 14:15:41 UTC (rev 5346)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java 2007-12-18 15:45:14 UTC (rev 5347)
@@ -33,7 +33,7 @@
*
* @author richard.opalka(a)jboss.com
*/
-final class RMMarshaller implements Marshaller
+public final class RMMarshaller implements Marshaller
{
private static final Marshaller instance = new RMMarshaller();
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2007-12-18 14:15:41 UTC (rev 5346)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2007-12-18 15:45:14 UTC (rev 5347)
@@ -33,7 +33,7 @@
*
* @author richard.opalka(a)jboss.com
*/
-final class RMUnMarshaller implements UnMarshaller
+public final class RMUnMarshaller implements UnMarshaller
{
private static final UnMarshaller instance = new RMUnMarshaller();
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2007-12-18 14:15:41 UTC (rev 5346)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2007-12-18 15:45:14 UTC (rev 5347)
@@ -26,9 +26,10 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.transport.Connector;
import org.jboss.ws.extensions.wsrm.api.RMException;
+import org.jboss.ws.extensions.wsrm.transport.RMMarshaller;
+import org.jboss.ws.extensions.wsrm.transport.RMUnMarshaller;
/**
* Back ports server used by addressable clients
@@ -78,7 +79,9 @@
this.port = port;
try
{
- InvokerLocator il = new InvokerLocator(this.scheme + "://" + this.host + ":" + this.port);
+ // we have to use custom unmarshaller because default one removes CRNLs
+ String customUnmarshaller = "/?unmarshaller=" + RMUnMarshaller.class.getName();
+ InvokerLocator il = new InvokerLocator(this.scheme + "://" + this.host + ":" + this.port + customUnmarshaller);
this.connector = new Connector();
this.connector.setInvokerLocator(il.getLocatorURI());
this.connector.create();
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java 2007-12-18 14:15:41 UTC (rev 5346)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java 2007-12-18 15:45:14 UTC (rev 5347)
@@ -28,10 +28,9 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.transport.coyote.RequestMap;
import org.jboss.ws.core.MessageTrace;
import org.jboss.ws.extensions.wsrm.transport.RMMessage;
-import org.jboss.ws.extensions.wsrm.transport.RMMessageFactory;
-import org.jboss.ws.extensions.wsrm.transport.RMMetadata;
import org.jboss.ws.extensions.wsrm.transport.RMUnassignedMessageListener;
/**
@@ -74,14 +73,11 @@
public final void handle(InvocationRequest request)
{
- String requestMessage = (String)request.getParameter();
+ RMMessage message = (RMMessage)request.getParameter();
synchronized (instanceLock)
{
- logger.debug("Setting response object");
- MessageTrace.traceMessage("Incoming RM Response Message", requestMessage.getBytes());
- // TODO: is it necessary to initialize metadata from request message?
- RMMetadata metadata = new RMMetadata(new java.util.HashMap<String, Object>());
- RMMessage message = RMMessageFactory.newMessage(requestMessage.getBytes(), metadata);
+ String requestMessage = new String(message.getPayload());
+ MessageTrace.traceMessage("Incoming RM Response Message (callback)", requestMessage);
String startPattern = "<wsa:RelatesTo>"; // TODO: remove this with XML content inspection
String endPattern = "</wsa:RelatesTo>";
int begin = requestMessage.indexOf(startPattern) + startPattern.length();
@@ -101,7 +97,6 @@
this.listener.unassignedMessageReceived();
}
}
- MessageTrace.traceMessage("Incoming RM Response Message (callback)", requestMessage.getBytes());
}
}
16 years, 4 months
- 1
- 0