JBossWS SVN: r3983 - branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-24 18:46:30 -0400 (Tue, 24 Jul 2007)
New Revision: 3983
Added:
branches/jbossws-1.2.0.SP1_JBWS-1764/
Log:
Branch for patch
Copied: branches/jbossws-1.2.0.SP1_JBWS-1764 (from rev 3982, tags/jbossws-1.2.0.SP1)
16 years, 10 months
- 1
- 0
JBossWS SVN: r3982 - in branches/dlofthouse/JBWS-1763/jbossws-core/src/java: org/jboss/ws/core/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-24 18:05:26 -0400 (Tue, 24 Jul 2007)
New Revision: 3982
Modified:
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java
Log:
Roll back first prototype.
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -21,55 +21,29 @@
*/
package javax.xml.soap;
-/** The container for the SOAPHeader and SOAPBody portions of a SOAPPart object.
- * By default, a SOAPMessage object is created with a SOAPPart object that has a SOAPEnvelope object.
- * The SOAPEnvelope object by default has an empty SOAPBody object and an empty SOAPHeader object.<p>
- * The SOAPBody object is required, and the SOAPHeader object, though optional,
- * is used in the majority of cases. If the SOAPHeader object is not needed, it can be deleted, which is shown later.<p>
- * A client can access the SOAPHeader and SOAPBody objects by calling the methods SOAPEnvelope.getHeader and SOAPEnvelope.getBody.
- * The following lines of code use these two methods after starting with the SOAPMessage object message to get the SOAPPart object
- * sp, which is then used to get the SOAPEnvelope object se.<p>
- *
- * <code>
- * SOAPPart sp = message.getSOAPPart();<br>
- * SOAPEnvelope se = sp.getEnvelope();<br>
- * SOAPHeader sh = se.getHeader();<br>
- * SOAPBody sb = se.getBody(); <br>
- * </code>
- * <p>
- * It is possible to change the body or header of a SOAPEnvelope object by retrieving the current one,
- * deleting it, and then adding a new body or header.
- * The javax.xml.soap.Node method deleteNode deletes the XML element (node) on which it is called.
- * For example, the following line of code deletes the SOAPBody object that is retrieved by the method getBody.
- * <p>
- * <code>se.getBody().detachNode();</code>
- * <p>
- * To create a SOAPHeader object to replace the one that was removed,
- * a client uses the method SOAPEnvelope.addHeader, which creates a new header and adds it to the SOAPEnvelope object.
- * Similarly, the method addBody creates a new SOAPBody object and adds it to the SOAPEnvelope object.
- * The following code fragment retrieves the current header, removes it, and adds a new one.
- * Then it retrieves the current body, removes it, and adds a new one.
- * <p>
- * <code>
- * SOAPPart sp = message.getSOAPPart();<br>
- * SOAPEnvelope se = sp.getEnvelope();<br>
- * se.getHeader().detachNode(); <br>
- * SOAPHeader sh = se.addHeader();<br>
- * se.getBody().detachNode(); <br>
- * SOAPBody sb = se.addBody();<br>
- * </code>
- * <p>
- * <b>It is an error to add a SOAPBody or SOAPHeader object if one already exists.</b>
- * The SOAPEnvelope interface provides three methods for creating Name objects.
- * One method creates Name objects with a local name, a namespace prefix, and a namesapce URI.
- * The second method creates Name objects with a local name and a namespace prefix,
- * and the third creates Name objects with just a local name.
- * <p>
- * The following line of code, in which se is a SOAPEnvelope object, creates a new Name object with all three.
- * <code>
- * Name name = se.createName("GetLastTradePrice", "WOMBAT", "http://www.wombat.org/trader");
- * </code>
- *
+/** The container for the SOAPHeader and SOAPBody portions of a SOAPPart object. By default, a SOAPMessage object is created with a SOAPPart object that has a SOAPEnvelope object. The SOAPEnvelope object by default has an empty SOAPBody object and an empty SOAPHeader object. The SOAPBody object is required, and the SOAPHeader object, though optional, is used in the majority of cases. If the SOAPHeader object is not needed, it can be deleted, which is shown later.
+ A client can access the SOAPHeader and SOAPBody objects by calling the methods SOAPEnvelope.getHeader and SOAPEnvelope.getBody. The following lines of code use these two methods after starting with the SOAPMessage object message to get the SOAPPart object sp, which is then used to get the SOAPEnvelope object se.
+ SOAPPart sp = message.getSOAPPart();
+ SOAPEnvelope se = sp.getEnvelope();
+ SOAPHeader sh = se.getHeader();
+ SOAPBody sb = se.getBody();
+
+ It is possible to change the body or header of a SOAPEnvelope object by retrieving the current one, deleting it, and then adding a new body or header. The javax.xml.soap.Node method deleteNode deletes the XML element (node) on which it is called. For example, the following line of code deletes the SOAPBody object that is retrieved by the method getBody.
+ se.getBody().detachNode();
+
+ To create a SOAPHeader object to replace the one that was removed, a client uses the method SOAPEnvelope.addHeader, which creates a new header and adds it to the SOAPEnvelope object. Similarly, the method addBody creates a new SOAPBody object and adds it to the SOAPEnvelope object. The following code fragment retrieves the current header, removes it, and adds a new one. Then it retrieves the current body, removes it, and adds a new one.
+ SOAPPart sp = message.getSOAPPart();
+ SOAPEnvelope se = sp.getEnvelope();
+ se.getHeader().detachNode();
+ SOAPHeader sh = se.addHeader();
+ se.getBody().detachNode();
+ SOAPBody sb = se.addBody();
+
+ It is an error to add a SOAPBody or SOAPHeader object if one already exists.
+ The SOAPEnvelope interface provides three methods for creating Name objects. One method creates Name objects with a local name, a namespace prefix, and a namesapce URI. The second method creates Name objects with a local name and a namespace prefix, and the third creates Name objects with just a local name. The following line of code, in which se is a SOAPEnvelope object, creates a new Name object with all three.
+ Name name = se.createName("GetLastTradePrice", "WOMBAT",
+ "http://www.wombat.org/trader");
+
* @author Scott.Stark(a)jboss.org
* @version $Revision$
*/
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -24,13 +24,12 @@
// $Id$
import java.io.IOException;
+import java.io.InputStream;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
-import org.xml.sax.InputSource;
-
/**
* @author Heiko Braun, <heiko.braun(a)jboss.com>
* @author Thomas.Diesler(a)jboss.com
@@ -38,5 +37,5 @@
*/
public interface EnvelopeBuilder
{
- SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException;
+ SOAPEnvelope build(SOAPMessage soapMessage, InputStream in, boolean ignoreParseError) throws IOException, SOAPException;
}
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -23,28 +23,20 @@
//$Id$
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.Detail;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.dom.DOMSource;
-
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
+import javax.xml.namespace.QName;
+import javax.xml.soap.*;
+import javax.xml.transform.dom.DOMSource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
/**
* A SOAPEnvelope builder for JAXRPC based on DOM
*
@@ -64,13 +56,13 @@
this.style = style;
}
- public SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException
+ public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
{
// Parse the XML input stream
Element domEnv = null;
try
{
- domEnv = DOMUtils.parse(is);
+ domEnv = DOMUtils.parse(ins);
}
catch (IOException ex)
{
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -24,6 +24,7 @@
//$Id$
import java.io.IOException;
+import java.io.InputStream;
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -35,8 +36,8 @@
import javax.xml.transform.dom.DOMSource;
import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.core.utils.DOMWriter;
import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
/**
* A SOAPEnvelope builder for JAXWS in service mode PAYLOAD
@@ -46,13 +47,13 @@
*/
public class EnvelopeBuilderPayload implements EnvelopeBuilder
{
- public SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException
+ public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
{
// Parse the XML input stream
Element domEnv = null;
try
{
- domEnv = DOMUtils.parse(is);
+ domEnv = DOMUtils.parse(ins);
}
catch (IOException ex)
{
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -41,7 +41,6 @@
import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
import com.ctc.wstx.stax.WstxInputFactory;
@@ -92,20 +91,11 @@
this.fragmentBuffer.ensureCapacity(2048);
}
- public SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException
+ public SOAPEnvelope build(SOAPMessage soapMessage, InputStream in, boolean ignoreParseError) throws IOException, SOAPException
{
try
{
- XMLInputFactory factory = getFactoryInstance();
- InputStream ins = is.getByteStream();
- if (ins != null)
- {
- reader = factory.createXMLStreamReader(ins);
- }
- else
- {
- reader = factory.createXMLStreamReader(is.getCharacterStream());
- }
+ reader = getFactoryInstance().createXMLStreamReader(in);
}
catch (XMLStreamException e)
{
@@ -247,8 +237,7 @@
}
// TODO: this is rubbish. Use Source internally instead...
- private XMLFragment bufferToFragment(StringBuffer fragmentBuffer)
- {
+ private XMLFragment bufferToFragment(StringBuffer fragmentBuffer) {
StreamSource source = new StreamSource(new ByteArrayInputStream(fragmentBuffer.toString().getBytes()));
return new XMLFragment(source);
}
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -27,8 +27,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
import java.util.Collection;
import java.util.Iterator;
@@ -49,7 +47,6 @@
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
import org.jboss.ws.core.utils.IOUtils;
-import org.xml.sax.InputSource;
/**
* MessageFactory implementation
@@ -77,7 +74,8 @@
{
if (SOAPConstants.SOAP_1_2_PROTOCOL.equals(protocol))
envNamespace = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE;
- else envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
+ else
+ envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
}
/**
@@ -190,8 +188,7 @@
}
ContentType contentType = getContentType(mimeHeaders);
- if (log.isDebugEnabled())
- log.debug("createMessage: [contentType=" + contentType + "]");
+ if(log.isDebugEnabled()) log.debug("createMessage: [contentType=" + contentType + "]");
// Debug the incoming message
if (log.isTraceEnabled())
@@ -252,21 +249,8 @@
envBuilder = new EnvelopeBuilderDOM(getStyle());
}
- String charset = contentType.getParameter("charset");
- Reader reader = null;
-
- if (charset != null)
- {
- reader = new InputStreamReader(ins, charset);
- }
- else
- {
- reader = new InputStreamReader(ins);
- }
- InputSource source = new InputSource(reader);
-
// Build the payload
- envBuilder.build(soapMessage, source, ignoreParseError);
+ envBuilder.build(soapMessage, ins, ignoreParseError);
return soapMessage;
}
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -71,9 +71,8 @@
assertEnvelopeNamespace(namespaceURI);
addNamespaceDeclaration(prefix, namespaceURI);
- // the Element source might already contain a Header and Body declaration
- if(null == soapPart.getEnvelope().getHeader()) addHeader();
- if(null == soapPart.getEnvelope().getBody()) addBody();
+ addHeader();
+ addBody();
}
/** Construct a SOAP envelope for the given SOAP version URI.
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-07-24 21:58:32 UTC (rev 3981)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-07-24 22:05:26 UTC (rev 3982)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
package org.jboss.ws.core.soap;
// $Id$
@@ -28,7 +28,12 @@
import java.util.Iterator;
import java.util.List;
-import javax.xml.soap.*;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
@@ -53,7 +58,6 @@
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
import org.w3c.dom.UserDataHandler;
-import org.xml.sax.InputSource;
/** An implementation of SOAPPart.
*
@@ -79,7 +83,7 @@
{
return soapMessage;
}
-
+
public SOAPEnvelope getEnvelope() throws SOAPException
{
return soapEnvelope;
@@ -144,17 +148,11 @@
// Specifically, the HTTP response entity-body must be empty.
if (source == null)
{
- if (log.isDebugEnabled())
- log.debug("Setting content source to null removes the SOAPEnvelope");
+ if(log.isDebugEnabled()) log.debug("Setting content source to null removes the SOAPEnvelope");
soapEnvelope = null;
return;
}
- // Start with a fresh soapMessage
- /*MessageFactory mf = MessageFactory.newInstance();
- soapMessage = mf.createMessage();
- soapMessage.getSOAPHeader().detachNode();*/
-
if (source instanceof DOMSource)
{
Element domElement;
@@ -164,8 +162,9 @@
domElement = ((Document)node).getDocumentElement();
else if (node instanceof Element)
domElement = (Element)node;
- else throw new SOAPException("Unsupported DOMSource node: " + node);
-
+ else
+ throw new SOAPException("Unsupported DOMSource node: " + node);
+
EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
envBuilder.build(soapMessage, domElement);
}
@@ -175,7 +174,7 @@
{
StreamSource streamSource = (StreamSource)source;
EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
- envBuilder.build(soapMessage, new InputSource(streamSource.getInputStream()), false);
+ envBuilder.build(soapMessage, streamSource.getInputStream(), false);
}
catch (IOException e)
{
@@ -303,7 +302,7 @@
if (soapEnvelope != null)
{
list.add((NodeImpl)soapEnvelope);
- }
+ }
return new NodeListImpl(list);
}
16 years, 10 months
- 1
- 0
JBossWS SVN: r3981 - branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-24 17:58:32 -0400 (Tue, 24 Jul 2007)
New Revision: 3981
Modified:
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
Log:
Prototype Code
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-07-24 17:13:30 UTC (rev 3980)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/binding/DeserializerSupport.java 2007-07-24 21:58:32 UTC (rev 3981)
@@ -35,6 +35,7 @@
import org.jboss.ws.WSException;
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
/** The base class for all Deserializers.
*
@@ -62,7 +63,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray());
+ xmlFragment = new String(baos.toByteArray(), "UTF-8");
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -70,6 +71,8 @@
}
} catch (TransformerException e) {
WSException.rethrow(e);
+ } catch (UnsupportedEncodingException e) {
+ WSException.rethrow(e);
}
return xmlFragment;
16 years, 10 months
- 1
- 0
JBossWS SVN: r3980 - in branches/dlofthouse/JBWS-1763/jbossws-core/src/java: org/jboss/ws/core/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-24 13:13:30 -0400 (Tue, 24 Jul 2007)
New Revision: 3980
Modified:
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java
Log:
Prototype Code
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/javax/xml/soap/SOAPEnvelope.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -21,29 +21,55 @@
*/
package javax.xml.soap;
-/** The container for the SOAPHeader and SOAPBody portions of a SOAPPart object. By default, a SOAPMessage object is created with a SOAPPart object that has a SOAPEnvelope object. The SOAPEnvelope object by default has an empty SOAPBody object and an empty SOAPHeader object. The SOAPBody object is required, and the SOAPHeader object, though optional, is used in the majority of cases. If the SOAPHeader object is not needed, it can be deleted, which is shown later.
- A client can access the SOAPHeader and SOAPBody objects by calling the methods SOAPEnvelope.getHeader and SOAPEnvelope.getBody. The following lines of code use these two methods after starting with the SOAPMessage object message to get the SOAPPart object sp, which is then used to get the SOAPEnvelope object se.
- SOAPPart sp = message.getSOAPPart();
- SOAPEnvelope se = sp.getEnvelope();
- SOAPHeader sh = se.getHeader();
- SOAPBody sb = se.getBody();
-
- It is possible to change the body or header of a SOAPEnvelope object by retrieving the current one, deleting it, and then adding a new body or header. The javax.xml.soap.Node method deleteNode deletes the XML element (node) on which it is called. For example, the following line of code deletes the SOAPBody object that is retrieved by the method getBody.
- se.getBody().detachNode();
-
- To create a SOAPHeader object to replace the one that was removed, a client uses the method SOAPEnvelope.addHeader, which creates a new header and adds it to the SOAPEnvelope object. Similarly, the method addBody creates a new SOAPBody object and adds it to the SOAPEnvelope object. The following code fragment retrieves the current header, removes it, and adds a new one. Then it retrieves the current body, removes it, and adds a new one.
- SOAPPart sp = message.getSOAPPart();
- SOAPEnvelope se = sp.getEnvelope();
- se.getHeader().detachNode();
- SOAPHeader sh = se.addHeader();
- se.getBody().detachNode();
- SOAPBody sb = se.addBody();
-
- It is an error to add a SOAPBody or SOAPHeader object if one already exists.
- The SOAPEnvelope interface provides three methods for creating Name objects. One method creates Name objects with a local name, a namespace prefix, and a namesapce URI. The second method creates Name objects with a local name and a namespace prefix, and the third creates Name objects with just a local name. The following line of code, in which se is a SOAPEnvelope object, creates a new Name object with all three.
- Name name = se.createName("GetLastTradePrice", "WOMBAT",
- "http://www.wombat.org/trader");
-
+/** The container for the SOAPHeader and SOAPBody portions of a SOAPPart object.
+ * By default, a SOAPMessage object is created with a SOAPPart object that has a SOAPEnvelope object.
+ * The SOAPEnvelope object by default has an empty SOAPBody object and an empty SOAPHeader object.<p>
+ * The SOAPBody object is required, and the SOAPHeader object, though optional,
+ * is used in the majority of cases. If the SOAPHeader object is not needed, it can be deleted, which is shown later.<p>
+ * A client can access the SOAPHeader and SOAPBody objects by calling the methods SOAPEnvelope.getHeader and SOAPEnvelope.getBody.
+ * The following lines of code use these two methods after starting with the SOAPMessage object message to get the SOAPPart object
+ * sp, which is then used to get the SOAPEnvelope object se.<p>
+ *
+ * <code>
+ * SOAPPart sp = message.getSOAPPart();<br>
+ * SOAPEnvelope se = sp.getEnvelope();<br>
+ * SOAPHeader sh = se.getHeader();<br>
+ * SOAPBody sb = se.getBody(); <br>
+ * </code>
+ * <p>
+ * It is possible to change the body or header of a SOAPEnvelope object by retrieving the current one,
+ * deleting it, and then adding a new body or header.
+ * The javax.xml.soap.Node method deleteNode deletes the XML element (node) on which it is called.
+ * For example, the following line of code deletes the SOAPBody object that is retrieved by the method getBody.
+ * <p>
+ * <code>se.getBody().detachNode();</code>
+ * <p>
+ * To create a SOAPHeader object to replace the one that was removed,
+ * a client uses the method SOAPEnvelope.addHeader, which creates a new header and adds it to the SOAPEnvelope object.
+ * Similarly, the method addBody creates a new SOAPBody object and adds it to the SOAPEnvelope object.
+ * The following code fragment retrieves the current header, removes it, and adds a new one.
+ * Then it retrieves the current body, removes it, and adds a new one.
+ * <p>
+ * <code>
+ * SOAPPart sp = message.getSOAPPart();<br>
+ * SOAPEnvelope se = sp.getEnvelope();<br>
+ * se.getHeader().detachNode(); <br>
+ * SOAPHeader sh = se.addHeader();<br>
+ * se.getBody().detachNode(); <br>
+ * SOAPBody sb = se.addBody();<br>
+ * </code>
+ * <p>
+ * <b>It is an error to add a SOAPBody or SOAPHeader object if one already exists.</b>
+ * The SOAPEnvelope interface provides three methods for creating Name objects.
+ * One method creates Name objects with a local name, a namespace prefix, and a namesapce URI.
+ * The second method creates Name objects with a local name and a namespace prefix,
+ * and the third creates Name objects with just a local name.
+ * <p>
+ * The following line of code, in which se is a SOAPEnvelope object, creates a new Name object with all three.
+ * <code>
+ * Name name = se.createName("GetLastTradePrice", "WOMBAT", "http://www.wombat.org/trader");
+ * </code>
+ *
* @author Scott.Stark(a)jboss.org
* @version $Revision$
*/
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilder.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -24,12 +24,13 @@
// $Id$
import java.io.IOException;
-import java.io.InputStream;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import org.xml.sax.InputSource;
+
/**
* @author Heiko Braun, <heiko.braun(a)jboss.com>
* @author Thomas.Diesler(a)jboss.com
@@ -37,5 +38,5 @@
*/
public interface EnvelopeBuilder
{
- SOAPEnvelope build(SOAPMessage soapMessage, InputStream in, boolean ignoreParseError) throws IOException, SOAPException;
+ SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException;
}
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -23,20 +23,28 @@
//$Id$
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.Detail;
+import javax.xml.soap.Name;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.dom.DOMSource;
+
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
-import javax.xml.namespace.QName;
-import javax.xml.soap.*;
-import javax.xml.transform.dom.DOMSource;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
/**
* A SOAPEnvelope builder for JAXRPC based on DOM
*
@@ -56,13 +64,13 @@
this.style = style;
}
- public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
+ public SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException
{
// Parse the XML input stream
Element domEnv = null;
try
{
- domEnv = DOMUtils.parse(ins);
+ domEnv = DOMUtils.parse(is);
}
catch (IOException ex)
{
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderPayload.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -24,7 +24,6 @@
//$Id$
import java.io.IOException;
-import java.io.InputStream;
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -36,8 +35,8 @@
import javax.xml.transform.dom.DOMSource;
import org.jboss.ws.core.utils.DOMUtils;
-import org.jboss.ws.core.utils.DOMWriter;
import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
/**
* A SOAPEnvelope builder for JAXWS in service mode PAYLOAD
@@ -47,13 +46,13 @@
*/
public class EnvelopeBuilderPayload implements EnvelopeBuilder
{
- public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException
+ public SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException
{
// Parse the XML input stream
Element domEnv = null;
try
{
- domEnv = DOMUtils.parse(ins);
+ domEnv = DOMUtils.parse(is);
}
catch (IOException ex)
{
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -41,6 +41,7 @@
import javax.xml.transform.stream.StreamSource;
import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
import com.ctc.wstx.stax.WstxInputFactory;
@@ -91,11 +92,20 @@
this.fragmentBuffer.ensureCapacity(2048);
}
- public SOAPEnvelope build(SOAPMessage soapMessage, InputStream in, boolean ignoreParseError) throws IOException, SOAPException
+ public SOAPEnvelope build(SOAPMessage soapMessage, InputSource is, boolean ignoreParseError) throws IOException, SOAPException
{
try
{
- reader = getFactoryInstance().createXMLStreamReader(in);
+ XMLInputFactory factory = getFactoryInstance();
+ InputStream ins = is.getByteStream();
+ if (ins != null)
+ {
+ reader = factory.createXMLStreamReader(ins);
+ }
+ else
+ {
+ reader = factory.createXMLStreamReader(is.getCharacterStream());
+ }
}
catch (XMLStreamException e)
{
@@ -237,7 +247,8 @@
}
// TODO: this is rubbish. Use Source internally instead...
- private XMLFragment bufferToFragment(StringBuffer fragmentBuffer) {
+ private XMLFragment bufferToFragment(StringBuffer fragmentBuffer)
+ {
StreamSource source = new StreamSource(new ByteArrayInputStream(fragmentBuffer.toString().getBytes()));
return new XMLFragment(source);
}
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -27,6 +27,8 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.util.Collection;
import java.util.Iterator;
@@ -47,6 +49,7 @@
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
import org.jboss.ws.core.utils.IOUtils;
+import org.xml.sax.InputSource;
/**
* MessageFactory implementation
@@ -74,8 +77,7 @@
{
if (SOAPConstants.SOAP_1_2_PROTOCOL.equals(protocol))
envNamespace = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE;
- else
- envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
+ else envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE;
}
/**
@@ -188,7 +190,8 @@
}
ContentType contentType = getContentType(mimeHeaders);
- if(log.isDebugEnabled()) log.debug("createMessage: [contentType=" + contentType + "]");
+ if (log.isDebugEnabled())
+ log.debug("createMessage: [contentType=" + contentType + "]");
// Debug the incoming message
if (log.isTraceEnabled())
@@ -249,8 +252,21 @@
envBuilder = new EnvelopeBuilderDOM(getStyle());
}
+ String charset = contentType.getParameter("charset");
+ Reader reader = null;
+
+ if (charset != null)
+ {
+ reader = new InputStreamReader(ins, charset);
+ }
+ else
+ {
+ reader = new InputStreamReader(ins);
+ }
+ InputSource source = new InputSource(reader);
+
// Build the payload
- envBuilder.build(soapMessage, ins, ignoreParseError);
+ envBuilder.build(soapMessage, source, ignoreParseError);
return soapMessage;
}
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -71,8 +71,9 @@
assertEnvelopeNamespace(namespaceURI);
addNamespaceDeclaration(prefix, namespaceURI);
- addHeader();
- addBody();
+ // the Element source might already contain a Header and Body declaration
+ if(null == soapPart.getEnvelope().getHeader()) addHeader();
+ if(null == soapPart.getEnvelope().getBody()) addBody();
}
/** Construct a SOAP envelope for the given SOAP version URI.
Modified: branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-07-24 17:02:53 UTC (rev 3979)
+++ branches/dlofthouse/JBWS-1763/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-07-24 17:13:30 UTC (rev 3980)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.core.soap;
// $Id$
@@ -28,12 +28,7 @@
import java.util.Iterator;
import java.util.List;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
+import javax.xml.soap.*;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
@@ -58,6 +53,7 @@
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
import org.w3c.dom.UserDataHandler;
+import org.xml.sax.InputSource;
/** An implementation of SOAPPart.
*
@@ -83,7 +79,7 @@
{
return soapMessage;
}
-
+
public SOAPEnvelope getEnvelope() throws SOAPException
{
return soapEnvelope;
@@ -148,11 +144,17 @@
// Specifically, the HTTP response entity-body must be empty.
if (source == null)
{
- if(log.isDebugEnabled()) log.debug("Setting content source to null removes the SOAPEnvelope");
+ if (log.isDebugEnabled())
+ log.debug("Setting content source to null removes the SOAPEnvelope");
soapEnvelope = null;
return;
}
+ // Start with a fresh soapMessage
+ /*MessageFactory mf = MessageFactory.newInstance();
+ soapMessage = mf.createMessage();
+ soapMessage.getSOAPHeader().detachNode();*/
+
if (source instanceof DOMSource)
{
Element domElement;
@@ -162,9 +164,8 @@
domElement = ((Document)node).getDocumentElement();
else if (node instanceof Element)
domElement = (Element)node;
- else
- throw new SOAPException("Unsupported DOMSource node: " + node);
-
+ else throw new SOAPException("Unsupported DOMSource node: " + node);
+
EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
envBuilder.build(soapMessage, domElement);
}
@@ -174,7 +175,7 @@
{
StreamSource streamSource = (StreamSource)source;
EnvelopeBuilderDOM envBuilder = new EnvelopeBuilderDOM(Style.DOCUMENT);
- envBuilder.build(soapMessage, streamSource.getInputStream(), false);
+ envBuilder.build(soapMessage, new InputSource(streamSource.getInputStream()), false);
}
catch (IOException e)
{
@@ -302,7 +303,7 @@
if (soapEnvelope != null)
{
list.add((NodeImpl)soapEnvelope);
- }
+ }
return new NodeListImpl(list);
}
16 years, 10 months
- 1
- 0
JBossWS SVN: r3979 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-07-24 13:02:53 -0400 (Tue, 24 Jul 2007)
New Revision: 3979
Added:
branches/dlofthouse/JBWS-1763/
Log:
Branch to prototype the solution.
Copied: branches/dlofthouse/JBWS-1763 (from rev 3978, tags/jbossws-1.2.0.SP1)
16 years, 10 months
- 1
- 0
JBossWS SVN: r3978 - in trunk: integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-07-24 11:09:52 -0400 (Tue, 24 Jul 2007)
New Revision: 3978
Added:
trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java
trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
Removed:
trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor
trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor
Modified:
trunk/JBossWS-Trunk.iws
trunk/integration/jboss42/int-42.iml
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
Log:
Provide SecurityAdapterFactory through SPIProvider
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/JBossWS-Trunk.iws 2007-07-24 15:09:52 UTC (rev 3978)
@@ -121,7 +121,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="61" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework">
+ <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="62" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework">
<option name="ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -186,7 +186,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.ServiceEndpointServlet" package="org.jboss.wsf.stack.jbws">
+ <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.EndpointServlet" package="org.jboss.wsf.stack.jbws">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -199,6 +199,32 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="115" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework">
+ <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://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="121" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework">
+ <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>
@@ -254,39 +280,48 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="ServerConfigFactory.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java">
+ <file leaf-file-name="DefaultSPIProviderResolver.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="22" selection-start="1310" selection-end="1310" vertical-scroll-proportion="0.30952382">
+ <state line="137" column="0" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.73170733">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ServiceLoader.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="83" column="0" selection-start="3381" selection-end="3381" vertical-scroll-proportion="0.1863354">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DefaultSPIProviderResolver.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java">
+ <file leaf-file-name="org.jboss.wsf.spi.invocation.SecurityAdaptorFactory" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="13" selection-start="1881" selection-end="1881" vertical-scroll-proportion="-1.4285715">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ServerConfig.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java">
+ <file leaf-file-name="TestDeployerJBoss.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="17" selection-start="1327" selection-end="1327" vertical-scroll-proportion="0.33333334">
+ <state line="83" column="12" selection-start="2874" selection-end="2874" vertical-scroll-proportion="0.3416149">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RequestHandlerImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java">
+ <file leaf-file-name="SecurityAdapterFactoryImpl.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="36" selection-start="3863" selection-end="3863" vertical-scroll-proportion="0.13818182">
+ <state line="30" column="39" selection-start="1257" selection-end="1283" vertical-scroll-proportion="0.24390244">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -325,7 +360,7 @@
<setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="int-40" />
+ <option name="LAST_EDITED_MODULE_NAME" value="int-42" />
<option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
</component>
<component name="NamedScopeManager" />
@@ -420,7 +455,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="management" />
+ <option name="myItemId" value="invocation" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
@@ -441,7 +476,73 @@
<option name="myItemId" value="jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="framework" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="container" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
</component>
<component name="PerforceChangeBrowserSettings">
<option name="USE_CLIENT_FILTER" value="true" />
@@ -493,6 +594,10 @@
<option name="myItemId" value="JBossWS-Trunk.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -500,6 +605,70 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/samples" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="spi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
@@ -532,16 +701,580 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/src/main/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/output" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.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$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/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$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.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$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss42/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.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$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="int-40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss40/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="PackagesPane" splitterProportion="0.5">
+ <navigator currentView="ProjectPane" splitterProportion="0.5">
<flattenPackages PackagesPane="false" />
<showMembers />
<showModules />
@@ -593,6 +1326,13 @@
<option name="ALTERNATIVE_JRE_PATH" />
<module name="" />
</configuration>
+ <configuration selected="false" 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 selected="false" default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -605,13 +1345,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration selected="false" 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 selected="false" default="true" type="JUnit" factoryName="JUnit">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -628,7 +1361,7 @@
<value defaultName="wholeProject" />
</option>
</configuration>
- <configuration selected="true" default="false" name="server" type="Remote" factoryName="Remote">
+ <configuration selected="false" default="false" name="server" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
@@ -641,7 +1374,7 @@
</RunnerSettings>
<ConfigurationWrapper RunnerId="Debug" />
</configuration>
- <configuration selected="false" default="false" name="client" type="Remote" factoryName="Remote">
+ <configuration selected="true" 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" />
@@ -701,12 +1434,12 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1680" height="1000" extended-state="0" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.30147967" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5452463" order="1" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.35326758" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.49140894" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
@@ -715,7 +1448,7 @@
<window_info id="Favorites" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23366214" order="2" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.17509247" order="2" />
<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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
@@ -791,120 +1524,107 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.024242423">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="155" column="113" selection-start="6114" selection-end="6114" vertical-scroll-proportion="0.18692811">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
+ <state line="49" column="113" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.5751634">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.24242425">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="38" column="3" selection-start="1459" selection-end="1459" vertical-scroll-proportion="0.3821656">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1364" selection-end="1364" vertical-scroll-proportion="0.26190478">
+ <state line="38" column="3" selection-start="1456" selection-end="1456" vertical-scroll-proportion="0.3821656">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="46" selection-start="1317" selection-end="1317" vertical-scroll-proportion="0.19393939">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="21" column="36" selection-start="1022" selection-end="1050" vertical-scroll-proportion="0.026143791">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="40" selection-start="1893" selection-end="1893" vertical-scroll-proportion="0.5090909">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="31" column="22" selection-start="1212" selection-end="1212" vertical-scroll-proportion="0.26666668">
+ <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.26666668">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="22" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.21428572">
+ <state line="33" column="17" selection-start="1278" selection-end="1278" vertical-scroll-proportion="0.325">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="17" selection-start="1270" selection-end="1270" vertical-scroll-proportion="0.23809524">
- <folding />
+ <state line="21" column="39" selection-start="1022" selection-end="1053" vertical-scroll-proportion="0.025">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="17" selection-start="1327" selection-end="1327" vertical-scroll-proportion="0.33333334">
+ <state line="83" column="12" selection-start="2874" selection-end="2874" vertical-scroll-proportion="0.3416149">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="167" column="22" selection-start="6457" selection-end="6457" vertical-scroll-proportion="0.17575757">
- <folding />
+ <state line="30" column="39" selection-start="1257" selection-end="1283" vertical-scroll-proportion="0.24390244">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="36" selection-start="3863" selection-end="3863" vertical-scroll-proportion="0.13818182">
+ <state line="137" column="0" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.73170733">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="22" selection-start="1310" selection-end="1310" vertical-scroll-proportion="0.30952382">
+ <state line="83" column="0" selection-start="3381" selection-end="3381" vertical-scroll-proportion="0.1863354">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="13" selection-start="1881" selection-end="1881" vertical-scroll-proportion="-1.4285715">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="0" column="58" selection-start="58" selection-end="58" vertical-scroll-proportion="0.0">
+ <folding />
</state>
</provider>
</entry>
Deleted: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor
===================================================================
--- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor 2007-07-24 15:09:52 UTC (rev 3978)
@@ -1 +0,0 @@
-org.jboss.wsf.container.jboss42.SecurityAdaptorImpl
\ No newline at end of file
Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0)
+++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2007-07-24 15:09:52 UTC (rev 3978)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.SecurityAdapterFactoryImpl
\ No newline at end of file
Modified: trunk/integration/jboss42/int-42.iml
===================================================================
--- trunk/integration/jboss42/int-42.iml 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss42/int-42.iml 2007-07-24 15:09:52 UTC (rev 3978)
@@ -20,7 +20,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="42-server" />
- <orderEntry type="module" module-name="42-system" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -33,6 +32,7 @@
<orderEntry type="library" name="jboss-system" level="project" />
<orderEntry type="library" name="jboss-jmx" level="project" />
<orderEntry type="library" name="jboss-system-jmx" level="project" />
+ <orderEntry type="module" module-name="jbossws-core" />
<orderEntryProperties />
</component>
</module>
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -37,6 +37,8 @@
import org.jboss.wsf.spi.invocation.*;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.SPIProvider;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -153,7 +155,8 @@
if (msgContext == null)
throw new IllegalStateException("Cannot obtain MessageContext");
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).createSecurityAdapter();
Principal principal = securityAdaptor.getPrincipal();
Object credential = securityAdaptor.getCredential();
Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss42;
+
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory
+{
+ public SecurityAdaptor createSecurityAdapter()
+ {
+ return new SecurityAdaptorImpl();
+ }
+}
Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdapterFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityAdaptorImpl.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -36,6 +36,10 @@
*/
public class SecurityAdaptorImpl implements SecurityAdaptor
{
+ SecurityAdaptorImpl()
+ {
+ }
+
public Principal getPrincipal()
{
return SecurityAssociation.getPrincipal();
Deleted: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor 2007-07-24 15:09:52 UTC (rev 3978)
@@ -1 +0,0 @@
-org.jboss.wsf.container.jboss42.SecurityAdaptorImpl
\ No newline at end of file
Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2007-07-24 15:09:52 UTC (rev 3978)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss42.SecurityAdapterFactoryImpl
\ No newline at end of file
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -39,6 +39,8 @@
import org.jboss.wsf.spi.invocation.*;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -150,7 +152,8 @@
if (msgContext == null)
throw new IllegalStateException("Cannot obtain MessageContext");
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).createSecurityAdapter();
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
Principal principal = securityAdaptor.getPrincipal();
Object credential = securityAdaptor.getCredential();
Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss50;
+
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory
+{
+ public SecurityAdaptor createSecurityAdapter()
+ {
+ return new SecurityAdaptorImpl();
+ }
+}
Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdapterFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -36,6 +36,10 @@
*/
public class SecurityAdaptorImpl implements SecurityAdaptor
{
+ SecurityAdaptorImpl()
+ {
+ }
+
public Principal getPrincipal()
{
return SecurityAssociation.getPrincipal();
Deleted: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor
===================================================================
--- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptor 2007-07-24 15:09:52 UTC (rev 3978)
@@ -1 +0,0 @@
-org.jboss.wsf.container.jboss50.SecurityAdaptorImpl
\ No newline at end of file
Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2007-07-24 15:09:52 UTC (rev 3978)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss50.SecurityAdapterFactoryImpl
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -35,6 +35,7 @@
import org.jboss.wsf.spi.invocation.InvocationModelFactory;
import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
/**
* @author Heiko.Braun(a)jboss.com
@@ -112,6 +113,10 @@
{
returnType = (T) loadService(spiType, null);
}
+ else if(SecurityAdaptorFactory.class.equals(spiType))
+ {
+ returnType = (T) loadService(spiType, null);
+ }
// help debugging
if(null == returnType)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -23,22 +23,17 @@
// $Id$
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.SPIView;
/**
* A container idependent SecurityAdaptorFactory
*
* @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ *
* @since 10-May-2005
*/
-public final class SecurityAdaptorFactory
+public abstract class SecurityAdaptorFactory implements SPIView
{
- public static SecurityAdaptor getSecurityAdaptor()
- {
- SecurityAdaptor securityAdaptor = (SecurityAdaptor) ServiceLoader.loadService(SecurityAdaptor.class.getName(), null);
- if (securityAdaptor == null)
- throw new IllegalStateException("Cannot load SecurityAdaptor");
-
- return securityAdaptor;
- }
+ public abstract SecurityAdaptor createSecurityAdapter();
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -35,6 +35,8 @@
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* A JBossWS test helper that deals with test deployment/undeployment, etc.
@@ -45,7 +47,7 @@
public class TestDeployerJBoss implements TestDeployer
{
private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
-
+
private MBeanServerConnection server;
private String username;
private String password;
@@ -53,11 +55,11 @@
public TestDeployerJBoss(MBeanServerConnection server)
{
this.server = server;
-
+
username = System.getProperty("jmx.authentication.username");
if ("${jmx.authentication.username}".equals(username))
username = null;
-
+
password = System.getProperty("jmx.authentication.password");
if ("${jmx.authentication.password}".equals(password))
password = null;
@@ -77,8 +79,9 @@
{
Principal prevUsername = null;
Object prevPassword = null;
-
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
+
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).createSecurityAdapter();
if (username != null || password != null)
{
prevUsername = securityAdaptor.getPrincipal();
@@ -86,7 +89,7 @@
securityAdaptor.setPrincipal(new SimplePrincipal(username));
securityAdaptor.setCredential(password);
}
-
+
try
{
server.invoke(new ObjectName(MAIN_DEPLOYER), methodName, new Object[] { url }, new String[] { "java.net.URL" });
@@ -104,7 +107,7 @@
public static class SimplePrincipal implements Principal, Serializable
{
private String name;
-
+
public SimplePrincipal(String name)
{
this.name = name;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-07-24 14:13:52 UTC (rev 3977)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-07-24 15:09:52 UTC (rev 3978)
@@ -28,6 +28,8 @@
import org.jboss.ws.extensions.security.element.UsernameToken;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.w3c.dom.Document;
public class ReceiveUsernameOperation implements TokenOperation
@@ -44,7 +46,8 @@
public void process(Document message, Token token) throws WSSecurityException
{
UsernameToken user = (UsernameToken)token;
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).createSecurityAdapter();
securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername()));
securityAdaptor.setCredential(user.getPassword());
}
16 years, 10 months
- 1
- 0
JBossWS SVN: r3977 - trunk/integration/xfire/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-07-24 10:13:52 -0400 (Tue, 24 Jul 2007)
New Revision: 3977
Modified:
trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt
trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt
Log:
Fix typo
Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-07-24 13:52:23 UTC (rev 3976)
+++ trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-07-24 14:13:52 UTC (rev 3977)
@@ -51,6 +51,6 @@
# [JBWS-1759] Investigate CXF samples webservice
org/jboss/test/ws/jaxws/samples/webservice/**
-# [JBWS-1759] Investigate CXF samples xop
+# [JBWS-1760] Investigate CXF samples xop
org/jboss/test/ws/jaxws/samples/xop/**
Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-07-24 13:52:23 UTC (rev 3976)
+++ trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-07-24 14:13:52 UTC (rev 3977)
@@ -51,6 +51,6 @@
# [JBWS-1759] Investigate CXF samples webservice
org/jboss/test/ws/jaxws/samples/webservice/**
-# [JBWS-1759] Investigate CXF samples xop
+# [JBWS-1760] Investigate CXF samples xop
org/jboss/test/ws/jaxws/samples/xop/**
16 years, 10 months
- 1
- 0
JBossWS SVN: r3976 - in trunk: integration/jboss40 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-07-24 09:52:23 -0400 (Tue, 24 Jul 2007)
New Revision: 3976
Modified:
trunk/JBossWS-Trunk.iws
trunk/integration/jboss40/int-40.iml
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
Log:
WebServiceClientDeployer did depend on DefaultSPIProvider implementation: Fixed
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-07-24 13:35:47 UTC (rev 3975)
+++ trunk/JBossWS-Trunk.iws 2007-07-24 13:52:23 UTC (rev 3976)
@@ -253,7 +253,48 @@
<option name="myCurrentFavoritesList" value="JBossWS-Trunk" />
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="ServerConfigFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="33" column="22" selection-start="1310" selection-end="1310" vertical-scroll-proportion="0.30952382">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DefaultSPIProviderResolver.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="42" column="13" selection-start="1881" selection-end="1881" vertical-scroll-proportion="-1.4285715">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ServerConfig.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="36" column="17" selection-start="1327" selection-end="1327" vertical-scroll-proportion="0.33333334">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RequestHandlerImpl.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="88" column="36" selection-start="3863" selection-end="3863" vertical-scroll-proportion="0.13818182">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -284,7 +325,7 @@
<setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="int-xfire" />
+ <option name="LAST_EDITED_MODULE_NAME" value="int-40" />
<option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
</component>
<component name="NamedScopeManager" />
@@ -301,7 +342,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-42" />
+ <option name="myItemId" value="spi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
@@ -311,7 +352,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="int-42" />
+ <option name="myItemId" value="spi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -326,15 +367,81 @@
<option name="myItemId" value="wsf" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="container" />
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="jboss42" />
+ <option name="myItemId" value="jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="wsf" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="management" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="JBossWS-Trunk.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="spi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
+ </PATH>
</component>
<component name="PerforceChangeBrowserSettings">
<option name="USE_CLIENT_FILTER" value="true" />
@@ -425,122 +532,16 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/output" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/src/main/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="ProjectPane" splitterProportion="0.5">
+ <navigator currentView="PackagesPane" splitterProportion="0.5">
<flattenPackages PackagesPane="false" />
<showMembers />
<showModules />
@@ -700,11 +701,11 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1680" height="1000" extended-state="0" />
- <editor active="false" />
+ <editor active="true" />
<layout>
<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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.30147967" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.30147967" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5452463" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
@@ -790,115 +791,117 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-javaee.jar!/javax/servlet/http/HttpServlet.class">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="22" selection-start="165" selection-end="165" vertical-scroll-proportion="0.096969694">
- <folding />
+ <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.024242423">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/xml/ws/transport/http/servlet/WSServletDelegate.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="30" selection-start="1956" selection-end="1956" vertical-scroll-proportion="0.26190478">
+ <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="22" selection-start="2614" selection-end="2614" vertical-scroll-proportion="0.6708075">
+ <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.24242425">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandler.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="17" selection-start="1562" selection-end="1562" vertical-scroll-proportion="0.32298136">
+ <state line="35" column="13" selection-start="1364" selection-end="1364" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="84" column="28" selection-start="2716" selection-end="2716" vertical-scroll-proportion="0.104347825">
- <folding />
+ <state line="28" column="46" selection-start="1317" selection-end="1317" vertical-scroll-proportion="0.19393939">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="19" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.34146342">
- <folding />
+ <state line="41" column="40" selection-start="1893" selection-end="1893" vertical-scroll-proportion="0.5090909">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIProviderResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="70" selection-start="3687" selection-end="3687" vertical-scroll-proportion="0.33262712">
+ <state line="31" column="22" selection-start="1212" selection-end="1212" vertical-scroll-proportion="0.26666668">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="101" column="13" selection-start="4191" selection-end="4191" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.26666668">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://WebAppResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1374" selection-end="1374" vertical-scroll-proportion="0.1904762">
+ <state line="29" column="22" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.21428572">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
+ <state line="30" column="17" selection-start="1270" selection-end="1270" vertical-scroll-proportion="0.23809524">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.024242423">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="36" column="17" selection-start="1327" selection-end="1327" vertical-scroll-proportion="0.33333334">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java">
+ <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
+ <state line="167" column="22" selection-start="6457" selection-end="6457" vertical-scroll-proportion="0.17575757">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.24242425">
+ <state line="88" column="36" selection-start="3863" selection-end="3863" vertical-scroll-proportion="0.13818182">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="13" selection-start="1364" selection-end="1364" vertical-scroll-proportion="0.26190478">
+ <state line="33" column="22" selection-start="1310" selection-end="1310" vertical-scroll-proportion="0.30952382">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="46" selection-start="1317" selection-end="1317" vertical-scroll-proportion="0.19393939">
+ <state line="42" column="13" selection-start="1881" selection-end="1881" vertical-scroll-proportion="-1.4285715">
<folding>
<element signature="imports" expanded="true" />
</folding>
Modified: trunk/integration/jboss40/int-40.iml
===================================================================
--- trunk/integration/jboss40/int-40.iml 2007-07-24 13:35:47 UTC (rev 3975)
+++ trunk/integration/jboss40/int-40.iml 2007-07-24 13:52:23 UTC (rev 3976)
@@ -19,6 +19,12 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="int-42" />
+ <orderEntry type="module" module-name="jbossws-core" />
+ <orderEntry type="module" module-name="42-server" />
+ <orderEntry type="library" name="jboss-jmx" level="project" />
+ <orderEntry type="library" name="jboss-logging-spi" level="project" />
+ <orderEntry type="library" name="jboss-system" level="project" />
+ <orderEntry type="library" name="jboss-system-jmx" level="project" />
<orderEntryProperties />
</component>
</module>
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-24 13:35:47 UTC (rev 3975)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-24 13:52:23 UTC (rev 3976)
@@ -42,7 +42,7 @@
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.framework.DefaultSPIProviderResolver;
+import org.jboss.wsf.spi.SPIProviderResolver;
/**
* Binds a JAXRPC Service object in the client's ENC for every service-ref element in the
@@ -71,7 +71,7 @@
String serviceRefName = serviceRef.getServiceRefName();
// Build the container independent deployment info
- SPIProvider spiProvider = DefaultSPIProviderResolver.getInstance().getProvider();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
Deployment dep = spiProvider.getSPI(DeploymentModelFactory.class).createDeployment();
UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(Deployment.DeploymentType.JAXRPC_CLIENT);
DeploymentInfoAdapter adapter = DeploymentInfoAdapterFactory.getDeploymentInfoAdapter();
16 years, 10 months
- 1
- 0
JBossWS SVN: r3975 - in trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-07-24 09:35:47 -0400 (Tue, 24 Jul 2007)
New Revision: 3975
Added:
trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
Removed:
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java
Modified:
trunk/JBossWS-Trunk.iws
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java
Log:
Move KernelAwareSPIFactory to 'common' package
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/JBossWS-Trunk.iws 2007-07-24 13:35:47 UTC (rev 3975)
@@ -512,18 +512,6 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -546,37 +534,7 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/src/main/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -615,11 +573,11 @@
<recent name="org.jboss.wsf.stack.xfire" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.wsf.common" />
<recent name="org.jboss.wsf.spi.invocation" />
<recent name="org.jboss.ws.core.server" />
<recent name="org.jboss.wsf.stack.jbws" />
<recent name="org.jboss.wsf.spi.management" />
- <recent name="org.jboss.wsf.framework.deployment" />
</key>
</component>
<component name="RestoreUpdateTree" />
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -24,7 +24,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.framework.KernelAwareSPIFactory;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
import org.jboss.logging.Logger;
/**
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -24,7 +24,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.framework.KernelAwareSPIFactory;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
import org.jboss.logging.Logger;
/**
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -23,7 +23,7 @@
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.framework.KernelAwareSPIFactory;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
/**
* An EndpointRegistryFactory implementation that retrieves
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.common;
+
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.registry.KernelRegistry;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.ws.integration.KernelLocator;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 19, 2007
+ */
+public class KernelAwareSPIFactory
+{
+ public <T> T getKernelProvidedSPI(String beanName, Class<T> spiArtifact)
+ {
+ Kernel kernel = KernelLocator.getKernel();
+ KernelRegistry registry = kernel.getRegistry();
+ KernelRegistryEntry entry = registry.getEntry(beanName);
+ return (T)entry.getTarget();
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -1,42 +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.wsf.framework;
-
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.registry.KernelRegistry;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.ws.integration.KernelLocator;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 19, 2007
- */
-public class KernelAwareSPIFactory
-{
- public <T> T getKernelProvidedSPI(String beanName, Class<T> spiArtifact)
- {
- Kernel kernel = KernelLocator.getKernel();
- KernelRegistry registry = kernel.getRegistry();
- KernelRegistryEntry entry = registry.getEntry(beanName);
- return (T)entry.getTarget();
- }
-}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterFactoryImpl.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -23,7 +23,7 @@
import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory;
import org.jboss.wsf.spi.deployment.WebXMLRewriter;
-import org.jboss.wsf.framework.KernelAwareSPIFactory;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
/**
* @author Heiko.Braun(a)jboss.com
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -23,7 +23,7 @@
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.framework.KernelAwareSPIFactory;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
/**
* @author Heiko.Braun(a)jboss.com
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -23,7 +23,7 @@
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.framework.KernelAwareSPIFactory;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
/**
* An EndpointRegistryFactory implementation that retrieves
Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java 2007-07-24 13:35:47 UTC (rev 3975)
@@ -23,7 +23,7 @@
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.framework.KernelAwareSPIFactory;
+import org.jboss.wsf.common.KernelAwareSPIFactory;
/**
* An EndpointRegistryFactory implementation that retrieves
16 years, 10 months
- 1
- 0
JBossWS SVN: r3974 - in trunk: integration/native and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-07-24 09:34:03 -0400 (Tue, 24 Jul 2007)
New Revision: 3974
Added:
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java
Removed:
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java
Modified:
trunk/JBossWS-Trunk.iws
trunk/integration/native/int-native.iml
trunk/integration/native/src/main/resources/jbossws-native-config.xml
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java
trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml
trunk/integration/xfire/int-xfire.iml
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java
trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java
trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
Log:
Move endpoints servlets to stack integration packages
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/JBossWS-Trunk.iws 2007-07-24 13:34:03 UTC (rev 3974)
@@ -186,7 +186,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java" line="87" class="org.jboss.wsf.framework.invocation.EndpointServlet" package="org.jboss.wsf.framework.invocation">
+ <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.ServiceEndpointServlet" package="org.jboss.wsf.stack.jbws">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -199,19 +199,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java" line="51" class="org.jboss.wsf.stack.jbws.ServiceEndpointServlet" package="org.jboss.wsf.stack.jbws">
- <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>
@@ -266,86 +253,7 @@
<option name="myCurrentFavoritesList" value="JBossWS-Trunk" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="EndpointRegistry.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="37" column="3" selection-start="1400" selection-end="1400" vertical-scroll-proportion="0.17073171">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ServiceEndpointServlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="67" column="28" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.4390244">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="EndpointServlet.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="107" column="50" selection-start="4068" selection-end="4068" vertical-scroll-proportion="0.902439">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="SecurityAssociationValve.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="177" column="0" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.18902439">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="DefaultEndpointRegistry.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="61" column="0" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.18902439">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="WebAppResolver.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="2298" selection-end="2298" vertical-scroll-proportion="0.7804878">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Endpoint.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-1.8780488">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="EndpointResolver.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="33" column="12" selection-start="1250" selection-end="1250" vertical-scroll-proportion="0.31707317">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -376,8 +284,8 @@
<setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="int-native" />
- <option name="LAST_EDITED_TAB_NAME" value="Dependencies" />
+ <option name="LAST_EDITED_MODULE_NAME" value="int-xfire" />
+ <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
@@ -571,86 +479,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="JBossWS-Trunk.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/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$/integration/spi/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$/integration/spi/src/main/java/org/jboss/wsf" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -781,12 +609,17 @@
<option name="SHOW_DIALOG" value="true" />
</component>
<component name="RecentsManager">
+ <key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="org.jboss.wsf.stack.jbws" />
+ <recent name="org.jboss.wsf.stack.sunri" />
+ <recent name="org.jboss.wsf.stack.xfire" />
+ </key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.wsf.spi.invocation" />
<recent name="org.jboss.ws.core.server" />
<recent name="org.jboss.wsf.stack.jbws" />
<recent name="org.jboss.wsf.spi.management" />
<recent name="org.jboss.wsf.framework.deployment" />
- <recent name="org.jboss.wsf.framework" />
</key>
</component>
<component name="RestoreUpdateTree" />
@@ -909,12 +742,12 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1680" height="1000" extended-state="0" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25647348" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37342498" order="1" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.30147967" order="0" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5452463" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
@@ -999,113 +832,115 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java">
+ <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-javaee.jar!/javax/servlet/http/HttpServlet.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="13" selection-start="1457" selection-end="1457" vertical-scroll-proportion="0.3096647">
+ <state line="5" column="22" selection-start="165" selection-end="165" vertical-scroll-proportion="0.096969694">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java">
+ <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/xml/ws/transport/http/servlet/WSServletDelegate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="189" column="89" selection-start="8285" selection-end="8285" vertical-scroll-proportion="0.20372671">
+ <state line="55" column="30" selection-start="1956" selection-end="1956" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="81" column="80" selection-start="3425" selection-end="3425" vertical-scroll-proportion="0.4878049">
- <folding />
+ <state line="71" column="22" selection-start="2614" selection-end="2614" vertical-scroll-proportion="0.6708075">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="0" selection-start="2118" selection-end="2118" vertical-scroll-proportion="0.29268292">
+ <state line="42" column="17" selection-start="1562" selection-end="1562" vertical-scroll-proportion="0.32298136">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="40" selection-start="1040" selection-end="1072" vertical-scroll-proportion="0.023809524">
+ <state line="84" column="28" selection-start="2716" selection-end="2716" vertical-scroll-proportion="0.104347825">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="13" selection-start="1356" selection-end="1356" vertical-scroll-proportion="0.33333334">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="177" column="0" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.18902439">
+ <state line="34" column="19" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.34146342">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-1.8780488">
+ <state line="69" column="70" selection-start="3687" selection-end="3687" vertical-scroll-proportion="0.33262712">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="12" selection-start="1250" selection-end="1250" vertical-scroll-proportion="0.31707317">
+ <state line="101" column="13" selection-start="4191" selection-end="4191" vertical-scroll-proportion="0.0">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java">
+ <entry file="file://WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="2298" selection-end="2298" vertical-scroll-proportion="0.7804878">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="35" column="13" selection-start="1374" selection-end="1374" vertical-scroll-proportion="0.1904762">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="0" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.18902439">
+ <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="28" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.4390244">
- <folding />
+ <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.024242423">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="13" selection-start="1869" selection-end="1869" vertical-scroll-proportion="0.09756097">
+ <state line="35" column="13" selection-start="1365" selection-end="1365" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java">
+ <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="3" selection-start="1400" selection-end="1400" vertical-scroll-proportion="0.17073171">
+ <state line="30" column="56" selection-start="1451" selection-end="1451" vertical-scroll-proportion="0.24242425">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="35" column="13" selection-start="1364" selection-end="1364" vertical-scroll-proportion="0.26190478">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="50" selection-start="4068" selection-end="4068" vertical-scroll-proportion="0.902439">
+ <state line="28" column="46" selection-start="1317" selection-end="1317" vertical-scroll-proportion="0.19393939">
<folding>
<element signature="imports" expanded="true" />
</folding>
Modified: trunk/integration/native/int-native.iml
===================================================================
--- trunk/integration/native/int-native.iml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/native/int-native.iml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -12,6 +12,24 @@
<orderEntry type="module" module-name="jbossws-core" />
<orderEntry type="module" module-name="spi" />
<orderEntry type="library" name="jboss-logging-spi" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../spi/thirdparty/servlet-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../spi/thirdparty/activation.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java (rev 0)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.jbws;
+
+// $Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+import javax.management.ObjectName;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
+/**
+ * A servlet that is installed for every web service endpoint.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class EndpointServlet extends HttpServlet
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(EndpointServlet.class);
+
+ protected Endpoint endpoint;
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initServiceEndpoint(String contextPath)
+ {
+ initEndpoint(contextPath, getServletName());
+ initClassLoader();
+ initEndpointConfig();
+ initializeAndStart();
+ }
+
+ private void initializeAndStart()
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
+ {
+ // Initialize the meta data model
+ UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class);
+ if (umd.isEagerInitialized() == false)
+ {
+ umd.setClassLoader(dep.getRuntimeClassLoader());
+ umd.eagerInitialize();
+ }
+
+ // Start the endpoint
+ if (endpoint.getState() == EndpointState.CREATED)
+ endpoint.getLifecycleHandler().start(endpoint);
+ }
+ }
+
+ private void initEndpointConfig()
+ {
+ // read the config name/file from web.xml
+ ServletContext ctx = getServletContext();
+ String configName = ctx.getInitParameter("jbossws-config-name");
+ String configFile = ctx.getInitParameter("jbossws-config-file");
+ if (configName != null || configFile != null)
+ {
+ ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class);
+ if (epMetaData == null)
+ throw new IllegalStateException("Cannot obtain endpoint meta data");
+
+ log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
+ epMetaData.setConfigName(configName, configFile);
+ }
+ }
+
+ private void initClassLoader()
+ {
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+
+ private void initEndpoint(String contextPath, String servletName)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, servletName);
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+
+ }
+}
Property changes on: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,84 +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.wsf.stack.jbws;
-
-// $Id$
-
-import javax.servlet.ServletContext;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
-import org.jboss.wsf.framework.invocation.EndpointServlet;
-
-/**
- * A servlet that is installed for every web service endpoint.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class ServiceEndpointServlet extends EndpointServlet
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ServiceEndpointServlet.class);
-
- /** Initialize the service endpoint
- */
- @Override
- protected void initServiceEndpoint(String contextPath)
- {
- super.initServiceEndpoint(contextPath);
-
- // read the config name/file from web.xml
- ServletContext ctx = getServletContext();
- String configName = ctx.getInitParameter("jbossws-config-name");
- String configFile = ctx.getInitParameter("jbossws-config-file");
- if (configName != null || configFile != null)
- {
- ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class);
- if (epMetaData == null)
- throw new IllegalStateException("Cannot obtain endpoint meta data");
-
- log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
- epMetaData.setConfigName(configName, configFile);
- }
-
- Deployment dep = endpoint.getService().getDeployment();
- if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
- {
- // Initialize the meta data model
- UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class);
- if (umd.isEagerInitialized() == false)
- {
- umd.setClassLoader(dep.getRuntimeClassLoader());
- umd.eagerInitialize();
- }
-
- // Start the endpoint
- if (endpoint.getState() == EndpointState.CREATED)
- endpoint.getLifecycleHandler().start(endpoint);
- }
- }
-}
Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java (rev 0)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.jbws;
+
+import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+
+/**
+ * Resolves Endpoints by Servlet name and web context path.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class WebAppResolver implements EndpointResolver
+{
+ private String contextPath;
+ private String servletName;
+
+ public WebAppResolver(String contextPath, String servletName)
+ {
+ this.contextPath = contextPath;
+ this.servletName = servletName;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ if (contextPath.startsWith("/"))
+ contextPath = contextPath.substring(1);
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
+ }
+
+ return endpoint;
+ }
+}
Property changes on: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/native/src/main/resources/jbossws-native-config.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -51,7 +51,7 @@
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>ServletClass</key><value>org.jboss.wsf.stack.jbws.ServiceEndpointServlet</value></entry>
+ <entry><key>ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
</map>
</property>
</bean>
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointAssociation.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,53 +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.wsf.framework.invocation;
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-// $Id$
-
-
-/**
- * Associates the endpoint meta data with the current thead.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public final class EndpointAssociation
-{
- private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>();
-
- public static void setEndpoint(Endpoint ep)
- {
- endpoint.set(ep);
- }
-
- public static Endpoint getEndpoint()
- {
- return endpoint.get();
- }
-
- public static void removeEndpoint()
- {
- endpoint.remove();
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,108 +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.wsf.framework.invocation;
-
-// $Id$
-
-import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceException;
-import java.io.IOException;
-
-/**
- * The JAX-WS dispatcher servlet.
- *
- * @author WS Development Team
- * @author Thomas.Diesler(a)jboss.org
- * @since 10-May-2007
- */
-public class EndpointServlet extends HttpServlet
-{
- protected Endpoint endpoint;
- protected EndpointRegistry epRegistry;
-
- public void init(ServletConfig servletConfig) throws ServletException
- {
- super.init(servletConfig);
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
- }
-
- public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
- try
- {
- EndpointAssociation.setEndpoint(endpoint);
- RequestHandler requestHandler = endpoint.getRequestHandler();
- requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
- }
- finally
- {
- EndpointAssociation.removeEndpoint();
- }
- }
-
- /** Initialize the service endpoint
- */
- protected void initServiceEndpoint(String contextPath)
- {
- WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
- this.endpoint = epRegistry.resolve(resolver);
-
- if (this.endpoint == null)
- {
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
- Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
- Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
- );
- throw new WebServiceException("Cannot obtain endpoint for: " + oname);
- }
-
- // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
- Deployment dep = endpoint.getService().getDeployment();
- if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- dep.setRuntimeClassLoader(classLoader);
- }
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -1,69 +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.wsf.framework.invocation;
-
-import org.jboss.wsf.spi.management.EndpointResolver;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-import javax.management.ObjectName;
-import java.util.Iterator;
-
-/**
- * Resolves Endpoints by Servlet name and web context path.
- *
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 24, 2007
- */
-public class WebAppResolver implements EndpointResolver
-{
- private String contextPath;
- private String servletName;
-
- public WebAppResolver(String contextPath, String servletName)
- {
- this.contextPath = contextPath;
- this.servletName = servletName;
- }
-
- public Endpoint query(Iterator<Endpoint> endpoints)
- {
- Endpoint endpoint = null;
-
- if (contextPath.startsWith("/"))
- contextPath = contextPath.substring(1);
-
- while(endpoints.hasNext())
- {
- Endpoint auxEndpoint = endpoints.next();
- ObjectName sepId = auxEndpoint.getName();
- String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
- String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
- if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
- {
- endpoint = auxEndpoint;
- break;
- }
- }
-
- return endpoint;
- }
-}
Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.invocation;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+// $Id$
+
+
+/**
+ * Associates the endpoint meta data with the current thead.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2007
+ */
+public final class EndpointAssociation
+{
+ private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>();
+
+ public static void setEndpoint(Endpoint ep)
+ {
+ endpoint.set(ep);
+ }
+
+ public static Endpoint getEndpoint()
+ {
+ return endpoint.get();
+ }
+
+ public static void removeEndpoint()
+ {
+ endpoint.remove();
+ }
+}
Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java (rev 0)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.sunri;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.common.ObjectNameFactory;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServlet;
+import javax.management.ObjectName;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class EndpointServlet extends HttpServlet
+{
+ protected Endpoint endpoint;
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initServiceEndpoint(String contextPath)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+}
Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerEJB3.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -31,7 +31,7 @@
import javax.xml.ws.handler.MessageContext;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/InvokerJSE.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -30,7 +30,7 @@
import javax.xml.ws.WebServiceException;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -34,7 +34,6 @@
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
@@ -88,11 +87,11 @@
public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
{
- throw new NotImplementedException();
+ throw new IllegalArgumentException("Not implemented");
}
public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context)
{
- throw new NotImplementedException();
+ throw new IllegalArgumentException("Not implemented");
}
}
Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java
===================================================================
--- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java (rev 0)
+++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.sunri;
+
+import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+
+/**
+ * Resolves Endpoints by Servlet name and web context path.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class WebAppResolver implements EndpointResolver
+{
+ private String contextPath;
+ private String servletName;
+
+ public WebAppResolver(String contextPath, String servletName)
+ {
+ this.contextPath = contextPath;
+ this.servletName = servletName;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ if (contextPath.startsWith("/"))
+ contextPath = contextPath.substring(1);
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
+ }
+
+ return endpoint;
+ }
+}
Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -67,7 +67,7 @@
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>ServletClass</key><value>org.jboss.wsf.framework.invocation.EndpointServlet</value></entry>
+ <entry><key>ServletClass</key><value>org.jboss.wsf.stack.sunri.EndpointServlet</value></entry>
<entry><key>ServletContextListener</key><value>org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</value></entry>
</map>
</property>
Modified: trunk/integration/xfire/int-xfire.iml
===================================================================
--- trunk/integration/xfire/int-xfire.iml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/xfire/int-xfire.iml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -10,6 +10,24 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="spi" />
<orderEntry type="library" name="jboss-logging-spi" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../spi/thirdparty/servlet-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -40,7 +40,7 @@
import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.jboss.logging.Logger;
import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java (rev 0)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.xfire;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.common.ObjectNameFactory;
+
+import javax.management.ObjectName;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class EndpointServlet extends HttpServlet
+{
+ protected Endpoint endpoint;
+ protected EndpointRegistry epRegistry;
+
+ public void init(ServletConfig servletConfig) throws ServletException
+ {
+ super.init(servletConfig);
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry();
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ try
+ {
+ EndpointAssociation.setEndpoint(endpoint);
+ RequestHandler requestHandler = endpoint.getRequestHandler();
+ requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ }
+ finally
+ {
+ EndpointAssociation.removeEndpoint();
+ }
+ }
+
+ /** Initialize the service endpoint
+ */
+ protected void initServiceEndpoint(String contextPath)
+ {
+ WebAppResolver resolver = new WebAppResolver(contextPath, getServletName());
+ this.endpoint = epRegistry.resolve(resolver);
+
+ if (this.endpoint == null)
+ {
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
+ throw new WebServiceException("Cannot obtain endpoint for: " + oname);
+ }
+
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
+}
Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -34,7 +34,7 @@
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.framework.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java
===================================================================
--- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java (rev 0)
+++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java 2007-07-24 13:34:03 UTC (rev 3974)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.xfire;
+
+import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+import javax.management.ObjectName;
+import java.util.Iterator;
+
+/**
+ * Resolves Endpoints by Servlet name and web context path.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * Created: Jul 24, 2007
+ */
+public class WebAppResolver implements EndpointResolver
+{
+ private String contextPath;
+ private String servletName;
+
+ public WebAppResolver(String contextPath, String servletName)
+ {
+ this.contextPath = contextPath;
+ this.servletName = servletName;
+ }
+
+ public Endpoint query(Iterator<Endpoint> endpoints)
+ {
+ Endpoint endpoint = null;
+
+ if (contextPath.startsWith("/"))
+ contextPath = contextPath.substring(1);
+
+ while(endpoints.hasNext())
+ {
+ Endpoint auxEndpoint = endpoints.next();
+ ObjectName sepId = auxEndpoint.getName();
+ String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT);
+ String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT);
+ if (servletName.equals(propEndpoint) && contextPath.equals(propContext))
+ {
+ endpoint = auxEndpoint;
+ break;
+ }
+ }
+
+ return endpoint;
+ }
+}
Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-07-24 13:25:49 UTC (rev 3973)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-07-24 13:34:03 UTC (rev 3974)
@@ -8,7 +8,7 @@
<!-- Test that we can deploy an already modified web.xml -->
<servlet>
<servlet-name>Hello</servlet-name>
- <servlet-class>org.jboss.wsf.stack.jbws.ServiceEndpointServlet</servlet-class>
+ <servlet-class>org.jboss.wsf.stack.jbws.EndpointServlet</servlet-class>
<init-param>
<param-name>jboss.ws.endpoint</param-name>
<param-value>org.jboss.test.ws.jaxrpc.jbws124.HelloJavaBean</param-value>
16 years, 10 months
- 1
- 0