[jbossws-commits] JBossWS SVN: r2735 - in trunk: jbossws-core/src/java/org/jboss/ws/core/jaxws/handler and 12 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Mar 31 09:58:18 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-03-31 09:58:18 -0400 (Sat, 31 Mar 2007)
New Revision: 2735
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
trunk/jbossws-tests/src/resources/jaxrpc/jbws1121/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml
trunk/jbossws-tests/src/resources/jaxrpc/outparam/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/samples/holder/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/samples/mtom/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/ejb-jar.xml
trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/xop/doclit/WEB-INF/web.xml
trunk/jbossws-tests/src/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml
Log:
Allow multiple writing of XMLFragment
Fix invalid DD that do not conform to the schema
SOAPBody payload is backed up by XMLFrament instead of source
Remove warning that getHandlerChain() returns a modifiableList
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-03-31 13:58:18 UTC (rev 2735)
@@ -60,9 +60,6 @@
if (handlerType == HandlerType.POST || handlerType == HandlerType.ALL)
handlerChain.addAll(postHandlerChain);
- log.warn("[JBCTS-544] - Binding.getHandlerChain() expected to return a modifyable list");
- // return Collections.unmodifiableList(handlerChain);
-
return handlerChain;
}
@@ -89,9 +86,6 @@
public List<Handler> getHandlerChain()
{
- log.warn("[JBCTS-544] - Binding.getHandlerChain() expected to return a modifiable list");
- // return Collections.unmodifiableList(jaxwsHandlerChain);
-
return new ArrayList<Handler>(jaxwsHandlerChain);
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-03-31 13:58:18 UTC (rev 2735)
@@ -104,10 +104,6 @@
if (scopedHandler.matches(info))
handlers.add(scopedHandler.handler);
}
-
- log.warn("[JBCTS-544] - HandlerResolver.getHandlerChain() expected to return a modifiable list");
- // return Collections.unmodifiableList(jaxwsHandlerChain);
-
return handlers;
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-03-31 13:58:18 UTC (rev 2735)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.util.Iterator;
import javax.xml.bind.JAXBContext;
@@ -31,17 +32,17 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.LogicalMessage;
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.jaxrpc.binding.BufferedStreamSource;
import org.jboss.ws.core.soap.EnvelopeBuilderDOM;
import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.soap.XMLFragment;
+import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
/**
@@ -103,9 +104,16 @@
SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next();
if (style == Style.RPC)
{
- EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(style);
- Element domBodyElement = EnvelopeBuilderDOM.getElementFromSource(source);
- builder.buildBodyElementRpc(soapBody, domBodyElement);
+ try
+ {
+ EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(style);
+ Element domBodyElement = DOMUtils.sourceToElement(source);
+ builder.buildBodyElementRpc(soapBody, domBodyElement);
+ }
+ catch (IOException ex)
+ {
+ WSException.rethrow(ex);
+ }
}
else
{
@@ -122,7 +130,7 @@
{
soapBody.setSource(source);
}
-
+
// The body payload has been modified
soapBody.setModifiedFromSource(true);
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-03-31 13:58:18 UTC (rev 2735)
@@ -23,11 +23,8 @@
//$Id$
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Reader;
import java.util.Iterator;
import javax.xml.namespace.QName;
@@ -37,23 +34,15 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.utils.DOMUtils;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
/**
* A SOAPEnvelope builder for JAXRPC based on DOM
@@ -210,17 +199,17 @@
}
}
}
-
+
// Process additional soap encoded body elements
- boolean attachHRefElements = Constants.URI_SOAP11_ENC.equals(soapEnv.getAttributeNS(envNS, "encodingStyle"));
- attachHRefElements = attachHRefElements || Constants.URI_SOAP11_ENC.equals(soapBody.getAttributeNS(envNS, "encodingStyle"));
- attachHRefElements = attachHRefElements && itBody.hasNext();
- while(attachHRefElements && itBody.hasNext())
+ boolean attachHRefElements = Constants.URI_SOAP11_ENC.equals(soapEnv.getAttributeNS(envNS, "encodingStyle"));
+ attachHRefElements = attachHRefElements || Constants.URI_SOAP11_ENC.equals(soapBody.getAttributeNS(envNS, "encodingStyle"));
+ attachHRefElements = attachHRefElements && itBody.hasNext();
+ while (attachHRefElements && itBody.hasNext())
{
Element srcElement = (Element)itBody.next();
soapBody.addChildElement(soapFactory.createElement(srcElement, true));
}
-
+
// Inline all attached href elements
if (attachHRefElements)
{
@@ -234,9 +223,9 @@
public void buildBodyElementDoc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
{
soapBody.removeContents();
-
+
Element srcElement = (Element)domBodyElement;
-
+
QName beName = DOMUtils.getElementQName(domBodyElement);
SOAPContentElement destElement = new SOAPBodyElementDoc(beName);
destElement = (SOAPContentElement)soapBody.addChildElement(destElement);
@@ -250,7 +239,7 @@
public void buildBodyElementRpc(SOAPBodyImpl soapBody, Element domBodyElement) throws SOAPException
{
soapBody.removeContents();
-
+
QName beName = DOMUtils.getElementQName(domBodyElement);
SOAPBodyElementRpc soapBodyElement = new SOAPBodyElementRpc(beName);
soapBodyElement = (SOAPBodyElementRpc)soapBody.addChildElement(soapBodyElement);
@@ -272,69 +261,4 @@
destElement.setXMLFragment(xmlFragment);
}
}
-
- public static Element getElementFromSource(Source payload)
- {
- Element child = null;
- try
- {
- if (payload instanceof StreamSource)
- {
- StreamSource streamSource = (StreamSource)payload;
-
- InputStream ins = streamSource.getInputStream();
- if (ins != null)
- {
- child = DOMUtils.parse(ins);
- }
- else
- {
- Reader reader = streamSource.getReader();
- child = DOMUtils.parse(new InputSource(reader));
- }
- }
- else if (payload instanceof DOMSource)
- {
- DOMSource domSource = (DOMSource)payload;
- Node node = domSource.getNode();
- if (node instanceof Element)
- {
- child = (Element)node;
- }
- else if (node instanceof Document)
- {
- child = ((Document)node).getDocumentElement();
- }
- else
- {
- throw new WSException("Unsupported Node type: " + node.getClass().getName());
- }
- }
- else if (payload instanceof SAXSource)
- {
- // The fact that JAXBSource derives from SAXSource is an implementation detail.
- // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource.
- // The XMLReader object obtained by the getXMLReader method shall be used only for parsing the InputSource object returned by the getInputSource method.
-
- TransformerFactory tf = TransformerFactory.newInstance();
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- tf.newTransformer().transform(payload, new StreamResult(baos));
-
- child = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray()));
- }
- else
- {
- throw new WSException("Source type not implemented: " + payload.getClass().getName());
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new WSException("Cannot get root element from Source" + ex);
- }
- return child;
- }
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-03-31 13:58:18 UTC (rev 2735)
@@ -23,7 +23,6 @@
// $Id$
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.Writer;
import java.util.Iterator;
@@ -38,15 +37,11 @@
import javax.xml.soap.SOAPFault;
import javax.xml.soap.Text;
import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxrpc.binding.BufferedStreamSource;
import org.jboss.ws.core.utils.DOMUtils;
-import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -70,7 +65,7 @@
private static Logger log = Logger.getLogger(SOAPBodyImpl.class);
// Generic JAXWS payload
- private Source source;
+ private XMLFragment xmlFragment;
private boolean isDOMValid = true;
private boolean isModifiedFromSource;
@@ -88,7 +83,7 @@
{
return isModifiedFromSource;
}
-
+
public void setModifiedFromSource(boolean isModified)
{
this.isModifiedFromSource = isModified;
@@ -96,21 +91,15 @@
public Source getSource()
{
- // Do the buffering
- if (source instanceof StreamSource && !(source instanceof BufferedStreamSource))
- source = new BufferedStreamSource((StreamSource)source);
-
- return source;
+ return (xmlFragment != null ? xmlFragment.getSource() : null);
}
public void setSource(Source source)
{
log.debug("setPayload: " + source);
-
removeContents();
-
- this.source = source;
- this.isDOMValid = false;
+ xmlFragment = new XMLFragment(source);
+ isDOMValid = false;
}
/** Convert the child into a SOAPBodyElement */
@@ -347,10 +336,10 @@
isDOMValid = true;
try
{
- Element child = getBodyElementFromSource();
+ Element child = xmlFragment.toElement();
SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
addChildElement(soapFactory.createElement(child));
- source = null;
+ xmlFragment = null;
}
catch (RuntimeException rte)
{
@@ -370,25 +359,13 @@
}
}
- private Element getBodyElementFromSource()
- {
- Element child = EnvelopeBuilderDOM.getElementFromSource(source);
- // Allow multiple writing
- source = new DOMSource(child);
-
- return child;
- }
-
@Override
public void writeElementContent(Writer writer) throws IOException
{
- if (source != null)
+ if (xmlFragment != null)
{
- Element child = getBodyElementFromSource();
- String xmlPayload = DOMWriter.printNode(child, false);
- if (log.isDebugEnabled())
- log.debug("writeElementContent from payload: " + xmlPayload);
- writer.write(xmlPayload);
+ log.debug("writeElementContent from payload: " + xmlFragment);
+ xmlFragment.writeTo(writer);
}
else
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/XMLFragment.java 2007-03-31 13:58:18 UTC (rev 2735)
@@ -36,6 +36,7 @@
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
import org.jboss.logging.Logger;
@@ -101,8 +102,8 @@
public Source getSource()
{
- source = beginStreamSourceAccess(source);
- endStreamSourceAccess();
+ source = beginSourceAccess(source);
+ endSourceAccess();
return source;
}
@@ -127,18 +128,16 @@
public Element toElement()
{
Element retElement = null;
-
try
{
- source = beginStreamSourceAccess(source);
+ source = beginSourceAccess(source);
retElement = DOMUtils.sourceToElement(source);
- endStreamSourceAccess();
+ endSourceAccess();
}
catch (IOException ex)
{
- handleStreamSourceAccessException(ex);
+ handleSourceAccessException(ex);
}
-
return retElement;
}
@@ -157,17 +156,17 @@
*/
private void writeSourceInternal(Writer writer) throws IOException
{
- if (source instanceof DOMSource)
+ try
{
- DOMSource domSource = (DOMSource)source;
- new DOMWriter(writer).print(domSource.getNode());
- }
- else if (source instanceof StreamSource)
- {
- try
+ source = beginSourceAccess(source);
+
+ if (source instanceof DOMSource)
{
- source = beginStreamSourceAccess(source);
-
+ DOMSource domSource = (DOMSource)source;
+ new DOMWriter(writer).print(domSource.getNode());
+ }
+ else if (source instanceof StreamSource || source instanceof SAXSource)
+ {
StreamSource streamSource = (StreamSource)source;
Reader reader = streamSource.getReader();
@@ -185,30 +184,44 @@
writer.write(cbuf, 0, r);
r = reader.read(cbuf);
}
-
- endStreamSourceAccess();
}
- catch (IOException ex)
+ else
{
- handleStreamSourceAccessException(ex);
+ throw new IllegalArgumentException("Unsupported source type: " + source);
}
+
+ endSourceAccess();
}
- else
+ catch (IOException ex)
{
- throw new IllegalArgumentException("Unable to process source: " + source);
+ handleSourceAccessException(ex);
}
}
- private Source beginStreamSourceAccess(Source source)
+ private Source beginSourceAccess(Source source)
{
// Buffer the source content
if (source instanceof StreamSource && !(source instanceof BufferedStreamSource))
+ {
source = new BufferedStreamSource((StreamSource)source);
-
+ }
+ else
+ {
+ try
+ {
+ Element element = DOMUtils.sourceToElement(source);
+ source = new DOMSource(element);
+ }
+ catch (IOException ex)
+ {
+ WSException.rethrow(ex);
+ }
+ }
+
return source;
}
- private void endStreamSourceAccess()
+ private void endSourceAccess()
{
// Create the marker exception
if (source instanceof StreamSource)
@@ -217,7 +230,7 @@
}
}
- private void handleStreamSourceAccessException(IOException ex)
+ private void handleSourceAccessException(IOException ex)
{
if (source instanceof StreamSource && streamSourceAccessMarker != null)
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2007-03-31 13:58:18 UTC (rev 2735)
@@ -571,7 +571,6 @@
TransformerFactory tf = TransformerFactory.newInstance();
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
tf.newTransformer().transform(source, new StreamResult(baos));
-
retElement = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray()));
}
else
Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws1121/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws1121/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1121/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard WSSecurity Endpoint</param-value>
</context-param>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -8,8 +8,8 @@
<enterprise-beans>
<session>
<ejb-name>RoleSecuredSLSB</ejb-name>
+ <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote>
- <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint>
<ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class>
<session-type>Stateless</session-type>
@@ -20,8 +20,8 @@
</session>
<session>
<ejb-name>BasicSecuredSLSB</ejb-name>
+ <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote>
- <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint>
<ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class>
<session-type>Stateless</session-type>
@@ -29,8 +29,8 @@
</session>
<session>
<ejb-name>ConfidentialSLSB</ejb-name>
+ <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote>
- <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home>
<service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint>
<ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class>
<session-type>Stateless</session-type>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/outparam/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard Endpoint</param-value>
</context-param>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/samples/holder/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard Endpoint</param-value>
</context-param>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/samples/mtom/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard MTOM Endpoint</param-value>
</context-param>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/ejb-jar.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/ejb-jar.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/ejb-jar.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -8,8 +8,8 @@
<enterprise-beans>
<session>
<ejb-name>RoleSecuredSLSB</ejb-name>
+ <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationRemote</remote>
- <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home>
<service-endpoint>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint>
<ejb-class>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationImpl</ejb-class>
<session-type>Stateless</session-type>
@@ -20,8 +20,8 @@
</session>
<session>
<ejb-name>BasicSecuredSLSB</ejb-name>
+ <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationRemote</remote>
- <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home>
<service-endpoint>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint>
<ejb-class>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationImpl</ejb-class>
<session-type>Stateless</session-type>
@@ -29,8 +29,8 @@
</session>
<session>
<ejb-name>ConfidentialSLSB</ejb-name>
+ <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home>
<remote>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationRemote</remote>
- <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home>
<service-endpoint>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint>
<ejb-class>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationImpl</ejb-class>
<session-type>Stateless</session-type>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard WSSecurity Endpoint</param-value>
</context-param>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard WSSecurity Endpoint</param-value>
</context-param>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/xop/doclit/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard MTOM Endpoint</param-value>
</context-param>
Modified: trunk/jbossws-tests/src/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-03-30 23:45:39 UTC (rev 2734)
+++ trunk/jbossws-tests/src/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-03-31 13:58:18 UTC (rev 2735)
@@ -6,7 +6,7 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Standard MTOM Endpoint</param-value>
</context-param>
More information about the jbossws-commits
mailing list