[xgws-dev] CVS Update: codes/xsul/java/modules/xservo_soap_http/xsul/xservo_soap_http
Aleksander Andrzej Slominski
xgws-dev_at_extreme.indiana.edu
Tue Oct 3 16:44:01 2006
aslom 06/10/03 16:42:53
Modified: xsul/java/modules/monitoring/xsul/monitoring
XsulMonitoringStats.java XsulMonitoringUtil.java
xsul/java/modules/xservo_soap_http/xsul/xservo_soap_http
HttpBasedServices.java
Log:
cleanup
Revision Changes Path
1.9 +2 -2 codes/xsul/java/modules/monitoring/xsul/monitoring/XsulMonitoringStats.java
Index: XsulMonitoringStats.java
===================================================================
RCS file: /l/extreme/cvs/codes/xsul/java/modules/monitoring/xsul/monitoring/XsulMonitoringStats.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -t -w -r1.8 -r1.9
--- XsulMonitoringStats.java 3 Oct 2006 20:22:32 -0000 1.8
+++ XsulMonitoringStats.java 3 Oct 2006 20:42:53 -0000 1.9
@@ -4,7 +4,7 @@
*
* This software is open source. See the bottom of this file for the licence.
*
- * $Id: XsulMonitoringStats.java,v 1.8 2006/10/03 20:22:32 aslom Exp $
+ * $Id: XsulMonitoringStats.java,v 1.9 2006/10/03 20:42:53 aslom Exp $
*/
package xsul.monitoring;
@@ -85,7 +85,7 @@
}
{
XmlElement starttimeEl = addElement(MONITORING_NS, STARTTIME_SECONDS);
- starttimeEl.addChild(""+startTimeInMs/1000.0);
+ starttimeEl.addChild(""+(long)(startTimeInMs/1000.0));
}
{
XmlElement numberOfConnectionsEl = addElement(MONITORING_NS, CONNECTIONS_COUNT);
1.13 +2 -2 codes/xsul/java/modules/monitoring/xsul/monitoring/XsulMonitoringUtil.java
Index: XsulMonitoringUtil.java
===================================================================
RCS file: /l/extreme/cvs/codes/xsul/java/modules/monitoring/xsul/monitoring/XsulMonitoringUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -t -w -r1.12 -r1.13
--- XsulMonitoringUtil.java 3 Oct 2006 20:22:32 -0000 1.12
+++ XsulMonitoringUtil.java 3 Oct 2006 20:42:53 -0000 1.13
@@ -4,7 +4,7 @@
*
* This software is open source. See the bottom of this file for the licence.
*
- * $Id: XsulMonitoringUtil.java,v 1.12 2006/10/03 20:22:32 aslom Exp $
+ * $Id: XsulMonitoringUtil.java,v 1.13 2006/10/03 20:42:53 aslom Exp $
*/
package xsul.monitoring;
@@ -145,7 +145,7 @@
p.addChild("Start time: ");
XmlElement spanStartTime = p.addElement(H, "span");
//spanStartTime.addChild(""+stats.getStarTimeInMs());
- long startTimeInSeconds = stats.getStarTimeInMs()/1000;
+ long startTimeInSeconds = (long)(stats.getStarTimeInMs()/1000L);
spanStartTime.addChild(""+ startTimeInSeconds);
spanStartTime.addAttribute(null, "class", XsulMonitoringStats.STARTTIME_SECONDS);
//p.addChild(" [milliseconds] since UNIX epoch.");
1.24 +3 -133 codes/xsul/java/modules/xservo_soap_http/xsul/xservo_soap_http/HttpBasedServices.java
Index: HttpBasedServices.java
===================================================================
RCS file: /l/extreme/cvs/codes/xsul/java/modules/xservo_soap_http/xsul/xservo_soap_http/HttpBasedServices.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -t -w -r1.23 -r1.24
--- HttpBasedServices.java 3 Oct 2006 20:36:04 -0000 1.23
+++ HttpBasedServices.java 3 Oct 2006 20:42:53 -0000 1.24
@@ -4,7 +4,7 @@
*
* This software is open source. See the bottom of this file for the licence.
*
- * $Id: HttpBasedServices.java,v 1.23 2006/10/03 20:36:04 aslom Exp $
+ * $Id: HttpBasedServices.java,v 1.24 2006/10/03 20:42:53 aslom Exp $
*/
package xsul.xservo_soap_http;
@@ -68,7 +68,7 @@
private HttpMiniServlet servlet;
private int serverPort;
//private ServerSocketFactory serverSocketFactory;
- private long startTime = System.currentTimeMillis() - 1; //defensive programming ot avoid divide-per-zero
+ private long startTime = System.currentTimeMillis();
private long requestXmlMsgCount;
private long numberOfConnections;
private String serverName; // = XsulVersion.getUserAgent();
@@ -269,7 +269,7 @@
// resp.setStatusCode("404");
// resp.setReasonPhrase("No favicon");
OutputStream outResp = res.getOutputStream();
- // resp.setContentType("image/vnd.microsoft.icon");
+ res.setContentType("image/vnd.microsoft.icon");
try {
outResp.write(XsulMonitoringUtil.getFaviconAsBytes());
outResp.close();
@@ -459,139 +459,9 @@
service.process(ctx);
- // // pass incoming message through list of global handlers
- //
- // int lastHandler = -1;
- // for(int i = 0; i < globalHandlers.size(); ++i) {
- // XHandler gloabalHandler = (XHandler) globalHandlers.get(i);
- // boolean shortCircuit = gloabalHandler.process(ctx);
- // if(shortCircuit) {
- // lastHandler = i;
- // break;
- // }
- // }
- // if(lastHandler == -1) {
- // service.process(ctx); //FIXME: do not care about return value?
- // lastHandler = globalHandlers.size() - 1;
- // }
- // soapUtil.wrapBodyContent(ctx.getOutgoingMessage());
- // ctx.setDirection(MessageContext.DIR_OUTGOING);
- // //and pass outgoing message (if any) back through list of global handlers
- // for(int i = lastHandler; i >= 0; --i) {
- // XHandler gloabalHandler = (XHandler) globalHandlers.get(i);
- // boolean shortCircuit = gloabalHandler.process(ctx);
- // if(shortCircuit) {
- // //lastHandler = i;
- // //TODO: what exactly should happen here ...
- // break;
- // }
- // }
}
- // private XmlDocument processSoapEnvelope(XmlElement envelope, final SoapUtil soapFragrance)
- // throws DynamicInfosetProcessorException
- // {
- // // concert envelope to String
- // // System.err.println(getClass().getName()+" received envelope="
- // // +builder.serializeToString(envelope));
- // logger.finest("received envelope="+builder.serializeToString(envelope));
- // // this XML string could be convertedto DOM ot whatever API one preferes (like JDOM, DOM4J, ...)
- //
- // XmlElement soapHeader = envelope.element(null, "Header");
- // //String location = getServer().getLocation();
- // final WsaMessageInformationHeaders requestWsaHeaders;
- // if(soapHeader != null) {
- // //throw new XsulException("SOAP message must have headers");
- //
- // requestWsaHeaders = new WsaMessageInformationHeaders(envelope);
- // //System.err.println(getClass().getName()+" message destinaiton="+wsah.getTo());
- // //assertEquals(location, wsah.getTo().toString());
- // // if(!location.equals(wsah.getTo().toString())) {
- // // throw new IllegalStateException();
- // // }
- // } else {
- // requestWsaHeaders = null;
- // }
- // final XmlElement message = soapFragrance.requiredBodyContent(envelope);
- //
- // XmlElement responseMessage;
- // XmlElement fault;
- // try {
- // responseMessage = null;//processMessage(message);
- // fault = null;
- // } catch (Exception e) {
- // fault = soapFragrance.generateSoapClientFault("could not process: "+e.getMessage(), e);
- // responseMessage = fault;
- // //return soapFragrance.wrapBodyContent(fault);
- // }
- //
- // if(responseMessage == null) {
- // // no response needed -- method wants to be one-way
- // return null;
- // }
- //
- // //TODO: use getFaultTo if there was fault
- // if(requestWsaHeaders != null) {
- // if(requestWsaHeaders.getReplyTo() != null) {
- // if(requestWsaHeaders.getReplyTo().getAddress().equals(WsAddressing.URI_ROLE_ANONYMOUS)) {
- // //to send back response wrapped in SOAP envelope
- // XmlDocument responseEnvelope = soapFragrance.wrapBodyContent(responseMessage);
- // WsaMessageInformationHeaders responseWsaHeaders =
- // new WsaMessageInformationHeaders(responseEnvelope);
- // responseWsaHeaders.setMessageId(URI.create(FastUUIDGen.nextUUID()));
- // responseWsaHeaders.explodeEndpointReference(requestWsaHeaders.getReplyTo());
- // URI messageId = requestWsaHeaders.getMessageId();
- // if(messageId != null) {
- // responseWsaHeaders.addRelatesTo(new WsaRelatesTo(requestWsaHeaders.getMessageId()));
- // }
- //
- // return responseEnvelope;
- //
- // } else {
- // asyncSendResponse(soapFragrance, responseMessage, requestWsaHeaders);
- // // no response sent - actual response will be sent over new connection
- // return null;
- // }
- // } else {
- // // no response needed
- // return null;
- // }
- // } else {
- // // should we add WSA stuff even if it was not in request?!
- // XmlDocument responseEnvelope = soapFragrance.wrapBodyContent(responseMessage);
- // return responseEnvelope;
- // }
- // }
- //
- // private void asyncSendResponse(final SoapUtil soapFragrance,
- // final XmlElement responseMessage,
- // final WsaMessageInformationHeaders requestWsaHeaders) {
- // Runnable r = new Runnable() {
- // public void run() {
- // try {
- // XmlDocument responseEnvelope = soapFragrance.wrapBodyContent(responseMessage);
- // // now we need to add all WSA headers etc ...
- // WsaMessageInformationHeaders responseWsaHeaders =
- // new WsaMessageInformationHeaders(responseEnvelope);
- // responseWsaHeaders.explodeEndpointReference(requestWsaHeaders.getReplyTo());
- // URI messageId = requestWsaHeaders.getMessageId();
- // if(messageId != null) {
- // responseWsaHeaders.addRelatesTo(new WsaRelatesTo(requestWsaHeaders.getMessageId()));
- // }
- // WsaInvoker invoker = new WsaInvoker();
- // //invoker.setDefaultAction(URI.create(MESSAGE_URI+"Response")); //TODO use WSDL!!!!
- // invoker.sendXml(responseEnvelope);
- // } catch (Exception e) {
- // logger.finest("could not send response to "+requestWsaHeaders.getReplyTo(), e);
- // }
- // }
- // };
- // //LATER: use Executor / ThreadPool
- // new Thread(r).start();
- // }
- //
- //
private void serializeXmlResponse(XmlDocument xmlRes, Writer writer) throws XmlBuilderException {
//builder.serializeToWriter(xmlRes, u8w);
//builder.serializeToWriter(input, utf8Writer);