You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2004/12/24 06:52:12 UTC
svn commit: r123277 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/encoding java/org/apache/axis/engine java/org/apache/axis/impl/llom java/org/apache/axis/impl/llom/builder java/org/apache/axis/impl/providers java/org/apache/axis/impl/transport/http java/org/apache/axis/om test/org/apache/axis/encoding test/org/apache/axis/engine test/org/apache/axis/om
Author: hemapani
Date: Thu Dec 23 21:52:10 2004
New Revision: 123277
URL: http://svn.apache.org/viewcvs?view=rev&rev=123277
Log:
add simpe binding
Added:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/SimpleTypeEncodingUtils.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OutObject.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/encoding/EncodingTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/BadInputTest.java
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java?view=auto&rev=123277
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java Thu Dec 23 21:52:10 2004
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2003,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis.encoding;
+
+import org.apache.axis.om.OMException;
+import org.apache.axis.om.OutObject;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+
+public class OutObjectImpl implements OutObject{
+ private ContentHandler cHandler;
+ private Object obj = null;
+ public OutObjectImpl(Object obj){
+
+ }
+ public ContentHandler getContentHandler() {
+ return cHandler;
+ }
+
+ public void setContentHandler(ContentHandler contentHandler) {
+ this.cHandler = contentHandler;
+ }
+
+ public void startBuilding() throws OMException {
+ try {
+ if(obj instanceof String){
+ char[] str = ((String)obj).toCharArray();
+ cHandler.characters(str,0,str.length);
+ }else if(obj instanceof Integer){
+ char[] str = obj.toString().toCharArray();
+ cHandler.characters(str,0,str.length);
+ }else{
+ throw new OMException("Unsupported type");
+ }
+ } catch (SAXException e) {
+ throw new OMException(e);
+ }
+
+ }
+
+}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/SimpleTypeEncodingUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/SimpleTypeEncodingUtils.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/SimpleTypeEncodingUtils.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/SimpleTypeEncodingUtils.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/SimpleTypeEncodingUtils.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/SimpleTypeEncodingUtils.java Thu Dec 23 21:52:10 2004
@@ -15,6 +15,8 @@
*/
package org.apache.axis.encoding;
+import java.util.ArrayList;
+
import org.apache.axis.engine.AxisFault;
import javax.xml.namespace.QName;
@@ -25,6 +27,32 @@
public class SimpleTypeEncodingUtils {
+ public static String[] deserializeStringArray(XMLStreamReader xpp)throws AxisFault{
+ ArrayList strings = new ArrayList();
+
+ try{
+ int event = xpp.next();
+ while(true){
+ if(XMLStreamConstants.START_ELEMENT == event){
+ strings.add(deserializeString(xpp));
+ }if(XMLStreamConstants.END_ELEMENT == event){
+ break;
+ }if(XMLStreamConstants.END_DOCUMENT == event){
+ throw new AxisFault("premature and of file");
+ }
+ event = xpp.next();
+ }
+ String[] stringvals = new String[strings.size()];
+ for(int i = 0;i<strings.size();i++){
+ stringvals[i] = (String)strings.get(i);
+ }
+ return stringvals;
+ } catch (XMLStreamException e) {
+ throw AxisFault.makeFault(e);
+ }
+
+ }
+
public static String deserializeString(XMLStreamReader xpp)throws AxisFault{
StringBuffer value = new StringBuffer();
try {
@@ -40,7 +68,7 @@
event = xpp.next();
}
} catch (XMLStreamException e) {
- AxisFault.makeFault(e);
+ throw AxisFault.makeFault(e);
}
if(value.length() == 0){
return null;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java Thu Dec 23 21:52:10 2004
@@ -34,7 +34,7 @@
String filePart = toEPR.getAddress();
String soapAction = (String) msgctx.getProperty(MessageContext.SOAP_ACTION);
- if (filePart.startsWith("axis/services/")) {
+ if (filePart.startsWith("axis/services/") || filePart.startsWith("/axis/services/")) {
String servicePart = filePart.substring(14);
int separator = servicePart.indexOf('/');
if (separator > -1) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java Thu Dec 23 21:52:10 2004
@@ -4,6 +4,9 @@
import org.apache.axis.om.*;
import javax.xml.namespace.QName;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Locale;
/**
@@ -29,7 +32,9 @@
public SOAPFaultImpl(OMElement parent, Exception e) {
super(parent);
this.e = e;
- this.addChild(OMFactory.newInstance().createText(this, e.getMessage()));
+ StringWriter sw = new StringWriter();
+ e.printStackTrace(new PrintWriter(sw));
+ this.addChild(OMFactory.newInstance().createText(this, sw.getBuffer().toString()));
localName = SOAPFAULT_LOCAL_NAME;
setNamespace(new OMNamespaceImpl(SOAPFAULT_NAMESPACE_URI, SOAPFAULT_NAMESPACE_PREFIX));
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java Thu Dec 23 21:52:10 2004
@@ -192,10 +192,11 @@
//set the own namespace
OMNamespace namespace = node.findInScopeNamespace(parser.getNamespaceURI(), parser.getPrefix());
-
- if (namespace == null) {
- throw new OMException("All elements must be namespace qualified!");
- }
+//TODO we got to have this to make sure OM reject mesagess that are not sname space qualified
+//But got to comment this to interop with Axis.1.x
+// if (namespace == null) {
+// throw new OMException("All elements must be namespace qualified!");
+// }
if (isSOAPElement) {
if (!namespace.getName().equals(OMConstants.SOAP_ENVELOPE_NAMESPACE_URI))
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java Thu Dec 23 21:52:10 2004
@@ -26,13 +26,18 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
import org.apache.axis.description.AxisOperation;
+import org.apache.axis.encoding.OutObjectImpl;
import org.apache.axis.encoding.SimpleTypeEncodingUtils;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Constants;
import org.apache.axis.engine.Provider;
import org.apache.axis.impl.description.AxisService;
+import org.apache.axis.impl.llom.builder.ObjectToOMBuilder;
import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
import org.apache.axis.om.OMNode;
+import org.apache.axis.om.OutObject;
import org.apache.axis.om.SOAPBody;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.commons.logging.Log;
@@ -113,10 +118,12 @@
Object[] objs = new Object[parms.length];
for(int i = 0;i<parms.length;i++){
- if("int".equals(parms[i].getName())){
+ if(int.class.equals(parms[i])){
objs[i] = new Integer(SimpleTypeEncodingUtils.deserializeInt(xpp));
- }else if("java.lang.String".equals(parms[i].getName())){
+ }else if(String.class.equals(parms[i])){
objs[i] = SimpleTypeEncodingUtils.deserializeString(xpp);
+ }else if(String[].class.equals(parms[i])){
+ objs[i] = SimpleTypeEncodingUtils.deserializeStringArray(xpp);
}else{
throw new UnsupportedOperationException("Only int and the String supported yet");
}
@@ -149,10 +156,18 @@
Object[] parms = deserializeParameters(msgContext, method);
//invoke the WebService
Object result = method.invoke(obj, parms);
-
- //TODO fix the server side
-// SOAPXMLParserWrapper parser = new OMXMLPullParserWrapper();
-// msgContext.setOutMessage(new OMMessageImpl(parser));
+ OutObject outobj = new OutObjectImpl(result);
+ OMFactory fac = OMFactory.newInstance();
+ SOAPEnvelope responseEnvelope = fac.getDefaultEnvelope();
+
+ OMNamespace ns = fac.createOMNamespace("http://soapenc/","res");
+ OMElement responseMethodName = fac.createOMElement(methodName+"Response",ns);
+ responseEnvelope.getBody().addChild(responseMethodName);
+ OMElement returnelement = fac.createOMElement("return",ns);
+ responseMethodName.addChild(returnelement);
+ ObjectToOMBuilder builder = new ObjectToOMBuilder(returnelement,outobj);
+ msgContext.setEnvelope(responseEnvelope);
+
return msgContext;
} catch (SecurityException e) {
throw AxisFault.makeFault(e);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java Thu Dec 23 21:52:10 2004
@@ -48,11 +48,7 @@
protected static Log log =
LogFactory.getLog(SimpleHTTPReceiver.class.getName());
- // Axis specific constants
protected static String transportName = "SimpleHTTP";
- protected AxisEngine engine;
- // private SimpleAxisServer server;
- // private Socket socket;
@@ -145,6 +141,12 @@
try {
DeploymentEngine deploymentEngine = new DeploymentEngine(dir);
EngineRegistry er = deploymentEngine.start();
+ try {
+ Thread.sleep(9000);
+ } catch (InterruptedException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
this.engine = new AxisEngine(er);
} catch (PhaseException e) {
throw AxisFault.makeFault(e);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OutObject.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OutObject.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OutObject.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OutObject.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OutObject.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OutObject.java Thu Dec 23 21:52:10 2004
@@ -1,5 +1,6 @@
package org.apache.axis.om;
+import org.apache.axis.engine.AxisFault;
import org.xml.sax.ContentHandler;
/**
@@ -43,5 +44,5 @@
* When this method is being called the Object should start throwing SAX events through the
* ContentHandler registered earlier.
*/
- public void startBuilding();
+ public void startBuilding()throws OMException ;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/encoding/EncodingTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/encoding/EncodingTest.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/encoding/EncodingTest.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/encoding/EncodingTest.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/encoding/EncodingTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/encoding/EncodingTest.java Thu Dec 23 21:52:10 2004
@@ -24,6 +24,11 @@
import java.lang.reflect.Method;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
public class EncodingTest extends AbstractTestCase {
@@ -58,9 +63,49 @@
sjp.deserializeParameters(omel.getPullParser(false),method);
}
+
+ public void testDeserializingStringArray() throws SecurityException, NoSuchMethodException, AxisFault{
+ Method method = Echo.class.getMethod("echoStringArray",new Class[]{String[].class});
+ OMNamespace omNs = OMFactory.newInstance().createOMNamespace("http://host/my","my");
+ OMFactory omfac = OMFactory.newInstance();
+ OMElement omel = omfac.createOMElement("Array",omNs);
+
+ for(int i = 0;i<5;i++){
+ OMElement temp = omfac.createOMElement("val",omNs);
+ temp.addChild(omfac.createText(String.valueOf(i)));
+ omel.addChild(temp);
+ }
+
+ SimpleJavaProvider sjp = new SimpleJavaProvider();
+ sjp.deserializeParameters(omel.getPullParser(false),method);
+ }
+
+ public void testDeserializingStringArrayVal() throws SecurityException, NoSuchMethodException, AxisFault, XMLStreamException, FactoryConfigurationError{
+ OMNamespace omNs = OMFactory.newInstance().createOMNamespace("http://host/my","my");
+ OMFactory omfac = OMFactory.newInstance();
+ OMElement omel = omfac.createOMElement("Array",omNs);
+
+ for(int i = 0;i<5;i++){
+ OMElement temp = omfac.createOMElement("val",omNs);
+ temp.addChild(omfac.createText(String.valueOf(i)));
+ omel.addChild(temp);
+ }
+
+ omel.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out),true);
+ XMLStreamReader xpp = omel.getPullParser(false);
+ String[] strs = SimpleTypeEncodingUtils.deserializeStringArray(xpp);
+ for(int i = 0;i<strs.length;i++){
+ System.out.println(strs[i]);
+ }
+
+ }
+
public class Echo{
public int echoInt(int intVal){
return intVal;
+ }
+ public String[] echoStringArray(String[] in){
+ return in;
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java Thu Dec 23 21:52:10 2004
@@ -34,7 +34,7 @@
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
public class EngineUtils {
- public static final int TESTING_PORT = 7777;
+ public static final int TESTING_PORT = 3333;
public static final String FAILURE_MESSAGE = "Intentional Faliure";
private static int index = 0;
private static SimpleHTTPReceiver sas;
@@ -50,13 +50,20 @@
public static synchronized SimpleHTTPReceiver startServer(EngineRegistry engineRegistry) throws IOException{
AxisEngine engine = new AxisEngine(engineRegistry);
- ServerSocket serverSoc = new ServerSocket(TESTING_PORT);
+ ServerSocket serverSoc = null;
if(sas == null){
- sas = new SimpleHTTPReceiver(engine);
}else{
sas.stop();
- sas = new SimpleHTTPReceiver(engine);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
+ serverSoc = new ServerSocket(TESTING_PORT);
+ sas = new SimpleHTTPReceiver(engine);
+
sas.setServerSocket(serverSoc);
Thread thisThread = new Thread(sas);
thisThread.setDaemon(true);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java Thu Dec 23 21:52:10 2004
@@ -153,7 +153,7 @@
OMElement omele = call.syncCall(method,url);
assertNotNull(omele);
}catch(AxisFault e){
- assertEquals(e.getMessage(),EngineUtils.FAILURE_MESSAGE);
+ assertTrue((e.getMessage().indexOf(EngineUtils.FAILURE_MESSAGE)) > 0);
tearDown();
return;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java Thu Dec 23 21:52:10 2004
@@ -16,8 +16,6 @@
package org.apache.axis.engine;
//todo
-import java.net.ServerSocket;
-
import javax.xml.namespace.QName;
import org.apache.axis.AbstractTestCase;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/BadInputTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/BadInputTest.java?view=diff&rev=123277&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/BadInputTest.java&r1=123276&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/BadInputTest.java&r2=123277
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/BadInputTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/BadInputTest.java Thu Dec 23 21:52:10 2004
@@ -32,22 +32,6 @@
super(testName);
}
- //done
- public void testBodyNotQualified() throws Exception {
- try {
- SOAPEnvelope soapEnvelope =
- (SOAPEnvelope) OMTestUtils.getOMBuilder(new File(dir, "bodyNotQualified.xml")).getDocumentElement();
- OMTestUtils.walkThrough(soapEnvelope);
- fail("this must failed gracefully with OMException or AxisFault");
- } catch (OMException e) {
- //we are OK!
- return;
- } catch (AxisFault e) {
- //we are OK here too!
- return;
- }
-
- }
//done
@@ -81,19 +65,35 @@
}
//done
- public void testNotnamespaceQualified() throws Exception {
- try {
- SOAPEnvelope soapEnvelope =
- (SOAPEnvelope) OMTestUtils.getOMBuilder(new File(dir, "notnamespaceQualified.xml")).getDocumentElement();
- OMTestUtils.walkThrough(soapEnvelope);
- fail("this must failed gracefully with OMException or AxisFault");
- } catch (OMException e) {
- return;
- } catch (AxisFault e) {
- return;
- }
-
- }
+// public void testNotnamespaceQualified() throws Exception {
+// try {
+// SOAPEnvelope soapEnvelope =
+// (SOAPEnvelope) OMTestUtils.getOMBuilder(new File(dir, "notnamespaceQualified.xml")).getDocumentElement();
+// OMTestUtils.walkThrough(soapEnvelope);
+// fail("this must failed gracefully with OMException or AxisFault");
+// } catch (OMException e) {
+// return;
+// } catch (AxisFault e) {
+// return;
+// }
+//
+// }
+ //done
+// public void testBodyNotQualified() throws Exception {
+// try {
+// SOAPEnvelope soapEnvelope =
+// (SOAPEnvelope) OMTestUtils.getOMBuilder(new File(dir, "bodyNotQualified.xml")).getDocumentElement();
+// OMTestUtils.walkThrough(soapEnvelope);
+// fail("this must failed gracefully with OMException or AxisFault");
+// } catch (OMException e) {
+// //we are OK!
+// return;
+// } catch (AxisFault e) {
+// //we are OK here too!
+// return;
+// }
+//
+// }
//done
public void testTwoBodymessage() throws Exception {