[jboss-svn-commits] JBossWS SVN: r698 - in branches/jbossws-1.0_Heiko/src: main/java/org/jboss/ws/soap test/java/org/jboss/test/ws/binding test/java/org/jboss/test/ws/jsr181/webservice test/java/org/jboss/test/ws/samples/dynamichandler test/java/org/jboss/test/ws/samples/jsr181ejb test/java/org/jboss/test/ws/samples/wssecurity test/java/org/jboss/test/ws/soap test/java/org/jboss/test/ws/wsse
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 7 09:49:30 EDT 2006
Author: heiko.braun at jboss.com
Date: 2006-08-07 09:49:04 -0400 (Mon, 07 Aug 2006)
New Revision: 698
Modified:
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementDoc.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPEnvelopeImpl.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPHeaderImpl.java
branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java
branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java
branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java
branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java
branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java
branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/wssecurity/SimpleEncryptTestCase.java
branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/soap/SOAPConnectionTestCase.java
branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java
Log:
move from DOMWriter to SAAJElementWriter
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/DOMEnvelopeBuilder.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -77,13 +77,15 @@
while (it.hasNext())
{
Element srcElement = (Element)it.next();
+ //registerLocalNamespace(srcElement);
+
String xmlFragment = DOMWriter.printNode(srcElement, false);
Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI());
SOAPContentElement destElement = new SOAPHeaderElementImpl(name);
soapHeader.addChildElement(destElement);
- DOMUtils.copyAttributes(destElement, srcElement);
+ //DOMUtils.copyAttributes(destElement, srcElement);
destElement.setXMLFragment(xmlFragment);
}
}
@@ -164,6 +166,7 @@
while (itBodyElement.hasNext())
{
Element srcElement = (Element)itBodyElement.next();
+ registerLocalNamespace(srcElement);
Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI());
SOAPContentElement destElement = new SOAPContentElement(name);
@@ -176,6 +179,7 @@
else if (style == Style.DOCUMENT)
{
Element srcElement = (Element)domBodyElement;
+
SOAPBodyElementDoc destElement = new SOAPBodyElementDoc(beName);
destElement = (SOAPBodyElementDoc)soapBody.addChildElement(destElement);
@@ -225,6 +229,17 @@
return soapEnv;
}
+ private void registerLocalNamespace(Element srcElement) {
+ if(srcElement.getPrefix()== null)
+ {
+ srcElement.setAttribute("xmlns", srcElement.getNamespaceURI());
+ }
+ else
+ {
+ srcElement.setAttribute("xmlns:"+srcElement.getPrefix(), srcElement.getNamespaceURI());
+ }
+ }
+
private void registerNamespaces(NamespaceRegistry namespaceRegistry, SOAPElement soapEl)
{
Iterator itNSPrefixes = soapEl.getNamespacePrefixes();
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementDoc.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementDoc.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementDoc.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -23,6 +23,7 @@
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBodyElement;
+import java.io.Writer;
/**
* An abstract implemenation of the SOAPBodyElement
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementMessage.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -21,8 +21,11 @@
*/
package org.jboss.ws.soap;
+import org.jboss.util.xml.DOMWriter;
+
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBodyElement;
+import java.io.Writer;
/**
* An abstract implemenation of the SOAPBodyElement
@@ -43,4 +46,12 @@
{
super(element);
}
+
+ public String write(Writer writer, boolean pretty) {
+ DOMWriter domWriter = new DOMWriter(writer);
+ domWriter.setPrettyprint(pretty);
+ domWriter.print(this);
+
+ return null;
+ }
}
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyElementRpc.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -21,8 +21,15 @@
*/
package org.jboss.ws.soap;
+import org.jboss.util.xml.DOMWriter;
+import org.jboss.ws.WSException;
+import org.w3c.dom.Element;
+
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBodyElement;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
/**
* An abstract implemenation of the SOAPBodyElement
@@ -43,4 +50,60 @@
{
super(element);
}
+
+ public String write(Writer writer, boolean pretty) {
+ try
+ {
+
+ writer.write('<');
+ String prefix = getPrefix()!=null ? getPrefix():"";
+ String fqn = prefix.length()>0 ? prefix+":"+getLocalName() : getLocalName();
+ writer.write(fqn);
+
+ // namespaces
+ Iterator it = getNamespacePrefixes();
+ while(it.hasNext())
+ {
+ String nsPrefix = (String)it.next();
+ writer.write(" xmlns:"+nsPrefix+"='"+getNamespaceURI(nsPrefix)+"'");
+ }
+
+ // attributes
+ Iterator attNames = getAllAttributes();
+ while(attNames.hasNext())
+ {
+ NameImpl name = (NameImpl)attNames.next();
+ String attPrefix = name.getPrefix()!=null ? name.getPrefix():"";
+ String attFqn = attPrefix.length()>0 ? attPrefix+":"+name.getLocalName() : name.getLocalName();
+ writer.write(" "+attFqn);
+ writer.write("='"+getAttributeValue(name)+"'");
+ }
+
+ writer.write('>');
+
+ // children
+ Iterator children = getChildElements();
+ while(children.hasNext())
+ {
+ Object child = children.next();
+ if( (child instanceof SOAPContentElement) == false)
+ {
+ DOMWriter domWriter = new DOMWriter(writer);
+ domWriter.setPrettyprint(pretty);
+ domWriter.print((Element)child);
+ }
+ }
+
+ if(pretty)
+ writer.write("\n");
+
+ return("</"+fqn+">");
+
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e.getMessage());
+ }
+ }
+
}
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPBodyImpl.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -25,6 +25,8 @@
import java.util.Iterator;
import java.util.Locale;
+import java.io.Writer;
+import java.io.IOException;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
@@ -35,6 +37,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.WSException;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
@@ -164,4 +167,42 @@
element.detachNode();
return new SOAPBodyElementDoc(element);
}
+
+ public String write(Writer writer, boolean pretty) {
+ try
+ {
+ writer.write("<");
+ writer.write(getParentElement().getPrefix()+":Body");
+
+ // namespaces
+ Iterator nsPrefixes = getNamespacePrefixes();
+ while(nsPrefixes.hasNext())
+ {
+ String prefix = (String)nsPrefixes.next();
+ writer.write(" xmlns:"+prefix+"='"+getNamespaceURI(prefix)+"'");
+ }
+
+ // attributes
+ Iterator attNames = getAllAttributes();
+ while(attNames.hasNext())
+ {
+ NameImpl name = (NameImpl)attNames.next();
+ String attPrefix = name.getPrefix()!=null ? name.getPrefix():"";
+ String attFqn = attPrefix.length()>0 ? attPrefix+":"+name.getLocalName() : name.getLocalName();
+ writer.write(" "+attFqn);
+ writer.write("='"+getAttributeValue(name)+"'");
+ }
+
+ writer.write(">");
+
+ if(pretty)
+ writer.write("\n");
+
+ return ("</"+getParentElement().getPrefix()+":Body>");
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e.getMessage());
+ }
+ }
}
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPConnectionImpl.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -42,7 +42,6 @@
import org.jboss.remoting.Client;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.util.socket.RemotingSSLSocketFactory;
-import org.jboss.util.xml.DOMWriter;
import org.jboss.ws.binding.soap.SOAPMessageMarshaller;
import org.jboss.ws.binding.soap.SOAPMessageUnMarshaller;
import org.jboss.ws.jaxrpc.StubExt;
@@ -171,7 +170,7 @@
if(msgLog.isDebugEnabled())
{
SOAPEnvelope soapReqEnv = reqMessage.getSOAPPart().getEnvelope();
- String envStr = DOMWriter.printNode(soapReqEnv, true);
+ String envStr = SAAJElementWriter.printSOAPElement((SOAPElementImpl)soapReqEnv, true);
msgLog.debug("Remoting meta data: " + metadata);
msgLog.debug("Outgoing SOAPMessage\n" + envStr);
}
@@ -189,8 +188,8 @@
// debug the incomming response message
if (resMessage != null && msgLog.isDebugEnabled())
{
- SOAPEnvelope soapResEnv = resMessage.getSOAPPart().getEnvelope();
- String envStr = DOMWriter.printNode(soapResEnv, true);
+ SOAPEnvelope soapResEnv = resMessage.getSOAPPart().getEnvelope();
+ String envStr = SAAJElementWriter.printSOAPElement((SOAPElementImpl)soapResEnv, true);
msgLog.debug("Incomming Response SOAPMessage\n" + envStr);
}
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -46,6 +46,7 @@
import java.util.Iterator;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.Writer;
/**
* A SOAPElement that gives access to its content as XML fragment or Java object.
@@ -801,6 +802,9 @@
*/
private void expandToDOM()
{
+
+ log.debug("*** Expand to DOM called ***", new RuntimeException("Show Callee"));
+
if (isDOMValid == false && expandingToDOM == false)
{
log.trace("BEGIN: expandToDOM");
@@ -954,4 +958,29 @@
invalidateXMLContent();
}
}
+
+ public String write(Writer writer, boolean pretty) {
+ try
+ {
+ if(isDOMValid)
+ {
+ DOMWriter dw = new DOMWriter(writer);
+ dw.setPrettyprint(pretty);
+ dw.print(this);
+ }
+ else
+ {
+ writer.write( getXMLFragment() );
+ if(pretty)
+ writer.write("\n");
+ }
+
+ }
+ catch (Exception e)
+ {
+ log.error(e);
+ }
+
+ return null;
+ }
}
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.io.Writer;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
@@ -36,6 +37,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.xml.DOMUtils;
+import org.jboss.util.xml.DOMWriter;
import org.jboss.ws.Constants;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
@@ -654,4 +656,23 @@
// FIXME setIdAttributeNS
throw new org.jboss.util.NotImplementedException("setIdAttributeNS");
}
+
+ /**
+ * The default implementation uses a DOMWriter.
+ * SOAPContentElements overwrite this to optimize DOM callbacks.
+ *
+ * @param writer
+ * @param pretty
+ *
+ * @return end element tag
+ */
+ public String write(Writer writer, boolean pretty)
+ {
+ /*DOMWriter domWriter = new DOMWriter(writer);
+ domWriter.setPrettyprint(pretty);
+ domWriter.print(this);
+ */
+
+ return null;
+ }
}
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPEnvelopeImpl.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPEnvelopeImpl.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPEnvelopeImpl.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -24,6 +24,8 @@
// $Id$
import java.util.Iterator;
+import java.io.Writer;
+import java.io.IOException;
import javax.xml.namespace.QName;
import javax.xml.rpc.soap.SOAPFaultException;
@@ -35,9 +37,9 @@
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
import org.jboss.ws.Constants;
+import org.jboss.ws.WSException;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.Document;
@@ -190,4 +192,33 @@
{
return soapPart;
}
+
+ public String write(Writer writer, boolean pretty) {
+ try
+ {
+ writer.write("<");
+ String envPrefix = getPrefix();
+ writer.write(envPrefix +":Envelope xmlns:"+getPrefix()+"='"+getNamespaceURI()+"'");
+
+ // namespaces
+ Iterator it = getNamespacePrefixes();
+ while(it.hasNext())
+ {
+ String prefix = (String)it.next();
+ if(!prefix.equals(envPrefix))
+ writer.write(" xmlns:"+prefix+"='"+getNamespaceURI(prefix)+"'");
+ }
+
+ writer.write('>');
+
+ if(pretty)
+ writer.write("\n");
+
+ return("</"+getPrefix()+":Envelope>");
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e.getMessage());
+ }
+ }
}
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPHeaderImpl.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPHeaderImpl.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPHeaderImpl.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -23,6 +23,8 @@
import java.util.ArrayList;
import java.util.Iterator;
+import java.io.Writer;
+import java.io.IOException;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
@@ -33,6 +35,7 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
+import org.jboss.ws.WSException;
/**
@@ -195,4 +198,53 @@
return super.replaceChild(newChild, oldChild);
}
+
+ public String write(Writer writer, boolean pretty) {
+ try
+ {
+
+ writer.write('<');
+ writer.write(getParentElement().getPrefix()+":Header");
+
+ // namespaces
+ Iterator it = getNamespacePrefixes();
+ while(it.hasNext())
+ {
+ String prefix = (String)it.next();
+ writer.write(" xmlns:"+prefix+"='"+getNamespaceURI(prefix)+"'");
+ }
+
+ // attributes
+ Iterator attNames = getAllAttributes();
+ while(attNames.hasNext())
+ {
+ NameImpl name = (NameImpl)attNames.next();
+ String attPrefix = name.getPrefix()!=null ? name.getPrefix():"";
+ String attFqn = attPrefix.length()>0 ? attPrefix+":"+name.getLocalName() : name.getLocalName();
+ writer.write(" "+attFqn);
+ writer.write("='"+getAttributeValue(name)+"'");
+ }
+
+ boolean hasChildren = getChildNodes().getLength() > 0;
+ String endTag = null;
+ if(hasChildren)
+ {
+ writer.write('>');
+ endTag = "</"+getParentElement().getPrefix()+":Header>";
+ }
+ else
+ {
+ writer.write("/>");
+ }
+
+ if(pretty)
+ writer.write("\n");
+
+ return endTag;
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e.getMessage());
+ }
+ }
}
\ No newline at end of file
Modified: branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/main/java/org/jboss/ws/soap/SOAPMessageImpl.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -23,7 +23,6 @@
// $Id$
-import org.jboss.util.xml.DOMWriter;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.EndpointMetaData;
import org.jboss.ws.metadata.OperationMetaData;
@@ -247,8 +246,8 @@
{
boolean writeXML = isWriteXMLDeclaration();
String charsetEncoding = getCharSetEncoding();
- DOMWriter domWriter = new DOMWriter(outs, charsetEncoding);
- domWriter.setWriteXMLDeclaration(writeXML).print(soapEnv);
+ SAAJElementWriter writer = new SAAJElementWriter(outs, charsetEncoding);
+ writer.setWriteXMLDeclaration(writeXML).print((SOAPEnvelopeImpl)soapEnv);
}
}
}
Modified: branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/binding/SOAPBindingTestCase.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -175,7 +175,7 @@
ByteArrayOutputStream outs = new ByteArrayOutputStream();
reqMessage.writeTo(outs);
- String retString = new String(outs.toByteArray());
+ String retString = new String(outs.toByteArray());
assertEquals(DOMUtils.parse(reqEnvelope), DOMUtils.parse(retString));
}
Modified: branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -26,6 +26,7 @@
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
+import javax.xml.rpc.Stub;
import junit.framework.Test;
@@ -57,7 +58,7 @@
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
port = (EndpointInterface)service.getPort(EndpointInterface.class);
- }
+ }
}
public void testRemoteAccess() throws Exception
Modified: branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/dynamichandler/DynamicHandlerTestCase.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.HandlerRegistry;
+import javax.xml.rpc.Stub;
import junit.framework.Test;
@@ -67,6 +68,8 @@
service = (ServiceExt)iniCtx.lookup("java:comp/env/service/TestService");
endpoint = (HandlerTestService)service.getPort(HandlerTestService.class);
}
+
+ //((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jbossws-samples-dynamichandler");
}
public void testStaticHandlers() throws Exception
Modified: branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -73,7 +73,7 @@
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8080/jbossws-samples-jsr181ejb/EJB3Bean01");
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jbossws-samples-jsr181ejb/EJB3Bean01");
Stub stub = (Stub)port;
stub._setProperty(Stub.USERNAME_PROPERTY, "kermit");
Modified: branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/wssecurity/SimpleEncryptTestCase.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/wssecurity/SimpleEncryptTestCase.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/samples/wssecurity/SimpleEncryptTestCase.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -77,6 +77,9 @@
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
Hello port = (Hello)service.getPort(Hello.class);
+
+ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jbossws-samples-wssecurity-encrypt");
+
return port;
}
else
Modified: branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/soap/SOAPConnectionTestCase.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/soap/SOAPConnectionTestCase.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/soap/SOAPConnectionTestCase.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -47,7 +47,7 @@
*/
public class SOAPConnectionTestCase extends JBossWSTest
{
- private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jbossws-samples-jsr109pojo-rpc";
+ private final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jbossws-samples-jsr109pojo-rpc";
private static final String TARGET_NAMESPACE = "http://org.jboss.ws/samples/jsr109pojo";
public static Test suite()
Modified: branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java
===================================================================
--- branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java 2006-08-07 08:44:39 UTC (rev 697)
+++ branches/jbossws-1.0_Heiko/src/test/java/org/jboss/test/ws/wsse/SimpleSignEncryptTestCase.java 2006-08-07 13:49:04 UTC (rev 698)
@@ -23,6 +23,7 @@
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
+import javax.xml.rpc.Stub;
import junit.framework.Test;
More information about the jboss-svn-commits
mailing list