[wsas-java-dev] svn commit r858 - in trunk/wsas/java/modules: integration/test/org/wso2/wsas/rest standalone-edition/src/org/wso2/wsas/transport/jetty

[svn at wso2.org]

Author: saminda
Date: Sun Feb 11 22:22:16 2007
New Revision: 858

Modified:
   trunk/wsas/java/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java
   trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
   trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyHTTPOutTransportInfo.java
Log:
Fixing test cases related to REST invocation 


Modified: trunk/wsas/java/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java
==============================================================================
--- trunk/wsas/java/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java	(original)
+++ trunk/wsas/java/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java	Sun Feb 11 22:22:16 2007
@@ -62,7 +62,7 @@
         super.setUp();
         String hostAddress = NetworkUtils.getLocalHostname();
         eprString = "http://" + hostAddress + ":"
-                    + TestConstants.TESTING_PORT
+                    + (TestConstants.TESTING_PORT)
                     + "/rest/" + serviceName.getLocalPart() + "/" + operationName.getLocalPart();
 
         configContext = getConfigContext();

Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java	(original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/Axis2Handler.java	Sun Feb 11 22:22:16 2007
@@ -27,8 +27,9 @@
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.ServletBasedOutTransportInfo;
 import org.apache.axis2.transport.http.TransportHeaders;
-import org.apache.axis2.util.UUIDGenerator;
+import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mortbay.jetty.HttpConnection;
@@ -120,14 +121,14 @@
         msgContext.setTo(new EndpointReference(requestURI));
 
         msgContext.setProperty(Constants.OUT_TRANSPORT_INFO,
-                               new JettyHTTPOutTransportInfo(response));
+                               new ServletBasedOutTransportInfo(response));
 
         msgContext.setProperty(MessageContext.TRANSPORT_OUT, bos);
 
         // set the transport Headers
         msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,
                                getTransportHeaders(request));
-        msgContext.setServiceGroupContextId(UUIDGenerator.getUUID());
+        msgContext.setServiceGroupContextId(org.apache.axiom.om.util.UUIDGenerator.getUUID());
 
         // set msg context properties
         msgContext.setProperty(MessageContext.REMOTE_ADDR, request.getRemoteAddr());
@@ -178,8 +179,7 @@
                 AxisEngine engine = new AxisEngine(configurationContext);
                 msgContext.setProperty(MessageContext.TRANSPORT_OUT, bos);
                 MessageContext faultContext =
-                        engine.createFaultMessageContext(msgContext, e);
-
+                        MessageContextBuilder.createFaultMessageContext(msgContext, e);
                 response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 
                 SOAPFaultCode code = faultContext.getEnvelope().getBody().getFault().getCode();

Modified: trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyHTTPOutTransportInfo.java
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyHTTPOutTransportInfo.java	(original)
+++ trunk/wsas/java/modules/standalone-edition/src/org/wso2/wsas/transport/jetty/JettyHTTPOutTransportInfo.java	Sun Feb 11 22:22:16 2007
@@ -19,6 +19,9 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+/**
+ * @deprecated ; Use org.apache.axis2.transport.http.ServletBasedOutTransportInfo from Axis2
+ */
 public class JettyHTTPOutTransportInfo implements OutTransportInfo {
 	public JettyHTTPOutTransportInfo(HttpServletResponse response) {
 		this.response = response;