JBossWS SVN: r10947 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/aegis and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-10-17 00:03:31 -0400 (Sat, 17 Oct 2009)
New Revision: 10947
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis/jaxws/annotation/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java
Log:
[JBWS-2766]:The testcase to demonstrate configure Aegis databinding via @DataBinding annotation
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-10-17 00:01:15 UTC (rev 10946)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2009-10-17 04:03:31 UTC (rev 10947)
@@ -27,12 +27,24 @@
warfile="${tests.output.dir}/test-libs/jaxws-aegis.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/cxf/aegis/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQueryImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/WEB-INF/">
<include name="jbossws-cxf.xml"/>
</webinf>
</war>
+
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-aegis-annotation.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/aegis/Member.class"/>
+ </classes>
+ </war>
<!-- jaxws-cxf-descriptor -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQuery.java 2009-10-17 04:03:31 UTC (rev 10947)
@@ -0,0 +1,38 @@
+/*
+ * 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.jaxws.cxf.aegis;
+
+import java.util.Map;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import org.apache.cxf.aegis.databinding.AegisDatabinding;
+import org.apache.cxf.annotations.DataBinding;
+
+@WebService(name="AegisGroupQuery")
+(a)DataBinding(AegisDatabinding.class)
+public interface AegisAnnotationGroupQuery
+{
+ @WebMethod
+ Map getMembers();
+}
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationGroupQueryImpl.java 2009-10-17 04:03:31 UTC (rev 10947)
@@ -0,0 +1,48 @@
+/*
+ * 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.jaxws.cxf.aegis;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jws.WebService;
+
+@WebService(endpointInterface="org.jboss.test.ws.jaxws.cxf.aegis.AegisAnnotationGroupQuery")
+public class AegisAnnotationGroupQueryImpl implements AegisAnnotationGroupQuery
+{
+ Map<Integer, Member> members = new HashMap<Integer, Member>();
+
+ public Map getMembers() {
+ Member member1 = new Member();
+ member1.setId(1);
+ member1.setName("Jane");
+
+ Member member2 = new Member();
+ member2.setId(2);
+ member2.setName("Mike");
+
+ members.put(member1.getId(), member1);
+ members.put(member2.getId(), member2);
+ return members;
+ }
+
+}
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisAnnotationTestCase.java 2009-10-17 04:03:31 UTC (rev 10947)
@@ -0,0 +1,54 @@
+/*
+ * 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.jaxws.cxf.aegis;
+
+import java.util.Map;
+
+import junit.framework.Test;
+
+import org.apache.cxf.aegis.databinding.AegisDatabinding;
+import org.apache.cxf.frontend.ClientProxyFactoryBean;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+public class AegisAnnotationTestCase extends JBossWSTest
+{
+ private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-aegis-annotation";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(AegisAnnotationTestCase.class, "jaxws-aegis-annotation.war");
+ }
+
+ public void testAccessAnnotation() throws Exception
+ {
+ ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean();
+ proxyFactory.setDataBinding(new AegisDatabinding());
+ proxyFactory.setServiceClass(AegisGroupQuery.class);
+ proxyFactory.setAddress(endpointURL);
+ AegisGroupQuery query = (AegisGroupQuery)proxyFactory.create();
+ Map<Integer, String> members = query.getMembers();
+ this.assertEquals(2, members.size());
+ this.assertEquals(true, members.containsKey(2));
+ }
+
+}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.java 2009-10-17 00:01:15 UTC (rev 10946)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisGroupQuery.java 2009-10-17 04:03:31 UTC (rev 10947)
@@ -24,7 +24,6 @@
import java.util.Map;
import javax.jws.WebMethod;
-import javax.jws.WebParam;
import javax.jws.WebService;
@WebService(name="AegisGroupQuery")
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java 2009-10-17 00:01:15 UTC (rev 10946)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/aegis/AegisTestCase.java 2009-10-17 04:03:31 UTC (rev 10947)
@@ -21,32 +21,25 @@
*/
package org.jboss.test.ws.jaxws.cxf.aegis;
-import java.net.URL;
import java.util.Map;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
import junit.framework.Test;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpoint;
-import org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorJSETestCase;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
public class AegisTestCase extends JBossWSTest
{
private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-aegis";
- private String targetNS = "http://org.jboss.ws.jaxws.cxf/descriptor";
public static Test suite()
{
return new JBossWSTestSetup(AegisTestCase.class, "jaxws-aegis.war");
}
- public void testLegalAccess() throws Exception
+ public void testAccess() throws Exception
{
ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean();
proxyFactory.setDataBinding(new AegisDatabinding());
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/aegis/jaxws/annotation/WEB-INF/web.xml 2009-10-17 04:03:31 UTC (rev 10947)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>AegisAnnotationGroupQueryService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.aegis.AegisAnnotationGroupQueryImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>AegisAnnotationGroupQueryService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
14 years, 11 months
JBossWS SVN: r10946 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-16 20:01:15 -0400 (Fri, 16 Oct 2009)
New Revision: 10946
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2789] updating excludes
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-16 16:58:24 UTC (rev 10945)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-10-17 00:01:15 UTC (rev 10946)
@@ -7,6 +7,6 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBWS-2674] Implement javax.xml.ws.Endpoint
+# [JBWS-2789] Endpoint.publish() doesn't work on server side on AS Branch_5_x
org/jboss/test/ws/jaxws/endpoint/*TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-10-16 16:58:24 UTC (rev 10945)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-10-17 00:01:15 UTC (rev 10946)
@@ -7,6 +7,3 @@
# [JBWS-2217] Fix BPEL jaxrpc samples
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-# [JBWS-2674] Implement javax.xml.ws.Endpoint
-org/jboss/test/ws/jaxws/endpoint/*TestCase.*
-
14 years, 11 months
JBossWS SVN: r10945 - stack/cxf/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-16 12:58:24 -0400 (Fri, 16 Oct 2009)
New Revision: 10945
Modified:
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Adding jetty libs to binary distro thirdparty dir for runnning the endpoint api testcase
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-10-16 16:56:22 UTC (rev 10944)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-10-16 16:58:24 UTC (rev 10945)
@@ -50,6 +50,7 @@
<include>commons-collections:commons-collections:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>jboss.jaxbintros:jboss-jaxb-intros</include>
+ <include>org.mortbay.jetty:jetty*</include>
</includes>
</dependencySet>
<dependencySet>
14 years, 11 months
JBossWS SVN: r10944 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-16 12:56:22 -0400 (Fri, 16 Oct 2009)
New Revision: 10944
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
Adding servlet-api to client test classpath for running endpoint api testcase
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-10-16 15:37:11 UTC (rev 10943)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-10-16 16:56:22 UTC (rev 10944)
@@ -273,6 +273,7 @@
<pathelement location="${jboss.server.lib}/jnpserver.jar"/>
<pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
<pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
@@ -352,6 +353,7 @@
<pathelement location="${jboss.server.lib}/jnpserver.jar"/>
<pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
<pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
@@ -433,6 +435,7 @@
<pathelement location="${jboss.server.lib}/jnpserver.jar"/>
<pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
<pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
+ <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
14 years, 11 months
JBossWS SVN: r10943 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-16 11:37:11 -0400 (Fri, 16 Oct 2009)
New Revision: 10943
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
[JBWS-2262] WSDL is not correctly modified to use the configured https port
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-10-16 10:54:30 UTC (rev 10942)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-10-16 15:37:11 UTC (rev 10943)
@@ -216,7 +216,7 @@
if (isHttp(orgLocation))
{
URL orgURL = new URL(orgLocation);
- String protocol = orgURL.getProtocol();
+ String orgProtocol = orgURL.getProtocol();
String host = orgURL.getHost();
final boolean rewriteLocation =
ServerConfig.UNDEFINED_HOSTNAME.equals(host) ||
@@ -224,9 +224,14 @@
if (rewriteLocation)
{
- int port = getPortForProtocol(protocol);
+ //we stick with the original protocol (https) if the transport guarantee is CONFIDENTIAL
+ //(if the original wsdl soap:address uses https we can't overwrite it with http)
+ boolean confidential = "https".equalsIgnoreCase(orgProtocol);
+ String reqProtocol = reqURL.getProtocol();
+
+ int port = confidential ? getPortForProtocol("https") : getPortForProtocol(reqProtocol);
String path = orgURL.getPath();
- String newLocation = new URL(protocol, wsdlHost, port, path).toString();
+ String newLocation = new URL(confidential ? "https" : reqProtocol, wsdlHost, port, path).toString();
if (!newLocation.equals(orgLocation))
{
locationAttr.setNodeValue(newLocation);
14 years, 11 months
JBossWS SVN: r10942 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/endpoints.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-16 06:54:30 -0400 (Fri, 16 Oct 2009)
New Revision: 10942
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/endpoints/Endpoint1Impl.java
Log:
Removing system.out
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/endpoints/Endpoint1Impl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/endpoints/Endpoint1Impl.java 2009-10-16 10:53:33 UTC (rev 10941)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/endpoints/Endpoint1Impl.java 2009-10-16 10:54:30 UTC (rev 10942)
@@ -57,14 +57,13 @@
@PostConstruct
public void init()
{
- System.out.println("Endpoint initialized: " + this);
this.initialized = true;
}
@PreDestroy
public void destroy()
{
- System.out.println("Endpoint destroyed: " + this);
+ //nothing to do
}
public int getCount()
14 years, 11 months
JBossWS SVN: r10941 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: samples and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-16 06:53:33 -0400 (Fri, 16 Oct 2009)
New Revision: 10941
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointBean.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointInterface.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointTestCase.java
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/
Log:
Moving endpoint testcase to samples (to be included in binary distro)
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointBean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointBean.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointBean.java 2009-10-16 10:53:33 UTC (rev 10941)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jaxws.samples.endpoint;
+
+import javax.jws.WebService;
+
+/**
+ * Endpoint implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ serviceName = "EndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.endpoint.EndpointInterface",
+ targetNamespace = "http://org.jboss.ws/jaxws/endpoint/"
+)
+public class EndpointBean implements EndpointInterface
+{
+
+ private int count;
+
+ public String echo(String input)
+ {
+ count++;
+ return input;
+ }
+
+ public int getCount()
+ {
+ return count;
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointInterface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointInterface.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointInterface.java 2009-10-16 10:53:33 UTC (rev 10941)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jaxws.samples.endpoint;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * Endpoint interface.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/endpoint/")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointInterface extends Remote
+{
+
+ String echo(String input) throws RemoteException;
+
+ public int getCount();
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointInterface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointTestCase.java 2009-10-16 10:53:33 UTC (rev 10941)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jaxws.samples.endpoint;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Tests JAXWS dynamic endpoint deployment in an JSE environment.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class EndpointTestCase extends JBossWSTest
+{
+ private static final int port = 8878;
+
+ public void test() throws Exception
+ {
+ String publishURL1 = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint1";
+ Endpoint endpoint1 = publishEndpoint(new EndpointBean(), publishURL1);
+
+ String publishURL2 = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint2";
+ Endpoint endpoint2 = publishEndpoint(new EndpointBean(), publishURL2);
+
+ invokeEndpoint(publishURL1);
+ invokeEndpoint(publishURL2);
+
+ endpoint1.stop();
+ endpoint2.stop();
+ }
+
+ private Endpoint publishEndpoint(EndpointBean epImpl, String publishURL)
+ {
+ Endpoint endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl);
+ endpoint.publish(publishURL);
+ return endpoint;
+ }
+
+ private void invokeEndpoint(String publishURL) throws Exception
+ {
+ URL wsdlURL = new URL(publishURL + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/endpoint/", "EndpointService");
+ Service service = Service.create(wsdlURL, qname);
+ EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
+
+ // Invoke the endpoint
+ String helloWorld = "Hello world!";
+ assertEquals(0, port.getCount());
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ assertEquals(1, port.getCount());
+ port.echo(helloWorld);
+ assertEquals(2, port.getCount());
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/endpoint/EndpointTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
14 years, 11 months