JBossWS SVN: r14734 - in stack/cxf/branches/jbossws-cxf-4.0.0.Beta3: modules/addons and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-21 07:05:23 -0400 (Thu, 21 Jul 2011)
New Revision: 14734
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/management/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/pom.xml
Log:
Updating pom.xml files
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/transports/http/httpserver/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/addons/transports/http/httpserver/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/client/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/client/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/management/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/management/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/management/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- Build -->
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/dist/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -4,12 +4,12 @@
<name>JBoss Web Services - Stack CXF Distrubiton</name>
<artifactId>jbossws-cxf-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/endorsed/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/endorsed/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/resources/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/resources/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/server/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/server/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-spring-tests/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-spring-tests/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-tests/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/cxf-tests/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -1030,7 +1030,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!-- TODO: JMX client to AS7 server -->
+ <!-- [JBWS-3330] Restore RecordProcessor functionalities, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/management/recording/**</exclude>
<!-- TODO: will we support wars bundled in jars on AS7? -->
@@ -1218,7 +1218,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<!-- TODO: JMX client to AS7 server -->
- <exclude>org/jboss/test/ws/management/recording/**</exclude>
+ <exclude>org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase*</exclude>
<!-- TODO: will we support wars bundled in jars on AS7? -->
<exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/shared-tests/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/modules/testsuite/shared-tests/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/pom.xml 2011-07-21 11:03:16 UTC (rev 14733)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/pom.xml 2011-07-21 11:05:23 UTC (rev 14734)
@@ -19,20 +19,20 @@
<description>JBossWS CXF stack</description>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta3</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.10.Alpha2</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.0.0...</url>
</scm>
<!-- Modules -->
@@ -46,11 +46,11 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
+ <jbossws.spi.version>2.0.0.Beta6</jbossws.spi.version>
+ <jbossws.common.version>2.0.0.Beta5</jbossws.common.version>
+ <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.version>
+ <jbossws.shared.testsuite.version>4.0.0.Beta3</jbossws.shared.testsuite.version>
+ <jbossws.jboss600.version>4.0.0.Beta3</jbossws.jboss600.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
12 years, 9 months
JBossWS SVN: r14732 - container/jboss60/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-21 07:00:28 -0400 (Thu, 21 Jul 2011)
New Revision: 14732
Added:
container/jboss60/tags/jbossws-jboss600-4.0.0.Beta3/
Log:
Tagging jbossws-jboss600-4.0.0.Beta3
12 years, 9 months
JBossWS SVN: r14730 - in shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test: java/org/jboss/test/ws/management/recording and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-21 06:48:39 -0400 (Thu, 21 Jul 2011)
New Revision: 14730
Added:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/EndpointWithConfigImpl.java
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/ant-import/build-samples-jaxws.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java
shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
Log:
[JBWS-3330] Fixing testcases
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-07-21 10:47:28 UTC (rev 14729)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-07-21 10:48:39 UTC (rev 14730)
@@ -494,20 +494,31 @@
<!-- 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"/>
+ <include name="org/jboss/test/ws/management/recording/Endpoint.class"/>
+ <include name="org/jboss/test/ws/management/recording/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/>
+ <include name="org/jboss/test/ws/management/recording/ExtManaged*.class"/>
</fileset>
<manifest>
<attribute name="Dependencies" value="org.jboss.logging"/>
</manifest>
</jar>
+ <jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/management/recording/Endpoint.class"/>
+ <include name="org/jboss/test/ws/management/recording/EndpointWithConfigImpl.class"/>
+ </fileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.logging"/>
+ </manifest>
+ </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/Endpoint.class"/>
+ <include name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/>
+ <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/>
+ <include name="org/jboss/test/ws/management/recording/ExtManaged*.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>
<manifest>
<attribute name="Dependencies" value="org.jboss.logging"/>
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-07-21 10:47:28 UTC (rev 14729)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-07-21 10:48:39 UTC (rev 14730)
@@ -22,6 +22,7 @@
package org.jboss.test.ws.management.recording;
import java.net.URL;
+import java.rmi.RMISecurityManager;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
@@ -47,16 +48,27 @@
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";
+ if (!isTargetJBoss6()) {
+ endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl";
+ JBossWSTestHelper.deploy("management-recording-as7.jar");
+ } else if (isIntegrationNative()) {
+ endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl";
+ JBossWSTestHelper.deploy("management-recording-native.jar");
+ } else {
+ endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl";
+ JBossWSTestHelper.deploy("management-recording.jar");
+ }
}
protected void tearDown() throws Exception
{
- boolean isNative = isIntegrationNative();
- new JBossWSTestHelper().undeploy(isNative ? "management-recording-native.jar" : "management-recording.jar");
+ if (!isTargetJBoss6()) {
+ JBossWSTestHelper.undeploy("management-recording-as7.jar");
+ } else if (isIntegrationNative()) {
+ JBossWSTestHelper.undeploy("management-recording-native.jar");
+ } else {
+ JBossWSTestHelper.undeploy("management-recording.jar");
+ }
}
public void testAddCustomProcessor() throws Exception
Added: shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/EndpointWithConfigImpl.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/EndpointWithConfigImpl.java (rev 0)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/EndpointWithConfigImpl.java 2011-07-21 10:48:39 UTC (rev 14730)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.ws.api.annotation.EndpointConfig;
+import org.jboss.ws.api.annotation.WebContext;
+
+/**
+ * author alessio.soldano(a)jboss.com
+ * @since 20-Jul-2011
+ */
+@Stateless
+@WebService(serviceName="EndpointService", endpointInterface = "org.jboss.test.ws.management.recording.Endpoint")
+@WebContext(contextRoot="/management-recording", urlPattern="/EndpointImpl")
+@EndpointConfig(configName="Recording-Endpoint-Config")
+public class EndpointWithConfigImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointWithConfigImpl.class);
+
+ public String echo1(String input)
+ {
+ log.info("echo1: " + input);
+ return input;
+ }
+
+ public String echo2(String input)
+ {
+ log.info("echo2: " + input);
+ return input;
+ }
+}
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-07-21 10:47:28 UTC (rev 14729)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-07-21 10:48:39 UTC (rev 14730)
@@ -55,16 +55,27 @@
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";
+ if (!isTargetJBoss6()) {
+ endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl";
+ JBossWSTestHelper.deploy("management-recording-as7.jar");
+ } else if (isIntegrationNative()) {
+ endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl";
+ JBossWSTestHelper.deploy("management-recording-native.jar");
+ } else {
+ endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl";
+ JBossWSTestHelper.deploy("management-recording.jar");
+ }
}
protected void tearDown() throws Exception
{
- boolean isNative = isIntegrationNative();
- new JBossWSTestHelper().undeploy(isNative ? "management-recording-native.jar" : "management-recording.jar");
+ if (!isTargetJBoss6()) {
+ JBossWSTestHelper.undeploy("management-recording-as7.jar");
+ } else if (isIntegrationNative()) {
+ JBossWSTestHelper.undeploy("management-recording-native.jar");
+ } else {
+ JBossWSTestHelper.undeploy("management-recording.jar");
+ }
}
public void testRecording() throws Exception
12 years, 9 months
JBossWS SVN: r14729 - shared-testsuite/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-21 06:47:28 -0400 (Thu, 21 Jul 2011)
New Revision: 14729
Added:
shared-testsuite/branches/jbossws-shared-testsuite-4.0.0.Beta3/
Log:
Branching for jbossws-shared-testsuite-4.0.0.Beta3
12 years, 9 months
JBossWS SVN: r14728 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-21 06:33:48 -0400 (Thu, 21 Jul 2011)
New Revision: 14728
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java
Removed:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml
Log:
[AS7-1322] Adding testcase
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-07-21 09:53:08 UTC (rev 14727)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-07-21 10:33:48 UTC (rev 14728)
@@ -482,6 +482,14 @@
<exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/>
</classes>
</war>
+
+ <!-- endpoint-publish.war -->
+ <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/publish/**"/>
+ <exclude name="org/jboss/test/ws/publish/*TestCase.class"/>
+ </classes>
+ </war>
<!-- management-recording.jar -->
<jar destfile="${tests.output.dir}/test-libs/management-recording-native.jar">
Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java
===================================================================
--- shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java 2011-07-19 14:38:40 UTC (rev 14705)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.publish;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService (name="Endpoint")
-@SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface Endpoint
-{
- @WebMethod(operationName = "echoString", action = "urn:EchoString")
- String echo(String input);
-}
Copied: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java (from rev 14705, shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java)
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/Endpoint.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.publish;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (name="Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface Endpoint
+{
+ @WebMethod(operationName = "echoString", action = "urn:EchoString")
+ String echo(String input);
+}
Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java
===================================================================
--- shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java 2011-07-19 14:38:40 UTC (rev 14705)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.publish;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-
-import org.jboss.logging.Logger;
-
-@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint")
-public class EndpointImpl
-{
- @Resource
- WebServiceContext wsCtx;
-
- // Provide logging
- private static Logger log = Logger.getLogger(EndpointImpl.class);
-
- public String echo(String input)
- {
- log.info("echo: " + input);
- MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
- if (msgContext == null) {
- return "MessageContext is null!";
- }
- log.info("WSDL_DESCRIPTION: " + msgContext.get(MessageContext.WSDL_DESCRIPTION));
- log.info("WSDL_SERVICE: " + msgContext.get(MessageContext.WSDL_SERVICE));
- log.info("WSDL_INTERFACE: " + msgContext.get(MessageContext.WSDL_INTERFACE));
- log.info("WSDL_PORT: " + msgContext.get(MessageContext.WSDL_PORT));
- log.info("WSDL_OPERATION: " + msgContext.get(MessageContext.WSDL_OPERATION));
- return input;
- }
-}
Copied: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java (from rev 14705, shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java)
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.publish;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.logging.Logger;
+
+@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint")
+public class EndpointImpl
+{
+ @Resource
+ WebServiceContext wsCtx;
+
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl.class);
+
+ public String echo(String input)
+ {
+ log.info("echo: " + input);
+ MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
+ if (msgContext == null) {
+ return "MessageContext is null!";
+ }
+ log.info("WSDL_DESCRIPTION: " + msgContext.get(MessageContext.WSDL_DESCRIPTION));
+ log.info("WSDL_SERVICE: " + msgContext.get(MessageContext.WSDL_SERVICE));
+ log.info("WSDL_INTERFACE: " + msgContext.get(MessageContext.WSDL_INTERFACE));
+ log.info("WSDL_PORT: " + msgContext.get(MessageContext.WSDL_PORT));
+ log.info("WSDL_OPERATION: " + msgContext.get(MessageContext.WSDL_OPERATION));
+ return input;
+ }
+}
Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java
===================================================================
--- shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2011-07-19 14:38:40 UTC (rev 14705)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.publish;
-
-import javax.jws.WebService;
-
-import org.jboss.logging.Logger;
-
-@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint")
-public class EndpointImpl2
-{
- // Provide logging
- private static Logger log = Logger.getLogger(EndpointImpl2.class);
-
- public String echo(String input)
- {
- log.info("echo (2): " + input);
- return input;
- }
-}
Copied: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java (from rev 14705, shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java)
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.publish;
+
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+
+@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint")
+public class EndpointImpl2
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl2.class);
+
+ public String echo(String input)
+ {
+ log.info("echo (2): " + input);
+ return input;
+ }
+}
Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2011-07-19 14:38:40 UTC (rev 14705)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -1,123 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.publish;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.publish.Context;
-import org.jboss.wsf.spi.publish.EndpointPublisher;
-import org.jboss.wsf.spi.publish.EndpointPublisherFactory;
-
-/**
- *
- * @author alessio.soldano(a)jboss.com
- * @since 01-Apr-2011
- *
- */
-@WebServlet(name = "EndpointPublishServlet", urlPatterns = "/*")
-public class EndpointPublishServlet extends HttpServlet
-{
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
- {
- Context ctx = null;
- EndpointPublisher publisher = null;
- try
- {
- //deploy endpoints
- ClassLoader loader = ClassLoaderProvider.getDefaultProvider().getWebServiceSubsystemClassLoader();
- EndpointPublisherFactory factory = ServiceLoader.load(EndpointPublisherFactory.class, loader).iterator().next();
- publisher = factory.newEndpointPublisher("default-host");
-
- Map<String,String> map = new HashMap<String, String>();
- map.put("/pattern", "org.jboss.test.ws.publish.EndpointImpl");
- map.put("/pattern2", "org.jboss.test.ws.publish.EndpointImpl2");
-
- ctx = publisher.publish("ep-publish-test", Thread.currentThread().getContextClassLoader(), map);
- for (Endpoint ep : ctx.getEndpoints()) {
- System.out.println("State: " + ep.getState());
- System.out.println("Address: " + ep.getAddress());
- System.out.println("TargetBeanClass: " + ep.getTargetBeanClass());
- }
-
- //call endpoint
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"));
- invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"));
-
- res.getWriter().print("1");
- }
- catch (Exception e)
- {
- e.printStackTrace();
- res.getWriter().print(e.getMessage());
- }
- finally
- {
- if (ctx != null && publisher != null)
- {
- try
- {
- //undeploy endpoints
- publisher.destroy(ctx);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- res.getWriter().print(e.getMessage());
- }
- }
- }
- }
-
- private static void invoke(URL wsdlURL) throws Exception {
- QName serviceName = new QName("http://publish.ws.test.jboss.org/", "EndpointService");
- Service service = Service.create(wsdlURL, serviceName);
- org.jboss.test.ws.publish.Endpoint port = service.getPort(org.jboss.test.ws.publish.Endpoint.class);
- String result = port.echo("Foo");
- if (!"Foo".equals(result))
- {
- throw new Exception("Expected 'Foo' but got '" + result + "'");
- }
- }
-}
Copied: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java (from rev 14705, shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java)
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.publish;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.publish.Context;
+import org.jboss.wsf.spi.publish.EndpointPublisher;
+import org.jboss.wsf.spi.publish.EndpointPublisherFactory;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 01-Apr-2011
+ *
+ */
+@WebServlet(name = "EndpointPublishServlet", urlPatterns = "/*")
+public class EndpointPublishServlet extends HttpServlet
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ Context ctx = null;
+ EndpointPublisher publisher = null;
+ try
+ {
+ //deploy endpoints
+ ClassLoader loader = ClassLoaderProvider.getDefaultProvider().getWebServiceSubsystemClassLoader();
+ EndpointPublisherFactory factory = ServiceLoader.load(EndpointPublisherFactory.class, loader).iterator().next();
+ publisher = factory.newEndpointPublisher("default-host");
+
+ Map<String,String> map = new HashMap<String, String>();
+ map.put("/pattern", "org.jboss.test.ws.publish.EndpointImpl");
+ map.put("/pattern2", "org.jboss.test.ws.publish.EndpointImpl2");
+
+ ctx = publisher.publish("ep-publish-test", Thread.currentThread().getContextClassLoader(), map);
+ for (Endpoint ep : ctx.getEndpoints()) {
+ System.out.println("State: " + ep.getState());
+ System.out.println("Address: " + ep.getAddress());
+ System.out.println("TargetBeanClass: " + ep.getTargetBeanClass());
+ }
+
+ //call endpoint
+ invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"));
+ invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"));
+
+ res.getWriter().print("1");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ res.getWriter().print(e.getMessage());
+ }
+ finally
+ {
+ if (ctx != null && publisher != null)
+ {
+ try
+ {
+ //undeploy endpoints
+ publisher.destroy(ctx);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ res.getWriter().print(e.getMessage());
+ }
+ }
+ }
+ }
+
+ private static void invoke(URL wsdlURL) throws Exception {
+ QName serviceName = new QName("http://publish.ws.test.jboss.org/", "EndpointService");
+ Service service = Service.create(wsdlURL, serviceName);
+ org.jboss.test.ws.publish.Endpoint port = service.getPort(org.jboss.test.ws.publish.Endpoint.class);
+ String result = port.echo("Foo");
+ if (!"Foo".equals(result))
+ {
+ throw new Exception("Expected 'Foo' but got '" + result + "'");
+ }
+ }
+}
Deleted: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java
===================================================================
--- shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2011-07-19 14:38:40 UTC (rev 14705)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.publish;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Test WS endpoint publish api to JBoss AS container
- *
- * @author alessio.soldano(a)jboss.com
- * @since 13-Jul-2011
- */
-public class EndpointPublishTestCase extends JBossWSTest
-{
- public static Test suite()
- {
- return new JBossWSTestSetup(EndpointPublishTestCase.class, "endpoint-publish.war");
- }
-
- public void testEndpointPublish() throws Exception
- {
- URL url = new URL("http://" + getServerHost() + ":8080/endpoint-publish");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("1", br.readLine());
- }
-}
Copied: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java (from rev 14705, shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java)
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2011-07-21 10:33:48 UTC (rev 14728)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.publish;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test WS endpoint publish api to JBoss AS container
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 13-Jul-2011
+ */
+public class EndpointPublishTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(EndpointPublishTestCase.class, "endpoint-publish.war");
+ }
+
+ public void testEndpointPublish() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/endpoint-publish");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("1", br.readLine());
+ }
+}
12 years, 9 months
JBossWS SVN: r14726 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-21 05:49:22 -0400 (Thu, 21 Jul 2011)
New Revision: 14726
Added:
common/tags/jbossws-common-2.0.0.Beta5/
Log:
Tagging jbossws-common-2.0.0.Beta5
12 years, 9 months
JBossWS SVN: r14725 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-21 05:46:11 -0400 (Thu, 21 Jul 2011)
New Revision: 14725
Added:
stack/cxf/branches/jbossws-cxf-4.0.0.Beta3/
Log:
Branching for 4.0.0.Beta3 release
12 years, 9 months