JBossWS SVN: r5111 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-26 09:03:28 -0500 (Mon, 26 Nov 2007)
New Revision: 5111
Removed:
stack/native/branches/jbossws-native-2.0.2/
Log:
Delete branch 2.0.2
16 years, 5 months
- 1
- 0
JBossWS SVN: r5110 - in stack/native/trunk/src: main/java/org/jboss/ws/core/jaxws/client and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-11-26 07:18:41 -0500 (Mon, 26 Nov 2007)
New Revision: 5110
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java
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/RMChannel.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/backchannel/RMBackPortsServer.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java
stack/native/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties
Log:
refactoring + enabling inbound messages handler for all WS-RM messages
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -54,6 +54,7 @@
import org.jboss.ws.core.soap.UnboundHeader;
import org.jboss.ws.core.utils.HolderUtils;
import org.jboss.ws.extensions.addressing.AddressingConstantsImpl;
+import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.metadata.umdm.ClientEndpointMetaData;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -353,7 +354,8 @@
// Get the return object
Object retObj = null;
- if (oneway == false && handlerPass)
+ boolean isWsrmMessage = msgContext.get(RMConstant.REQUEST_CONTEXT) != null;
+ if ((oneway == false && handlerPass) || isWsrmMessage)
{
// Verify
if (binding instanceof CommonSOAPBinding)
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-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -27,6 +27,7 @@
import java.rmi.RemoteException;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Observable;
@@ -287,8 +288,10 @@
addressingProps.setReplyTo(AddressingBuilder.getAddressingBuilder().newEndpointReference(this.wsrmSequence.getBackPort()));
}
Map<String, Object> rmRequestContext = new HashMap<String, Object>();
- QName sequenceQName = Provider.get().getConstants().getSequenceQName();
- rmRequestContext.put(RMConstant.OPERATION_QNAME, sequenceQName);
+ List<QName> outMsgs = new LinkedList<QName>();
+ outMsgs.add(Provider.get().getConstants().getSequenceQName());
+ outMsgs.add(Provider.get().getConstants().getAckRequestedQName());
+ rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, wsrmSequence);
reqContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
}
@@ -514,13 +517,15 @@
// set up wsrm request context
QName createSequenceQN = Provider.get().getConstants().getCreateSequenceQName();
Map rmRequestContext = new HashMap();
- rmRequestContext.put(RMConstant.OPERATION_QNAME, createSequenceQN);
+ List outMsgs = new LinkedList();
+ outMsgs.add(createSequenceQN);
+ rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
requestContext.put(RMConstant.REQUEST_CONTEXT, rmRequestContext);
// invoke stub method
invoke(createSequenceQN, new Object[] {}, getBindingProvider().getResponseContext());
// read WSRM sequence id from response context
Map rmResponseContext = (Map)getBindingProvider().getResponseContext().get(RMConstant.RESPONSE_CONTEXT);
- String id = ((CreateSequenceResponse)((List)rmResponseContext.get(RMConstant.DATA)).get(0)).getIdentifier();
+ String id = ((CreateSequenceResponse)((Map)rmResponseContext.get(RMConstant.PROTOCOL_MESSAGES_MAPPING)).get(Provider.get().getConstants().getCreateSequenceResponseQName())).getIdentifier();
return this.wsrmSequence = new RMSequenceImpl(this, id, backPort);
}
catch (Exception e)
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMChannel.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMChannel.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMChannel.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -98,7 +98,7 @@
Map<String, Object> invocationContext = rmMetadata.getContext(INVOCATION_CONTEXT);
boolean oneWay = (Boolean)rmMetadata.getContext(INVOCATION_CONTEXT).get(ONE_WAY_OPERATION);
MessageAbstraction response = null;
- if (!oneWay)
+ //if (!oneWay)
{
byte[] payload = rmResponse.getPayload();
InputStream is = payload == null ? null : new ByteArrayInputStream(rmResponse.getPayload());
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -40,15 +40,21 @@
import org.jboss.logging.Logger;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
+import org.jboss.ws.extensions.wsrm.client_api.RMException;
import org.jboss.ws.extensions.wsrm.spi.Constants;
import org.jboss.ws.extensions.wsrm.spi.MessageFactory;
import org.jboss.ws.extensions.wsrm.spi.Provider;
import org.jboss.ws.extensions.wsrm.spi.protocol.AckRequested;
+import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequence;
+import org.jboss.ws.extensions.wsrm.spi.protocol.CloseSequenceResponse;
import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence;
import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequenceResponse;
import org.jboss.ws.extensions.wsrm.spi.protocol.Sequence;
+import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceAcknowledgement;
+import org.jboss.ws.extensions.wsrm.spi.protocol.SequenceFault;
import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable;
import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequence;
+import org.jboss.ws.extensions.wsrm.spi.protocol.TerminateSequenceResponse;
/**
* TODO: add comment
@@ -63,20 +69,8 @@
private static final Logger log = Logger.getLogger(RMClientHandler.class);
private static final MessageFactory rmFactory = Provider.get().getMessageFactory();
private static final Constants rmConstants = Provider.get().getConstants();
- private static final Set headers;
+ private static final Set headers = RMConstant.PROTOCOL_OPERATION_QNAMES;
- static
- {
- Set temp = new HashSet();
- temp.add(rmConstants.getCreateSequenceQName());
- temp.add(rmConstants.getCloseSequenceQName());
- temp.add(rmConstants.getTerminateSequenceQName());
- temp.add(rmConstants.getCreateSequenceResponseQName());
- temp.add(rmConstants.getCloseSequenceResponseQName());
- temp.add(rmConstants.getTerminateSequenceResponseQName());
- headers = Collections.unmodifiableSet(temp);
- }
-
public Set getHeaders()
{
return headers;
@@ -84,97 +78,225 @@
protected boolean handleOutbound(MessageContext msgContext)
{
- log.debug("WS-RM handleOutbound");
+ log.debug("handling outbound message");
CommonMessageContext commonMsgContext = (CommonMessageContext)msgContext;
SOAPAddressingProperties addrProps = (SOAPAddressingProperties)commonMsgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+ if (addrProps == null)
+ throw new RMException("WS-Addressing properties not found in message context");
+
Map rmRequestContext = (Map)commonMsgContext.get(RMConstant.REQUEST_CONTEXT);
- QName operation = (QName)rmRequestContext.get(RMConstant.OPERATION_QNAME);
+ List<QName> outMsgs = (List<QName>)rmRequestContext.get(RMConstant.PROTOCOL_MESSAGES);
+ Map<QName, Serializable> data = new HashMap<QName, Serializable>();
rmRequestContext.put(RMConstant.WSA_MESSAGE_ID, addrProps.getMessageID().getURI().toString());
- if (addrProps != null)
+ rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data);
+ SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage();
+
+ QName msgQName = rmConstants.getCreateSequenceQName();
+ if (outMsgs.contains(msgQName))
{
- SOAPMessage soapMessage = ((SOAPMessageContext)commonMsgContext).getMessage();
- if (rmConstants.getCreateSequenceQName().equals(operation))
- {
- String replyTo = addrProps.getReplyTo().getAddress().getURI().toString();
- CreateSequence createSequence = rmFactory.newCreateSequence();
- createSequence.setAcksTo(replyTo);
- createSequence.serializeTo(soapMessage);
- List<Serializable> data = new LinkedList<Serializable>();
- data.add(createSequence);
- rmRequestContext.put(RMConstant.DATA, data);
-
- return true;
- }
+ // try to serialize CreateSequence to message
+ String replyTo = addrProps.getReplyTo().getAddress().getURI().toString();
+ CreateSequence createSequence = rmFactory.newCreateSequence();
+ createSequence.setAcksTo(replyTo);
+ createSequence.serializeTo(soapMessage);
+ data.put(msgQName, createSequence);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
- if (rmConstants.getSequenceQName().equals(operation))
- {
- RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
- Sequence sequence = rmFactory.newSequence();
- sequence.setIdentifier(sequenceImpl.getId());
- sequence.setMessageNumber(sequenceImpl.newMessageNumber());
- sequence.serializeTo(soapMessage);
-
- List<Serializable> data = new LinkedList<Serializable>();
- data.add(sequence);
-
- // TODO: ask msgStore if there are other sequences related to the same
- // endpoint that requires ack and serialize it here
- AckRequested ackRequested = rmFactory.newAckRequested();
- ackRequested.setIdentifier(sequenceImpl.getId());
- ackRequested.setMessageNumber(sequenceImpl.getLastMessageNumber());
- ackRequested.serializeTo(soapMessage);
- data.add(ackRequested);
-
- rmRequestContext.put(RMConstant.DATA, data);
-
- return true;
- }
+ msgQName = rmConstants.getSequenceQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize Sequence to message
+ RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
+ Sequence sequence = rmFactory.newSequence();
+ sequence.setIdentifier(sequenceImpl.getId());
+ sequence.setMessageNumber(sequenceImpl.newMessageNumber());
+ sequence.serializeTo(soapMessage);
+ data.put(msgQName, sequence);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
+
+ msgQName = rmConstants.getAckRequestedQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize AckRequested to message
+ RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
+ AckRequested ackRequested = rmFactory.newAckRequested();
+ ackRequested.setIdentifier(sequenceImpl.getId());
+ ackRequested.setMessageNumber(sequenceImpl.getLastMessageNumber());
+ ackRequested.serializeTo(soapMessage);
+ data.put(msgQName, ackRequested);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
- if (rmConstants.getTerminateSequenceQName().equals(operation))
- {
- RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
- TerminateSequence terminateSequence = rmFactory.newTerminateSequence();
- terminateSequence.setIdentifier(sequenceImpl.getId());
- terminateSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
- terminateSequence.serializeTo(soapMessage);
-
- List<Serializable> data = new LinkedList<Serializable>();
- data.add(terminateSequence);
- rmRequestContext.put(RMConstant.DATA, data);
-
- return true;
- }
+ msgQName = rmConstants.getCloseSequenceQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize CloseSequence to message
+ RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
+ CloseSequence closeSequence = rmFactory.newCloseSequence();
+ closeSequence.setIdentifier(sequenceImpl.getId());
+ closeSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
+ closeSequence.serializeTo(soapMessage);
+ data.put(msgQName, closeSequence);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
}
- else
+
+ msgQName = rmConstants.getCloseSequenceResponseQName();
+ if (outMsgs.contains(msgQName))
{
- throw new IllegalStateException();
+ // try to serialize CloseSequenceResponse to message
+ RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
+ CloseSequenceResponse closeSequenceResponse = rmFactory.newCloseSequenceResponse();
+ closeSequenceResponse.setIdentifier(sequenceImpl.getId());
+ data.put(msgQName, closeSequenceResponse);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
}
+ msgQName = rmConstants.getTerminateSequenceQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize TerminateSequence to message
+ RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
+ TerminateSequence terminateSequence = rmFactory.newTerminateSequence();
+ terminateSequence.setIdentifier(sequenceImpl.getId());
+ terminateSequence.setLastMsgNumber(sequenceImpl.getLastMessageNumber());
+ terminateSequence.serializeTo(soapMessage);
+ data.put(msgQName, terminateSequence);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
+
+ msgQName = rmConstants.getTerminateSequenceResponseQName();
+ if (outMsgs.contains(msgQName))
+ {
+ // try to serialize terminateSequenceResponse to message
+ RMSequenceImpl sequenceImpl = (RMSequenceImpl)rmRequestContext.get(RMConstant.SEQUENCE_REFERENCE);
+ TerminateSequenceResponse terminateSequenceResponse = rmFactory.newTerminateSequenceResponse();
+ terminateSequenceResponse.setIdentifier(sequenceImpl.getId());
+ data.put(msgQName, terminateSequenceResponse);
+ log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
+ }
+
+ // TODO: implement SequenceAcknowledgement handler part
+
return true;
}
protected boolean handleInbound(MessageContext msgContext)
{
- log.debug("WS-RM handleInbound");
+ log.debug("handling inbound message");
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- // TODO: inspect operation type different way - don't forget on piggy-backing
- Map rmRequestContext = (Map)msgContext.get(RMConstant.REQUEST_CONTEXT);
- QName operation = (QName)rmRequestContext.get(RMConstant.OPERATION_QNAME);
- if (rmConstants.getCreateSequenceQName().equals(operation))
+ Map rmResponseContext = new HashMap();
+ List<QName> messages = new LinkedList<QName>();
+ rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, messages);
+ Map<QName, Serializable> data = new HashMap<QName, Serializable>();
+ rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES_MAPPING, data);
+ msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext);
+ msgContext.setScope(RMConstant.RESPONSE_CONTEXT, Scope.APPLICATION);
+
+ try
{
- CreateSequenceResponse createSequenceResponse = rmFactory.newCreateSequenceResponse();
- createSequenceResponse.deserializeFrom(soapMessage);
- List<Serializable> data = new LinkedList<Serializable>();
- data.add(createSequenceResponse);
- Map rmResponseContext = new HashMap();
- rmResponseContext.put(RMConstant.OPERATION_QNAME, rmConstants.getCreateSequenceResponseQName());
- rmResponseContext.put(RMConstant.DATA, data);
- msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext);
- msgContext.setScope(RMConstant.RESPONSE_CONTEXT, Scope.APPLICATION);
+ // try to deserialize CreateSequenceResponse from message
+ QName msgQName = rmConstants.getCreateSequenceResponseQName();
+ CreateSequenceResponse wsrmMsg = rmFactory.newCreateSequenceResponse();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
}
+ catch (RMException ignore) {}
+
+ try
+ {
+ // try to deserialize AckRequested from message
+ QName msgQName = rmConstants.getAckRequestedQName();
+ AckRequested wsrmMsg = rmFactory.newAckRequested();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+
+ try
+ {
+ // try to deserialize Sequence from message
+ QName msgQName = rmConstants.getSequenceQName();
+ Sequence wsrmMsg = rmFactory.newSequence();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+
+ try
+ {
+ // try to deserialize SequenceAcknowledgement from message
+ QName msgQName = rmConstants.getSequenceAcknowledgementQName();
+ SequenceAcknowledgement wsrmMsg = rmFactory.newSequenceAcknowledgement();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+ try
+ {
+ // try to deserialize CloseSequence from message
+ QName msgQName = rmConstants.getCloseSequenceQName();
+ CloseSequence wsrmMsg = rmFactory.newCloseSequence();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+
+ try
+ {
+ // try to deserialize CloseSequence from message
+ QName msgQName = rmConstants.getCloseSequenceResponseQName();
+ CloseSequenceResponse wsrmMsg = rmFactory.newCloseSequenceResponse();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+
+ try
+ {
+ // try to deserialize TerminateSequence from message
+ QName msgQName = rmConstants.getTerminateSequenceQName();
+ TerminateSequence wsrmMsg = rmFactory.newTerminateSequence();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+
+ try
+ {
+ // try to deserialize TerminateSequenceResponse from message
+ QName msgQName = rmConstants.getTerminateSequenceResponseQName();
+ TerminateSequenceResponse wsrmMsg = rmFactory.newTerminateSequenceResponse();
+ wsrmMsg.deserializeFrom(soapMessage);
+ messages.add(msgQName);
+ data.put(msgQName, wsrmMsg);
+ log.debug(msgQName.getLocalPart() + " WSRM message was deserialized from payload");
+ }
+ catch (RMException ignore) {}
+
+ // TODO: implement SequenceFault deserialization
+
+ if (data.size() == 0)
+ throw new RMException("RM handler was not able to find WS-RM message in the payload");
+
return true;
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMConstant.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -1,8 +1,10 @@
package org.jboss.ws.extensions.wsrm;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import javax.xml.namespace.QName;
import javax.xml.ws.addressing.AddressingBuilder;
@@ -21,35 +23,36 @@
public static final String SERIALIZATION_CONTEXT = PREFIX + ".serializationContext";
public static final String REMOTING_INVOCATION_CONTEXT = PREFIX + ".remotingInvocationContext";
public static final String REMOTING_CONFIGURATION_CONTEXT = PREFIX + ".remotingConfigurationContext";
- public static final String OPERATION_QNAME = PREFIX + ".operationType";
public static final String REQUEST_CONTEXT = PREFIX + ".requestContext";
public static final String RESPONSE_CONTEXT = PREFIX + ".responseContext";
public static final String SEQUENCE_REFERENCE = PREFIX + ".sequenceReference";
- public static final String DATA = PREFIX + ".data";
+ public static final String PROTOCOL_MESSAGES = PREFIX + ".protocolMessages";
+ public static final String PROTOCOL_MESSAGES_MAPPING = PREFIX + ".protocolMessagesMapping";
// WS-Addressing related actions
public static final String CREATE_SEQUENCE_WSA_ACTION;
public static final String CLOSE_SEQUENCE_WSA_ACTION;
public static final String TERMINATE_SEQUENCE_WSA_ACTION;
- public static final List<QName> PROTOCOL_OPERATION_QNAMES;
+ public static final Set<QName> PROTOCOL_OPERATION_QNAMES;
public static final String WSA_ANONYMOUS_URI = AddressingBuilder.getAddressingBuilder().newAddressingConstants().getAnonymousURI();
public static final String WSA_MESSAGE_ID = PREFIX + ".wsaMessageId";
static
{
- LinkedList<QName> temp = new LinkedList<QName>();
+ Set<QName> temp = new HashSet<QName>();
Constants constants = Provider.get().getConstants();
+ temp.add(constants.getSequenceQName());
+ temp.add(constants.getSequenceFaultQName());
+ temp.add(constants.getAcknowledgementRangeQName());
+ temp.add(constants.getAckRequestedQName());
temp.add(constants.getCreateSequenceQName());
temp.add(constants.getCreateSequenceResponseQName());
- temp.add(constants.getSequenceQName());
- temp.add(constants.getAckRequestedQName());
temp.add(constants.getCloseSequenceQName());
- temp.add(constants.getSequenceAcknowledgementQName());
temp.add(constants.getCloseSequenceResponseQName());
temp.add(constants.getTerminateSequenceQName());
temp.add(constants.getTerminateSequenceResponseQName());
- PROTOCOL_OPERATION_QNAMES = Collections.unmodifiableList(temp);
+ PROTOCOL_OPERATION_QNAMES = Collections.unmodifiableSet(temp);
CREATE_SEQUENCE_WSA_ACTION = Provider.get().getConstants().getNamespaceURI() + "/CreateSequence";
CLOSE_SEQUENCE_WSA_ACTION = Provider.get().getConstants().getNamespaceURI() + "/CloseSequence";
TERMINATE_SEQUENCE_WSA_ACTION = Provider.get().getConstants().getNamespaceURI() + "/TerminateSequence";
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -6,7 +6,10 @@
import java.util.List;
import java.util.Map;
+import javax.xml.namespace.QName;
+
import org.jboss.logging.Logger;
+import org.jboss.ws.extensions.wsrm.spi.Provider;
import org.jboss.ws.extensions.wsrm.spi.protocol.CreateSequence;
import org.jboss.ws.extensions.wsrm.spi.protocol.Serializable;
@@ -38,11 +41,13 @@
{
Map<String, Object> invocationCtx = (Map<String, Object>)rmRequest.getMetadata().getContext(INVOCATION_CONTEXT);
Map<String, Object> wsrmRequestCtx = (Map<String, Object>)invocationCtx.get(REQUEST_CONTEXT);
- List<Serializable> wsrmMessages = (List<Serializable>)wsrmRequestCtx.get(DATA);
+ List<Serializable> outMsgs = (List<Serializable>)wsrmRequestCtx.get(PROTOCOL_MESSAGES);
+ Map<QName, Serializable> msgs = (Map<QName, Serializable>)wsrmRequestCtx.get(PROTOCOL_MESSAGES_MAPPING);
+ QName createSequenceQName = Provider.get().getConstants().getCreateSequenceQName();
URI retVal = null;
- if (wsrmMessages.get(0) instanceof CreateSequence)
+ if (outMsgs.contains(createSequenceQName))
{
- CreateSequence cs = (CreateSequence)wsrmMessages.get(0);
+ CreateSequence cs = (CreateSequence)msgs.get(createSequenceQName);
try
{
retVal = RMConstant.WSA_ANONYMOUS_URI.equals(cs.getAcksTo()) ? null : new URI(cs.getAcksTo());;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMSequenceImpl.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -23,6 +23,8 @@
import java.net.URI;
import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
@@ -155,7 +157,9 @@
// prepare WS-RM request context
QName terminateSequenceQN = Provider.get().getConstants().getTerminateSequenceQName();
Map rmRequestContext = new HashMap();
- rmRequestContext.put(RMConstant.OPERATION_QNAME, terminateSequenceQN);
+ List outMsgs = new LinkedList();
+ outMsgs.add(terminateSequenceQN);
+ rmRequestContext.put(RMConstant.PROTOCOL_MESSAGES, outMsgs);
rmRequestContext.put(RMConstant.SEQUENCE_REFERENCE, client.getWSRMSequence());
// set up method invocation context
Map requestContext = client.getBindingProvider().getRequestContext();
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/backchannel/RMBackPortsServer.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/backchannel/RMBackPortsServer.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/backchannel/RMBackPortsServer.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -185,7 +185,7 @@
{
INSTANCE = new RMBackPortsServer(scheme, host, (port == -1) ? 80 : port);
// forking back ports server
- Thread t = new Thread(INSTANCE);
+ Thread t = new Thread(INSTANCE, "RMBackPortsServer");
t.setDaemon(true);
t.start();
// registering shutdown hook
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/EndpointEmulator.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -27,10 +27,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.net.HttpURLConnection;
import java.net.Socket;
import java.net.URL;
-import java.net.URLConnection;
import java.util.List;
import java.util.Map;
@@ -138,7 +136,7 @@
URL url = new URL(responseTo);
Socket socket = new Socket(url.getHost(), url.getPort());
OutputStream out = socket.getOutputStream();
- out.write(Util.createHTTPHeaders(url, responseMessage.length()));
+ out.write(Util.createHTTPHeaders(url, responseMessage.length(), view.getResponse().getContentType()));
out.write(responseMessage.getBytes());
out.flush();
out.close();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/emulator/Util.java 2007-11-26 12:18:41 UTC (rev 5110)
@@ -68,11 +68,11 @@
private static final String CRLF = "\r\n";
- public static byte[] createHTTPHeaders(URL url, int payloadLength)
+ public static byte[] createHTTPHeaders(URL url, int payloadLength, String contentType)
{
StringBuilder sb = new StringBuilder();
sb.append("POST " + url.getPath() + " HTTP/1.1" + CRLF);
- sb.append("Content-Type: text/xml" + CRLF);
+ sb.append("Content-Type: " + contentType + CRLF);
sb.append("Host: " + url.getHost() + ":" + url.getPort() + CRLF);
sb.append("Content-Length: " + payloadLength + CRLF);
sb.append(CRLF);
Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties 2007-11-26 11:26:17 UTC (rev 5109)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/properties/ReqResTestCase.properties 2007-11-26 12:18:41 UTC (rev 5110)
@@ -4,4 +4,4 @@
#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
archives=jaxws-wsrm-req-res-emulator.war, jaxws-wsrm-client.jar
emulator=true
-addressable=true
\ No newline at end of file
+addressable=true
16 years, 5 months
- 1
- 0
JBossWS SVN: r5109 - in rest: src/main/java/org/jboss/rest and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-26 06:26:17 -0500 (Mon, 26 Nov 2007)
New Revision: 5109
Added:
rest/src/main/java/org/jboss/rest/jaxrs/
rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java
Removed:
rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java
Modified:
rest/jboss-rest.iws
rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java
rest/src/main/java/org/jboss/rest/model/ParameterBinding.java
rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory
rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java
Log:
Added jaxrs package that contains all 311 SPI artifacts
Modified: rest/jboss-rest.iws
===================================================================
--- rest/jboss-rest.iws 2007-11-26 11:22:07 UTC (rev 5108)
+++ rest/jboss-rest.iws 2007-11-26 11:26:17 UTC (rev 5109)
@@ -17,30 +17,19 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/MediaTypeProvider.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.ipr" afterPath="$PROJECT_DIR$/jboss-rest.ipr" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" />
<change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookStoreResource.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookStoreResource.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/util/Convert.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/util/Convert.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceMethod.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceMethod.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.iws" afterPath="$PROJECT_DIR$/jboss-rest.iws" />
</list>
</component>
@@ -223,98 +212,7 @@
</subPane>
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="ParameterBinding.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Widget.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="WidgetList.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="InvocationMediator.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ResourceServlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MediaTypeTestCase.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="InvocationBuilderTestCase.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="107" column="75" selection-start="4161" selection-end="4161" vertical-scroll-proportion="0.21506684">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="RuntimeContext.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ResponseBuilderImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="BookResource.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -835,13 +733,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/container" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -906,6 +800,7 @@
<recent name="" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.rest.jaxrs" />
<recent name="org.jboss.test.rest.samples.resourceview" />
<recent name="org.jboss.wsf.container.jboss50.rest" />
<recent name="org.jboss.rs.container.wsf" />
@@ -1098,13 +993,13 @@
</component>
<component name="ToolWindowManager">
<frame x="3" y="25" width="1674" height="994" extended-state="2" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4498861" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44954127" order="1" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="3" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -1117,7 +1012,7 @@
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.74943054" order="8" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28676924" order="0" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28676924" order="0" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1563458" order="2" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48063782" order="2" />
@@ -1228,86 +1123,86 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state line="48" column="0" selection-start="1355" selection-end="1355" vertical-scroll-proportion="0.6993604">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java">
+ <entry file="jar:///home/hbraun/Desktop/JSR-311/0.5/lib/jsr311-api.jar!/javax/ws/rs/core/EntityTag.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303">
+ <state line="5" column="13" selection-start="154" selection-end="154" vertical-scroll-proportion="0.16204691">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144">
+ <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238">
+ <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778">
+ <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166">
+ <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///home/hbraun/Desktop/JSR-311/0.5/lib/jsr311-api.jar!/javax/ws/rs/core/EntityTag.class">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="154" selection-end="154" vertical-scroll-proportion="0.16204691">
+ <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007">
+ <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118">
+ <state line="112" column="40" selection-start="4346" selection-end="4346" vertical-scroll-proportion="0.3304982">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921">
+ <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java">
+ <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567">
+ <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="75" selection-start="4161" selection-end="4161" vertical-scroll-proportion="0.21506684">
+ <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007">
<folding />
</state>
</provider>
Modified: rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java
===================================================================
--- rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-26 11:22:07 UTC (rev 5108)
+++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-26 11:26:17 UTC (rev 5109)
@@ -26,7 +26,7 @@
import org.jboss.rest.ResourceError;
import org.jboss.rest.ResourceRegistry;
import org.jboss.rest.ResourceRegistryFactory;
-import org.jboss.rest.media.DefaultProviderFactory;
+import org.jboss.rest.jaxrs.ProviderFactoryImpl;
import org.jboss.rest.model.ResourceModel;
import org.jboss.rest.runtime.InvocationMediator;
import org.jboss.rest.runtime.RuntimeContext;
@@ -124,7 +124,7 @@
// OK
res.setStatus(200);
- ProviderFactory providerfactory = DefaultProviderFactory.newInstance();
+ ProviderFactory providerfactory = ProviderFactoryImpl.newInstance();
MessageBodyWriter writer = providerfactory.createMessageBodyWriter(returnValue.getClass(), null);
OutputStream out = res.getOutputStream();
writer.writeTo(returnValue, null, null, out);
Copied: rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java (from rev 5107, rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java)
===================================================================
--- rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java (rev 0)
+++ rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java 2007-11-26 11:26:17 UTC (rev 5109)
@@ -0,0 +1,110 @@
+package org.jboss.rest.jaxrs;
+
+import org.jboss.rest.media.simple.StringProvider;
+import org.jboss.rest.media.xml.JAXBProvider;
+import org.jboss.rest.media.MediaTypeProvider;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.HeaderProvider;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.ProviderFactory;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Prelimenary solution.
+ *
+ * TODO: Provide a scoped (classloading) reader/writer registry that this class can delegate to.
+ */
+public class ProviderFactoryImpl extends ProviderFactory
+{
+
+ private static List<MessageBodyReader> reader = new ArrayList<MessageBodyReader>();
+ private static List<MessageBodyWriter> writer = new ArrayList<MessageBodyWriter>();
+ private static List<HeaderProvider> headerProvider = new ArrayList<HeaderProvider>();
+
+ static final JAXBProvider JAXB = new JAXBProvider();
+ static final StringProvider STRING = new StringProvider();
+ static final MediaTypeProvider MEDIA_TYPE = new MediaTypeProvider();
+
+ static
+ {
+ reader.add( JAXB );
+ reader.add( STRING );
+
+ writer.add( JAXB );
+ writer.add( STRING );
+
+ headerProvider.add(MEDIA_TYPE);
+ }
+
+ public static ProviderFactory newInstance()
+ {
+ return new ProviderFactoryImpl();
+ }
+
+ public <T> T createInstance(Class<T> aClass)
+ {
+ throw new IllegalArgumentException("Cannot create instance for " + aClass);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> HeaderProvider<T> createHeaderProvider(Class<T> aClass)
+ {
+ HeaderProvider<T> provider = null;
+
+ for(HeaderProvider h : headerProvider)
+ {
+ if(h.supports(aClass))
+ {
+ provider = h;
+ break;
+ }
+ }
+
+ if(null==provider)
+ throw new IllegalArgumentException("No header provider for type: " + aClass);
+
+ return provider;
+ }
+
+ public <T> MessageBodyReader<T> createMessageBodyReader(Class<T> aClass, MediaType mediaType)
+ {
+ MessageBodyReader match = null;
+
+ for(MessageBodyReader r : reader)
+ {
+ if(r.isReadable(aClass))
+ {
+ match = r;
+ break;
+ }
+ }
+
+ if(null==match)
+ throw new RuntimeException("No reader for type: " + aClass + ", mediaType="+mediaType);
+
+ return match;
+ }
+
+ public <T> MessageBodyWriter<T> createMessageBodyWriter(Class<T> aClass, MediaType mediaType)
+ {
+ MessageBodyWriter match = null;
+
+ for(MessageBodyWriter w : writer)
+ {
+ if(w.isWriteable(aClass))
+ {
+ match = w;
+ break;
+ }
+ }
+
+ if(null==match)
+ throw new RuntimeException("No writer for type: " + aClass + ", mediaType="+mediaType);
+
+ return match;
+ }
+}
Property changes on: rest/src/main/java/org/jboss/rest/jaxrs/ProviderFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java
===================================================================
--- rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java 2007-11-26 11:22:07 UTC (rev 5108)
+++ rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java 2007-11-26 11:26:17 UTC (rev 5109)
@@ -1,109 +0,0 @@
-package org.jboss.rest.media;
-
-import org.jboss.rest.media.simple.StringProvider;
-import org.jboss.rest.media.xml.JAXBProvider;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.HeaderProvider;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.ProviderFactory;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Prelimenary solution.
- *
- * TODO: Provide a scoped (classloading) reader/writer registry that this class can delegate to.
- */
-public class DefaultProviderFactory extends ProviderFactory
-{
-
- private static List<MessageBodyReader> reader = new ArrayList<MessageBodyReader>();
- private static List<MessageBodyWriter> writer = new ArrayList<MessageBodyWriter>();
- private static List<HeaderProvider> headerProvider = new ArrayList<HeaderProvider>();
-
- static final JAXBProvider JAXB = new JAXBProvider();
- static final StringProvider STRING = new StringProvider();
- static final MediaTypeProvider MEDIA_TYPE = new MediaTypeProvider();
-
- static
- {
- reader.add( JAXB );
- reader.add( STRING );
-
- writer.add( JAXB );
- writer.add( STRING );
-
- headerProvider.add(MEDIA_TYPE);
- }
-
- public static ProviderFactory newInstance()
- {
- return new DefaultProviderFactory();
- }
-
- public <T> T createInstance(Class<T> aClass)
- {
- throw new IllegalArgumentException("Cannot create instance for " + aClass);
- }
-
- @SuppressWarnings("unchecked")
- public <T> HeaderProvider<T> createHeaderProvider(Class<T> aClass)
- {
- HeaderProvider<T> provider = null;
-
- for(HeaderProvider h : headerProvider)
- {
- if(h.supports(aClass))
- {
- provider = h;
- break;
- }
- }
-
- if(null==provider)
- throw new IllegalArgumentException("No header provider for type: " + aClass);
-
- return provider;
- }
-
- public <T> MessageBodyReader<T> createMessageBodyReader(Class<T> aClass, MediaType mediaType)
- {
- MessageBodyReader match = null;
-
- for(MessageBodyReader r : reader)
- {
- if(r.isReadable(aClass))
- {
- match = r;
- break;
- }
- }
-
- if(null==match)
- throw new RuntimeException("No reader for type: " + aClass + ", mediaType="+mediaType);
-
- return match;
- }
-
- public <T> MessageBodyWriter<T> createMessageBodyWriter(Class<T> aClass, MediaType mediaType)
- {
- MessageBodyWriter match = null;
-
- for(MessageBodyWriter w : writer)
- {
- if(w.isWriteable(aClass))
- {
- match = w;
- break;
- }
- }
-
- if(null==match)
- throw new RuntimeException("No writer for type: " + aClass + ", mediaType="+mediaType);
-
- return match;
- }
-}
Modified: rest/src/main/java/org/jboss/rest/model/ParameterBinding.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 11:22:07 UTC (rev 5108)
+++ rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 11:26:17 UTC (rev 5109)
@@ -23,7 +23,7 @@
import org.jboss.logging.Logger;
import org.jboss.rest.MethodHTTP;
-import org.jboss.rest.media.DefaultProviderFactory;
+import org.jboss.rest.jaxrs.ProviderFactoryImpl;
import org.jboss.rest.runtime.ContextAdapterBuilder;
import org.jboss.rest.runtime.Invocation;
import org.jboss.rest.runtime.InvocationModel;
@@ -165,7 +165,7 @@
try
{
// unmarshall body
- ProviderFactory providerfactory = DefaultProviderFactory.newInstance();
+ ProviderFactory providerfactory = ProviderFactoryImpl.newInstance();
MessageBodyReader reader = providerfactory.createMessageBodyReader(entityBodyType, null);
Object messageBody = reader.readFrom(entityBodyType, null, null, ctx.getInStream() );
Modified: rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory
===================================================================
--- rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory 2007-11-26 11:22:07 UTC (rev 5108)
+++ rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory 2007-11-26 11:26:17 UTC (rev 5109)
@@ -1 +1 @@
-org.jboss.rest.media.DefaultProviderFactory
\ No newline at end of file
+org.jboss.rest.jaxrs.ProviderFactoryImpl
\ No newline at end of file
Modified: rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-26 11:22:07 UTC (rev 5108)
+++ rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-26 11:26:17 UTC (rev 5109)
@@ -1,7 +1,7 @@
package org.jboss.test.rest.media;
import junit.framework.Test;
-import org.jboss.rest.media.DefaultProviderFactory;
+import org.jboss.rest.jaxrs.ProviderFactoryImpl;
import org.jboss.rest.MethodHTTP;
import org.jboss.test.rest.util.RestCase;
import org.jboss.test.rest.util.RestTestSetup;
@@ -60,7 +60,7 @@
private Object executeRequest(URL url, MethodHTTP method, Object data) throws Exception
{
- ProviderFactory providerFactory = DefaultProviderFactory.newInstance();
+ ProviderFactory providerFactory = ProviderFactoryImpl.newInstance();
HttpURLConnection conn = (HttpURLConnection)url.openConnection();
conn.setDoOutput( data!=null );
16 years, 5 months
- 1
- 0
JBossWS SVN: r5108 - rest.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-26 06:22:07 -0500 (Mon, 26 Nov 2007)
New Revision: 5108
Added:
rest/ROADMAP.txt
Log:
Todo list
Added: rest/ROADMAP.txt
===================================================================
--- rest/ROADMAP.txt (rev 0)
+++ rest/ROADMAP.txt 2007-11-26 11:22:07 UTC (rev 5108)
@@ -0,0 +1,14 @@
+beta1
+ - complete SPI impl (Response.Builder)
+ - (unmarshall message body)
+ - header injection
+ - query and matrix param
+ - pluggable reader/writer through config
+beta2
+ - standalone deployment
+ - container abstraction, SPI
+CR1
+ - EJB3 endpoints
+CR2
+ - resource injection for servlet and ejb endpoints
+
Property changes on: rest/ROADMAP.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 5 months
- 1
- 0
JBossWS SVN: r5107 - in rest: src/main/java/org/jboss/rest/container/wsf and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-26 06:20:31 -0500 (Mon, 26 Nov 2007)
New Revision: 5107
Added:
rest/src/main/java/org/jboss/rest/media/MediaTypeProvider.java
rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory
Removed:
rest/src/test/java/org/jboss/test/rest/model/RunRegex.java
Modified:
rest/jboss-rest.ipr
rest/jboss-rest.iws
rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java
rest/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java
rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java
rest/src/main/java/org/jboss/rest/model/ParameterBinding.java
rest/src/main/java/org/jboss/rest/model/ResourceMethod.java
rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java
rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java
rest/src/main/java/org/jboss/rest/runtime/RuntimeContext.java
rest/src/main/java/org/jboss/rest/util/Convert.java
rest/src/test/java/org/jboss/test/rest/WidgetList.java
rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java
rest/src/test/java/org/jboss/test/rest/media/BookResource.java
rest/src/test/java/org/jboss/test/rest/media/BookStoreResource.java
rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java
Log:
First provider factory impl, added entity body binding
Modified: rest/jboss-rest.ipr
===================================================================
--- rest/jboss-rest.ipr 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/jboss-rest.ipr 2007-11-26 11:20:31 UTC (rev 5107)
@@ -252,6 +252,7 @@
</component>
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file:///home/hbraun/Desktop/JSR-311/0.5/examples/Jersey-Examples.iml" filepath="/home/hbraun/Desktop/JSR-311/0.5/examples/Jersey-Examples.iml" />
<module fileurl="file://$PROJECT_DIR$/jboss-rest.iml" filepath="$PROJECT_DIR$/jboss-rest.iml" />
<module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" />
<module fileurl="file:///home/hbraun/dev/prj/jbossws/spi/trunk/spi.iml" filepath="/home/hbraun/dev/prj/jbossws/spi/trunk/spi.iml" />
Modified: rest/jboss-rest.iws
===================================================================
--- rest/jboss-rest.iws 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/jboss-rest.iws 2007-11-26 11:20:31 UTC (rev 5107)
@@ -17,36 +17,30 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/samples" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java" afterPath="" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/MediaTypeProvider.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ant-import-tests/build-testsuite.xml" afterPath="$PROJECT_DIR$/ant-import-tests/build-testsuite.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ant-import/macros-deploy-rs.xml" afterPath="$PROJECT_DIR$/ant-import/macros-deploy-rs.xml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/ant-import-tests/build-jars-jaxws.xml" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/index.html" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/index.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/distro/bin-dist-build.xml" afterPath="$PROJECT_DIR$/src/main/distro/bin-dist-build.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.ipr" afterPath="$PROJECT_DIR$/jboss-rest.ipr" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" />
<change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookStoreResource.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookStoreResource.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/util/Convert.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/util/Convert.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceMethod.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ResourceMethod.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java" />
<change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.iws" afterPath="$PROJECT_DIR$/jboss-rest.iws" />
</list>
</component>
@@ -119,8 +113,8 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" line="72" class="org.jboss.rest.container.wsf.ModelDeploymentAspect" package="org.jboss.rest.container.wsf">
- <option name="ENABLED" value="true" />
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java" line="32" class="org.jboss.rest.runtime.InvocationMediator" package="org.jboss.rest.runtime">
+ <option name="ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -132,7 +126,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java" line="101" class="org.jboss.wsf.container.jboss50.ArchiveDeployerHook" package="org.jboss.wsf.container.jboss50">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" line="96" class="org.jboss.rest.container.wsf.ResourceServlet" package="org.jboss.rest.container.wsf">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -145,7 +139,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java" line="81" class="org.jboss.wsf.container.jboss50.ArchiveDeployerHook" package="org.jboss.wsf.container.jboss50">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java" line="167" class="org.jboss.rest.model.ParameterBinding" package="org.jboss.rest.model">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -206,8 +200,8 @@
<property name="field_breakpoints_groupByClasses" value="true" />
<property name="method_breakpoints_groupByClasses" value="true" />
<property name="exception_breakpoints_viewId" value="TABLE" />
+ <property name="field_breakpoints_viewId" value="TABLE" />
<property name="exception_breakpoints_groupByClasses" value="true" />
- <property name="field_breakpoints_viewId" value="TABLE" />
<property name="method_breakpoints_groupByMethods" value="false" />
</ui_properties>
</component>
@@ -218,45 +212,108 @@
<component name="FavoritesManager">
<favorites_list name="jboss-rest" />
</component>
- <component name="FavoritesProjectViewPane" />
+ <component name="FavoritesProjectViewPane">
+ <subPane subId="jboss-rest">
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="ResourceRegistry.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java">
+ <file leaf-file-name="ParameterBinding.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="13" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.24675325">
+ <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="build-jars-rest.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml">
+ <file leaf-file-name="Widget.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="88" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.72596157">
+ <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DeploymentTestCase.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java">
+ <file leaf-file-name="WidgetList.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="51" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.11216056">
+ <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="InvocationMediator.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ResourceServlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="MediaTypeTestCase.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="51" selection-start="849" selection-end="849" vertical-scroll-proportion="0.08028335">
+ <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="InvocationBuilderTestCase.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="107" column="75" selection-start="4161" selection-end="4161" vertical-scroll-proportion="0.21506684">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RuntimeContext.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ResponseBuilderImpl.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="BookResource.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -419,10 +476,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -446,23 +499,23 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples/resourceview" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -488,13 +541,29 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -537,28 +606,10 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="jboss-rest.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss-rest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -612,9 +663,17 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest-context.war" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest.jar" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest.jar/META-INF/services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -638,17 +697,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest-context.war" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -687,6 +750,10 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -726,7 +793,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/model" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/media" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -768,11 +835,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/model" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/container" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -798,24 +865,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss-rest.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss-rest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/ant-import-tests" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -829,7 +878,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -838,8 +887,8 @@
<component name="PropertiesComponent">
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
<property name="RunManagerConfig.compileBeforeRunning" value="false" />
- <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
<property name="MemberChooser.sorted" value="false" />
<property name="last_opened_file_path" value="/home/hbraun/dev/prj/jbossas/trunk/build" />
<property name="MemberChooser.showClasses" value="true" />
@@ -853,6 +902,9 @@
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="org.jboss.test.rest.util" />
</key>
+ <key name="IntroduceConstantDialog.RECENTS_KEY">
+ <recent name="" />
+ </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="org.jboss.test.rest.samples.resourceview" />
<recent name="org.jboss.wsf.container.jboss50.rest" />
@@ -860,22 +912,26 @@
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="Application.RunRegex">
- <tempConfiguration default="false" name="RunRegex" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" value="org.jboss.test.rest.model.RunRegex" />
+ <component name="RunManager" selected="Remote.client">
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
+ <option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="jboss-rest" />
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Run" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
<method>
<option name="Make" value="true" />
</method>
- </tempConfiguration>
+ </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -888,6 +944,13 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -901,28 +964,23 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
- <module name="" />
+ <configuration default="false" name="RunRegex" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" value="org.jboss.test.rest.model.RunRegex" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="jboss-rest" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="38109" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
<method>
<option name="Make" value="true" />
</method>
@@ -943,12 +1001,37 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="false" name="client" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="5005" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Debug" />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
</configuration>
</component>
- <component name="ScopeViewComponent" />
+ <component name="ScopeViewComponent">
+ <subPane subId="Project">
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </component>
<component name="SelectInManager" />
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
@@ -1014,7 +1097,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-3" y="25" width="1686" height="1003" extended-state="6" />
+ <frame x="3" y="25" width="1674" height="994" extended-state="2" />
<editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
@@ -1022,7 +1105,7 @@
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4498861" order="1" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39863327" order="3" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="3" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
@@ -1034,10 +1117,10 @@
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.74943054" order="8" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29368487" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28676924" order="0" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1563458" order="2" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32914287" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48063782" order="2" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
@@ -1116,112 +1199,119 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="spi" />
+ <option name="myLastEditedConfigurable" value="Jersey-Examples" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/AbstractResourceOperation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="13" selection-start="1586" selection-end="1586" vertical-scroll-proportion="0.1794569">
+ <state line="49" column="44" selection-start="1446" selection-end="1446" vertical-scroll-proportion="0.47044632">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="83" selection-start="2851" selection-end="2986" vertical-scroll-proportion="0.40023613">
+ <state line="57" column="0" selection-start="1920" selection-end="1920" vertical-scroll-proportion="0.799514">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/rest/RestDeployerHookPostJSE.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/DefaultInvocationBuilder.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="76" selection-start="1701" selection-end="1701" vertical-scroll-proportion="0.6505313">
+ <state line="33" column="0" selection-start="1286" selection-end="1286" vertical-scroll-proportion="0.30012152">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="0" selection-start="456" selection-end="456" vertical-scroll-proportion="0.29161748">
+ <state line="48" column="0" selection-start="1355" selection-end="1355" vertical-scroll-proportion="0.6993604">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java">
+ <entry file="file:///home/hbraun/Desktop/JSR-311/0.5/src/com/sun/ws/rest/impl/ResponseBuilderImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="13" selection-start="1619" selection-end="1619" vertical-scroll-proportion="-0.08972845">
+ <state line="52" column="66" selection-start="1923" selection-end="1923" vertical-scroll-proportion="-0.60024303">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/jboss-web.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/InvocationMediator.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="65" column="0" selection-start="2362" selection-end="2362" vertical-scroll-proportion="0.75334144">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="0" selection-start="44" selection-end="44" vertical-scroll-proportion="0.022432113">
+ <state line="55" column="6" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.6148238">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="99" column="17" selection-start="3734" selection-end="3734" vertical-scroll-proportion="0.41433778">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/runtime/RuntimeContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="51" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.11216056">
+ <state line="63" column="32" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.48481166">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
+ <entry file="jar:///home/hbraun/Desktop/JSR-311/0.5/lib/jsr311-api.jar!/javax/ws/rs/core/EntityTag.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="51" selection-start="849" selection-end="849" vertical-scroll-proportion="0.08028335">
+ <state line="5" column="13" selection-start="154" selection-end="154" vertical-scroll-proportion="0.16204691">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/BookResource.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="88" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.72596157">
+ <state line="76" column="60" selection-start="1371" selection-end="1371" vertical-scroll-proportion="0.63791007">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/ParameterBinding.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="25" selection-start="324" selection-end="324" vertical-scroll-proportion="0.26918536">
+ <state line="168" column="0" selection-start="5574" selection-end="5574" vertical-scroll-proportion="0.18688118">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/Widget.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="18" selection-start="408" selection-end="408" vertical-scroll-proportion="0.022836538">
+ <state line="34" column="13" selection-start="1304" selection-end="1304" vertical-scroll-proportion="0.07654921">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/WidgetList.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="13" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.24675325">
+ <state line="47" column="11" selection-start="1585" selection-end="1585" vertical-scroll-proportion="0.5771567">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="107" column="75" selection-start="4161" selection-end="4161" vertical-scroll-proportion="0.21506684">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified: rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java
===================================================================
--- rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -95,9 +95,10 @@
{
// construct a runtime context
URI uri = new URI(req.getRequestURI());
- RuntimeContext rt = new RuntimeContext(method, uri, rootResources);
- parseAcceptHeader(req, rt);
-
+ RuntimeContext rt = new RuntimeContext(method, uri, rootResources);
+ parseMimeHeader(req, rt);
+ rt.setInStream(req.getInputStream());
+
// mediate the invocation
InvocationMediator mediator = new InvocationMediator(rt);
Object invocationResult = mediator.invoke();
@@ -115,32 +116,56 @@
returnValue = invocationResult;
}
- // response meta data
- // write to output stream, TODO: mediatypes
- ProviderFactory providerfactory = DefaultProviderFactory.newInstance();
- MessageBodyWriter writer = providerfactory.createMessageBodyWriter(returnValue.getClass(), null);
- OutputStream out = res.getOutputStream();
- writer.writeTo(returnValue, null, null, out);
- out.flush();
- out.close();
+ // TODO: response meta data
+ // write to output stream
+ if(returnValue!=null)
+ {
+ // OK
+ res.setStatus(200);
+
+ ProviderFactory providerfactory = DefaultProviderFactory.newInstance();
+ MessageBodyWriter writer = providerfactory.createMessageBodyWriter(returnValue.getClass(), null);
+ OutputStream out = res.getOutputStream();
+ writer.writeTo(returnValue, null, null, out);
+ out.flush();
+ out.close();
+ }
+ else
+ {
+ // No content
+ res.setStatus(204);
+ }
+
}
catch(ResourceError resourceError)
{
+ log.error(resourceError);
serverError(resourceError.status, resourceError.getMessage(), res);
}
catch (Throwable e)
{
- throw new ServletException(e);
+ log.error(e);
+ serverError(500, e.getMessage(), res);
}
}
- private void parseAcceptHeader(HttpServletRequest req, RuntimeContext rt) throws ServletException {
+ private void parseMimeHeader(HttpServletRequest req, RuntimeContext rt) throws ServletException {
String requestAccept = req.getHeader("Accept");
+ String requestContentType = req.getHeader("Content-Type");
+
if(requestAccept!=null)
rt.parseAcceptHeader(requestAccept);
else
throw new ServletException("Accept header is missing");
+
+ if(req.getMethod().equals("PUT") || req.getMethod().equals("POST"))
+ {
+ if(requestContentType!=null)
+ rt.parseContentTypeHeader(requestContentType);
+ else
+ throw new ServletException("Content-Type header is missing");
+ }
}
private void serverError(int status, String message, HttpServletResponse res)
Modified: rest/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java
===================================================================
--- rest/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/media/DefaultContentNegotiation.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -28,7 +28,7 @@
import org.jboss.rest.model.ResourceMethod;
import org.jboss.rest.runtime.RuntimeContext;
-import javax.activation.MimeType;
+import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.List;
@@ -119,13 +119,13 @@
// matching by input mime only works on POST and PUT
if(MethodHTTP.POST == requestMethod || MethodHTTP.PUT == requestMethod)
{
- MimeType produceMime = context.getProvideMimeType();
+ MediaType produceMime = context.getProvideMimeType();
for(ResourceMethod candiate : candidates)
{
- for(MimeType consumeMime : candiate.getConsumeMimeTypes())
+ for(MediaType consumeMime : candiate.getConsumeMimeTypes())
{
- if(consumeMime.match(produceMime))
+ if(consumeMime.isCompatible(produceMime))
matches.add(candiate);
}
}
@@ -155,22 +155,22 @@
throws NoMethodException
{
List<ResourceMethod> matches = new ArrayList<ResourceMethod>();
- List<MimeType> requestConsumeMimes = context.getConsumeMimeTypes();
+ List<MediaType> requestAcceptMime = context.getAcceptMimeTypes();
for(ResourceMethod candiate : candidates)
{
- for(MimeType methodProduceMime : candiate.getProduceMimeTypes())
+ for(MediaType methodProduceMime : candiate.getProduceMimeTypes())
{
- for(MimeType requestConsumeMime : requestConsumeMimes)
+ for(MediaType requestConsumeMime : requestAcceptMime)
{
- if(methodProduceMime.match(requestConsumeMime))
+ if(requestConsumeMime.isCompatible(methodProduceMime))
matches.add(candiate);
}
}
}
if(matches.isEmpty())
- throw new NoMethodException(415, "No producer for " + requestConsumeMimes);
+ throw new NoMethodException(415, "No producer for " + requestAcceptMime);
return matches;
}
Modified: rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java
===================================================================
--- rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/media/DefaultProviderFactory.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -13,7 +13,8 @@
/**
- * Ugly hack.
+ * Prelimenary solution.
+ *
* TODO: Provide a scoped (classloading) reader/writer registry that this class can delegate to.
*/
public class DefaultProviderFactory extends ProviderFactory
@@ -21,9 +22,11 @@
private static List<MessageBodyReader> reader = new ArrayList<MessageBodyReader>();
private static List<MessageBodyWriter> writer = new ArrayList<MessageBodyWriter>();
+ private static List<HeaderProvider> headerProvider = new ArrayList<HeaderProvider>();
static final JAXBProvider JAXB = new JAXBProvider();
static final StringProvider STRING = new StringProvider();
+ static final MediaTypeProvider MEDIA_TYPE = new MediaTypeProvider();
static
{
@@ -32,6 +35,8 @@
writer.add( JAXB );
writer.add( STRING );
+
+ headerProvider.add(MEDIA_TYPE);
}
public static ProviderFactory newInstance()
@@ -41,12 +46,27 @@
public <T> T createInstance(Class<T> aClass)
{
- return null;
+ throw new IllegalArgumentException("Cannot create instance for " + aClass);
}
+ @SuppressWarnings("unchecked")
public <T> HeaderProvider<T> createHeaderProvider(Class<T> aClass)
{
- throw new IllegalArgumentException("Not implemented");
+ HeaderProvider<T> provider = null;
+
+ for(HeaderProvider h : headerProvider)
+ {
+ if(h.supports(aClass))
+ {
+ provider = h;
+ break;
+ }
+ }
+
+ if(null==provider)
+ throw new IllegalArgumentException("No header provider for type: " + aClass);
+
+ return provider;
}
public <T> MessageBodyReader<T> createMessageBodyReader(Class<T> aClass, MediaType mediaType)
Added: rest/src/main/java/org/jboss/rest/media/MediaTypeProvider.java
===================================================================
--- rest/src/main/java/org/jboss/rest/media/MediaTypeProvider.java (rev 0)
+++ rest/src/main/java/org/jboss/rest/media/MediaTypeProvider.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -0,0 +1,46 @@
+package org.jboss.rest.media;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.HeaderProvider;
+import java.text.ParseException;
+import java.util.StringTokenizer;
+
+public class MediaTypeProvider implements HeaderProvider<MediaType> {
+
+ public boolean supports(Class<?> type) {
+ return type==MediaType.class ? true : false;
+ }
+
+ public String toString(MediaType header) {
+ StringBuilder b = new StringBuilder();
+ b.append(header.getType());
+ b.append('/');
+ b.append(header.getSubtype());
+ for (String key: header.getParameters().keySet()) {
+ b.append(';');
+ b.append(key);
+ b.append('=');
+ b.append( header.getParameters().get(key) );
+ }
+ return b.toString();
+ }
+
+ public MediaType fromString(String header) throws ParseException {
+
+ if (header==null)
+ return new MediaType();
+
+ StringTokenizer tok = new StringTokenizer(header, "/");
+
+ assert tok.countTokens() == 2;
+
+ String type = tok. nextToken();
+ String subType = tok.nextToken();
+
+ // TODO: parameter parsing
+
+ return new MediaType(type,subType);
+ }
+
+}
+
Property changes on: rest/src/main/java/org/jboss/rest/media/MediaTypeProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: rest/src/main/java/org/jboss/rest/model/ParameterBinding.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/model/ParameterBinding.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -21,7 +21,9 @@
*/
package org.jboss.rest.model;
+import org.jboss.logging.Logger;
import org.jboss.rest.MethodHTTP;
+import org.jboss.rest.media.DefaultProviderFactory;
import org.jboss.rest.runtime.ContextAdapterBuilder;
import org.jboss.rest.runtime.Invocation;
import org.jboss.rest.runtime.InvocationModel;
@@ -30,6 +32,9 @@
import javax.ws.rs.HeaderParam;
import javax.ws.rs.UriParam;
import javax.ws.rs.core.HttpContext;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.ProviderFactory;
+import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -63,6 +68,8 @@
*/
public class ParameterBinding implements InvocationModel
{
+ private static Logger log = Logger.getLogger(ParameterBinding.class);
+
/* Pattern of the owning ResourceMethod */
private final Pattern regex;
@@ -94,6 +101,7 @@
this.regex = rootPattern;
}
+ @SuppressWarnings("unchecked")
public void accept(Invocation invocation)
{
RuntimeContext ctx = invocation.getContext();
@@ -110,10 +118,25 @@
throw new RuntimeException("RuntimeContext doesn't match invocation model");
// @UriParam
- for(String param : uriParam.keySet())
- {
- int paramIndex = uriParam.get(param);
- String paramValue = matcher.group(regexMapping.get(param));
+ for(String paramName : uriParam.keySet())
+ {
+ int paramIndex = uriParam.get(paramName);
+ String paramValue;
+
+ Integer group = regexMapping.get(paramName); // can be null when parent parameter
+ if(group!=null)
+ {
+ paramValue = matcher.group(group);
+ ctx.addBoundParameter(paramName, paramValue);
+ }
+ else
+ {
+ paramValue = ctx.getBoundParameter(paramName);
+ }
+
+ if(null == paramValue)
+ throw new RuntimeException("Parameter '" + paramName + "' not bound");
+
invocation.insertParameterInstance(paramIndex, paramValue);
}
@@ -130,14 +153,29 @@
invocation.insertParameterInstance(contextParamter.get(paramType), paramInstance);
}
- // TODO: Entity body
+ // Bind entity body
if(entityBodyType != null)
{
boolean validRequestMethod = MethodHTTP.POST == ctx.getRequestMethod() || MethodHTTP.PUT == ctx.getRequestMethod();
+
if(!validRequestMethod)
throw new RuntimeException("No entity body with request type " + ctx.getRequestMethod());
- // unmarshall body
+
+ try
+ {
+ // unmarshall body
+ ProviderFactory providerfactory = DefaultProviderFactory.newInstance();
+ MessageBodyReader reader = providerfactory.createMessageBodyReader(entityBodyType, null);
+ Object messageBody = reader.readFrom(entityBodyType, null, null, ctx.getInStream() );
+
+ // provide the invocation
+ invocation.insertParameterInstance(entityBodyIndex, messageBody);
+
+ } catch (IOException e)
+ {
+ throw new RuntimeException("Failed to unmarshall request body", e);
+ }
}
}
@@ -150,7 +188,7 @@
{
for (Annotation[] parameterAnnotations : method.getParameterAnnotations())
{
- if (parameterAnnotations!=null)
+ if (parameterAnnotations.length >0)
{
for (Annotation annotation : parameterAnnotations)
{
@@ -186,7 +224,7 @@
if(entityBodyType!=null)
throw new RuntimeException("Method " + method.getName() + " contains more then one possible entity body parameters");
- entityBodyType = method.getParameterTypes()[totalParameters-1];
+ entityBodyType = method.getParameterTypes()[totalParameters];
entityBodyIndex = totalParameters;
}
Modified: rest/src/main/java/org/jboss/rest/model/ResourceMethod.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/ResourceMethod.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/model/ResourceMethod.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -24,9 +24,9 @@
import org.jboss.rest.MethodHTTP;
import org.jboss.rest.util.Convert;
-import javax.activation.MimeType;
import javax.ws.rs.ConsumeMime;
import javax.ws.rs.ProduceMime;
+import javax.ws.rs.core.MediaType;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -41,8 +41,8 @@
public class ResourceMethod extends AbstractResourceOperation {
private MethodHTTP methodHTTP;
- private List<MimeType> consumeMimeTypes = new ArrayList<MimeType>();
- private List<MimeType> produceMimeTypes = new ArrayList<MimeType>();
+ private List<MediaType> consumeMimeTypes = new ArrayList<MediaType>();
+ private List<MediaType> produceMimeTypes = new ArrayList<MediaType>();
ResourceMethod(ResourceModel parent, MethodHTTP method, String uriTemplate, Method invocationTarget)
{
@@ -73,12 +73,12 @@
}
- public List<MimeType> getConsumeMimeTypes()
+ public List<MediaType> getConsumeMimeTypes()
{
return consumeMimeTypes;
}
- public List<MimeType> getProduceMimeTypes()
+ public List<MediaType> getProduceMimeTypes()
{
return produceMimeTypes;
}
@@ -96,7 +96,7 @@
// ConsumeMime
ConsumeMime consumeMime = (ConsumeMime)mimeFromMethodOrClass(ConsumeMime.class);
if(consumeMime != null)
- consumeMimeTypes.addAll(Convert.annotationToMimeType(consumeMime));
+ consumeMimeTypes.addAll(Convert.annotationToMediaType(consumeMime));
else
consumeMimeTypes.add( Convert.ANY_MIME );
Modified: rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -99,7 +99,7 @@
resourceMethod = dfsResourceMatch(rootResource);
}
- if(null == resourceMethod && visitedLocator.isEmpty())
+ if(null == resourceMethod)
throw new NoMethodException("No method matches URI '"+context.getPath());
// gotcha
@@ -150,16 +150,11 @@
ResourceLocator bridge = locators.next();
RegexQualifier qualifier = bridge.resolve(uriToken);
- if(qualifier!=null && ! qualifier.marksEnd() )
+ if(qualifier!=null)
{
- // a subresource method is the target
+ // a subresource method is the target
weightedResults.add( new ResourceMatch<ResourceModel>( bridge.field(), qualifier) );
}
- else if(qualifier!=null)
- {
- // the locator is the target itself
- rememberLocator(bridge, uriToken);
- }
}
if(!weightedResults.isEmpty())
@@ -177,8 +172,6 @@
}
}
-
-
return match;
}
Modified: rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java
===================================================================
--- rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/runtime/InvocationMediator.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -24,10 +24,10 @@
public Object invoke() throws ResourceError
{
- Object result = null;
-
+ Object returnValue;
+
StatefulResourceResolver resolver = StatefulResourceResolver.newInstance(runtimeContext);
- ResourceMethod resourceMethod = resolver.resolve();
+ ResourceMethod resourceMethod = resolver.resolve(); // not null, throws exception
// evaluate locator stack
Object subResourceInstance = null;
@@ -38,33 +38,33 @@
runtimeContext.setWorkingPath(resolver.getLocatorWorkingPath(loc));
InvocationBuilder builder = new DefaultInvocationBuilder();
+
+ if(subResourceInstance!=null)
+ builder.addInvocationModel(new PresetInvocationTarget(subResourceInstance));
+
builder.addInvocationModel(loc.getParameterBinding());
builder.addInvocationModel(loc.getOperationBinding());
Invocation locatorInvocation = builder.build(runtimeContext);
InvocationHandler bridgeInvoker = new DefaultInvocationHandler();
subResourceInstance = bridgeInvoker.invoke(locatorInvocation);
- result = subResourceInstance; // best match
}
- if(resourceMethod!=null)
- {
- // create an Invocation instance
- InvocationBuilder builder = new DefaultInvocationBuilder();
- runtimeContext.setWorkingPath(resolver.getMethodWorkingPath());
+ // create an Invocation instance
+ InvocationBuilder builder = new DefaultInvocationBuilder();
+ runtimeContext.setWorkingPath(resolver.getMethodWorkingPath());
- if(subResourceInstance!=null)
- builder.addInvocationModel(new PresetInvocationTarget(subResourceInstance));
+ if(subResourceInstance!=null)
+ builder.addInvocationModel(new PresetInvocationTarget(subResourceInstance));
- builder.addInvocationModel( resourceMethod.getParameterBinding() );
- builder.addInvocationModel( resourceMethod.getOperationBinding() );
- Invocation invocation = builder.build(runtimeContext);
+ builder.addInvocationModel( resourceMethod.getParameterBinding() );
+ builder.addInvocationModel( resourceMethod.getOperationBinding() );
+ Invocation invocation = builder.build(runtimeContext);
- // invoke it
- InvocationHandler invoker = new DefaultInvocationHandler();
- result = invoker.invoke(invocation); // more fine grained match
- }
+ // invoke it
+ InvocationHandler invoker = new DefaultInvocationHandler();
+ returnValue = invoker.invoke(invocation); // more fine grained match
- return result;
+ return returnValue;
}
}
Modified: rest/src/main/java/org/jboss/rest/runtime/RuntimeContext.java
===================================================================
--- rest/src/main/java/org/jboss/rest/runtime/RuntimeContext.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/runtime/RuntimeContext.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -25,14 +25,16 @@
import org.jboss.rest.model.ResourceModel;
import org.jboss.rest.util.Convert;
-import javax.activation.MimeType;
-import javax.activation.MimeTypeParseException;
+import javax.ws.rs.core.MediaType;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.InputStream;
/**
- * Requesting a resource thorugh HTTP creates a runtime context<br>
+ * Requesting a resource through HTTP creates a runtime context<br>
* The context is associated with a set of {@link ResourceModel}
*
* @author Heiko.Braun(a)jboss.com
@@ -41,28 +43,39 @@
public class RuntimeContext
{
// Request method
- private MethodHTTP requestMethod;
+ private final MethodHTTP requestMethod;
// Request URI
- private URI uri;
+ private final URI uri;
+ // The associated runtime model for a web context
+ private final List<ResourceModel> rootResources;
+
private String path;
private String webcontext;
// Accepted response body mime types
- private List<MimeType> consumeMimeTypes = new ArrayList<MimeType>();
+ private List<MediaType> acceptMimeTypes = new ArrayList<MediaType>();
// Request body content-type, available with POST or PUT requests
- private MimeType provideMimeType;
+ private MediaType provideMimeType;
- // The associated runtime model for a web context
- private List<ResourceModel> rootResources;
+ private InputStream inStream;
+
+ // ----------------- mutable properties ------
+ /* Path that should be used when invoking resources */
private String workingPath;
+ /* Bound parameter are resolved across invocations, i.e. parent UriParameter*/
+ private Map<String, String> boundParameterInstances = new HashMap<String, String>();
+
+
+ // ----------------- end mutable properties ------
+
public RuntimeContext(MethodHTTP requestMethod, URI uri, List<ResourceModel> rootResources)
- {
+ {
this.requestMethod = requestMethod;
this.rootResources = rootResources;
this.uri = uri;
@@ -107,28 +120,21 @@
public void parseAcceptHeader(String headerValue)
{
assert headerValue!=null;
- consumeMimeTypes.addAll( Convert.mimeStringToMimeTypes(headerValue) );
+ acceptMimeTypes.addAll( Convert.mimeStringToMediaTypes(headerValue) );
}
public void parseContentTypeHeader(String headerValue)
{
- try
- {
- this.provideMimeType = new MimeType(headerValue);
- }
- catch (MimeTypeParseException e)
- {
- throw new IllegalArgumentException("Failed to parse 'Content-Type' header", e);
- }
+ this.provideMimeType = new MediaType(headerValue);
}
- public List<MimeType> getConsumeMimeTypes()
+ public List<MediaType> getAcceptMimeTypes()
{
- return consumeMimeTypes;
+ return acceptMimeTypes;
}
- public MimeType getProvideMimeType()
+ public MediaType getProvideMimeType()
{
if(! (requestMethod == MethodHTTP.POST || requestMethod == MethodHTTP.PUT) )
throw new IllegalArgumentException(requestMethod + " does not provide a 'Content-Type header'");
@@ -160,4 +166,46 @@
{
this.workingPath = workingPath;
}
+
+ /**
+ * Get a parameter that has been reolved in previous invocations
+ * @param name
+ * @return a String value
+ */
+ public String getBoundParameter(String name)
+ {
+ return boundParameterInstances.get(name);
+ }
+
+ /**
+ * Keep already resolved parameter
+ * @param name
+ * @param value
+ */
+ public void addBoundParameter(String name, String value)
+ {
+ boundParameterInstances.put(name, value);
+ }
+
+
+ public Map<String, String> getBoundParameterInstances()
+ {
+ return boundParameterInstances;
+ }
+
+ public void setBoundParameterInstances(Map<String, String> boundParameterInstances)
+ {
+ this.boundParameterInstances = boundParameterInstances;
+ }
+
+ public InputStream getInStream()
+ {
+ return inStream;
+ }
+
+ public void setInStream(InputStream inStream)
+ {
+ this.inStream = inStream;
+ }
+
}
Modified: rest/src/main/java/org/jboss/rest/util/Convert.java
===================================================================
--- rest/src/main/java/org/jboss/rest/util/Convert.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/main/java/org/jboss/rest/util/Convert.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -23,11 +23,10 @@
import org.jboss.rest.MethodHTTP;
-import javax.activation.MimeType;
-import javax.activation.MimeTypeParseException;
import javax.ws.rs.ConsumeMime;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.ProduceMime;
+import javax.ws.rs.core.MediaType;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@@ -39,20 +38,8 @@
*/
public class Convert
{
-
- public static MimeType ANY_MIME;
- static
- {
- try
- {
- ANY_MIME = new MimeType("*/*");
- }
- catch (MimeTypeParseException e)
- {
- //
- }
- }
+ public static MediaType ANY_MIME = new MediaType("*", "*");
public static MethodHTTP prefixToMethodHTTP(Method m)
{
@@ -70,12 +57,12 @@
if(null==result)
throw new IllegalArgumentException("Failed to match method by prefix: " + methodName);
-
+
return result;
}
public static MethodHTTP annotationToMethodHTTP(HttpMethod a)
- {
+ {
HttpMethod hm = (HttpMethod)a;
MethodHTTP result = null;
@@ -95,54 +82,40 @@
}
- public static List<MimeType> annotationToMimeType(ConsumeMime consumeMime)
+ public static List<MediaType> annotationToMediaType(ConsumeMime consumeMime)
{
return mimeStringsToMimeTypes(consumeMime.value());
}
- public static List<MimeType> annotationToMimeType(ProduceMime produceMime)
+ public static List<MediaType> annotationToMimeType(ProduceMime produceMime)
{
return mimeStringsToMimeTypes(produceMime.value());
}
- public static List<MimeType> mimeStringToMimeTypes(String mime)
+ public static List<MediaType> mimeStringToMediaTypes(String mime)
{
- List<MimeType> mimes = new ArrayList<MimeType>();
+ List<MediaType> mimes = new ArrayList<MediaType>();
- try
+ StringTokenizer tokenizer = new StringTokenizer(mime, ",");
+ while(tokenizer.hasMoreTokens())
{
- StringTokenizer tokenizer = new StringTokenizer(mime, ",");
- while(tokenizer.hasMoreTokens())
- {
- String tok = tokenizer.nextToken().trim();
- if(tok.indexOf("/") != -1) // Ignore mimes without subtype, i.e '*; q=.2'
- mimes.add( new MimeType(tok) );
- }
+ String tok = tokenizer.nextToken().trim();
+ if(tok.indexOf("/") != -1) // Ignore mimes without subtype, i.e '*; q=.2'
+ mimes.add( new MediaType(tok) );
}
- catch (MimeTypeParseException e)
- {
- throw new IllegalArgumentException("Failed to parse mime string '"+mime+"'", e);
- }
+
return mimes;
}
- public static List<MimeType> mimeStringsToMimeTypes(String[] mimeStrings)
+ public static List<MediaType> mimeStringsToMimeTypes(String[] mimeStrings)
{
- List<MimeType> mimes = new ArrayList<MimeType>();
-
- try
+ List<MediaType> mimes = new ArrayList<MediaType>();
+ for(String s : mimeStrings)
{
- for(String s : mimeStrings)
- {
- mimes.add( new MimeType(s) );
- }
+ mimes.add( new MediaType(s) );
}
- catch (MimeTypeParseException e)
- {
- throw new IllegalArgumentException("Failed to parse mime string '"+mimeStrings+"'", e);
- }
-
+
return mimes;
}
}
Added: rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory
===================================================================
--- rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory (rev 0)
+++ rest/src/main/resources/jbossrest.jar/META-INF/services/javax.ws.rs.ext.ProviderFactory 2007-11-26 11:20:31 UTC (rev 5107)
@@ -0,0 +1 @@
+org.jboss.rest.media.DefaultProviderFactory
\ No newline at end of file
Modified: rest/src/test/java/org/jboss/test/rest/WidgetList.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/WidgetList.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/test/java/org/jboss/test/rest/WidgetList.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -45,7 +45,7 @@
@ConsumeMime({"text/xml", "application/xml"})
public void putDiscounted(
@HttpContext HttpHeaders headers,
- Widget special
+ String special
)
{
Modified: rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/test/java/org/jboss/test/rest/invocation/InvocationBuilderTestCase.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -33,6 +33,7 @@
import java.net.URI;
import java.util.List;
import java.util.Stack;
+import java.io.ByteArrayInputStream;
/**
* @author Heiko.Braun(a)jboss.com
@@ -104,6 +105,8 @@
URI uri = new URI("/rest/widgets/special");
RuntimeContext context = defaultRuntimeContext(MethodHTTP.PUT, uri);
context.parseContentTypeHeader("text/xml");
+ context.setInStream( new ByteArrayInputStream("MySpecial".getBytes()) );
+
StatefulResourceResolver resolver = StatefulResourceResolver.newInstance(context);
ResourceMethod method = resolver.resolve();
Modified: rest/src/test/java/org/jboss/test/rest/media/BookResource.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/media/BookResource.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/test/java/org/jboss/test/rest/media/BookResource.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -1,7 +1,6 @@
package org.jboss.test.rest.media;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.UriTemplate;
+import javax.ws.rs.*;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@@ -59,4 +58,29 @@
{
this.title = title;
}
+
+ @HttpMethod
+ @ProduceMime("text/xml")
+ public BookResource getBook(
+ @UriParam("isbn") String isbn
+ )
+ {
+ return BookStoreResource.findBook(isbn);
+ }
+
+ @HttpMethod
+ @ConsumeMime("text/xml")
+ public void putBook(
+ @UriParam("isbn") String isbn,
+ BookResource book)
+ {
+ BookResource match = BookStoreResource.findBook(isbn);
+ match.updateFrom(book);
+ }
+
+ public void updateFrom(BookResource update)
+ {
+ this.title = update.title;
+ this.author = update.author;
+ }
}
Modified: rest/src/test/java/org/jboss/test/rest/media/BookStoreResource.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/media/BookStoreResource.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/test/java/org/jboss/test/rest/media/BookStoreResource.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -10,10 +10,10 @@
@UriTemplate("books")
public class BookStoreResource
{
-
- private List<BookResource> availableBooks = new ArrayList<BookResource>();
- public BookStoreResource()
+ private static List<BookResource> availableBooks = new ArrayList<BookResource>();
+
+ static
{
availableBooks.add( new BookResource("Leonard Richardson", "596529260", "RESTful Web Services") );
availableBooks.add( new BookResource("Sam Ruby", "3897217279", "Web Services mit REST") );
@@ -23,9 +23,20 @@
public BookResource getBookByISBN(
@UriParam("isbn")
String isbn)
+ {
+ return findBook(isbn);
+ }
+
+ @HttpMethod
+ @ProduceMime("text/xml")
+ public List<BookResource> getAllBooks()
{
+ return availableBooks;
+ }
+
+ protected static BookResource findBook(String isbn)
+ {
BookResource match = null;
-
for(BookResource book : availableBooks)
{
if(book.getISBN().equals(isbn))
@@ -35,13 +46,10 @@
}
}
+ if(null == match)
+ throw new RuntimeException("No book matching ISBN " + isbn);
+
return match;
}
- @HttpMethod
- @ProduceMime("text/xml")
- public List<BookResource> getAllBooks()
- {
- return availableBooks;
- }
}
Modified: rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -2,6 +2,7 @@
import junit.framework.Test;
import org.jboss.rest.media.DefaultProviderFactory;
+import org.jboss.rest.MethodHTTP;
import org.jboss.test.rest.util.RestCase;
import org.jboss.test.rest.util.RestTestSetup;
@@ -24,30 +25,52 @@
}
/**
- * Request a xml resource representation
+ * GET a xml resource representation
*
* @throws Exception
*/
- public void testRequest1() throws Exception
+ public void testGetXMLRepresentation() throws Exception
{
URL url = new URL("http://localhost:8080/rest-mediatype/books/3897217279");
- Object response = doMediaRequest(url, null);
+ Object response = executeRequest(url, MethodHTTP.GET, null );
assertNotNull(response );
assertTrue( (response instanceof BookResource));
assertEquals( "Sam Ruby", ((BookResource)response ).getAuthor());
}
- private Object doMediaRequest(URL url, Object data) throws Exception
+ /**
+ * PUT a resource representation
+ * @throws Exception
+ */
+ public void testPutXMLRepresentation() throws Exception
{
+ URL url = new URL("http://localhost:8080/rest-mediatype/books/3897217279");
+
+ BookResource book = new BookResource("Sam Ruby", "3897217279", "Web Services mit REST, Edition 2");
+
+ Object response = executeRequest(url, MethodHTTP.PUT, book);
+ assertNull(response);
+
+ // verify update
+ response = executeRequest(url, MethodHTTP.GET, null );
+ assertTrue( (response instanceof BookResource));
+ assertEquals( "Web Services mit REST, Edition 2", ((BookResource)response ).getTitle());
+ }
+
+ private Object executeRequest(URL url, MethodHTTP method, Object data) throws Exception
+ {
ProviderFactory providerFactory = DefaultProviderFactory.newInstance();
HttpURLConnection conn = (HttpURLConnection)url.openConnection();
conn.setDoOutput( data!=null );
conn.setRequestProperty("accept", "text/xml");
+ conn.setRequestMethod(method.toString());
if(data !=null)
{
+ conn.setRequestProperty("Content-Type", "text/xml");
+
OutputStream out = conn.getOutputStream();
MessageBodyWriter writer = providerFactory.createMessageBodyWriter(data.getClass(), null);
writer.writeTo(data, null, null, out);
@@ -56,10 +79,13 @@
}
Object returnValue = null;
- MessageBodyReader reader = providerFactory.createMessageBodyReader(BookResource.class, null);
- if(reader.isReadable(BookResource.class))
+ if(conn.getResponseCode() == 200)
{
- returnValue = reader.readFrom(BookResource.class, null, null, conn.getInputStream());
+ MessageBodyReader reader = providerFactory.createMessageBodyReader(BookResource.class, null);
+ if(reader.isReadable(BookResource.class))
+ {
+ returnValue = reader.readFrom(BookResource.class, null, null, conn.getInputStream());
+ }
}
return returnValue;
Deleted: rest/src/test/java/org/jboss/test/rest/model/RunRegex.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/model/RunRegex.java 2007-11-26 10:53:50 UTC (rev 5106)
+++ rest/src/test/java/org/jboss/test/rest/model/RunRegex.java 2007-11-26 11:20:31 UTC (rev 5107)
@@ -1,78 +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.rest.model;
-
-import java.net.URI;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public class RunRegex
-{
- public static void main(String[] args) throws Exception
- {
-
- /*URI uri = new URI("http://jboss.com/widgets/special");
- System.out.println(uri.getPath());
-
- String s = "spec";
- System.out.println("> " +s);
- Pattern p = Pattern.compile("(\\bspec\\b)(.*?)(/)?");
- //Pattern p = Pattern.compile("(\\bspec\\b)(/)?");
- Matcher m = p.matcher(s);
-
- System.out.println("? " + m.matches());
-
- int matchingGroups = 0;
- for(int i=1; i<=m.groupCount(); i++)
- {
- String s1 = m.group(i);
- System.out.println("g '" + s1 + "'");
- if(s1!=null && "".equals(s1)==false)
- matchingGroups++;
- }
-
- System.out.println("! "+matchingGroups);
- System.out.println("< "+m.group(m.groupCount()));
- System.out.println("---"); */
-
-
- List<String> l = new ArrayList<String>();
- Class type = getComponentType(l);
- System.out.println(type);
- System.out.println( type == String.class );
-
- }
-
- public static Class getComponentType(Collection<?> c)
- {
- System.out.println(c.getClass().getConstructors()[0].getParameterTypes());
- return c.getClass();
- }
-
-}
16 years, 5 months
- 1
- 0
JBossWS SVN: r5106 - stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-26 05:53:50 -0500 (Mon, 26 Nov 2007)
New Revision: 5106
Modified:
stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/Install.txt
stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/ReleaseNotes.txt
Log:
Update release notes
Modified: stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/Install.txt
===================================================================
--- stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/Install.txt 2007-11-26 09:52:44 UTC (rev 5105)
+++ stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/Install.txt 2007-11-26 10:53:50 UTC (rev 5106)
@@ -13,9 +13,9 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss50
- ant deploy-jboss42
- ant deploy-jboss40
+ ant deploy-jboss500
+ ant deploy-jboss422
+ ant deploy-jboss405
Please consult the wiki for detailed up to date install instructions
http://labs.jboss.com/portal/jbossws/
Modified: stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/ReleaseNotes.txt 2007-11-26 09:52:44 UTC (rev 5105)
+++ stack/native/tags/jbossws-native-2.0.2.GA/src/main/distro/ReleaseNotes.txt 2007-11-26 10:53:50 UTC (rev 5106)
@@ -27,6 +27,78 @@
Feature Request
+ * [JBWS-492] - Add support for Policy Identification
+ * [JBWS-493] - Add support for Compact Policy Expression
+ * [JBWS-494] - Add support for Policy Intersection
+ * [JBWS-895] - Provide support for policy attachments
+ * [JBWS-1644] - Process wsdl extensibility elements
+ * [JBWS-1645] - Modify WSDLGenerator to deal with policies
+ * [JBWS-1806] - Add EndpointRegistry to jmx-console
+ * [JBWS-1807] - HTTP bindings for Provider
+
+Bug
+
+ * [JBWS-700] - Update documentation for dealing with attachments
+ * [JBWS-1669] - Fix WebServiceContext.getMessageContext() for EJB endpoints
+ * [JBWS-1704] - The Use Of Remoting Causes An Additional 'datatype' Parameter To Be Sent On All Requests
+ * [JBWS-1735] - wstx.jar is missing from release, causes wsconsume to fail
+ * [JBWS-1761] - WSProvide ignores SOAPBinding declaration
+ * [JBWS-1791] - target deploy-jboss42-endorsed incomplete
+ * [JBWS-1792] - init-param for handler defined in jaxrpc-config not processed
+ * [JBWS-1795] - Type Substitution doesn't work with Schema2Java Client approach
+ * [JBWS-1796] - deploy-jboss40-no-ejb3 build fails
+ * [JBWS-1797] - Setting .NET friendly Endpoint in web.xml
+ * [JBWS-1798] - Cannot find local schema with relative urls
+ * [JBWS-1800] - Trying to monitor the JVM using -Dcom.sun.management.jmxremote prevents the jbossws 2.0.1 from coming up
+ * [JBWS-1801] - WSDL To Java - When an array if returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping.
+ * [JBWS-1808] - BackwardCompatibleURLPatternDeploymentAspect is mangling valid URLpatterns
+ * [JBWS-1809] - JAXBIntros are not taken into consideration when generating the WSDL
+ * [JBWS-1811] - Cannot access CLIENT_ADDRESSING_PROPERTIES inside client
+ * [JBWS-1815] - Missing fault detail in messages from SLSB Provider
+ * [JBWS-1843] - WSDL with custom schema imports causes java.lang.OutOfMemoryError: Java heap space when there are circular schema imports dependencies
+ * [JBWS-1852] - Failed to create a new SAX parser
+ * [JBWS-1856] - Attachment part not cleanup correctly
+ * [JBWS-1903] - DOMUtils doesn't clear thread locals
+
+Task
+
+ * [JBWS-856] - Complete WS-Policy implementation
+ * [JBWS-1330] - Fix jaxrpc wsse tests for jbossws-5.0
+ * [JBWS-1571] - Provide/Verify WS-Policy implementation
+ * [JBWS-1572] - Provide/Verify WS-PolicyAttachment implementation
+ * [JBWS-1612] - Provide an integration layer for ESB
+ * [JBWS-1614] - Provide an integration layer for JBossAS
+ * [JBWS-1748] - Improve the documentation that explains proprietary DD options
+ * [JBWS-1793] - Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
+ * [JBWS-1816] - JAXWS SOAPFault inheritance
+ * [JBWS-1817] - WS-Security with JAX-WS Dispatch
+ * [JBWS-1835] - Schedule metro issues at java.net
+ * [JBWS-1842] - JAXB based ServiceRef meta data
+ * [JBWS-1846] - Release jbossws-2.0.2.GA binary
+
+Errata
+
+ FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface
+ FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations
+ FIXME: [JBWS-1665] incorrect wsdl generation
+ FIXME: [JBWS-1772] WSConsume output is not correctly redirected
+ FIXME: [JBWS-1773] Verify isolated classloading with WSConsume
+ FIXME: [JBWS-1776] Verify isolated classloading with WSProvide
+ FIXME: [JBWS-1813] context-root in jboss.xml is ignored
+ FIXME: [JBWS-751] Multiple schema imports with the same namespace
+ FIXME: [JBWS-798] Complete EventingTestCase
+ FIXME: [JBWS-981] Virtual host configuration for EJB endpoints
+
+Enjoy,
+The JBossWS Team
+
+Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+What's new in jbossws-2.0.1.GA
+------------------------------
+
+Feature Request
+
* [JBWS-1736] - MTOM property at service-ref level
Bug
@@ -54,7 +126,6 @@
* [JBWS-1770] - Fix Endpoint API for jboss-5.0.0.Beta3
Errata
-------
FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface
FIXME: [JBCTS-624] R2753 cannot parse web.xml for jsp vehicle
@@ -67,11 +138,6 @@
FIXME: [JBWS-798] Complete EventingTestCase
FIXME: [JBWS-981] Virtual host configuration for EJB endpoints
-Enjoy,
-The JBossWS Team
-
-Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
What's new in jbossws-2.0.0
---------------------------
16 years, 5 months
- 1
- 0
JBossWS SVN: r5105 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-26 04:52:44 -0500 (Mon, 26 Nov 2007)
New Revision: 5105
Added:
stack/native/tags/jbossws-native-2.0.2.GA/
Log:
Release jbossws-2.0.2.GA
Copied: stack/native/tags/jbossws-native-2.0.2.GA (from rev 5104, stack/native/branches/jbossws-native-2.0.2)
16 years, 5 months
- 1
- 0
JBossWS SVN: r5104 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-23 09:41:36 -0500 (Fri, 23 Nov 2007)
New Revision: 5104
Added:
stack/native/branches/jbossws-native-2.0.2/
Removed:
stack/native/branches/jbossws-native-2.0.2.GA/
Log:
Move tag 2.0.2.GA to branches
Copied: stack/native/branches/jbossws-native-2.0.2 (from rev 5103, stack/native/branches/jbossws-native-2.0.2.GA)
16 years, 5 months
- 1
- 0
JBossWS SVN: r5103 - in stack/native: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-11-23 09:38:34 -0500 (Fri, 23 Nov 2007)
New Revision: 5103
Added:
stack/native/branches/jbossws-native-2.0.2.GA/
Removed:
stack/native/tags/jbossws-native-2.0.2.GA/
Log:
Move tag 2.0.2.GA to branches
Copied: stack/native/branches/jbossws-native-2.0.2.GA (from rev 5102, stack/native/tags/jbossws-native-2.0.2.GA)
16 years, 5 months
- 1
- 0
JBossWS SVN: r5102 - in rest: ant-import and 17 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-11-22 12:10:00 -0500 (Thu, 22 Nov 2007)
New Revision: 5102
Added:
rest/ant-import-tests/build-jars-rest.xml
rest/src/test/java/org/jboss/test/rest/samples/
rest/src/test/java/org/jboss/test/rest/samples/resourceview/
rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java
rest/src/test/resources/rest/samples/
rest/src/test/resources/rest/samples/resourceview/
rest/src/test/resources/rest/samples/resourceview/WEB-INF/
rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml
rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml
rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml
Removed:
rest/ant-import-tests/build-jars-jaxws.xml
rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java
Modified:
rest/ant-import-tests/build-testsuite.xml
rest/ant-import/macros-deploy-rs.xml
rest/jboss-rest.ipr
rest/jboss-rest.iws
rest/src/main/distro/bin-dist-build.xml
rest/src/main/java/org/jboss/rest/ResourceRegistry.java
rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java
rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java
rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java
rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java
rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml
rest/src/main/resources/jbossrest-context.war/index.html
rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java
rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java
rest/src/test/java/org/jboss/test/rest/model/RunRegex.java
Log:
registry view sample
Modified: rest/ant-import/macros-deploy-rs.xml
===================================================================
--- rest/ant-import/macros-deploy-rs.xml 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/ant-import/macros-deploy-rs.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -472,7 +472,7 @@
</fileset>
</delete>
- <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossrs.sar"/>
+ <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossrest.sar"/>
</sequential>
</macrodef>
Deleted: rest/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- rest/ant-import-tests/build-jars-jaxws.xml 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/ant-import-tests/build-jars-jaxws.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project>
-
- <description>JBossWS test archive builder</description>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-jars-jaxws" description="Build the deployments.">
-
- <mkdir dir="${tests.output.dir}/libs"/>
-
- <!-- RS stuff -->
-
- <war warfile="${tests.output.dir}/libs/jbossrs-deployment.war" webxml="${tests.output.dir}/resources/rest/deployment/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/rest/WidgetList.class"/>
- <include name="org/jboss/test/rest/Widget.class"/>
- <include name="org/jboss/test/rest/Specification.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/rest/deployment">
- <include name="jbossrs.xml"/>
- </webinf>
- </war>
-
- <war warfile="${tests.output.dir}/libs/jbossrs-mediatype.war" webxml="${tests.output.dir}/resources/rest/media/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/rest/media/BookResource.class"/>
- <include name="org/jboss/test/rest/media/BookStoreResource.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/rest/media">
- <include name="jbossrs.xml"/>
- </webinf>
- </war>
-
- </target>
-
-
-</project>
Copied: rest/ant-import-tests/build-jars-rest.xml (from rev 5095, rest/ant-import-tests/build-jars-jaxws.xml)
===================================================================
--- rest/ant-import-tests/build-jars-rest.xml (rev 0)
+++ rest/ant-import-tests/build-jars-rest.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <description>JBoss REST test archive builder</description>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="build-jars-jaxws" description="Build the deployments.">
+
+ <mkdir dir="${tests.output.dir}/libs"/>
+
+ <!-- deployment -->
+ <war warfile="${tests.output.dir}/libs/rest-deployment.war" webxml="${tests.output.dir}/resources/rest/deployment/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/rest/WidgetList.class"/>
+ <include name="org/jboss/test/rest/Widget.class"/>
+ <include name="org/jboss/test/rest/Specification.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/rest/deployment">
+ <include name="jbossrs.xml"/>
+ </webinf>
+ </war>
+
+ <!-- mediatype -->
+ <war warfile="${tests.output.dir}/libs/rest-mediatype.war" webxml="${tests.output.dir}/resources/rest/media/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/rest/media/BookResource.class"/>
+ <include name="org/jboss/test/rest/media/BookStoreResource.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/rest/media">
+ <include name="jbossrs.xml"/>
+ </webinf>
+ </war>
+
+ <!-- samples/resourceview -->
+ <war warfile="${tests.output.dir}/libs/rest-samples-resourceview.war" webxml="${tests.output.dir}/resources/rest/samples/resourceview/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/rest/samples/resourceview/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/rest/samples/resourceview/WEB-INF/">
+ <include name="*.xml"/>
+ </webinf>
+ </war>
+
+ </target>
+
+
+</project>
Property changes on: rest/ant-import-tests/build-jars-rest.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: rest/ant-import-tests/build-testsuite.xml
===================================================================
--- rest/ant-import-tests/build-testsuite.xml 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/ant-import-tests/build-testsuite.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -62,7 +62,7 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
- <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${core.dir}/ant-import-tests/build-jars-rest.xml" target="build-jars-jaxws"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the deployments."/>
Modified: rest/jboss-rest.ipr
===================================================================
--- rest/jboss-rest.ipr 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/jboss-rest.ipr 2007-11-22 17:10:00 UTC (rev 5102)
@@ -254,6 +254,7 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/jboss-rest.iml" filepath="$PROJECT_DIR$/jboss-rest.iml" />
<module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" />
+ <module fileurl="file:///home/hbraun/dev/prj/jbossws/spi/trunk/spi.iml" filepath="/home/hbraun/dev/prj/jbossws/spi/trunk/spi.iml" />
<module fileurl="file:///home/hbraun/dev/prj/jbossws/common/trunk/trunk.iml" filepath="/home/hbraun/dev/prj/jbossws/common/trunk/trunk.iml" />
</modules>
</component>
Modified: rest/jboss-rest.iws
===================================================================
--- rest/jboss-rest.iws 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/jboss-rest.iws 2007-11-22 17:10:00 UTC (rev 5102)
@@ -16,7 +16,39 @@
<option name="USER" value="" />
</component>
<component name="ChangeListManager">
- <list default="true" name="Default" comment="" />
+ <list default="true" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/samples" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ant-import-tests/build-testsuite.xml" afterPath="$PROJECT_DIR$/ant-import-tests/build-testsuite.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ant-import/macros-deploy-rs.xml" afterPath="$PROJECT_DIR$/ant-import/macros-deploy-rs.xml" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/ant-import-tests/build-jars-jaxws.xml" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/index.html" afterPath="$PROJECT_DIR$/src/main/resources/jbossrest-context.war/index.html" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/distro/bin-dist-build.xml" afterPath="$PROJECT_DIR$/src/main/distro/bin-dist-build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.ipr" afterPath="$PROJECT_DIR$/jboss-rest.ipr" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/build.xml" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java" />
+ <change type="NEW" beforePath="" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/jboss50.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" afterPath="/home/hbraun/dev/prj/jbossws/spi/trunk/version.properties" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" afterPath="$PROJECT_DIR$/src/test/java/org/jboss/test/rest/model/RunRegex.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml" />
+ <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" afterPath="/home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java" afterPath="$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jboss-rest.iws" afterPath="$PROJECT_DIR$/jboss-rest.iws" />
+ </list>
</component>
<component name="ChangeListSynchronizer" />
<component name="ChangesViewManager" flattened_view="true" />
@@ -87,7 +119,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java" line="96" class="org.jboss.rest.container.wsf.ResourceServlet" package="org.jboss.rest.container.wsf">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java" line="72" class="org.jboss.rest.container.wsf.ModelDeploymentAspect" package="org.jboss.rest.container.wsf">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -100,6 +132,32 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java" line="101" class="org.jboss.wsf.container.jboss50.ArchiveDeployerHook" package="org.jboss.wsf.container.jboss50">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java" line="81" class="org.jboss.wsf.container.jboss50.ArchiveDeployerHook" package="org.jboss.wsf.container.jboss50">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
</line_breakpoints>
<breakpoint_any>
<breakpoint>
@@ -163,28 +221,37 @@
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="ResourceServlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java">
+ <file leaf-file-name="ResourceRegistry.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="96" column="0" selection-start="3556" selection-end="3556" vertical-scroll-proportion="0.38822114">
+ <state line="33" column="13" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.24675325">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DeploymentTestCase.java" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="build-jars-rest.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="50" column="88" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.72596157">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DeploymentTestCase.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="65" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.10271547">
+ <state line="63" column="51" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.11216056">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ArchiveDeployerHook.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java">
+ <file leaf-file-name="MediaTypeTestCase.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="94" column="0" selection-start="3414" selection-end="3414" vertical-scroll-proportion="0.19244392">
+ <state line="32" column="51" selection-start="849" selection-end="849" vertical-scroll-proportion="0.08028335">
<folding />
</state>
</provider>
@@ -228,10 +295,6 @@
<option name="myItemId" value="jboss-rest.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss-rest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -242,17 +305,7 @@
<option name="myItemId" value="jboss-rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss.test.rs" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss-rest.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="PerforceChangeBrowserSettings">
@@ -344,10 +397,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test-framework" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -367,11 +416,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test-framework" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test-framework/ant-import" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -396,6 +445,26 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples/resourceview" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -419,11 +488,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/resources/rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -453,13 +522,43 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment" />
+ <option name="myItemId" value="jboss-rest.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-rest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -577,6 +676,14 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -607,11 +714,19 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -636,6 +751,30 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rest/model/dd" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -651,6 +790,28 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-rest.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-rest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/ant-import-tests" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -662,11 +823,11 @@
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
- <flattenPackages />
+ <flattenPackages ProjectPane="false" />
<showMembers />
<showModules />
<showLibraryContents />
- <hideEmptyPackages />
+ <hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
<showStructure PackagesPane="false" ProjectPane="false" />
<autoscrollToSource />
@@ -693,12 +854,40 @@
<recent name="org.jboss.test.rest.util" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.test.rest.samples.resourceview" />
<recent name="org.jboss.wsf.container.jboss50.rest" />
<recent name="org.jboss.rs.container.wsf" />
</key>
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager" selected="Remote.server">
+ <component name="RunManager" selected="Application.RunRegex">
+ <tempConfiguration default="false" name="RunRegex" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" value="org.jboss.test.rest.model.RunRegex" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="jboss-rest" />
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Run" />
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </tempConfiguration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -708,7 +897,17 @@
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
+ <method>
+ <option name="Make" value="true" />
+ </method>
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -728,25 +927,6 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration default="false" name="server" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -817,6 +997,7 @@
<option name="UPDATE_RUN_STATUS" value="false" />
<option name="UPDATE_RECURSIVELY" value="true" />
<option name="MERGE_DRY_RUN" value="false" />
+ <configuration useDefault="true">/home/hbraun/.subversion</configuration>
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@@ -836,27 +1017,27 @@
<frame x="-3" y="25" width="1686" height="1003" extended-state="6" />
<editor active="true" />
<layout>
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4498861" order="1" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997722" order="3" />
- <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39863327" order="3" />
+ <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32915717" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24954017" order="1" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
- <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.74943054" order="-1" />
- <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33476394" order="0" />
+ <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.74943054" order="8" />
+ <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29368487" order="0" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1563458" order="2" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32914287" order="2" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
@@ -886,7 +1067,7 @@
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
<option name="ERROR_OCCURED" value="false" />
- <option name="ACTIVE_VCS_NAME" />
+ <option name="ACTIVE_VCS_NAME" value="svn" />
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
@@ -937,43 +1118,43 @@
</component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="jboss-rest" />
+ <option name="myLastEditedConfigurable" value="spi" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-jaxws.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/model/StatefulResourceResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="24" column="111" selection-start="1043" selection-end="1043" vertical-scroll-proportion="0.60745615">
+ <state line="38" column="13" selection-start="1586" selection-end="1586" vertical-scroll-proportion="0.1794569">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java">
+ <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="64" column="0" selection-start="2343" selection-end="2343" vertical-scroll-proportion="0.18673219">
+ <state line="76" column="83" selection-start="2851" selection-end="2986" vertical-scroll-proportion="0.40023613">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-logging-spi.jar!/org/jboss/logging/Logger.class">
+ <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/rest/RestDeployerHookPostJSE.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="0" selection-start="2198" selection-end="2198" vertical-scroll-proportion="0.46314496">
+ <state line="43" column="76" selection-start="1701" selection-end="1701" vertical-scroll-proportion="0.6505313">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="0" selection-start="2276" selection-end="2276" vertical-scroll-proportion="0.63329315">
+ <state line="13" column="0" selection-start="456" selection-end="456" vertical-scroll-proportion="0.29161748">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/rest/RestDeployerHookPostJSE.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="10" selection-start="1601" selection-end="1818" vertical-scroll-proportion="0.893848">
+ <state line="42" column="13" selection-start="1619" selection-end="1619" vertical-scroll-proportion="-0.08972845">
<folding />
</state>
</provider>
@@ -985,69 +1166,62 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/jbossrest-context.war/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="1" column="0" selection-start="44" selection-end="44" vertical-scroll-proportion="0.022432113">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java">
+ <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="49" selection-start="2202" selection-end="2202" vertical-scroll-proportion="0.6875754">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="105" column="0" selection-start="3744" selection-end="3744" vertical-scroll-proportion="0.1893848">
+ <state line="63" column="51" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.11216056">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/resources/rest/deployment/web.xml">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="63" selection-start="338" selection-end="382" vertical-scroll-proportion="0.20627262">
+ <state line="32" column="51" selection-start="849" selection-end="849" vertical-scroll-proportion="0.08028335">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/resources/rest/media/web.xml">
+ <entry file="file://$PROJECT_DIR$/ant-import-tests/build-jars-rest.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="63" selection-start="382" selection-end="382" vertical-scroll-proportion="0.20627262">
+ <state line="50" column="88" selection-start="2447" selection-end="2447" vertical-scroll-proportion="0.72596157">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-structure-spi.jar!/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.class">
+ <entry file="file://$PROJECT_DIR$/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="79" column="0" selection-start="4046" selection-end="4046" vertical-scroll-proportion="0.50982803">
+ <state line="12" column="25" selection-start="324" selection-end="324" vertical-scroll-proportion="0.26918536">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="94" column="0" selection-start="3414" selection-end="3414" vertical-scroll-proportion="0.19244392">
+ <state line="13" column="18" selection-start="408" selection-end="408" vertical-scroll-proportion="0.022836538">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rest/ResourceRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="96" column="0" selection-start="3556" selection-end="3556" vertical-scroll-proportion="0.38822114">
+ <state line="33" column="13" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.24675325">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="63" column="65" selection-start="2100" selection-end="2100" vertical-scroll-proportion="0.10271547">
- <folding />
- </state>
- </provider>
- </entry>
</component>
</project>
Modified: rest/src/main/distro/bin-dist-build.xml
===================================================================
--- rest/src/main/distro/bin-dist-build.xml 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/distro/bin-dist-build.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -150,7 +150,7 @@
</target>
<target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ <ant antfile="${tests.dir}/ant-import/build-jars-rest.xml" target="build-jars-jaxws" inheritall="true"/>
</target>
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
Modified: rest/src/main/java/org/jboss/rest/ResourceRegistry.java
===================================================================
--- rest/src/main/java/org/jboss/rest/ResourceRegistry.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/java/org/jboss/rest/ResourceRegistry.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -23,10 +23,7 @@
import org.jboss.rest.model.ResourceModel;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Register root resources for webContext's.
@@ -53,5 +50,16 @@
return webContextMapping.get(webContext);
}
-
+
+ public void clearContext(String context)
+ {
+ assert webContextMapping.keySet().contains(context);
+ webContextMapping.remove(context);
+ }
+
+ public Set<String> getContexts()
+ {
+ return webContextMapping.keySet();
+ }
+
}
Modified: rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java
===================================================================
--- rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/java/org/jboss/rest/container/wsf/DescriptorDeploymentAspect.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -29,6 +29,7 @@
import org.jboss.wsf.spi.deployment.*;
import java.io.IOException;
+import java.net.URL;
/**
* Parses the jbossrs descriptor and turns it into a
@@ -49,7 +50,8 @@
try
{
UnifiedVirtualFile vf = getJBossRSDescriptor(deployment);
- JbossrsType dd = DeploymentDescriptorParser.read(vf.toURL().openStream());
+ URL url = vf.toURL();
+ JbossrsType dd = DeploymentDescriptorParser.read(url.openStream());
// keep the DD model
deployment.addAttachment(JbossrsType.class, dd);
Modified: rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java
===================================================================
--- rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/java/org/jboss/rest/container/wsf/ModelDeploymentAspect.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -41,9 +41,9 @@
{
Service service = deployment.getService();
- String contextRoot = service.getContextRoot();
+ String webContext = service.getContextRoot();
- if(null == contextRoot)
+ if(null == webContext)
throw new IllegalArgumentException("Null context root");
ResourceRegistry registry = ResourceRegistryFactory.newInstance().createResourceRegistry();
@@ -57,7 +57,7 @@
{
Class c = runtimeLoader.loadClass(ep.getTargetBeanName());
ResourceModel rootResource = parser.parse(c);
- registry.addResourceModelForContext(contextRoot, rootResource);
+ registry.addResourceModelForContext(webContext, rootResource);
}
catch (Exception e)
{
@@ -67,4 +67,14 @@
}
}
+
+ public void destroy(Deployment deployment)
+ {
+ Service service = deployment.getService();
+ String webContext = service.getContextRoot();
+ ResourceRegistry registry = ResourceRegistryFactory.newInstance().createResourceRegistry();
+ registry.clearContext(webContext);
+
+ super.destroy(deployment);
+ }
}
Modified: rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java
===================================================================
--- rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceServlet.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -138,7 +138,7 @@
private void parseAcceptHeader(HttpServletRequest req, RuntimeContext rt) throws ServletException {
String requestAccept = req.getHeader("Accept");
if(requestAccept!=null)
- rt.parseAcceptHeader("text/plain, text/html");
+ rt.parseAcceptHeader(requestAccept);
else
throw new ServletException("Accept header is missing");
}
Deleted: rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java
===================================================================
--- rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/java/org/jboss/rest/container/wsf/ResourceViewServlet.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -1,19 +0,0 @@
-package org.jboss.rest.container.wsf;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-public class ResourceViewServlet extends HttpServlet
-{
-
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- PrintWriter writer = res.getWriter();
- writer.write("ResourceViewServlet");
- writer.close();
- }
-}
Modified: rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java
===================================================================
--- rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/java/org/jboss/rest/model/dd/DeploymentDescriptorParser.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -50,6 +50,10 @@
{
throw new RuntimeException("Failed to unmarshall container descriptor", e);
}
+ finally
+ {
+ inputStream.close();
+ }
}
public static void write(JbossrsType dd, OutputStream outputStream)
Modified: rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml
===================================================================
--- rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/resources/jbossrest-context.war/WEB-INF/web.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -10,64 +10,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>JBossRest</display-name>
+ <display-name>JBossRest</display-name>
- <servlet>
- <servlet-name>ResourceViewServlet</servlet-name>
- <servlet-class>org.jboss.rest.container.wsf.ResourceViewServlet</servlet-class>
- </servlet>
-
- <!-- now the mappings -->
-
- <servlet-mapping>
- <servlet-name>ResourceViewServlet</servlet-name>
- <url-pattern>/resources/*</url-pattern>
- </servlet-mapping>
-
-
- <!-- A security constraint that restricts access
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>ContextServlet</web-resource-name>
- <description>An example security config that only allows users with the
- role 'friend' to access the JBossWS console web application
- </description>
- <url-pattern>/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>friend</role-name>
- </auth-constraint>
- </security-constraint>
+ <!--
+ currently the W3C haven't settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response
-->
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>JBossWS Management Console</realm-name>
- </login-config>
-
- <security-role>
- <role-name>friend</role-name>
- </security-role>
-
- <!--
- currently the W3C haven't settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response
- -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
</web-app>
Modified: rest/src/main/resources/jbossrest-context.war/index.html
===================================================================
--- rest/src/main/resources/jbossrest-context.war/index.html 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/main/resources/jbossrest-context.war/index.html 2007-11-22 17:10:00 UTC (rev 5102)
@@ -1,11 +1,11 @@
<html><head>
<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
-<title>JBossRS</title>
+<title>JBoss REST</title>
<link rel='stylesheet' href='./styles.css'>
</head>
<body>
-<div class='pageHeader'>Welcome to JBoss RESTful services</div>
+<h1>Welcome to JBoss REST </h1>
</body>
</html>
Modified: rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/test/java/org/jboss/test/rest/deployment/DeploymentTestCase.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -39,7 +39,7 @@
{
public static Test suite()
{
- return new RestTestSetup(DeploymentTestCase.class, "jbossrs-deployment.war");
+ return new RestTestSetup(DeploymentTestCase.class, "rest-deployment.war");
}
/**
@@ -48,7 +48,7 @@
*/
public void testRequest1() throws Exception
{
- URL url = new URL("http://localhost:8080/jbossrs-deployment/widgets");
+ URL url = new URL("http://localhost:8080/rest-deployment/widgets");
String response = doTextPlainRequest(url, null);
assertNotNull(response);
assertEquals("A widgetlist", response);
@@ -61,7 +61,7 @@
*/
public void testRequest2() throws Exception
{
- URL url = new URL("http://localhost:8080/jbossrs-deployment/widgets/123/id");
+ URL url = new URL("http://localhost:8080/rest-deployment/widgets/123/id");
String response = doTextPlainRequest(url, null);
assertNotNull(response);
assertEquals("123", response);
Modified: rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/test/java/org/jboss/test/rest/media/MediaTypeTestCase.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -20,7 +20,7 @@
{
public static Test suite()
{
- return new RestTestSetup(MediaTypeTestCase.class, "jbossrs-mediatype.war");
+ return new RestTestSetup(MediaTypeTestCase.class, "rest-mediatype.war");
}
/**
@@ -30,7 +30,7 @@
*/
public void testRequest1() throws Exception
{
- URL url = new URL("http://localhost:8080/jbossrs-mediatype/books/3897217279");
+ URL url = new URL("http://localhost:8080/rest-mediatype/books/3897217279");
Object response = doMediaRequest(url, null);
assertNotNull(response );
Modified: rest/src/test/java/org/jboss/test/rest/model/RunRegex.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/model/RunRegex.java 2007-11-22 10:32:14 UTC (rev 5101)
+++ rest/src/test/java/org/jboss/test/rest/model/RunRegex.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -24,6 +24,9 @@
import java.net.URI;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.Collection;
+import java.util.List;
+import java.util.ArrayList;
/**
* @author Heiko.Braun(a)jboss.com
@@ -34,7 +37,7 @@
public static void main(String[] args) throws Exception
{
- URI uri = new URI("http://jboss.com/widgets/special");
+ /*URI uri = new URI("http://jboss.com/widgets/special");
System.out.println(uri.getPath());
String s = "spec";
@@ -56,8 +59,20 @@
System.out.println("! "+matchingGroups);
System.out.println("< "+m.group(m.groupCount()));
- System.out.println("---");
+ System.out.println("---"); */
+ List<String> l = new ArrayList<String>();
+ Class type = getComponentType(l);
+ System.out.println(type);
+ System.out.println( type == String.class );
+
}
+
+ public static Class getComponentType(Collection<?> c)
+ {
+ System.out.println(c.getClass().getConstructors()[0].getParameterTypes());
+ return c.getClass();
+ }
+
}
Added: rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java
===================================================================
--- rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java (rev 0)
+++ rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java 2007-11-22 17:10:00 UTC (rev 5102)
@@ -0,0 +1,87 @@
+package org.jboss.test.rest.samples.resourceview;
+
+import org.jboss.rest.ResourceRegistryFactory;
+import org.jboss.rest.ResourceRegistry;
+import org.jboss.rest.model.ResourceModel;
+import org.jboss.rest.model.ResourceMethod;
+import org.jboss.rest.model.ResourceLocator;
+
+import javax.ws.rs.UriTemplate;
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.ProduceMime;
+import java.util.List;
+
+@UriTemplate("view")
+public class RegistryResource
+{
+ @HttpMethod
+ @ProduceMime("text/html")
+ public String getResources()
+ {
+ StringBuffer sb = new StringBuffer();
+
+ ResourceRegistry registry = ResourceRegistryFactory.newInstance().createResourceRegistry();
+
+ sb.append("<html><body>");
+ sb.append("<h1>Root resources</h1>");
+
+ sb.append("<table border=1>");
+ sb.append("<th colspan=2>Root resource</th><th>Resource methods</th><th>Locator</th><th>Sub resource methods</th>");
+
+ for(String context : registry.getContexts())
+ {
+ List<ResourceModel> resources = registry.getResourceModelsForContext(context);
+ sb.append("<tr><td colspan=5><h2>").append(context).append("</h2></td></tr>");
+
+ for(ResourceModel model : resources)
+ {
+ sb.append("<tr valign=top>");
+ sb.append("<td colspan=2>");
+ sb.append("<ul>");
+ sb.append("<li><b>").append(model.getUriTemplate()).append("</b></br>");
+ sb.append(model.getInvocationTarget());
+ sb.append("</ul>");
+ sb.append("</td>");
+
+ // resource methods
+ sb.append("<td><ul>");
+ for(ResourceMethod m : model.getResourceMethods())
+ {
+ sb.append("<li><b>");
+ sb.append(m.getMethodHTTP()).append(": ").append(m.getUriTemplate()).append("</b><br>");
+ sb.append("Produces: ").append(m.getProduceMimeTypes()).append("<br>");
+ sb.append("Consumes: ").append(m.getConsumeMimeTypes()).append("<br>");
+ }
+ sb.append("</ul></td>");
+
+ // locators
+ sb.append("<td><ul>");
+ for(ResourceLocator l : model.getResourceLocator())
+ {
+ sb.append("<li><b>");
+ sb.append(l.getUriTemplate()).append("</b><br>");
+ sb.append("Locates: ").append(l.field().getInvocationTarget());
+ }
+ sb.append("</ul> </td>");
+
+ // subresource methods
+ sb.append("<td><ul>");
+ for(ResourceMethod m : model.getSubResourceMethods())
+ {
+ sb.append("<li><b>");
+ sb.append(m.getMethodHTTP()).append(": ").append(m.getUriTemplate()).append("</b><br>");
+ sb.append("Produces: ").append(m.getProduceMimeTypes()).append("<br>");
+ sb.append("Consumes: ").append(m.getConsumeMimeTypes()).append("<br>");
+ }
+ sb.append("</ul> </td>");
+
+ sb.append("</tr>");
+ }
+
+ }
+
+ sb.append("</table>");
+ sb.append("</body></html>");
+ return sb.toString();
+ }
+}
Property changes on: rest/src/test/java/org/jboss/test/rest/samples/resourceview/RegistryResource.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml
===================================================================
--- rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml (rev 0)
+++ rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!-- A security domain that restricts access
+ <security-domain>java:/jaas/JBossWS</security-domain>
+ -->
+
+ <context-root>resources</context-root>
+
+</jboss-web>
Property changes on: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml
===================================================================
--- rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml (rev 0)
+++ rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<jbossrs xmlns="http://org.jboss.rest/">
+ <resource>
+ <name>Registry</name>
+ <implementation>org.jboss.test.rest.samples.resourceview.RegistryResource</implementation>
+ </resource>
+</jbossrs>
Property changes on: rest/src/test/resources/rest/samples/resourceview/WEB-INF/jbossrs.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml
===================================================================
--- rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml (rev 0)
+++ rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml 2007-11-22 17:10:00 UTC (rev 5102)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossRest</display-name>
+
+ <servlet>
+ <servlet-name>JBossRS</servlet-name>
+ <servlet-class>org.jboss.rest.container.wsf.ResourceServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JBossRS</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: rest/src/test/resources/rest/samples/resourceview/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 5 months
- 1
- 0