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 aj...@apache.org on 2005/01/26 11:48:35 UTC
svn commit: r126496 - in webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis: deployment encoding engine impl/providers impl/transport/http
Author: ajith
Date: Wed Jan 26 02:48:33 2005
New Revision: 126496
URL: http://svn.apache.org/viewcvs?view=rev&rev=126496
Log:
Fixed some bugs that prevented axis from working inside tomcat
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.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/providers/SimpleJavaProvider.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&rev=126496&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r1=126495&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r2=126496
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java Wed Jan 26 02:48:33 2005
@@ -251,6 +251,7 @@
throw new RuntimeException("file not found !!!!!!!!!!!!!!!");
}
urlsToLoadFrom = new URL[]{file.toURL()};
+ System.out.println("urlsToLoadFrom = " + file.getAbsolutePath());
loader1 = new URLClassLoader(urlsToLoadFrom, parent);
service.setClassLoader(loader1);
if(! currentFileItem.getClassName().equals("")){
@@ -263,9 +264,10 @@
}
service.setServiceClass(serviceclass);
} catch (MalformedURLException e) {
- throw new AxisFault(e.getMessage());
+ throw new AxisFault(e.getMessage(),e);
} catch (Exception e) {
- throw new AxisFault(e.getMessage());
+ e.printStackTrace();
+ throw new AxisFault(e.getMessage(),e);
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java?view=diff&rev=126496&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r1=126495&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r2=126496
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java Wed Jan 26 02:48:33 2005
@@ -201,6 +201,7 @@
break;
} else if (eventType == XMLStreamConstants.START_ELEMENT) {
String ST = pullparser.getLocalName(); //Staring tag name
+
if (ST.equals(PARAMETERST)) {
Parameter parameter = processParameter();
axisService.addParameter(parameter);
Modified: 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=diff&rev=126496&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java&r1=126495&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java&r2=126496
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/encoding/OutObjectImpl.java Wed Jan 26 02:48:33 2005
@@ -25,7 +25,7 @@
private ContentHandler cHandler;
private Object obj = null;
public OutObjectImpl(Object obj){
-
+ this.obj = obj;
}
public ContentHandler getContentHandler() {
return cHandler;
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=126496&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r1=126495&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r2=126496
==============================================================================
--- 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 Wed Jan 26 02:48:33 2005
@@ -34,14 +34,11 @@
String filePart = toEPR.getAddress();
String soapAction = (String) msgctx.getProperty(MessageContext.SOAP_ACTION);
- if (filePart.startsWith("axis/services/") || filePart.startsWith("/axis/services/")) {
- String servicePart = filePart.substring(14);
- int separator = servicePart.indexOf('/');
- if (separator > -1) {
- uri = servicePart.substring(0, separator);
- } else {
- uri = servicePart;
- }
+ String pattern = "services/";
+ int serviceIndex = 0;
+ if((serviceIndex = filePart.indexOf(pattern)) > 0){
+ uri = filePart.substring(serviceIndex + pattern.length());
+ System.out.println(uri);
}
QName serviceName = null;
@@ -71,7 +68,7 @@
invokePhase.addHandler(ReceiverLocator.locateReceiver(msgctx));
chain.addPhase(invokePhase);
} else {
- throw new AxisFault("Service Not found");
+ throw new AxisFault("Service " + serviceName + " is not found");
}
}else{
throw new AxisFault("Both the URI and SOAP_ACTION Is Null");
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=126496&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java&r1=126495&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java&r2=126496
==============================================================================
--- 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 Wed Jan 26 02:48:33 2005
@@ -128,7 +128,7 @@
throw new UnsupportedOperationException("Only int and the String supported yet");
}
}
- return null;
+ return objs;
}
@@ -165,7 +165,7 @@
responseEnvelope.getBody().addChild(responseMethodName);
OMElement returnelement = fac.createOMElement("return",ns);
responseMethodName.addChild(returnelement);
- ObjectToOMBuilder builder = new ObjectToOMBuilder(returnelement,outobj);
+ returnelement.setBuilder(new ObjectToOMBuilder(returnelement,outobj));
msgContext.setEnvelope(responseEnvelope);
return msgContext;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java?view=diff&rev=126496&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java&r1=126495&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java&r2=126496
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/AxisServlet.java Wed Jan 26 02:48:33 2005
@@ -99,19 +99,19 @@
protected void storeOutputInfo(MessageContext msgContext,
OutputStream out) throws AxisFault {
- try {
+// try {
// Send it on its way...
- out.write(HTTPConstants.HTTP);
- out.write(HTTPConstants.OK);
- out.write("\n\n".getBytes());
+// out.write(HTTPConstants.HTTP);
+// out.write(HTTPConstants.OK);
+// out.write("\n\n".getBytes());
//We do not have any Addressing Headers to put
//let us put the information about incoming transport
msgContext.setProperty(MessageContext.TRANSPORT_TYPE,
TransportSenderLocator.TRANSPORT_HTTP);
msgContext.setProperty(MessageContext.TRANSPORT_DATA, out);
- } catch (IOException e) {
- throw AxisFault.makeFault(e);
- }
+// } catch (IOException e) {
+// throw AxisFault.makeFault(e);
+// }
}