JBossWS SVN: r8819 - in stack/native/trunk/modules: testsuite/native-tests/scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-28 09:32:57 -0500 (Fri, 28 Nov 2008)
New Revision: 8819
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2268/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2268/WEB-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2268/WEB-INF/web.xml
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-2268] refactoring javax.annotation support to stack specific endpoint servlet + providing issue test
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-11-28 14:32:23 UTC (rev 8818)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-11-28 14:32:57 UTC (rev 8819)
@@ -21,7 +21,14 @@
*/
package org.jboss.wsf.stack.jbws;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.EndpointResolver;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.common.servlet.AbstractEndpointServlet;
import javax.servlet.ServletConfig;
@@ -35,6 +42,11 @@
public final class EndpointServlet extends AbstractEndpointServlet
{
+ // provide logging
+ protected static final Logger log = Logger.getLogger(EndpointServlet.class);
+
+ private List<PreDestroyHolder> preDestroyRegistry = new LinkedList<PreDestroyHolder>();
+
/**
* Provides Native specific endpoint resolver
* @param servletContext servlet context
@@ -56,5 +68,49 @@
{
ServletConfigHelper.initEndpointConfig(servletConfig, endpoint);
}
+
+ @Override
+ protected final void postService()
+ {
+ registerForPreDestroy(endpoint);
+ }
+ @Override
+ public final void destroy()
+ {
+ synchronized(this.preDestroyRegistry)
+ {
+ for (PreDestroyHolder holder : this.preDestroyRegistry)
+ {
+ try
+ {
+ JavaxAnnotationHelper.callPreDestroyMethod(holder.getObject());
+ }
+ catch (Exception exception)
+ {
+ log.error(exception.getMessage(), exception);
+ }
+ }
+ this.preDestroyRegistry.clear();
+ this.preDestroyRegistry = null;
+ }
+ super.destroy();
+ }
+
+ private void registerForPreDestroy(Endpoint ep)
+ {
+ PreDestroyHolder holder = (PreDestroyHolder)ep.getAttachment(PreDestroyHolder.class);
+ if (holder != null)
+ {
+ synchronized(this.preDestroyRegistry)
+ {
+ if (!this.preDestroyRegistry.contains(holder))
+ {
+ this.preDestroyRegistry.add(holder);
+ }
+ }
+ ep.removeAttachment(PreDestroyHolder.class);
+ }
+ }
+
}
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-11-28 14:32:23 UTC (rev 8818)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-11-28 14:32:57 UTC (rev 8819)
@@ -382,6 +382,14 @@
</webinf>
</war>
+ <!-- jaxws-jbws2268 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2268.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2268/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2268/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2268/*TestCase.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jbws2285 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2285.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointImpl.java 2008-11-28 14:32:57 UTC (rev 8819)
@@ -0,0 +1,86 @@
+/*
+ * 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.jbws2268;
+
+import java.io.File;
+import java.io.FileWriter;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint Implementation
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService(
+ serviceName = "EndpointService",
+ targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws2268",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2268.EndpointInterface"
+)
+public final class EndpointImpl
+{
+
+ private StringBuilder builder = new StringBuilder();
+ private File file;
+
+ public EndpointImpl()
+ {
+ super();
+ }
+
+ @PostConstruct
+ protected void init()
+ {
+ this.builder.append("init() ");
+ }
+
+ @WebMethod
+ public boolean setFile(String targetFile)
+ {
+ this.file = new File(targetFile);
+ return this.file.exists();
+ }
+
+ @PreDestroy
+ private void destroy()
+ {
+ this.builder.append("destroy()");
+ this.writeTestLog();
+ }
+
+ private void writeTestLog()
+ {
+ try
+ {
+ FileWriter fw = new FileWriter(this.file);
+ fw.write(this.builder.toString());
+ fw.close();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
+
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/EndpointInterface.java 2008-11-28 14:32:57 UTC (rev 8819)
@@ -0,0 +1,34 @@
+/*
+ * 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.jbws2268;
+
+import javax.jws.WebService;
+
+/**
+ * Endpoint Interface
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws2268")
+public interface EndpointInterface
+{
+ boolean setFile(String targetFile);
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2008-11-28 14:32:57 UTC (rev 8819)
@@ -0,0 +1,93 @@
+/*
+ * 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.jbws2268;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2268] Implement @PostConstruct and @Predestroy annotations support for POJO based endpoints
+ * @author richard.opalka(a)jboss.com
+ */
+public final class JBWS2268TestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2268TestCase.class, "");
+ }
+
+ private EndpointInterface getProxy() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws2268", "EndpointService");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2268?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ return (EndpointInterface)service.getPort(EndpointInterface.class);
+ }
+
+ private File createLogFile() throws Exception
+ {
+ File workDir = getResourceFile("target");
+ assertTrue("Work dir doesn't exist", workDir.exists());
+ String fileName = System.identityHashCode(this) + ".log";
+ File retVal = new File(workDir, fileName);
+ retVal.createNewFile();
+ return retVal;
+ }
+
+ public void testJavaxAnnotationsSupport() throws Exception
+ {
+ File logFile = createLogFile();
+
+ deploy("jaxws-jbws2268.war");
+ try
+ {
+ assertTrue(getProxy().setFile(logFile.getAbsolutePath()));
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2268.war");
+ assertPostConstructAndPreDestroyLogs(logFile);
+ }
+ }
+
+ private void assertPostConstructAndPreDestroyLogs(File logFile) throws Exception
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ IOUtils.copyStream(baos, new FileInputStream(logFile));
+ assertEquals(baos.toString().trim(), "init() destroy()");
+ logFile.delete();
+ }
+
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2268/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2268/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2268/WEB-INF/web.xml 2008-11-28 14:32:57 UTC (rev 8819)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 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">
+
+ <servlet>
+ <servlet-name>EndpointImpl</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2268.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>EndpointImpl</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
15 years, 5 months
JBossWS SVN: r8818 - common/trunk/src/main/java/org/jboss/wsf/common/servlet.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-28 09:32:23 -0500 (Fri, 28 Nov 2008)
New Revision: 8818
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
Log:
[JBWS-2268] refactoring javax.annotation support to stack specific endpoint servlet
Modified: common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java 2008-11-28 13:58:54 UTC (rev 8817)
+++ common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java 2008-11-28 14:32:23 UTC (rev 8818)
@@ -22,8 +22,6 @@
package org.jboss.wsf.common.servlet;
import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
import javax.management.ObjectName;
import javax.servlet.ServletConfig;
@@ -32,10 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.logging.Logger;
import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
-import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -57,13 +52,9 @@
public abstract class AbstractEndpointServlet extends HttpServlet
{
- // provide logging
- private static final Logger log = Logger.getLogger(AbstractEndpointServlet.class);
-
private final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
protected Endpoint endpoint;
private EndpointRegistry epRegistry;
- private List<PreDestroyHolder> preDestroyRegistry = new LinkedList<PreDestroyHolder>();
/**
* Constructor
@@ -81,28 +72,6 @@
this.initServiceEndpoint(servletConfig);
}
- @Override
- public void destroy()
- {
- synchronized(this.preDestroyRegistry)
- {
- for (PreDestroyHolder holder : this.preDestroyRegistry)
- {
- try
- {
- JavaxAnnotationHelper.callPreDestroyMethod(holder.getObject());
- }
- catch (Exception exception)
- {
- log.error(exception.getMessage(), exception);
- }
- }
- this.preDestroyRegistry.clear();
- this.preDestroyRegistry = null;
- }
- super.destroy();
- }
-
/**
* Serves the requests
*/
@@ -114,30 +83,22 @@
EndpointAssociation.setEndpoint(endpoint);
RequestHandler requestHandler = endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
- registerForPreDestroy(endpoint);
}
finally
{
+ this.postService();
EndpointAssociation.removeEndpoint();
}
}
- private void registerForPreDestroy(Endpoint ep)
+ /**
+ * Template method
+ */
+ protected void postService()
{
- PreDestroyHolder holder = (PreDestroyHolder)ep.getAttachment(PreDestroyHolder.class);
- if (holder != null)
- {
- synchronized(this.preDestroyRegistry)
- {
- if (!this.preDestroyRegistry.contains(holder))
- {
- this.preDestroyRegistry.add(holder);
- }
- }
- ep.removeAttachment(PreDestroyHolder.class);
- }
+ // does nothing (because of BC)
}
-
+
/**
* Template method
* @param cfg servlet config
15 years, 5 months
JBossWS SVN: r8817 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-28 08:58:54 -0500 (Fri, 28 Nov 2008)
New Revision: 8817
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
Log:
[JBWS-2257] Excluding test for AS 4.2.x
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-28 13:48:45 UTC (rev 8816)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-28 13:58:54 UTC (rev 8817)
@@ -35,6 +35,9 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
+# [JBWS-2257] Wrong WebServiceContext injected in EJB3 endpoints
+org/jboss/test/ws/jaxws/jbws2257/**
+
# [JBWS-2308] faultCode argument for createFault was passed NULL
org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-28 13:48:45 UTC (rev 8816)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-28 13:58:54 UTC (rev 8817)
@@ -29,6 +29,9 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
+# [JBWS-2257] Wrong WebServiceContext injected in EJB3 endpoints
+org/jboss/test/ws/jaxws/jbws2257/**
+
# [JBWS-2308] faultCode argument for createFault was passed NULL
org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-28 13:48:45 UTC (rev 8816)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-28 13:58:54 UTC (rev 8817)
@@ -29,6 +29,9 @@
# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
org/jboss/test/ws/jaxws/jbws1190/**
+# [JBWS-2257] Wrong WebServiceContext injected in EJB3 endpoints
+org/jboss/test/ws/jaxws/jbws2257/**
+
# [JBWS-2308] faultCode argument for createFault was passed NULL
org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
15 years, 5 months
JBossWS SVN: r8816 - container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-28 08:48:45 -0500 (Fri, 28 Nov 2008)
New Revision: 8816
Modified:
container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
Log:
[JBWS-2257] Getting the provided WebServiceContext in the container integration through the MessageContext
Modified: container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
===================================================================
--- container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-11-28 13:38:50 UTC (rev 8815)
+++ container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-11-28 13:48:45 UTC (rev 8816)
@@ -23,6 +23,7 @@
import org.jboss.wsf.spi.invocation.*;
+import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
/**
@@ -35,7 +36,11 @@
{
ExtensibleWebServiceContext context = null;
- if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
+ //checking for a provided WebServiceContext in the MessageContext; to be removed after EJBTHREE-1604
+ WebServiceContext providedContext = (WebServiceContext)messageContext.get(WebServiceContext.class.toString());
+ if (providedContext != null)
+ context = new WebServiceContextDelegate(providedContext);
+ else if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
context = new WebServiceContextEJB(messageContext);
else
context = new WebServiceContextJSE(messageContext);
15 years, 5 months
JBossWS SVN: r8815 - container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-28 08:38:50 -0500 (Fri, 28 Nov 2008)
New Revision: 8815
Modified:
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
Log:
[JBWS-2257][EJBTHREE-1604] Temporary getting the provided WebServiceContext in the container integration through the MessageContext
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-11-28 13:38:37 UTC (rev 8814)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2008-11-28 13:38:50 UTC (rev 8815)
@@ -23,6 +23,7 @@
import org.jboss.wsf.spi.invocation.*;
+import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
/**
@@ -35,7 +36,11 @@
{
ExtensibleWebServiceContext context = null;
- if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
+ //checking for a provided WebServiceContext in the MessageContext; to be removed after EJBTHREE-1604
+ WebServiceContext providedContext = (WebServiceContext)messageContext.get(WebServiceContext.class.toString());
+ if (providedContext != null)
+ context = new WebServiceContextDelegate(providedContext);
+ else if (type.toString().indexOf("EJB") != -1 || type.toString().indexOf("MDB") != -1)
context = new WebServiceContextEJB(messageContext);
else
context = new WebServiceContextJSE(messageContext);
15 years, 5 months
JBossWS SVN: r8814 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-28 08:38:37 -0500 (Fri, 28 Nov 2008)
New Revision: 8814
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
Log:
[JBWS-2257][EJBTHREE-1604] Temporary setting the WebServiceContext in the MessageContext too
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-11-28 13:34:58 UTC (rev 8813)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-11-28 13:38:37 UTC (rev 8814)
@@ -85,7 +85,12 @@
Endpoint endpoint = EndpointAssociation.getEndpoint();
InvocationHandler invocationHandler = endpoint.getInvocationHandler();
Invocation invocation = invocationHandler.createInvocation();
- invocation.getInvocationContext().addAttachment(MessageContext.class, this.webServiceCtx.getMessageContext());
+ MessageContext messageContext = this.webServiceCtx.getMessageContext();
+
+ //to be removed after EJBTHREE-1604
+ messageContext.put(WebServiceContext.class.toString(), this.webServiceCtx);
+
+ invocation.getInvocationContext().addAttachment(MessageContext.class, messageContext);
invocation.getInvocationContext().addAttachment(WebServiceContext.class, this.webServiceCtx);
invocation.setJavaMethod(m);
invocation.setArgs(args);
15 years, 5 months
JBossWS SVN: r8813 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-28 08:34:58 -0500 (Fri, 28 Nov 2008)
New Revision: 8813
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
Log:
[JBWS-2257] Adding Metro provided WebServiceContext to the invocation context
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-11-28 13:28:56 UTC (rev 8812)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/InvokerEJB3.java 2008-11-28 13:34:58 UTC (rev 8813)
@@ -27,6 +27,7 @@
import javax.ejb.EJBException;
import javax.xml.ws.Provider;
import javax.xml.ws.WebFault;
+import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.MessageContext;
@@ -85,6 +86,7 @@
InvocationHandler invocationHandler = endpoint.getInvocationHandler();
Invocation invocation = invocationHandler.createInvocation();
invocation.getInvocationContext().addAttachment(MessageContext.class, this.webServiceCtx.getMessageContext());
+ invocation.getInvocationContext().addAttachment(WebServiceContext.class, this.webServiceCtx);
invocation.setJavaMethod(m);
invocation.setArgs(args);
15 years, 5 months
JBossWS SVN: r8812 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-28 08:28:56 -0500 (Fri, 28 Nov 2008)
New Revision: 8812
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDelegate.java
Log:
[JBWS-2257] Adding a WebServiceContext implementation delegating to an existing one
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDelegate.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDelegate.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDelegate.java 2008-11-28 13:28:56 UTC (rev 8812)
@@ -0,0 +1,77 @@
+/*
+ * 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.wsf.spi.invocation;
+
+import java.security.Principal;
+
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceContext;
+
+import org.w3c.dom.Element;
+
+/**
+ * A ExtensibleWebServiceContext implementation that delegates
+ * to a given WebServiceContext instance.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 28-Nov-2008
+ */
+public class WebServiceContextDelegate extends ExtensibleWebServiceContext
+{
+ private WebServiceContext ctx;
+
+ public WebServiceContextDelegate(WebServiceContext ctx)
+ {
+ super(ctx.getMessageContext());
+ this.ctx = ctx;
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ return ctx.getUserPrincipal();
+ }
+
+ @Override
+ public boolean isUserInRole(String s)
+ {
+ return ctx.isUserInRole(s);
+ }
+
+ @Override
+ public javax.xml.ws.handler.MessageContext getMessageContext()
+ {
+ return ctx.getMessageContext();
+ }
+
+ @Override
+ public EndpointReference getEndpointReference(Element... arg0)
+ {
+ return ctx.getEndpointReference(arg0);
+ }
+
+ @Override
+ public <T extends EndpointReference> T getEndpointReference(Class<T> arg0, Element... arg1)
+ {
+ return ctx.getEndpointReference(arg0, arg1);
+ }
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextDelegate.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 5 months
JBossWS SVN: r8811 - in stack/metro/trunk/modules/testsuite/metro-tests: src/test/java/org/jboss/test/ws/jaxws and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-28 08:04:17 -0500 (Fri, 28 Nov 2008)
New Revision: 8811
Added:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceIface.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceImpl.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHello.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHelloResponse.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService_schema1.xsd
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
Log:
[JBWS-2257] Adding testcase
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-28 11:56:44 UTC (rev 8810)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-11-28 13:04:17 UTC (rev 8811)
@@ -51,6 +51,17 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2206/META-INF"/>
</jar>
+ <!-- jbws2257 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2257.jar" >
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2257/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2257/jaxws/*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2257/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbws2307 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2307-client.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2307/WEB-INF-client/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java 2008-11-28 13:04:17 UTC (rev 8811)
@@ -0,0 +1,57 @@
+/*
+ * 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.jbws2257;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-Nov-2008
+ */
+public final class AddressingTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-jbws2257/ServiceImpl";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-jbws2257.jar");
+ }
+
+ public void test() throws Exception
+ {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ assertEquals("Hello World!", proxy.sayHello());
+ }
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceIface.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceIface.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceIface.java 2008-11-28 13:04:17 UTC (rev 8811)
@@ -0,0 +1,36 @@
+/*
+ * 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.jbws2257;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String sayHello();
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceImpl.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceImpl.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceImpl.java 2008-11-28 13:04:17 UTC (rev 8811)
@@ -0,0 +1,68 @@
+/*
+ * 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.jbws2257;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.logging.Logger;
+
+@Stateless
+@WebService
+(
+ portName = "AddressingServicePort",
+ serviceName = "AddressingService",
+ wsdlLocation = "META-INF/wsdl/AddressingService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2257.ServiceIface"
+)
+public class ServiceImpl
+{
+ private static final Logger log = Logger.getLogger(ServiceImpl.class);
+
+ @Resource
+ WebServiceContext ctx;
+
+ public String sayHello()
+ {
+ log.info("Current context: " + ctx);
+ try
+ {
+ EndpointReference epr = ctx.getEndpointReference();
+ log.info("Endpoint reference: " + epr);
+ if (epr == null || !epr.toString().contains("jbws2257"))
+ {
+ return "Unexpected endpoint reference: " + epr;
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Error while reading endpoint reference from context!", e);
+ return e.getMessage();
+ }
+ return "Hello World!";
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/ServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHello.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHello.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHello.java 2008-11-28 13:04:17 UTC (rev 8811)
@@ -0,0 +1,32 @@
+/*
+ * 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.jbws2257.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+public class SayHello {}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHelloResponse.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHelloResponse.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHelloResponse.java 2008-11-28 13:04:17 UTC (rev 8811)
@@ -0,0 +1,49 @@
+/*
+ * 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.jbws2257.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+public class SayHelloResponse
+{
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ public String getReturn()
+ {
+ return this._return;
+ }
+
+ public void setReturn(String _return)
+ {
+ this._return = _return;
+ }
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2257/jaxws/SayHelloResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService.wsdl
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService.wsdl 2008-11-28 13:04:17 UTC (rev 8811)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3-b02-. -->
+<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" name="AddressingService" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" schemaLocation="AddressingService_schema1.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="sayHello">
+ <part name="parameters" element="tns:sayHello"/>
+ </message>
+ <message name="sayHelloResponse">
+ <part name="parameters" element="tns:sayHelloResponse"/>
+ </message>
+ <portType name="ServiceIface">
+ <operation name="sayHello">
+ <input message="tns:sayHello"/>
+ <output message="tns:sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="AddressingServicePortBinding" type="tns:ServiceIface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="AddressingService">
+ <port name="AddressingServicePort" binding="tns:AddressingServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService_schema1.xsd
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService_schema1.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService_schema1.xsd 2008-11-28 13:04:17 UTC (rev 8811)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sayHello" type="tns:sayHello"/>
+
+ <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+
+ <xs:complexType name="sayHello">
+ <xs:sequence/>
+ </xs:complexType>
+
+ <xs:complexType name="sayHelloResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2257/META-INF/wsdl/AddressingService_schema1.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 5 months
JBossWS SVN: r8810 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-28 06:56:44 -0500 (Fri, 28 Nov 2008)
New Revision: 8810
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2384] enable tests on native
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-28 06:16:19 UTC (rev 8809)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-28 11:56:44 UTC (rev 8810)
@@ -21,7 +21,3 @@
# [JBWS-2217] Fix BPEL samples before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-28 06:16:19 UTC (rev 8809)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-28 11:56:44 UTC (rev 8810)
@@ -18,7 +18,3 @@
# [JBWS-2217] Fix BPEL samples before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-
-# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
15 years, 5 months