JBossWS SVN: r5754 - in stack/native/trunk/src/main/java/org/jboss/ws: extensions/security and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-02-20 13:59:33 -0500 (Wed, 20 Feb 2008)
New Revision: 5754
Added:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureKeysAssociation.java
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java
Log:
[JBWS-1814] Better implementation, fixes regression on hudson
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2008-02-20 17:02:34 UTC (rev 5753)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2008-02-20 18:59:33 UTC (rev 5754)
@@ -23,6 +23,8 @@
// $Id$
+import java.security.PublicKey;
+import java.util.List;
import java.util.Stack;
import org.jboss.ws.core.CommonMessageContext;
@@ -47,6 +49,11 @@
* @see org.jboss.ws.extensions.security.STRTransform
*/
private static ThreadLocal<SecurityStore> strTransformAssoc = new ThreadLocal<SecurityStore>();
+
+ /**
+ * Public keys used to sign incoming message
+ */
+ private static ThreadLocal<List<PublicKey>> signatureKeysAssoc = new ThreadLocal<List<PublicKey>>();
public static ThreadLocal<Stack<CommonMessageContext>> localMsgContextAssoc()
{
@@ -57,10 +64,16 @@
{
return strTransformAssoc;
}
+
+ public static ThreadLocal<List<PublicKey>> localSignatureKeysAssoc()
+ {
+ return signatureKeysAssoc;
+ }
public static void clear()
{
msgContextAssoc.remove();
strTransformAssoc.remove();
+ signatureKeysAssoc.remove();
}
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-02-20 17:02:34 UTC (rev 5753)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/Constants.java 2008-02-20 18:59:33 UTC (rev 5754)
@@ -71,6 +71,4 @@
public static final String XENC_CONTENT_TYPE = EncryptionConstants.TYPE_CONTENT;
public static final QName WSSE_HEADER_QNAME = new QName(WSSE_NS, "Security");
-
- public static final String SIGNATURE_KEYS = "org.jboss.ws.wsse.signaturePublicKeys";
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2008-02-20 17:02:34 UTC (rev 5753)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/EncryptionOperation.java 2008-02-20 18:59:33 UTC (rev 5754)
@@ -37,7 +37,6 @@
import org.apache.xml.security.encryption.XMLCipher;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.extensions.security.element.EncryptedKey;
import org.jboss.ws.extensions.security.element.Reference;
import org.jboss.ws.extensions.security.element.ReferenceList;
@@ -189,7 +188,7 @@
}
else
{
- List<PublicKey> publicKeys = (List<PublicKey>)MessageContextAssociation.peekMessageContext().get(Constants.SIGNATURE_KEYS);
+ List<PublicKey> publicKeys = SignatureKeysAssociation.getPublicKeys();
if (publicKeys != null && publicKeys.size() == 1)
cert = store.getCertificateByPublicKey(publicKeys.iterator().next());
if (cert == null)
Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureKeysAssociation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureKeysAssociation.java (rev 0)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureKeysAssociation.java 2008-02-20 18:59:33 UTC (rev 5754)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ws.extensions.security;
+
+//$Id$
+
+import java.security.PublicKey;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.ws.core.utils.ThreadLocalAssociation;
+
+/**
+ * This is used to save the public keys an incoming message is signed with;
+ * this is achieved using the a thread local list and is used by the encryption
+ * operation when handling the outbound message.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 20-Feb-2008
+ */
+public class SignatureKeysAssociation
+{
+ public static List<PublicKey> getPublicKeys()
+ {
+ return ThreadLocalAssociation.localSignatureKeysAssoc().get();
+ }
+
+ public static void saveKey(PublicKey key)
+ {
+ List<PublicKey> pkList = ThreadLocalAssociation.localSignatureKeysAssoc().get();
+ if (pkList == null)
+ {
+ pkList = new LinkedList<PublicKey>();
+ ThreadLocalAssociation.localSignatureKeysAssoc().set(pkList);
+ }
+ pkList.add(key);
+ }
+}
Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureKeysAssociation.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java 2008-02-20 17:02:34 UTC (rev 5753)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/security/SignatureVerificationOperation.java 2008-02-20 18:59:33 UTC (rev 5754)
@@ -21,18 +21,13 @@
*/
package org.jboss.ws.extensions.security;
-import java.security.PublicKey;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.SignedInfo;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.extensions.security.element.SecurityHeader;
import org.jboss.ws.extensions.security.element.SecurityProcess;
import org.jboss.ws.extensions.security.element.Signature;
@@ -65,7 +60,7 @@
if (! xmlSig.checkSignatureValue(signature.getPublicKey()))
throw new FailedCheckException("Signature is invalid.");
- savePublicKey(signature.getPublicKey());
+ SignatureKeysAssociation.saveKey(signature.getPublicKey());
}
catch (XMLSignatureException e)
{
@@ -95,24 +90,4 @@
return processed;
}
-
- /**
- * Save the public key the incoming message was signed with into the context;
- * this way it could be retrieved and used by the encryption operation
- * when handling the outbound message.
- *
- * @param key
- */
- @SuppressWarnings("unchecked")
- private void savePublicKey(PublicKey key)
- {
- CommonMessageContext ctx = MessageContextAssociation.peekMessageContext();
- List<PublicKey> pkList = (List<PublicKey>)ctx.get(Constants.SIGNATURE_KEYS);
- if (pkList == null)
- {
- pkList = new LinkedList<PublicKey>();
- ctx.put(Constants.SIGNATURE_KEYS, pkList);
- }
- pkList.add(key);
- }
}
16 years, 10 months
JBossWS SVN: r5753 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-02-20 12:02:34 -0500 (Wed, 20 Feb 2008)
New Revision: 5753
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
Log:
[JBWS-1964] Preventing NPE
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-02-20 13:15:03 UTC (rev 5752)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2008-02-20 17:02:34 UTC (rev 5753)
@@ -457,7 +457,7 @@
{
for (Subscription s : subscriptions)
{
- pw.println("<tr><td>" + s.getIdentifier() + "</td><td>" + s.getExpires() + "</td><td>" + s.getFilter().getExpression() + "</td></tr>");
+ pw.println("<tr><td>" + s.getIdentifier() + "</td><td>" + s.getExpires() + "</td><td>" + (s.getFilter()!=null ? s.getFilter().getExpression() : "") + "</td></tr>");
}
}
pw.println("</table>");
16 years, 10 months
JBossWS SVN: r5752 - in stack/native/trunk/src: test/java/org/jboss/test/ws/jaxws/wseventing and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-20 08:15:03 -0500 (Wed, 20 Feb 2008)
New Revision: 5752
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java
stack/native/trunk/src/test/resources/jaxws/wseventing/WEB-INF/web.xml
Log:
JBWS-1912: WS-Eventing, Bypass RMIAdaptor when used locally
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java 2008-02-20 13:14:01 UTC (rev 5751)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/mgmt/DispatcherDelegate.java 2008-02-20 13:15:03 UTC (rev 5752)
@@ -1,10 +1,9 @@
package org.jboss.ws.extensions.eventing.mgmt;
import java.net.URI;
+import java.util.Iterator;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServerInvocationHandler;
-import javax.management.ObjectName;
+import javax.management.*;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.Reference;
@@ -12,6 +11,7 @@
import javax.naming.StringRefAddr;
import org.jboss.ws.WSException;
+import org.jboss.logging.Logger;
import org.w3c.dom.Element;
/**
@@ -24,6 +24,8 @@
*/
public class DispatcherDelegate implements EventDispatcher, Referenceable
{
+ private static final Logger log = Logger.getLogger(DispatcherDelegate.class);
+
private String hostname;
public final static String MANAGER_HOSTNAME = "manager.hostname";
private SubscriptionManagerMBean subscriptionManager = null;
@@ -60,8 +62,12 @@
try
{
ObjectName objectName = SubscriptionManager.OBJECT_NAME;
- subscriptionManager = (SubscriptionManagerMBean)MBeanServerInvocationHandler.newProxyInstance(getServer(), objectName, SubscriptionManagerMBean.class,
- false);
+ subscriptionManager = (SubscriptionManagerMBean)
+ MBeanServerInvocationHandler.newProxyInstance(
+ getServer(),
+ objectName,
+ SubscriptionManagerMBean.class, false
+ );
}
catch (Exception e)
{
@@ -72,14 +78,49 @@
return subscriptionManager;
}
+ /**
+ * http://wiki.jboss.org/wiki/Wiki.jsp?page=FindMBeanServer
+ *
+ * @return
+ * @throws NamingException
+ */
private MBeanServerConnection getServer() throws NamingException
{
- // todo: bypass rmi adapter when used locally
- InitialContext iniCtx = new InitialContext();
- MBeanServerConnection server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
+ // Local
+ MBeanServerConnection server = locateJBoss();
+
+ if(null==server)
+ {
+ // Remote
+ InitialContext iniCtx = new InitialContext();
+ server = (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor");
+ log.debug("Using RMI invocation");
+ }
+ else
+ {
+ log.debug("Using in-VM invocation");
+ }
+
return server;
}
+ // avoid dependency on jboss-jmx.jar
+ public MBeanServerConnection locateJBoss()
+ {
+ MBeanServerConnection jboss = null;
+
+ for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext(); )
+ {
+ MBeanServer server = (MBeanServer) i.next();
+ if (server.getDefaultDomain().equals("jboss"))
+ {
+ jboss = server;
+ }
+ }
+
+ return jboss;
+ }
+
void setHostname(String hostname)
{
if (null == hostname)
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2008-02-20 13:14:01 UTC (rev 5751)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2008-02-20 13:15:03 UTC (rev 5752)
@@ -80,8 +80,7 @@
" <Lat>2746</Lat>\n" +
" <Long>8270</Long>\n" +
" <Comments xml:lang='en-US' >\n" +
- " WINDS 55 WITH GUSTS TO 65. ROOF TORN OFF BOAT HOUSE. REPORTED\n" +
- " BY STORM SPOTTER. (TBW)\n" +
+ " Should be a REMOTE notification\n" +
" </Comments>\n" +
"</WindReport>";
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java 2008-02-20 13:15:03 UTC (rev 5752)
@@ -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.test.ws.jaxws.wseventing;
+
+import org.jboss.ws.extensions.eventing.mgmt.EventDispatcher;
+import org.jboss.ws.extensions.eventing.EventingConstants;
+import org.jboss.wsf.common.DOMUtils;
+import org.w3c.dom.Element;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * Test the in vm event dispatching
+ */
+public class InVMServlet extends HttpServlet
+{
+
+ private final static String notification =
+ "<WindReport type='critical'>\n" +
+ " <Date>030701</Date>\n" +
+ " <Time>0041</Time>\n" +
+ " <Speed>65</Speed>\n" +
+ " <Location>BRADENTON BEACH</Location>\n" +
+ " <County>MANATEE</County>\n" +
+ " <State>FL</State>\n" +
+ " <Lat>2746</Lat>\n" +
+ " <Long>8270</Long>\n" +
+ " <Comments xml:lang='en-US' >\n" +
+ " Should be a LOCAL invocation\n" +
+ " </Comments>\n" +
+ "</WindReport>";
+
+ protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException
+ {
+ try
+ {
+ InitialContext iniCtx = new InitialContext();
+ EventDispatcher delegate = (EventDispatcher)
+ iniCtx.lookup(EventingConstants.DISPATCHER_JNDI_NAME);
+
+ Element payload = DOMUtils.parse(notification);
+ delegate.dispatch(new URI("http://www.jboss.org/wind/Warnings"), payload);
+
+ httpServletResponse.getWriter().print("Notification successful");
+ }
+ catch (Exception e)
+ {
+ throw new ServletException("Failed to do in VM dispatching", e);
+ }
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/InVMServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2008-02-20 13:14:01 UTC (rev 5751)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wseventing/NotificationTestCase.java 2008-02-20 13:15:03 UTC (rev 5752)
@@ -34,6 +34,13 @@
import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Element;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.OutputStream;
+import java.io.InputStream;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
/**
* Test the notification delivery.
*
@@ -66,4 +73,27 @@
}
}
+ public void testInVMNotification() throws Exception
+ {
+ URL u = new URL ( "http://localhost:8080/jaxws-wseventing/inVM" );
+ HttpURLConnection huc = (HttpURLConnection) u.openConnection();
+ huc.setRequestMethod("GET");
+ huc.connect();
+
+ StringBuffer sb = new StringBuffer();
+
+ int code = huc.getResponseCode();
+ if (code>=200 && code<300 )
+ {
+ InputStream in = huc.getInputStream();
+ BufferedReader input = new BufferedReader(new InputStreamReader(in));
+ String line = "";
+ while ((line = input.readLine()) != null)
+ sb.append(line);
+ }
+
+ assertEquals(sb.toString(), "Notification successful");
+ huc.disconnect();
+ }
+
}
Modified: stack/native/trunk/src/test/resources/jaxws/wseventing/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wseventing/WEB-INF/web.xml 2008-02-20 13:14:01 UTC (rev 5751)
+++ stack/native/trunk/src/test/resources/jaxws/wseventing/WEB-INF/web.xml 2008-02-20 13:15:03 UTC (rev 5752)
@@ -33,6 +33,17 @@
<url-pattern>/manage</url-pattern>
</servlet-mapping>
+ <servlet>
+ <servlet-name>inVM</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.wseventing.InVMServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>inVM</servlet-name>
+ <url-pattern>/inVM</url-pattern>
+ </servlet-mapping>
+
+
<session-config>
<session-timeout>54</session-timeout>
</session-config>
16 years, 10 months
JBossWS SVN: r5751 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-02-20 08:14:01 -0500 (Wed, 20 Feb 2008)
New Revision: 5751
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
Log:
Use 150mb attachments
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2008-02-20 12:38:22 UTC (rev 5750)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.java 2008-02-20 13:14:01 UTC (rev 5751)
@@ -60,7 +60,7 @@
public void testFileTransfer() throws Exception
{
DataHandler dh = new DataHandler(
- new GeneratorDataSource(1024*1204)
+ new GeneratorDataSource(1024*1204*150)
);
boolean success = port.transferFile("JBWS2000.data", dh);
16 years, 10 months
JBossWS SVN: r5750 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-20 07:38:22 -0500 (Wed, 20 Feb 2008)
New Revision: 5750
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
Log:
[JBWS-1872] test
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-20 10:56:09 UTC (rev 5749)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-02-20 12:38:22 UTC (rev 5750)
@@ -608,6 +608,15 @@
</metainf>
</jar>
+ <!-- jaxws-jbws1872 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1872.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1872/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1872/*TestCase*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1872/ClientIface.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws1904 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws1904.jar">
<fileset dir="${tests.output.dir}/classes">
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java 2008-02-20 12:38:22 UTC (rev 5750)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1872;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Interface used on client side
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService
+public interface ClientIface
+{
+ @WebMethod
+ String echo(String msg);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/ClientIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java 2008-02-20 12:38:22 UTC (rev 5750)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1872;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.ejb.Stateless;
+import javax.ejb.Local;
+import javax.ejb.Remote;
+
+/**
+ * EJB3 bean implementing both Local and Remote interfaces
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService(name = "Bean1", targetNamespace = "http://org.jboss.ws/jbws1872")
+@Stateless
+(a)Remote(RemoteIface.class)
+(a)Local(LocalIface.class)
+public final class EJB3Bean1 implements RemoteIface, LocalIface
+{
+
+ @WebMethod
+ public String echo(String msg)
+ {
+ return "bean1-" + msg;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean1.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java 2008-02-20 12:38:22 UTC (rev 5750)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1872;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * EJB3 bean implementing local interface only
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService(name = "Bean2", targetNamespace = "http://org.jboss.ws/jbws1872")
+@Stateless
+(a)Local(LocalIface.class)
+public final class EJB3Bean2 implements LocalIface
+{
+
+ @WebMethod
+ public String echo(String msg)
+ {
+ return "bean2-" + msg;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean2.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java 2008-02-20 12:38:22 UTC (rev 5750)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1872;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * EJB3 bean implementing remote interface only
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+@WebService(name = "Bean3", targetNamespace = "http://org.jboss.ws/jbws1872")
+@Stateless
+(a)Remote(RemoteIface.class)
+public final class EJB3Bean3 implements RemoteIface
+{
+
+ @WebMethod
+ public String echo(String msg)
+ {
+ return "bean3-" + msg;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/EJB3Bean3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java 2008-02-20 12:38:22 UTC (rev 5750)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1872;
+
+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;
+
+/**
+ * [JBWS-1872] EJB3 WebService implementation must have @Remote (instead of @Local) Business interface
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public class JBWS1872TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1872TestCase.class, "jaxws-jbws1872.jar");
+ }
+
+ public void testEJB1() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean1?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean1Service");
+ Service service = Service.create(wsdlURL, serviceName);
+ ClientIface port = service.getPort(ClientIface.class);
+ String retStr = port.echo("hello");
+ assertEquals("bean1-hello", retStr);
+ }
+
+ public void testEJB2() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean2?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean2Service");
+ Service service = Service.create(wsdlURL, serviceName);
+ ClientIface port = service.getPort(ClientIface.class);
+ String retStr = port.echo("hello");
+ assertEquals("bean2-hello", retStr);
+ }
+
+ public void testEJB3() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1872/EJB3Bean3?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbws1872", "EJB3Bean3Service");
+ Service service = Service.create(wsdlURL, serviceName);
+ ClientIface port = service.getPort(ClientIface.class);
+ String retStr = port.echo("hello");
+ assertEquals("bean3-hello", retStr);
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/JBWS1872TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java 2008-02-20 12:38:22 UTC (rev 5750)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1872;
+
+/**
+ * EJB3 local interface
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public interface LocalIface
+{
+ String echo(String msg);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/LocalIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java 2008-02-20 12:38:22 UTC (rev 5750)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1872;
+
+/**
+ * EJB3 remote interface
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public interface RemoteIface
+{
+ String echo(String msg);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1872/RemoteIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 10 months
JBossWS SVN: r5749 - stack/native/tags/jbossws-native-2.0.3.GA.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-02-20 05:56:09 -0500 (Wed, 20 Feb 2008)
New Revision: 5749
Modified:
stack/native/tags/jbossws-native-2.0.3.GA/version.properties
Log:
2.2.2.SP4-brew
Modified: stack/native/tags/jbossws-native-2.0.3.GA/version.properties
===================================================================
--- stack/native/tags/jbossws-native-2.0.3.GA/version.properties 2008-02-20 10:46:20 UTC (rev 5748)
+++ stack/native/tags/jbossws-native-2.0.3.GA/version.properties 2008-02-20 10:56:09 UTC (rev 5749)
@@ -32,11 +32,11 @@
# JBossAS-5.0
jboss-jbossxb-jboss50=2.0.0.CR5
-jboss-remoting-jboss50=2.2.2.SP4
+jboss-remoting-jboss50=2.2.2.SP4-brew
# JBossAS-4.2
jboss-jbossxb-jboss42=1.0.0.SP1
-jboss-remoting-jboss42=2.2.2.SP4
+jboss-remoting-jboss42=2.2.2.SP4-brew
# JBossAS-4.0
jboss-jbossxb-jboss40=1.0.0.CR11
16 years, 10 months
JBossWS SVN: r5748 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-20 05:46:20 -0500 (Wed, 20 Feb 2008)
New Revision: 5748
Modified:
stack/native/trunk/.classpath
Log:
fix eclipse project cp
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-02-20 09:41:21 UTC (rev 5747)
+++ stack/native/trunk/.classpath 2008-02-20 10:46:20 UTC (rev 5748)
@@ -32,7 +32,6 @@
<classpathentry kind="lib" path="thirdparty/policy.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
- <classpathentry kind="lib" path="thirdparty/xmlunit.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
16 years, 10 months
JBossWS SVN: r5747 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-20 04:41:21 -0500 (Wed, 20 Feb 2008)
New Revision: 5747
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java
Log:
[JBWS-1905] fix
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2008-02-20 08:39:13 UTC (rev 5746)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/PortHandler.java 2008-02-20 09:41:21 UTC (rev 5747)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.logicalhandler;
+import java.util.Iterator;
+
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -59,8 +61,8 @@
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
- soapElement = (SOAPElement)soapElement.getChildElements().next();
+ SOAPElement soapElement = getFirstChildElement(soapMessage.getSOAPBody());
+ soapElement = getFirstChildElement(soapElement);
String oldValue = soapElement.getValue();
String newValue = oldValue + ":" + direction + ":PortHandler";
@@ -76,4 +78,19 @@
throw new WebServiceException(ex);
}
}
+
+ private SOAPElement getFirstChildElement(SOAPElement parentNode)
+ {
+ Iterator i = parentNode.getChildElements();
+ while (i.hasNext())
+ {
+ Object currentNode = i.next();
+ if (currentNode instanceof SOAPElement)
+ {
+ return (SOAPElement) currentNode;
+ }
+ }
+
+ return null;
+ }
}
16 years, 10 months
JBossWS SVN: r5746 - stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-20 03:39:13 -0500 (Wed, 20 Feb 2008)
New Revision: 5746
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
Log:
[JBWS-1979] fix
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-02-20 08:32:36 UTC (rev 5745)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-02-20 08:39:13 UTC (rev 5746)
@@ -278,6 +278,10 @@
{
MessageAbstraction reqMsg = getRequestMessage(obj);
String targetAddress = epMetaData.getEndpointAddress();
+ Map<String, Object> callProps = new HashMap<String, Object>(getRequestContext());
+ if (callProps.containsKey(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)) {
+ targetAddress = (String) callProps.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
+ }
MessageAbstraction resMsg = getRemotingConnection().invoke(reqMsg, targetAddress, false);
Object retObj = getReturnObject(resMsg);
return retObj;
16 years, 10 months
JBossWS SVN: r5745 - stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-02-20 03:32:36 -0500 (Wed, 20 Feb 2008)
New Revision: 5745
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
Log:
[JBWS-1979] fix
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-02-20 08:18:59 UTC (rev 5744)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2008-02-20 08:32:36 UTC (rev 5745)
@@ -232,6 +232,9 @@
if (handlerPass)
{
Map<String, Object> callProps = new HashMap<String, Object>(getRequestContext());
+ if (callProps.containsKey(BindingProvider.ENDPOINT_ADDRESS_PROPERTY)) {
+ targetAddress = (String) callProps.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
+ }
EndpointInfo epInfo = new EndpointInfo(epMetaData, targetAddress, callProps);
resMsg = getRemotingConnection().invoke(reqMsg, epInfo, false);
16 years, 10 months