JBossWS SVN: r8033 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-08 04:16:39 -0400 (Fri, 08 Aug 2008)
New Revision: 8033
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2194] Enabling tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-08-08 07:05:12 UTC (rev 8032)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-08-08 08:16:39 UTC (rev 8033)
@@ -102,7 +102,8 @@
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
-# [JBWS-2194] request requires HTTP authentication: Unauthorized
+# [JBWS-2194] Cannot get security domain declared through jboss.xml DD (fixed
+# # starting from AS 5 trunk container integration, next release 5.0.0.CR2)
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
# [JBWS-2223] wsconsume for cxf build
@@ -113,4 +114,4 @@
org/jboss/test/ws/jaxws/jbws1178/**
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
\ No newline at end of file
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-08-08 07:05:12 UTC (rev 8032)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-08-08 08:16:39 UTC (rev 8033)
@@ -102,9 +102,6 @@
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
-# [JBWS-2194] request requires HTTP authentication: Unauthorized
-org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
-
# [JBWS-2223] wsconsume for cxf build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
15 years, 9 months
JBossWS SVN: r8032 - stack/native/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-08 03:05:12 -0400 (Fri, 08 Aug 2008)
New Revision: 8032
Modified:
stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
[JBWS-2191] Including tests in binary distro
Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-08-08 07:05:01 UTC (rev 8031)
+++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2008-08-08 07:05:12 UTC (rev 8032)
@@ -98,9 +98,11 @@
<include>ant-import/**</include>
<include>java/org/jboss/test/ws/console/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>java/org/jboss/test/ws/management/**</include>
<include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>resources/console/**</include>
<include>resources/jaxws/samples/**</include>
+ <include>resources/management/**</include>
<include>resources/projectGenerator/**</include>
</includes>
</unpackOptions>
15 years, 9 months
JBossWS SVN: r8031 - stack/cxf/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-08 03:05:01 -0400 (Fri, 08 Aug 2008)
New Revision: 8031
Modified:
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
[JBWS-2191] Including tests in binary distro
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-08-08 07:04:23 UTC (rev 8030)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-08-08 07:05:01 UTC (rev 8031)
@@ -98,9 +98,11 @@
<include>ant-import/**</include>
<include>java/org/jboss/test/ws/console/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>java/org/jboss/test/ws/management/**</include>
<include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>resources/console/**</include>
<include>resources/jaxws/samples/**</include>
+ <include>resources/management/**</include>
<include>resources/projectGenerator/**</include>
</includes>
</unpackOptions>
@@ -110,4 +112,4 @@
</moduleSet>
</moduleSets>
-</assembly>
\ No newline at end of file
+</assembly>
15 years, 9 months
JBossWS SVN: r8030 - stack/metro/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-08 03:04:23 -0400 (Fri, 08 Aug 2008)
New Revision: 8030
Modified:
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
[JBWS-2191] Including tests in binary distro
Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-08-08 07:03:07 UTC (rev 8029)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-08-08 07:04:23 UTC (rev 8030)
@@ -98,9 +98,11 @@
<include>ant-import/**</include>
<include>java/org/jboss/test/ws/console/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>java/org/jboss/test/ws/management/**</include>
<include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>resources/console/**</include>
<include>resources/jaxws/samples/**</include>
+ <include>resources/management/**</include>
<include>resources/projectGenerator/**</include>
</includes>
</unpackOptions>
@@ -110,4 +112,4 @@
</moduleSet>
</moduleSets>
-</assembly>
\ No newline at end of file
+</assembly>
15 years, 9 months
JBossWS SVN: r8029 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-08 03:03:07 -0400 (Fri, 08 Aug 2008)
New Revision: 8029
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
Log:
[JBWS-2191] Including tests in binary distro
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-08-07 15:28:20 UTC (rev 8028)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-08-08 07:03:07 UTC (rev 8029)
@@ -568,23 +568,6 @@
</classes>
</war>
- <!-- management-recording.jar -->
- <jar destfile="${tests.output.dir}/test-libs/management-recording-native.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/management/recording/*.class"/>
- <exclude name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/>
- <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
- </fileset>
- </jar>
- <jar destfile="${tests.output.dir}/test-libs/management-recording.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/management/recording/*.class"/>
- <include name="org/jboss/test/ws/management/recording/*.xml"/>
- <exclude name="org/jboss/test/ws/management/recording/EndpointImpl.class"/>
- <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
- </fileset>
- </jar>
-
<!-- Please add alphabetically -->
</target>
Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-08-07 15:28:20 UTC (rev 8028)
+++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2008-08-08 07:03:07 UTC (rev 8029)
@@ -434,6 +434,23 @@
<exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/>
</classes>
</war>
+
+ <!-- management-recording.jar -->
+ <jar destfile="${tests.output.dir}/test-libs/management-recording-native.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/management/recording/*.class"/>
+ <exclude name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/>
+ <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/test-libs/management-recording.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/management/recording/*.class"/>
+ <include name="org/jboss/test/ws/management/recording/*.xml"/>
+ <exclude name="org/jboss/test/ws/management/recording/EndpointImpl.class"/>
+ <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
+ </fileset>
+ </jar>
<!-- Please add alphabetically -->
15 years, 9 months
JBossWS SVN: r8028 - in framework/trunk/testsuite/test: java/org/jboss/test/ws and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-07 11:28:20 -0400 (Thu, 07 Aug 2008)
New Revision: 8028
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2191] Provide junit tests for the record management tools
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-08-07 15:27:33 UTC (rev 8027)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2008-08-07 15:28:20 UTC (rev 8028)
@@ -567,6 +567,23 @@
<include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/>
</classes>
</war>
+
+ <!-- management-recording.jar -->
+ <jar destfile="${tests.output.dir}/test-libs/management-recording-native.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/management/recording/*.class"/>
+ <exclude name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/>
+ <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${tests.output.dir}/test-libs/management-recording.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/management/recording/*.class"/>
+ <include name="org/jboss/test/ws/management/recording/*.xml"/>
+ <exclude name="org/jboss/test/ws/management/recording/EndpointImpl.class"/>
+ <exclude name="org/jboss/test/ws/management/recording/*TestCase.class"/>
+ </fileset>
+ </jar>
<!-- Please add alphabetically -->
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,94 @@
+/*
+ * 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.test.ws.management.recording;
+
+import java.net.URL;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+
+/**
+ * This test case shows how to dynamically add a custom record processor
+ * to a given endpoint.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 6-Aug-2008
+ */
+public class CustomRecordProcessorTestCase extends JBossWSTest
+{
+ private String endpointURL = "http://" + getServerHost() + ":8080/management-recording/EndpointImpl";
+ private String targetNS = "http://recording.management.ws.test.jboss.org/";
+ private String endpointObjectName;
+
+ protected void setUp() throws Exception
+ {
+ //Native does not require us to set the recording handler on the deployed endpoint
+ boolean isNative = isIntegrationNative();
+ new JBossWSTestHelper().deploy(isNative ? "management-recording-native.jar" : "management-recording.jar");
+ endpointObjectName = isNative ? "jboss.ws:context=management-recording,endpoint=EndpointImpl" : "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl";
+ }
+
+ protected void tearDown() throws Exception
+ {
+ boolean isNative = isIntegrationNative();
+ new JBossWSTestHelper().undeploy(isNative ? "management-recording-native.jar" : "management-recording.jar");
+ }
+
+ public void testAddCustomProcessor() throws Exception
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+ addCustomProcessor();
+ Object retObj = port.echo1("Hello");
+ assertEquals("Hello", retObj);
+ checkCustomProcessorJob();
+ }
+
+ private void addCustomProcessor() throws Exception
+ {
+ ObjectName oname = new ObjectName(endpointObjectName);
+ ExtManagedProcessor myProcessor = new ExtManagedProcessor();
+ myProcessor.setName("myExtProcessor");
+ myProcessor.setRecording(true);
+ myProcessor.setAttribute("Attribute value");
+ myProcessor.setExtAttribute("ExtAttribute value");
+ getServer().invoke(oname, "addRecordProcessor", new Object[] { myProcessor }, new String[] { RecordProcessor.class.getName() });
+ }
+
+ private void checkCustomProcessorJob() throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=myExtProcessor");
+ assertEquals(true, server.getAttribute(oname, "Recording"));
+ assertEquals(1, server.getAttribute(oname, "Size"));
+ assertEquals("Attribute value", server.getAttribute(oname, "Attribute"));
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/Endpoint.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/Endpoint.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,33 @@
+/*
+ * 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.test.ws.management.recording;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (name="Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Endpoint
+{
+ String echo1(String input);
+ String echo2(String input);
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,53 @@
+/*
+ * 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.test.ws.management.recording;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * author alessio.soldano(a)jboss.org
+ * @since 06-Aug-2008
+ */
+@Stateless
+@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint")
+@WebContext(contextRoot="/management-recording", urlPattern="/EndpointImpl")
+public class EndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl.class);
+
+ public String echo1(String input)
+ {
+ log.info("echo1: " + input);
+ return input;
+ }
+
+ public String echo2(String input)
+ {
+ log.info("echo2: " + input);
+ return input;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,55 @@
+/*
+ * 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.test.ws.management.recording;
+
+import javax.ejb.Stateless;
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * @author alessio.soldano(a)jboss.org
+ * @since 06-Aug-2008
+ */
+@Stateless
+@WebService(name="Endpoint", serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint")
+@HandlerChain(file="jaxws-handlers-server.xml")
+@WebContext(contextRoot="/management-recording", urlPattern="/EndpointImpl")
+public class EndpointWithHandlerImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointWithHandlerImpl.class);
+
+ public String echo1(String input)
+ {
+ log.info("echo1: " + input);
+ return input;
+ }
+
+ public String echo2(String input)
+ {
+ log.info("echo2: " + input);
+ return input;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,16 @@
+package org.jboss.test.ws.management.recording;
+
+import java.io.Serializable;
+
+public class ExtManagedProcessor extends MyManagedProcessor implements Serializable {
+
+ private String extAttribute;
+
+ public String getExtAttribute() {
+ return extAttribute;
+ }
+
+ public void setExtAttribute(String extAttribute) {
+ this.extAttribute = extAttribute;
+ }
+}
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/ExtManagedProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,265 @@
+/*
+ * 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.test.ws.management.recording;
+
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.Attribute;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.wsf.framework.management.recording.AndFilter;
+import org.jboss.wsf.framework.management.recording.HostFilter;
+import org.jboss.wsf.framework.management.recording.NotFilter;
+import org.jboss.wsf.framework.management.recording.OperationFilter;
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+
+/**
+ * This tests the MemoryBufferRecorder
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 7-Aug-2008
+ */
+public class MemoryBufferRecorderTestCase extends JBossWSTest
+{
+ private String endpointURL = "http://" + getServerHost() + ":8080/management-recording/EndpointImpl";
+ private String targetNS = "http://recording.management.ws.test.jboss.org/";
+ private String endpointObjectName;
+
+ protected void setUp() throws Exception
+ {
+ //Native does not require us to set the recording handler on the deployed endpoint
+ boolean isNative = isIntegrationNative();
+ new JBossWSTestHelper().deploy(isNative ? "management-recording-native.jar" : "management-recording.jar");
+ endpointObjectName = isNative ? "jboss.ws:context=management-recording,endpoint=EndpointImpl" : "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl";
+ }
+
+ protected void tearDown() throws Exception
+ {
+ boolean isNative = isIntegrationNative();
+ new JBossWSTestHelper().undeploy(isNative ? "management-recording-native.jar" : "management-recording.jar");
+ }
+
+ public void testRecording() throws Exception
+ {
+ Endpoint port = getPort();
+ MBeanServerConnection server = getServer();
+ ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
+ int startSize = (Integer)server.getAttribute(oname, "Size");
+ setRecording(true);
+ port.echo1("Hello");
+ port.echo1("Hello again");
+ port.echo2("Hi");
+ setRecording(false);
+ port.echo2("Hi again");
+ int endSize = (Integer)server.getAttribute(oname, "Size");
+ assertEquals(3, endSize - startSize);
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testGetRecordsByOperation() throws Exception
+ {
+ if (isIntegrationMetro())
+ {
+ //The WSDL_OPERATION ctx property is required for the operation filter to work
+ System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
+ return;
+ }
+ if (isIntegrationCXF())
+ {
+ //The WSDL_OPERATION ctx property is required for the operation filter to work
+ System.out.println("FIXME: [JBWS-2203] Implement CXF standard message context properties");
+ return;
+ }
+ Endpoint port = getPort();
+ MBeanServerConnection server = getServer();
+ ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
+ setRecording(true);
+
+ port.echo1("Test getRecordsByOperation");
+ port.echo2("Test getRecordsByOperation");
+
+ Map<String, List<Record>> echo1Records = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByOperation", new Object[] { targetNS, "echo1" }, new String[] {
+ "java.lang.String", "java.lang.String" });
+ Map<String, List<Record>> echo2Records = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByOperation", new Object[] { targetNS, "echo2" }, new String[] {
+ "java.lang.String", "java.lang.String" });
+
+ assertFalse(echo1Records.isEmpty());
+ assertFalse(echo2Records.isEmpty());
+ for (List<Record> list : echo1Records.values())
+ {
+ for (Record record : list)
+ {
+ QName qName = record.getOperation();
+ assertEquals(targetNS, qName.getNamespaceURI());
+ assertEquals("echo1", qName.getLocalPart());
+ assertTrue(record.getEnvelope().contains("echo1"));
+ }
+ }
+ for (List<Record> list : echo2Records.values())
+ {
+ for (Record record : list)
+ {
+ QName qName = record.getOperation();
+ assertEquals(targetNS, qName.getNamespaceURI());
+ assertEquals("echo2", qName.getLocalPart());
+ assertTrue(record.getEnvelope().contains("echo2"));
+ }
+ }
+ }
+
+
+ @SuppressWarnings("unchecked")
+ public void testGetRecordsByClientHost() throws Exception
+ {
+ Endpoint port = getPort();
+ MBeanServerConnection server = getServer();
+ ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
+ setRecording(true);
+
+ port.echo1("Test getRecordsByClientHost");
+
+ //We have client and server on the same host here...
+ String host = "localhost".equals(getServerHost()) ? "127.0.0.1" : getServerHost();
+ Map<String, List<Record>> localhostRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { host },
+ new String[] { "java.lang.String" });
+ Map<String, List<Record>> amazonRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { "72.21.203.1" },
+ new String[] { "java.lang.String" });
+
+ assertTrue(localhostRecords.size() > 0);
+ assertTrue(amazonRecords.size() == 0);
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testGetMatchingRecords() throws Exception
+ {
+ if (isIntegrationMetro())
+ {
+ //The WSDL_OPERATION ctx property is required for the operation filter to work
+ System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
+ return;
+ }
+ if (isIntegrationCXF())
+ {
+ //The WSDL_OPERATION ctx property is required for the operation filter to work
+ System.out.println("FIXME: [JBWS-2203] Implement CXF standard message context properties");
+ return;
+ }
+ Endpoint port = getPort();
+ MBeanServerConnection server = getServer();
+ ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
+ setRecording(true);
+
+ OperationFilter operationFilter = new OperationFilter(new QName(targetNS, "echo1"));
+ HostFilter hostFilter = new HostFilter("localhost".equals(getServerHost()) ? "127.0.0.1" : getServerHost(), false); //destination
+
+ RecordFilter[] filters = new RecordFilter[] {operationFilter, hostFilter};
+ Map<String, List<Record>> startRecords = (Map<String, List<Record>>)server.invoke(oname, "getMatchingRecords", new Object[] { filters }, new String[] { filters.getClass().getName() });
+
+ port.echo1("Test getMatchingRecords");
+ port.echo2("Test getMatchingRecords");
+
+ Map<String, List<Record>> stopRecords = (Map<String, List<Record>>)server.invoke(oname, "getMatchingRecords", new Object[] { filters }, new String[] { filters.getClass().getName() });
+
+ assertEquals(1, stopRecords.keySet().size() - startRecords.keySet().size());
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testAddRemoveFilter() throws Exception
+ {
+ if (isIntegrationMetro())
+ {
+ //The WSDL_OPERATION ctx property is required for the operation filter to work
+ System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
+ return;
+ }
+ if (isIntegrationCXF())
+ {
+ //The WSDL_OPERATION ctx property is required for the operation filter to work
+ System.out.println("FIXME: [JBWS-2203] Implement CXF standard message context properties");
+ return;
+ }
+ Endpoint port = getPort();
+ MBeanServerConnection server = getServer();
+ ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
+ setRecording(true);
+
+ OperationFilter operationFilter = new OperationFilter(new QName(targetNS, "echo1"));
+
+ //Adding Operation filter...
+ server.invoke(oname, "addFilter", new Object[] { operationFilter }, new String[] { RecordFilter.class.getName() });
+ int size = (Integer)server.getAttribute(oname, "Size");
+ port.echo1("Test testAddRemoveFilter");
+ port.echo2("Test testAddRemoveFilter");
+ assertEquals(1, (Integer)server.getAttribute(oname, "Size") - size);
+
+ //Clean filters...
+ server.setAttribute(oname, new Attribute("Filters", new LinkedList<RecordFilter>()));
+ size = (Integer)server.getAttribute(oname, "Size");
+ port.echo1("Test testAddRemoveFilter");
+ port.echo2("Test testAddRemoveFilter");
+ assertEquals(2, (Integer)server.getAttribute(oname, "Size") - size);
+
+ NotFilter notFilter = new NotFilter(operationFilter);
+ AndFilter andFilter = new AndFilter(operationFilter, notFilter);
+
+ //Adding And filter...
+ server.invoke(oname, "addFilter", new Object[] { andFilter }, new String[] { RecordFilter.class.getName() });
+ size = (Integer)server.getAttribute(oname, "Size");
+ port.echo1("Test testAddRemoveFilter");
+ port.echo2("Test testAddRemoveFilter");
+ assertEquals(0, (Integer)server.getAttribute(oname, "Size") - size);
+
+ //Clean filters...
+ server.setAttribute(oname, new Attribute("Filters", new LinkedList<RecordFilter>()));
+ size = (Integer)server.getAttribute(oname, "Size");
+ port.echo1("Test testAddRemoveFilter");
+ port.echo2("Test testAddRemoveFilter");
+ assertEquals(2, (Integer)server.getAttribute(oname, "Size") - size);
+ }
+
+ private void setRecording(boolean recording) throws Exception
+ {
+ MBeanServerConnection server = getServer();
+ ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
+ Attribute attribute = new Attribute("Recording", recording);
+ server.setAttribute(oname, attribute);
+ assertEquals(recording, server.getAttribute(oname, "Recording"));
+ }
+
+ private Endpoint getPort() throws Exception
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+ Service service = Service.create(wsdlURL, serviceName);
+ Endpoint port = (Endpoint)service.getPort(Endpoint.class);
+ return port;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,18 @@
+package org.jboss.test.ws.management.recording;
+
+import java.io.Serializable;
+
+import org.jboss.wsf.framework.management.recording.MemoryBufferRecorder;
+
+public class MyManagedProcessor extends MemoryBufferRecorder implements MyManagedProcessorMBean, Serializable {
+
+ private String attribute;
+
+ public String getAttribute() {
+ return attribute;
+ }
+
+ public void setAttribute(String attribute) {
+ this.attribute = attribute;
+ }
+}
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,10 @@
+package org.jboss.test.ws.management.recording;
+
+import org.jboss.wsf.framework.management.recording.MemoryBufferRecorderMBean;
+
+public interface MyManagedProcessorMBean extends MemoryBufferRecorderMBean
+{
+ public String getAttribute();
+ public void setAttribute(String attribute);
+
+}
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/MyManagedProcessorMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml 2008-08-07 15:28:20 UTC (rev 8028)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <handler>
+ <handler-name>Recording Handler</handler-name>
+ <handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+</handler-chains>
\ No newline at end of file
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/management/recording/jaxws-handlers-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 9 months
JBossWS SVN: r8027 - framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-07 11:27:33 -0400 (Thu, 07 Aug 2008)
New Revision: 8027
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
Log:
Make the Record, RecordFilters and RecordProcessors serializable
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AndFilter.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -33,6 +33,8 @@
*/
public class AndFilter implements RecordFilter
{
+ private static final long serialVersionUID = -7535769052173597426L;
+
private RecordFilter filter1;
private RecordFilter filter2;
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/HostFilter.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -37,6 +37,8 @@
*/
public class HostFilter implements RecordFilter
{
+ private static final long serialVersionUID = -5935962601380315102L;
+
private List<String> hosts = new LinkedList<String>();
private boolean source;
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.framework.management.recording;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -34,8 +35,10 @@
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public class LogRecorder extends AbstractRecordProcessor
+public class LogRecorder extends AbstractRecordProcessor implements Serializable
{
+ private static final long serialVersionUID = -7126227194320867819L;
+
private Logger log = Logger.getLogger(this.getClass());
public LogRecorder()
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/MemoryBufferRecorder.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.framework.management.recording;
+import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -43,8 +44,10 @@
* @author alessio.soldano(a)jboss.com
* @since 12-Dec-2007
*/
-public class MemoryBufferRecorder extends AbstractRecordProcessor implements MemoryBufferRecorderMBean
+public class MemoryBufferRecorder extends AbstractRecordProcessor implements MemoryBufferRecorderMBean, Serializable
{
+ private static final long serialVersionUID = 5180978625780333738L;
+
private Map<String, List<Record>> recentRecords = Collections.synchronizedMap(new HashMap<String, List<Record>>());
private ConcurrentLinkedQueue<String> recentRecordGroups = new ConcurrentLinkedQueue<String>();
private int size = 0;
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/NotFilter.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -33,6 +33,8 @@
*/
public class NotFilter implements RecordFilter
{
+ private static final long serialVersionUID = -3254118688017137981L;
+
private RecordFilter filter;
public NotFilter(RecordFilter filter)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OperationFilter.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -34,6 +34,8 @@
*/
public class OperationFilter implements RecordFilter
{
+ private static final long serialVersionUID = -726794729964445956L;
+
private QName operation;
public OperationFilter(QName operation)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/OrFilter.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -33,6 +33,8 @@
*/
public class OrFilter implements RecordFilter
{
+ private static final long serialVersionUID = 3372989051076281559L;
+
private RecordFilter filter1;
private RecordFilter filter2;
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2008-08-07 15:25:34 UTC (rev 8026)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2008-08-07 15:27:33 UTC (rev 8027)
@@ -38,6 +38,8 @@
*/
public class RecordImpl implements Record
{
+ private static final long serialVersionUID = -2421022916458208468L;
+
private String sourceHost;
private String destinationHost;
private Map<String, List<String>> headers = new HashMap<String, List<String>>();
@@ -94,7 +96,8 @@
public void setHeaders(Map<String, List<String>> headers)
{
- this.headers = headers;
+ if (headers != null)
+ this.headers = new HashMap<String, List<String>>(headers);
}
public String getGroupID()
15 years, 9 months
JBossWS SVN: r8026 - spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-08-07 11:25:34 -0400 (Thu, 07 Aug 2008)
New Revision: 8026
Modified:
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/RecordProcessor.java
Log:
Make the Record, RecordFilter and RecordProcessor serializable
Modified: spi/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 2008-08-07 08:33:54 UTC (rev 8025)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2008-08-07 15:25:34 UTC (rev 8026)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.spi.management.recording;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -32,7 +33,7 @@
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public interface Record
+public interface Record extends Serializable
{
public enum MessageType {INBOUND, OUTBOUND};
Modified: spi/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 2008-08-07 08:33:54 UTC (rev 8025)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordFilter.java 2008-08-07 15:25:34 UTC (rev 8026)
@@ -21,13 +21,15 @@
*/
package org.jboss.wsf.spi.management.recording;
+import java.io.Serializable;
+
/**
* A record filter
*
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public interface RecordFilter extends Cloneable
+public interface RecordFilter extends Cloneable, Serializable
{
/**
* Returns true if the filter matches the given record.
Modified: spi/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 2008-08-07 08:33:54 UTC (rev 8025)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2008-08-07 15:25:34 UTC (rev 8026)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.spi.management.recording;
+import java.io.Serializable;
import java.util.List;
/**
@@ -31,7 +32,7 @@
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public interface RecordProcessor extends Cloneable
+public interface RecordProcessor extends Cloneable, Serializable
{
String getName();
15 years, 9 months
JBossWS SVN: r8025 - in stack/native/trunk/modules/testsuite: native-tests/src/test/java/org/jboss/test/ws/tools/enums and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-08-07 04:33:54 -0400 (Thu, 07 Aug 2008)
New Revision: 8025
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
Log:
[JBWS-2258] enable test for AS trunk
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-08-06 12:51:02 UTC (rev 8024)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-08-07 08:33:54 UTC (rev 8025)
@@ -42,7 +42,6 @@
Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService.wsdl").getAbsolutePath()));
Element was = DOMUtils.parse(new FileInputStream("tools/enums/wsdl/EnumService.wsdl"));
- System.out.println("FIXME [JBWS-2258] - Fix testcase org.jboss.test.ws.tools.enums.EnumTestCase");
- //assertEquals(exp, was);
+ assertEquals(exp, was);
}
}
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-08-06 12:51:02 UTC (rev 8024)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-08-07 08:33:54 UTC (rev 8025)
@@ -31,4 +31,7 @@
org/jboss/test/ws/embedded/**
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
\ No newline at end of file
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk)
+org/jboss/test/ws/tools/enums/EnumTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-08-06 12:51:02 UTC (rev 8024)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-08-07 08:33:54 UTC (rev 8025)
@@ -15,4 +15,7 @@
org/jboss/test/ws/embedded/**
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
\ No newline at end of file
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk)
+org/jboss/test/ws/tools/enums/EnumTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-08-06 12:51:02 UTC (rev 8024)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-08-07 08:33:54 UTC (rev 8025)
@@ -15,4 +15,7 @@
org/jboss/test/ws/embedded/**
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
\ No newline at end of file
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk)
+org/jboss/test/ws/tools/enums/EnumTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-08-06 12:51:02 UTC (rev 8024)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-08-07 08:33:54 UTC (rev 8025)
@@ -28,3 +28,6 @@
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk)
+org/jboss/test/ws/tools/enums/EnumTestCase.*
15 years, 9 months
JBossWS SVN: r8024 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-08-06 08:51:02 -0400 (Wed, 06 Aug 2008)
New Revision: 8024
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
Log:
[JBWS-1949] enable tests
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-08-06 07:37:51 UTC (rev 8023)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBareTestCase.java 2008-08-06 12:51:02 UTC (rev 8024)
@@ -57,7 +57,6 @@
protected void setUp() throws Exception
{
-
QName serviceName = new QName("http://doclit.xop.samples.jaxws.ws.test.jboss.org/", "MTOMService");
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -71,13 +70,6 @@
*/
public void testDataHandlerRoundtrip() throws Exception
{
-
- if(isIntegrationMetro() && isTargetJBoss50())
- {
- System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part");
- return;
- }
-
getBinding().setMTOMEnabled(true);
DataHandler dh = new DataHandler("DataHandlerRoundtrip", "text/plain");
@@ -96,12 +88,6 @@
*/
public void testDataHandlerResponseOptimzed() throws Exception
{
- if(isIntegrationMetro() && isTargetJBoss50())
- {
- System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part");
- return;
- }
-
getBinding().setMTOMEnabled(false);
DataHandler dh = new DataHandler("DataHandlerResponseOptimzed", "text/plain");
@@ -113,6 +99,5 @@
assertEquals("Server data", content);
assertEquals("text/plain", contentType);
-
}
}
\ No newline at end of file
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-08-06 07:37:51 UTC (rev 8023)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-08-06 12:51:02 UTC (rev 8024)
@@ -71,12 +71,6 @@
public void testParameterAnnotation() throws Exception
{
- if(isIntegrationMetro() && isTargetJBoss50())
- {
- System.out.println("FIXME JBWS-1949: Metro MTOM ignores content-type on attachment part");
- return;
- }
-
DataHandler request = new DataHandler("Client data", "text/plain");
DataHandler response = port.parameterAnnotation(request);
15 years, 9 months