[jbossws-commits] JBossWS SVN: r5332 - in framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework: management/recording and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2007-12-17 07:56:13 -0500 (Mon, 17 Dec 2007) New Revision: 5332 Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java Log: Update due to previous spi changes Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-17 12:54:45 UTC (rev 5331) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-17 12:56:13 UTC (rev 5332) @@ -85,12 +85,12 @@ record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_REQUEST_HEADERS))); record.setMessageType(MessageType.INBOUND); record.setOperation((QName)ctx.get(MessageContext.WSDL_OPERATION)); - boolean processMessage = false; - for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processMessage; ) + boolean processEnvelope = false; + for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processEnvelope; ) { - processMessage = it.next().isProcessMessage(); + processEnvelope = it.next().isProcessEnvelope(); } - if (processMessage) //skip message processing if not required since it's very time-consuming + if (processEnvelope) //skip message processing if not required since it's very time-consuming { SOAPMessageContext soapCtx = (SOAPMessageContext)ctx; try @@ -123,12 +123,12 @@ record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_RESPONSE_HEADERS))); record.setMessageType(MessageType.OUTBOUND); record.setOperation((QName)ctx.get(MessageContext.WSDL_OPERATION)); - boolean processMessage = false; - for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processMessage; ) + boolean processEnvelope = false; + for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processEnvelope; ) { - processMessage = it.next().isProcessMessage(); + processEnvelope = it.next().isProcessEnvelope(); } - if (processMessage) //skip message processing if not required since it's very time-consuming + if (processEnvelope) //skip message processing if not required since it's very time-consuming { SOAPMessageContext soapCtx = (SOAPMessageContext)ctx; try Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-17 12:54:45 UTC (rev 5331) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-17 12:56:13 UTC (rev 5332) @@ -44,7 +44,7 @@ protected boolean processDestinationHost = true; protected boolean processSourceHost = true; protected boolean processHeaders = true; - protected boolean processMessage = true; + protected boolean processEnvelope = true; protected boolean processMessageType = true; protected boolean processOperation = true; protected boolean processDate = true; @@ -108,14 +108,14 @@ this.processHeaders = processHeaders; } - public boolean isProcessMessage() + public boolean isProcessEnvelope() { - return processMessage; + return processEnvelope; } - public void setProcessMessage(boolean processMessage) + public void setProcessEnvelope(boolean processEnvelope) { - this.processMessage = processMessage; + this.processEnvelope = processEnvelope; } public boolean isProcessMessageType() @@ -170,8 +170,8 @@ sb.append(processSourceHost); sb.append(", processHeaders = "); sb.append(processHeaders); - sb.append(", processMessage = "); - sb.append(processMessage); + sb.append(", processEnvelope = "); + sb.append(processEnvelope); sb.append(", processMessageType = "); sb.append(processMessageType); sb.append(", processOperation = "); Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2007-12-17 12:54:45 UTC (rev 5331) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2007-12-17 12:56:13 UTC (rev 5332) @@ -23,8 +23,6 @@ //$Id$ -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.List; import java.util.Map; @@ -115,23 +113,8 @@ sb.append("\n"); } sb.append("\n"); - if (this.isProcessMessage()) + if (this.isProcessEnvelope()) { - if (record.getPayload() != null) - { - try - { - ByteArrayOutputStream out = new ByteArrayOutputStream(1024); - out.write(record.getPayload()); - out.close(); - sb.append(out.toString()); //improve this... - sb.append("\n"); - } - catch (IOException e) - { - log.warn("Error while writing the payload!"); - } - } sb.append(record.getEnvelope()); } log.debug(sb.toString()); Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java 2007-12-17 12:54:45 UTC (rev 5331) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java 2007-12-17 12:56:13 UTC (rev 5332) @@ -69,9 +69,9 @@ return processor.isProcessHeaders(); } - public boolean isProcessMessage() + public boolean isProcessEnvelope() { - return processor.isProcessMessage(); + return processor.isProcessEnvelope(); } public boolean isProcessMessageType() @@ -114,9 +114,9 @@ processor.setProcessHeaders(value); } - public void setProcessMessage(boolean value) + public void setProcessEnvelope(boolean value) { - processor.setProcessMessage(value); + processor.setProcessEnvelope(value); } public void setProcessMessageType(boolean value) Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java 2007-12-17 12:54:45 UTC (rev 5331) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java 2007-12-17 12:56:13 UTC (rev 5332) @@ -60,9 +60,9 @@ public void setProcessMessageType(boolean value); - public boolean isProcessMessage(); + public boolean isProcessEnvelope(); - public void setProcessMessage(boolean value); + public void setProcessEnvelope(boolean value); public boolean isProcessHeaders(); Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java =================================================================== --- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2007-12-17 12:54:45 UTC (rev 5331) +++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2007-12-17 12:56:13 UTC (rev 5332) @@ -43,7 +43,6 @@ private String sourceHost; private String destinationHost; private Map<String, List<String>> headers = new HashMap<String, List<String>>(); - private byte[] payload; private MessageType messageType; private QName operation; private String groupID; @@ -66,21 +65,11 @@ return messageType; } - public byte[] getPayload() - { - return payload; - } - public void setMessageType(MessageType messageType) { this.messageType = messageType; } - public void setPayload(byte[] payload) - { - this.payload = payload; - } - public String getSourceHost() { return sourceHost;