Author: alessio.soldano(a)jboss.com Date: 2007-12-20 13:37:26 -0500 (Thu, 20 Dec 2007) New Revision: 5379 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java Log: Merging asoldano branch to trunk, svn merge -r 5187:HEAD Records management: - [JBWS-1897] - [JBWS-1898] - [JBWS-1899] Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-12-20 16:35:45 UTC (rev 5378) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -23,11 +23,15 @@ // $Id$ +import java.util.List; + import javax.management.ObjectName; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; +import org.jboss.wsf.spi.management.recording.Record; +import org.jboss.wsf.spi.management.recording.RecordProcessor; /** * A general JAXWS endpoint. @@ -116,4 +120,13 @@ /** Set the endpoint metrics for this endpoint */ void setEndpointMetrics(EndpointMetrics metrics); + + /** Get the record processors configured for this endpoint **/ + List<RecordProcessor> getRecordProcessors(); + + /** Set the record processors for this endpoint **/ + void setRecordProcessors(List<RecordProcessor> recordProcessors); + + /** Ask configured processors for processing of the given record **/ + void processRecord(Record record); } Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording (from rev 5374, spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording) Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java =================================================================== --- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-20 14:48:10 UTC (rev 5374) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -1,115 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.management.recording; - -//$Id$ - -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; - -/** - * - * @author alessio.soldano(a)jboss.com - * @since 8-Dec-2007 - */ -public interface Record -{ - public enum MessageType {INBOUND, OUTBOUND}; - - /** - * Gets the group ID corresponding to the current message exchange flow - * - * @return - */ - public String getGroupID(); - - public void setGroupID(String groupID); - - /** - * Gets the date of this record - * - * @return - */ - public Date getDate(); - - public void setDate(Date date); - - /** - * Gets the source (message sender) host. The result format conforms to RFC2732 - * - * @return source host - */ - public String getSourceHost(); - - public void setSourceHost(String host); - - /** - * Gets the source (message sender) host. The result format conforms to RFC2732 - * - * @return the source host - */ - public String getDestinationHost(); - - public void setDestinationHost(String host); - - /** - * Gets the message type, i.e. MessageType.INBOUND or MessageType.OUTBOUND - * - * @return the message type - */ - public MessageType getMessageType(); - - public void setMessageType(MessageType type); - - - /** - * Gets the SOAP message envelope - * - * @return - */ - public String getEnvelope(); - - public void setEnvelope(String envelope); - - /** - * Gets the HTTP headers - * - * @return the headers - */ - public Map<String, List<String>> getHeaders(); - - public void addHeaders(String key, List<String> value); - - public void setHeaders(Map<String, List<String>> headers); - - /** - * Gets the invoked operation - * - * @return the operation - */ - public QName getOperation(); - - public void setOperation(QName operation); -} Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java (from rev 5374, spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -0,0 +1,115 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management.recording; + +//$Id$ + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; + +/** + * + * @author alessio.soldano(a)jboss.com + * @since 8-Dec-2007 + */ +public interface Record +{ + public enum MessageType {INBOUND, OUTBOUND}; + + /** + * Gets the group ID corresponding to the current message exchange flow + * + * @return + */ + public String getGroupID(); + + public void setGroupID(String groupID); + + /** + * Gets the date of this record + * + * @return + */ + public Date getDate(); + + public void setDate(Date date); + + /** + * Gets the source (message sender) host. The result format conforms to RFC2732 + * + * @return source host + */ + public String getSourceHost(); + + public void setSourceHost(String host); + + /** + * Gets the source (message sender) host. The result format conforms to RFC2732 + * + * @return the source host + */ + public String getDestinationHost(); + + public void setDestinationHost(String host); + + /** + * Gets the message type, i.e. MessageType.INBOUND or MessageType.OUTBOUND + * + * @return the message type + */ + public MessageType getMessageType(); + + public void setMessageType(MessageType type); + + + /** + * Gets the SOAP message envelope + * + * @return + */ + public String getEnvelope(); + + public void setEnvelope(String envelope); + + /** + * Gets the HTTP headers + * + * @return the headers + */ + public Map<String, List<String>> getHeaders(); + + public void addHeaders(String key, List<String> value); + + public void setHeaders(Map<String, List<String>> headers); + + /** + * Gets the invoked operation + * + * @return the operation + */ + public QName getOperation(); + + public void setOperation(QName operation); +} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java =================================================================== --- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java 2007-12-20 14:48:10 UTC (rev 5374) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.management.recording; - -//$Id$ - -/** - * A record filter - * - * @author alessio.soldano(a)jboss.com - * @since 8-Dec-2007 - */ -public interface RecordFilter -{ - /** - * Returns true if the filter matches the given record. - * - * @param record - * @return - */ - public boolean match(Record record); -} Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java (from rev 5374, spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management.recording; + +//$Id$ + +/** + * A record filter + * + * @author alessio.soldano(a)jboss.com + * @since 8-Dec-2007 + */ +public interface RecordFilter +{ + /** + * Returns true if the filter matches the given record. + * + * @param record + * @return + */ + public boolean match(Record record); +} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java =================================================================== --- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2007-12-20 14:48:10 UTC (rev 5374) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.management.recording; - -import java.util.Stack; - -import org.jboss.logging.Logger; - -//$Id$ - -/** - * Associates the record group ID with the current thread. - * - * @author alessio.soldano(a)jboss.com - * @since 8-Dec-2007 - */ -public class RecordGroupAssociation -{ - private static ThreadLocal<Stack<String>> groupIDAssoc = new ThreadLocal<Stack<String>>(); - - // provide logging - private static Logger log = Logger.getLogger(RecordGroupAssociation.class); - - - public static void pushGroupID(String groupID) - { - if(log.isDebugEnabled()) log.debug("pushGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")"); - Stack<String> stack = groupIDAssoc.get(); - if (stack == null) - { - stack = new Stack<String>(); - groupIDAssoc.set(stack); - } - stack.push(groupID); - } - - public static String peekGroupID() - { - String groupID = null; - Stack<String> stack = groupIDAssoc.get(); - if (stack != null && stack.isEmpty() == false) - { - groupID = stack.peek(); - } - if(log.isDebugEnabled()) log.debug("peekGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")"); - return groupID; - } - - public static String popGroupID() - { - String groupID = null; - Stack<String> stack = groupIDAssoc.get(); - if (stack != null && stack.isEmpty() == false) - { - groupID = stack.pop(); - } - if(log.isDebugEnabled()) log.debug("popGroupID: " + groupID +" (Thread " +Thread.currentThread().getName()+ ")"); - return groupID; - } - -} Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java (from rev 5374, spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordGroupAssociation.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management.recording; + +import java.util.Stack; + +import org.jboss.logging.Logger; + +//$Id$ + +/** + * Associates the record group ID with the current thread. + * + * @author alessio.soldano(a)jboss.com + * @since 8-Dec-2007 + */ +public class RecordGroupAssociation +{ + private static ThreadLocal<Stack<String>> groupIDAssoc = new ThreadLocal<Stack<String>>(); + + // provide logging + private static Logger log = Logger.getLogger(RecordGroupAssociation.class); + + + public static void pushGroupID(String groupID) + { + if(log.isDebugEnabled()) log.debug("pushGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")"); + Stack<String> stack = groupIDAssoc.get(); + if (stack == null) + { + stack = new Stack<String>(); + groupIDAssoc.set(stack); + } + stack.push(groupID); + } + + public static String peekGroupID() + { + String groupID = null; + Stack<String> stack = groupIDAssoc.get(); + if (stack != null && stack.isEmpty() == false) + { + groupID = stack.peek(); + } + if(log.isDebugEnabled()) log.debug("peekGroupID: " + groupID + " (Thread " +Thread.currentThread().getName()+ ")"); + return groupID; + } + + public static String popGroupID() + { + String groupID = null; + Stack<String> stack = groupIDAssoc.get(); + if (stack != null && stack.isEmpty() == false) + { + groupID = stack.pop(); + } + if(log.isDebugEnabled()) log.debug("popGroupID: " + groupID +" (Thread " +Thread.currentThread().getName()+ ")"); + return groupID; + } + +} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java =================================================================== --- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-20 14:48:10 UTC (rev 5374) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.management.recording; - -//$Id$ - -import java.util.List; - -/** - * Processes a record. A RecordProcessor may have filters to allow processing - * of records matching given criteria. It also gives users fine management of - * record's attributes to processed. - * - * @author alessio.soldano(a)jboss.com - * @since 8-Dec-2007 - */ -public interface RecordProcessor -{ - public String getName(); - - public void setName(String name); - - public boolean isRecording(); - - public void setRecording(boolean value); - - public void processRecord(Record record); - - public List<RecordFilter> getFilters(); - - public void addFilter(RecordFilter filter); - - public void setFilters(List<RecordFilter> filters); - - public boolean isProcessSourceHost(); - - public void setProcessSourceHost(boolean value); - - public boolean isProcessDestinationHost(); - - public void setProcessDestinationHost(boolean value); - - public boolean isProcessMessageType(); - - public void setProcessMessageType(boolean value); - - public boolean isProcessEnvelope(); - - public void setProcessEnvelope(boolean value); - - public boolean isProcessHeaders(); - - public void setProcessHeaders(boolean value); - - public boolean isProcessOperation(); - - public void setProcessOperation(boolean value); - - public boolean isProcessDate(); - - public void setProcessDate(boolean value); -} Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java (from rev 5374, spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-20 18:37:26 UTC (rev 5379) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management.recording; + +//$Id$ + +import java.util.List; + +/** + * Processes a record. A RecordProcessor may have filters to allow processing + * of records matching given criteria. It also gives users fine management of + * record's attributes to processed. + * + * @author alessio.soldano(a)jboss.com + * @since 8-Dec-2007 + */ +public interface RecordProcessor +{ + public String getName(); + + public void setName(String name); + + public boolean isRecording(); + + public void setRecording(boolean value); + + public void processRecord(Record record); + + public List<RecordFilter> getFilters(); + + public void addFilter(RecordFilter filter); + + public void setFilters(List<RecordFilter> filters); + + public boolean isProcessSourceHost(); + + public void setProcessSourceHost(boolean value); + + public boolean isProcessDestinationHost(); + + public void setProcessDestinationHost(boolean value); + + public boolean isProcessMessageType(); + + public void setProcessMessageType(boolean value); + + public boolean isProcessEnvelope(); + + public void setProcessEnvelope(boolean value); + + public boolean isProcessHeaders(); + + public void setProcessHeaders(boolean value); + + public boolean isProcessOperation(); + + public void setProcessOperation(boolean value); + + public boolean isProcessDate(); + + public void setProcessDate(boolean value); +}