Author: keith
Date: Wed Mar 12 01:14:58 2008
New Revision: 14728
Log:
Fixing Mashup-691
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DownloadProcessor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SourceViewProcessor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/XsdProcessor.java
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DocProcessor.java
Wed Mar 12 01:14:58 2008
@@ -54,7 +54,7 @@
OutputStream outputStream = response.getOutputStream();
if (axisService != null) {
if (!axisService.isActive()) {
-
response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Service " + serviceName +
@@ -69,7 +69,7 @@
InputStream stubStream =
Thread.currentThread().getContextClassLoader()
.getResourceAsStream("doc.xslt");
if (stubStream == null) {
- response.sendError(404);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html; charset=utf-8");
outputStream.write(("<h4>Cannot find the stylesheet</h4>")
.getBytes());
@@ -96,7 +96,7 @@
transformer.transform(xmlSource, result);
} else {
response.setContentType("text/html");
- response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
outputStream
.write(("<h4>Service cannot be found. Cannot display
<em>API Documentation</em>.</h4>")
.getBytes());
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DownloadProcessor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DownloadProcessor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/DownloadProcessor.java
Wed Mar 12 01:14:58 2008
@@ -61,6 +61,7 @@
.createMashupArchive(axisService,
configurationContext, outputStream);
outputStream.flush();
} else {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Downloading is only available for
JavaScript services</h4>")
@@ -68,6 +69,7 @@
outputStream.flush();
}
} else {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Cannot download this service. This
service " +
@@ -79,6 +81,7 @@
if (log.isDebugEnabled()) {
log.debug("Cannot find the service" + serviceName + ". Axis
Service is null.");
}
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Service cannot be found. Cannot <em>download
service</em>.</h4>")
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SigProcessor.java
Wed Mar 12 01:14:58 2008
@@ -53,7 +53,7 @@
OutputStream outputStream = response.getOutputStream();
if (axisService != null) {
if (!axisService.isActive()) {
-
response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Service " + serviceName +
@@ -66,7 +66,7 @@
ByteArrayOutputStream sigOutStream =
Utils.getSigStream(axisService);
if (sigOutStream == null) {
- response.sendError(404);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html; charset=utf-8");
outputStream.write(("<h4>Cannot find the stylesheet
wsdl2sig.xslt</h4>")
.getBytes());
@@ -78,7 +78,7 @@
outputStream.flush();
} else {
response.setContentType("text/html");
- response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
outputStream
.write(("<h4>Service cannot be found. Cannot display
<em>Sig</em>.</h4>")
.getBytes());
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SourceViewProcessor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SourceViewProcessor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/SourceViewProcessor.java
Wed Mar 12 01:14:58 2008
@@ -92,6 +92,7 @@
File file = (File) implInfoParam.getValue();
Utils.writeFile(response, file);
} else {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Source is not available for this
service.")
@@ -99,6 +100,7 @@
outputStream.flush();
}
} else {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Source is not available for this
service. The source view " +
@@ -107,6 +109,7 @@
outputStream.flush();
}
} else {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Source is not available for this
service. This service " +
@@ -118,6 +121,7 @@
if (log.isDebugEnabled()) {
log.debug("Cannot find the service" + serviceName + ". Axis
Service is null.");
}
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Service cannot be found. Cannot display
<em>Source</em>.</h4>")
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/StubProcessor.java
Wed Mar 12 01:14:58 2008
@@ -56,7 +56,7 @@
OutputStream outputStream = response.getOutputStream();
if (axisService != null) {
if (!axisService.isActive()) {
-
response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html");
outputStream
.write(("<h4>Service " + serviceName +
@@ -71,7 +71,7 @@
InputStream stubStream =
Thread.currentThread().getContextClassLoader()
.getResourceAsStream("jsstub.xslt");
if (stubStream == null) {
- response.sendError(404);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
response.setContentType("text/html; charset=utf-8");
outputStream.write(("<h4>Cannot find the stylesheet</h4>")
.getBytes());
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/TryItProcessor.java
Wed Mar 12 01:14:58 2008
@@ -43,7 +43,7 @@
if (axisService != null) {
if (!axisService.isActive()) {
response.setContentType("text/html");
-
response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
outputStream
.write(("<h4>Service " + serviceName +
" is inactive. Cannot display
<em>TryIt</em>.</h4>")
@@ -58,7 +58,7 @@
} else {
response.setContentType("text/html");
- response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
outputStream
.write(("<h4>Service cannot be found. Cannot display
<em>TryIt</em>.</h4>").getBytes());
outputStream.flush();
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl11Processor.java
Wed Mar 12 01:14:58 2008
@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
public class Wsdl11Processor extends AbstractWsdlProcessor {
@@ -42,6 +43,27 @@
String contextPath = configurationContext.getServiceContextPath();
final String serviceName = MashupUtils.getServiceName(requestURI,
contextPath);
+ AxisService axisService =
+
configurationContext.getAxisConfiguration().getServiceForActivation(serviceName);
+ if (axisService == null) {
+ OutputStream outputStream = response.getOutputStream();
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ outputStream
+ .write(("<h4>Service cannot be found. Cannot display
<em>WSDL</em>.</h4>").getBytes());
+ outputStream.flush();
+ return;
+ } else if (!axisService.isActive()) {
+ OutputStream outputStream = response.getOutputStream();
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ outputStream
+ .write(("<h4>Service " + serviceName +
+ " is inactive. Cannot display <em>WSDL</em>.</h4>")
+ .getBytes());
+ outputStream.flush();
+ return;
+ }
WSDLPrinter wsdlPrinter = new WSDLPrinter() {
public void printWSDL(AxisService axisService) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/Wsdl20Processor.java
Wed Mar 12 01:14:58 2008
@@ -31,6 +31,7 @@
import javax.xml.stream.XMLStreamException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
public class Wsdl20Processor extends AbstractWsdlProcessor {
@@ -40,6 +41,27 @@
String requestURI = request.getRequestURI();
String contextPath = configurationContext.getServiceContextPath();
final String serviceName = MashupUtils.getServiceName(requestURI,
contextPath);
+ AxisService axisService =
+
configurationContext.getAxisConfiguration().getServiceForActivation(serviceName);
+ if (axisService == null) {
+ OutputStream outputStream = response.getOutputStream();
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ outputStream
+ .write(("<h4>Service cannot be found. Cannot display
<em>WSDL 2.0</em>.</h4>").getBytes());
+ outputStream.flush();
+ return;
+ } else if (!axisService.isActive()) {
+ OutputStream outputStream = response.getOutputStream();
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ outputStream
+ .write(("<h4>Service " + serviceName +
+ " is inactive. Cannot display <em>WSDL
2.0</em>.</h4>")
+ .getBytes());
+ outputStream.flush();
+ return;
+ }
WSDLPrinter wsdlPrinter = new WSDLPrinter() {
public void printWSDL(AxisService axisService) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified:
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/XsdProcessor.java
==============================================================================
---
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/XsdProcessor.java
(original)
+++
trunk/mashup/java/modules/core/src/org/wso2/mashup/requestprocessor/XsdProcessor.java
Wed Mar 12 01:14:58 2008
@@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
public class XsdProcessor implements HttpGetRequestProcessor {
/**
@@ -40,6 +41,25 @@
String serviceName = MashupUtils.getServiceName(requestURI,
contextPath);
AxisService axisService =
configurationContext.getAxisConfiguration().getServiceForActivation(serviceName);
+ if (axisService == null) {
+ OutputStream outputStream = response.getOutputStream();
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ outputStream
+ .write(("<h4>Service cannot be found. Cannot display
<em>XSD</em>.</h4>").getBytes());
+ outputStream.flush();
+ return;
+ } else if (!axisService.isActive()) {
+ OutputStream outputStream = response.getOutputStream();
+ response.setContentType("text/html");
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ outputStream
+ .write(("<h4>Service " + serviceName +
+ " is inactive. Cannot display <em>XSD</em>.</h4>")
+ .getBytes());
+ outputStream.flush();
+ return;
+ }
XsdUtil.printXsd(request, response, configurationContext, serviceName,
axisService);
}
}
\ No newline at end of file
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
