JBossWS SVN: r11953 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2010-04-07 09:04:32 -0400 (Wed, 07 Apr 2010)
New Revision: 11953
Removed:
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/
Log:
14 years, 1 month
JBossWS SVN: r11952 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2010-04-07 09:00:38 -0400 (Wed, 07 Apr 2010)
New Revision: 11952
Added:
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943/
Log:
[JBPAPP-3943] Branch for patch
Copied: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3943 (from rev 11053, stack/native/tags/jbossws-native-3.1.2.SP3-patch-02)
14 years, 1 month
JBossWS SVN: r11951 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-04-07 06:52:08 -0400 (Wed, 07 Apr 2010)
New Revision: 11951
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-4063] fixing MessageContext.HTTP_*_HEADERS propagation
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-04-07 10:05:46 UTC (rev 11950)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-04-07 10:52:08 UTC (rev 11951)
@@ -350,10 +350,14 @@
EndpointInfo epInfo = new EndpointInfo(epMetaData, targetAddress, callProps);
if (shouldMaintainSession())
addSessionInfo(reqMessage, callProps);
+
+ propagateRequestHeaders(reqMessage, getRequestContext());
RemoteConnection remoteConnection = new RemoteConnectionFactory().getRemoteConnection(epInfo);
MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway);
+ propagateResponseHeaders(callProps, getRequestContext());
+
if (shouldMaintainSession())
saveSessionInfo(callProps, getRequestContext());
@@ -435,6 +439,11 @@
closeHandlerChain(portName, handlerType[0]);
}
}
+
+ private void propagateResponseHeaders(Map<String, Object> remotingMetadata, Map<String, Object> responseContext)
+ {
+ responseContext.put(MessageContext.HTTP_RESPONSE_HEADERS, remotingMetadata.get("ResponseHeaders"));
+ }
private void saveSessionInfo(Map<String, Object> remotingMetadata, Map<String, Object> requestContext)
{
@@ -485,6 +494,34 @@
}
}
}
+
+ private void propagateRequestHeaders(MessageAbstraction reqMessage, Map<String, Object> callProperties)
+ {
+ Map<String, List<String>> requestHeaders = (Map<String, List<String>>)callProperties.get(MessageContext.HTTP_REQUEST_HEADERS);
+ if (requestHeaders != null)
+ {
+ for (Map.Entry<String, List<String>> header : requestHeaders.entrySet())
+ {
+ final String key = header.getKey();
+ final List<String> values = header.getValue();
+
+ if (key != null)
+ {
+ final StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < values.size(); i++)
+ {
+ boolean addLWS = (i != (values.size() - 1));
+ sb.append(values.get(i));
+ if (addLWS)
+ {
+ sb.append("\r\n ");
+ }
+ }
+ reqMessage.getMimeHeaders().addHeader(key, sb.toString());
+ }
+ }
+ }
+ }
private CommonMessageContext processPivotInternal(CommonMessageContext msgContext, DirectionHolder direction)
{
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-04-07 10:05:46 UTC (rev 11950)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-04-07 10:52:08 UTC (rev 11951)
@@ -662,6 +662,14 @@
</webinf>
</war>
+ <!-- jaxws-jbws2982 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2982.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2982/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2982/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2982/*TestCase*.class" />
+ </classes>
+ </war>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982 (from rev 11949, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java 2010-04-07 10:52:08 UTC (rev 11951)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws2982;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-/**
- * Endpoint interface.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-@WebService(name="Endpoint", targetNamespace="http://jboss.org/jbws2982")
-public interface Endpoint
-{
- @WebMethod
- public int getRequestParameter(String key);
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java (from rev 11949, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java 2010-04-07 10:52:08 UTC (rev 11951)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws2982;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint interface.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(name="Endpoint", targetNamespace="http://jboss.org/jbws2982")
+public interface Endpoint
+{
+ @WebMethod
+ public int getRequestParameter(String key);
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java 2010-04-07 10:52:08 UTC (rev 11951)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws2982;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * Endpoint implementation.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-@WebService
-(
- name = "Endpoint",
- serviceName = "EndpointService",
- targetNamespace="http://jboss.org/jbws2982",
- endpointInterface="org.jboss.test.ws.jaxws.jbws2982.Endpoint"
-)
-public class EndpointImpl implements Endpoint
-{
- @Resource
- WebServiceContext ctx;
-
- private int getRequestParameterInternal(String key)
- {
- int ctxValue = this.getValue(this.ctx, key);
-
- return ++ctxValue;
- }
-
- private int getValue(WebServiceContext wsCtx, String paramKey)
- {
- Map<String, List<String>> requestHeaders = (Map<String, List<String>>)wsCtx.getMessageContext().get(MessageContext.HTTP_REQUEST_HEADERS);
-
- return Integer.valueOf(requestHeaders.get("extension-header").get(0));
- }
-
- @WebMethod
- public int getRequestParameter(String key)
- {
- return this.getRequestParameterInternal(key);
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java (from rev 11949, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java 2010-04-07 10:52:08 UTC (rev 11951)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws2982;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * Endpoint implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ targetNamespace="http://jboss.org/jbws2982",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2982.Endpoint"
+)
+public class EndpointImpl implements Endpoint
+{
+ @Resource
+ WebServiceContext ctx;
+
+ private int getRequestParameterInternal(String key)
+ {
+ int ctxValue = this.getValue(this.ctx, key);
+
+ return ++ctxValue;
+ }
+
+ private int getValue(WebServiceContext wsCtx, String paramKey)
+ {
+ Map<String, List<String>> requestHeaders = (Map<String, List<String>>)wsCtx.getMessageContext().get(MessageContext.HTTP_REQUEST_HEADERS);
+
+ return Integer.valueOf(requestHeaders.get("extension-header").get(0));
+ }
+
+ @WebMethod
+ public int getRequestParameter(String key)
+ {
+ return this.getRequestParameterInternal(key);
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java 2010-04-07 10:52:08 UTC (rev 11951)
@@ -1,162 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.jbws2982;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.handler.MessageContext;
-
-import junit.framework.Test;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-2982] Native ignores user specified MessageContext.HTTP_REQUEST_HEADERS
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class JBWS2982TestCase extends JBossWSTest
-{
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2982TestCase.class, "jaxws-jbws2982.war");
- }
- private static final int THREADS_COUNT = 5;
- private static final int REQUESTS_COUNT = 5;
- private static final String ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2982";
- private final Endpoint[] proxies = new Endpoint[THREADS_COUNT];
- private final Thread[] threads = new Thread[THREADS_COUNT];
- private final TestJob[] jobs = new TestJob[THREADS_COUNT];
- private final Logger log = Logger.getLogger(this.getClass());
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- QName serviceName = new QName("http://jboss.org/jbws2982", "EndpointService");
- URL wsdlURL = new URL(ENDPOINT_ADDRESS + "?wsdl");
-
- Service service = Service.create(wsdlURL, serviceName);
- for (int i = 0; i < THREADS_COUNT; i++)
- proxies[i] = service.getPort(Endpoint.class);
- }
-
- public void testEndpointConcurrently() throws Exception
- {
- for (int i = 0; i < THREADS_COUNT; i++)
- {
- log.debug("Creating thread " + (i + 1));
- jobs[i] = new TestJob(proxies[i], REQUESTS_COUNT, "TestJob" + i);
- threads[i] = new Thread(jobs[i]);
- }
- for (int i = 0; i < THREADS_COUNT; i++)
- {
- log.debug("Starting thread " + (i + 1));
- threads[i].start();
- }
- Exception e = null;
- for (int i = 0; i < THREADS_COUNT; i++)
- {
- log.debug("Joining thread " + (i + 1));
- threads[i].join();
- if (e == null)
- e = jobs[i].getException();
- }
- if (e != null) throw e;
- }
-
- private static final class TestJob implements Runnable
- {
- private final String jobName;
- private final Endpoint proxy;
- private final int countOfRequests;
- private Exception exception;
- private static final Logger log = Logger.getLogger(TestJob.class);
-
- TestJob(Endpoint proxy, int countOfRequests, String jobName)
- {
- this.proxy = proxy;
- this.countOfRequests = countOfRequests;
- this.jobName = jobName;
- }
-
- public void run()
- {
- try
- {
- for (int i = 0; i < this.countOfRequests; i++)
- {
- this.setRequestParameter(proxy, i);
- int retVal = proxy.getRequestParameter(jobName);
- log.debug("Thread=" + this.jobName + ", iteration=" + i);
- if (retVal != (i + 1))
- throw new RuntimeException("Thread=" + this.jobName + ", iteration=" + i + ", received=" + retVal);
- assertNotNull(this.getResponseHeaders(proxy));
- }
- }
- catch (Exception e)
- {
- log.error("Exception caught: " + e.getMessage());
- this.exception = e;
- }
- }
-
- @SuppressWarnings("unchecked")
- private Map<String, List<String>> getResponseHeaders(Endpoint proxy)
- {
- BindingProvider bp = (BindingProvider)proxy;
-
- return (Map<String, List<String>>)bp.getResponseContext().get(MessageContext.HTTP_RESPONSE_HEADERS);
- }
-
- @SuppressWarnings("unchecked")
- private void setRequestParameter(Endpoint proxy, int value)
- {
- BindingProvider bp = (BindingProvider)proxy;
-
- Map<String, List<String>> requestHeaders = (Map<String, List<String>>)bp.getRequestContext().get(MessageContext.HTTP_REQUEST_HEADERS);
- if (requestHeaders == null)
- {
- requestHeaders = new HashMap<String, List<String>>();
- }
- List<String> encodedValue = new LinkedList<String>();
- encodedValue.add(String.valueOf(value));
- requestHeaders.put("extension-header", encodedValue);
- bp.getRequestContext().put(MessageContext.HTTP_REQUEST_HEADERS, requestHeaders);
- }
-
- Exception getException()
- {
- return this.exception;
- }
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java (from rev 11949, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java 2010-04-07 10:52:08 UTC (rev 11951)
@@ -0,0 +1,161 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws2982;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.MessageContext;
+
+import junit.framework.Test;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2982] Native ignores user specified MessageContext.HTTP_REQUEST_HEADERS
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS2982TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2982TestCase.class, "jaxws-jbws2982.war");
+ }
+ private static final int THREADS_COUNT = 1;
+ private static final int REQUESTS_COUNT = 1;
+ private final Endpoint[] proxies = new Endpoint[THREADS_COUNT];
+ private final Thread[] threads = new Thread[THREADS_COUNT];
+ private final TestJob[] jobs = new TestJob[THREADS_COUNT];
+ private final Logger log = Logger.getLogger(this.getClass());
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName("http://jboss.org/jbws2982", "EndpointService");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2982" + "?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ for (int i = 0; i < THREADS_COUNT; i++)
+ proxies[i] = service.getPort(Endpoint.class);
+ }
+
+ public void testEndpointConcurrently() throws Exception
+ {
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ log.debug("Creating thread " + (i + 1));
+ jobs[i] = new TestJob(proxies[i], REQUESTS_COUNT, "TestJob" + i);
+ threads[i] = new Thread(jobs[i]);
+ }
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ log.debug("Starting thread " + (i + 1));
+ threads[i].start();
+ }
+ Exception e = null;
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ log.debug("Joining thread " + (i + 1));
+ threads[i].join();
+ if (e == null)
+ e = jobs[i].getException();
+ }
+ if (e != null) throw e;
+ }
+
+ private static final class TestJob implements Runnable
+ {
+ private final String jobName;
+ private final Endpoint proxy;
+ private final int countOfRequests;
+ private Exception exception;
+ private static final Logger log = Logger.getLogger(TestJob.class);
+
+ TestJob(Endpoint proxy, int countOfRequests, String jobName)
+ {
+ this.proxy = proxy;
+ this.countOfRequests = countOfRequests;
+ this.jobName = jobName;
+ }
+
+ public void run()
+ {
+ try
+ {
+ for (int i = 0; i < this.countOfRequests; i++)
+ {
+ this.setRequestParameter(proxy, i);
+ int retVal = proxy.getRequestParameter(jobName);
+ log.debug("Thread=" + this.jobName + ", iteration=" + i);
+ if (retVal != (i + 1))
+ throw new RuntimeException("Thread=" + this.jobName + ", iteration=" + i + ", received=" + retVal);
+ assertNotNull(this.getResponseHeaders(proxy));
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Exception caught: " + e.getMessage());
+ this.exception = e;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private Map<String, List<String>> getResponseHeaders(Endpoint proxy)
+ {
+ BindingProvider bp = (BindingProvider)proxy;
+
+ return (Map<String, List<String>>)bp.getResponseContext().get(MessageContext.HTTP_RESPONSE_HEADERS);
+ }
+
+ @SuppressWarnings("unchecked")
+ private void setRequestParameter(Endpoint proxy, int value)
+ {
+ BindingProvider bp = (BindingProvider)proxy;
+
+ Map<String, List<String>> requestHeaders = (Map<String, List<String>>)bp.getRequestContext().get(MessageContext.HTTP_REQUEST_HEADERS);
+ if (requestHeaders == null)
+ {
+ requestHeaders = new HashMap<String, List<String>>();
+ }
+ List<String> encodedValue = new LinkedList<String>();
+ encodedValue.add(String.valueOf(value));
+ requestHeaders.put("extension-header", encodedValue);
+ bp.getRequestContext().put(MessageContext.HTTP_REQUEST_HEADERS, requestHeaders);
+ }
+
+ Exception getException()
+ {
+ return this.exception;
+ }
+ }
+}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982 (from rev 11949, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982)
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF (from rev 11949, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml 2010-04-07 10:52:08 UTC (rev 11951)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2982.EndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml (from rev 11949, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml 2010-04-07 10:52:08 UTC (rev 11951)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2982.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
14 years, 1 month
JBossWS SVN: r11950 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-07 06:05:46 -0400 (Wed, 07 Apr 2010)
New Revision: 11950
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-2989] Updating excludes
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-07 10:05:46 UTC (rev 11950)
@@ -62,6 +62,9 @@
# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3
org/jboss/test/ws/jaxrpc/**
+# [JBWS-2989] Write published wsdl to file on deploy
+org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.*
+
# These tests require JAX-WS 2.2 API
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-07 10:05:46 UTC (rev 11950)
@@ -62,6 +62,9 @@
# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3
org/jboss/test/ws/jaxrpc/**
+# [JBWS-2989] Write published wsdl to file on deploy
+org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.*
+
# These tests require JAX-WS 2.2 API
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-07 10:05:46 UTC (rev 11950)
@@ -62,6 +62,9 @@
# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3
org/jboss/test/ws/jaxrpc/**
+# [JBWS-2989] Write published wsdl to file on deploy
+org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.*
+
# These tests require JAX-WS 2.2 API
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-07 10:01:01 UTC (rev 11949)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-07 10:05:46 UTC (rev 11950)
@@ -53,6 +53,9 @@
# [JBWS-2915] WSDL metadata is missing in EPR
org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceTestCase.*
+# [JBWS-2989] Write published wsdl to file on deploy
+org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.*
+
# These tests require JAX-WS 2.2 API
org/jboss/test/ws/jaxws/jbws2960/**
org/jboss/test/ws/jaxws/jbws2985/**
14 years, 1 month
JBossWS SVN: r11949 - 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: 2010-04-07 06:01:01 -0400 (Wed, 07 Apr 2010)
New Revision: 11949
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-2982] providing test case and fixing MessageContext.HTTP_*_HEADERS propagation issue
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-04-07 09:58:04 UTC (rev 11948)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2010-04-07 10:01:01 UTC (rev 11949)
@@ -358,10 +358,14 @@
boolean maintainSession = shouldMaintainSession();
if (maintainSession)
addSessionInfo(reqMessage, callProps);
+
+ propagateRequestHeaders(reqMessage, msgContext);
RemoteConnection remoteConnection = new RemoteConnectionFactory().getRemoteConnection(epInfo);
MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway);
+ propagateResponseHeaders(callProps, msgContext);
+
if (maintainSession)
saveSessionInfo(callProps, requestCtx);
@@ -451,6 +455,11 @@
closeHandlerChain(portName, handlerType[0]);
}
}
+
+ private void propagateResponseHeaders(Map<String, Object> remotingMetadata, Map<String, Object> responseContext)
+ {
+ responseContext.put(MessageContext.HTTP_RESPONSE_HEADERS, remotingMetadata.get(NettyClient.RESPONSE_HEADERS));
+ }
private void saveSessionInfo(Map<String, Object> remotingMetadata, Map<String, Object> requestContext)
{
@@ -505,6 +514,34 @@
}
}
}
+
+ private void propagateRequestHeaders(MessageAbstraction reqMessage, CommonMessageContext callProperties)
+ {
+ Map<String, List<String>> requestHeaders = (Map<String, List<String>>)callProperties.get(MessageContext.HTTP_REQUEST_HEADERS);
+ if (requestHeaders != null)
+ {
+ for (Map.Entry<String, List<String>> header : requestHeaders.entrySet())
+ {
+ final String key = header.getKey();
+ final List<String> values = header.getValue();
+
+ if (key != null)
+ {
+ final StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < values.size(); i++)
+ {
+ boolean addLWS = (i != (values.size() - 1));
+ sb.append(values.get(i));
+ if (addLWS)
+ {
+ sb.append("\r\n ");
+ }
+ }
+ reqMessage.getMimeHeaders().addHeader(key, sb.toString());
+ }
+ }
+ }
+ }
private CommonMessageContext processPivotInternal(CommonMessageContext msgContext, DirectionHolder direction)
{
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 2010-04-07 09:58:04 UTC (rev 11948)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-04-07 10:01:01 UTC (rev 11949)
@@ -644,7 +644,15 @@
</webinf>
</war>
- <!-- jaxws-webserviceref -->
+ <!-- jaxws-jbws2982 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2982.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2982/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2982/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2982/*TestCase*.class" />
+ </classes>
+ </war>
+
+ <!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/>
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/Endpoint.java 2010-04-07 10:01:01 UTC (rev 11949)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws2982;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint interface.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(name="Endpoint", targetNamespace="http://jboss.org/jbws2982")
+public interface Endpoint
+{
+ @WebMethod
+ public int getRequestParameter(String key);
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/EndpointImpl.java 2010-04-07 10:01:01 UTC (rev 11949)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws2982;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * Endpoint implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ targetNamespace="http://jboss.org/jbws2982",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2982.Endpoint"
+)
+public class EndpointImpl implements Endpoint
+{
+ @Resource
+ WebServiceContext ctx;
+
+ private int getRequestParameterInternal(String key)
+ {
+ int ctxValue = this.getValue(this.ctx, key);
+
+ return ++ctxValue;
+ }
+
+ private int getValue(WebServiceContext wsCtx, String paramKey)
+ {
+ Map<String, List<String>> requestHeaders = (Map<String, List<String>>)wsCtx.getMessageContext().get(MessageContext.HTTP_REQUEST_HEADERS);
+
+ return Integer.valueOf(requestHeaders.get("extension-header").get(0));
+ }
+
+ @WebMethod
+ public int getRequestParameter(String key)
+ {
+ return this.getRequestParameterInternal(key);
+ }
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2982/JBWS2982TestCase.java 2010-04-07 10:01:01 UTC (rev 11949)
@@ -0,0 +1,162 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws2982;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.MessageContext;
+
+import junit.framework.Test;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2982] Native ignores user specified MessageContext.HTTP_REQUEST_HEADERS
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS2982TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2982TestCase.class, "jaxws-jbws2982.war");
+ }
+ private static final int THREADS_COUNT = 5;
+ private static final int REQUESTS_COUNT = 5;
+ private static final String ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2982";
+ private final Endpoint[] proxies = new Endpoint[THREADS_COUNT];
+ private final Thread[] threads = new Thread[THREADS_COUNT];
+ private final TestJob[] jobs = new TestJob[THREADS_COUNT];
+ private final Logger log = Logger.getLogger(this.getClass());
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName("http://jboss.org/jbws2982", "EndpointService");
+ URL wsdlURL = new URL(ENDPOINT_ADDRESS + "?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ for (int i = 0; i < THREADS_COUNT; i++)
+ proxies[i] = service.getPort(Endpoint.class);
+ }
+
+ public void testEndpointConcurrently() throws Exception
+ {
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ log.debug("Creating thread " + (i + 1));
+ jobs[i] = new TestJob(proxies[i], REQUESTS_COUNT, "TestJob" + i);
+ threads[i] = new Thread(jobs[i]);
+ }
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ log.debug("Starting thread " + (i + 1));
+ threads[i].start();
+ }
+ Exception e = null;
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ log.debug("Joining thread " + (i + 1));
+ threads[i].join();
+ if (e == null)
+ e = jobs[i].getException();
+ }
+ if (e != null) throw e;
+ }
+
+ private static final class TestJob implements Runnable
+ {
+ private final String jobName;
+ private final Endpoint proxy;
+ private final int countOfRequests;
+ private Exception exception;
+ private static final Logger log = Logger.getLogger(TestJob.class);
+
+ TestJob(Endpoint proxy, int countOfRequests, String jobName)
+ {
+ this.proxy = proxy;
+ this.countOfRequests = countOfRequests;
+ this.jobName = jobName;
+ }
+
+ public void run()
+ {
+ try
+ {
+ for (int i = 0; i < this.countOfRequests; i++)
+ {
+ this.setRequestParameter(proxy, i);
+ int retVal = proxy.getRequestParameter(jobName);
+ log.debug("Thread=" + this.jobName + ", iteration=" + i);
+ if (retVal != (i + 1))
+ throw new RuntimeException("Thread=" + this.jobName + ", iteration=" + i + ", received=" + retVal);
+ assertNotNull(this.getResponseHeaders(proxy));
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Exception caught: " + e.getMessage());
+ this.exception = e;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private Map<String, List<String>> getResponseHeaders(Endpoint proxy)
+ {
+ BindingProvider bp = (BindingProvider)proxy;
+
+ return (Map<String, List<String>>)bp.getResponseContext().get(MessageContext.HTTP_RESPONSE_HEADERS);
+ }
+
+ @SuppressWarnings("unchecked")
+ private void setRequestParameter(Endpoint proxy, int value)
+ {
+ BindingProvider bp = (BindingProvider)proxy;
+
+ Map<String, List<String>> requestHeaders = (Map<String, List<String>>)bp.getRequestContext().get(MessageContext.HTTP_REQUEST_HEADERS);
+ if (requestHeaders == null)
+ {
+ requestHeaders = new HashMap<String, List<String>>();
+ }
+ List<String> encodedValue = new LinkedList<String>();
+ encodedValue.add(String.valueOf(value));
+ requestHeaders.put("extension-header", encodedValue);
+ bp.getRequestContext().put(MessageContext.HTTP_REQUEST_HEADERS, requestHeaders);
+ }
+
+ Exception getException()
+ {
+ return this.exception;
+ }
+ }
+}
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2982/WEB-INF/web.xml 2010-04-07 10:01:01 UTC (rev 11949)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2982.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
14 years, 1 month
JBossWS SVN: r11948 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/samples/eardeployment and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-07 05:58:04 -0400 (Wed, 07 Apr 2010)
New Revision: 11948
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
Modified:
framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml
Log:
[JBWS-2971] Adding testcase
Modified: framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-04-07 02:33:24 UTC (rev 11947)
+++ framework/trunk/testsuite/test/ant-import/build-samples-jaxws.xml 2010-04-07 09:58:04 UTC (rev 11948)
@@ -58,6 +58,7 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-eardeployment-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/eardeployment/WEB-INF">
<include name="jboss-web.xml"/>
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java 2010-04-07 09:58:04 UTC (rev 11948)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.eardeployment;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+
+/**
+ * A servlet for returning the current data dir from the server config;
+ * this is required for WSDLPublishTestCase.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 07-Apr-2010
+ *
+ */
+public class SupportServlet extends HttpServlet
+{
+ private static final long serialVersionUID = 1L;
+
+ private File dataDir;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ res.getWriter().print(getDataDir().getAbsolutePath());
+ }
+
+ private File getDataDir()
+ {
+ if (dataDir == null)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ dataDir = serverConfig.getServerDataDir();
+ }
+ return dataDir;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/SupportServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2010-04-07 09:58:04 UTC (rev 11948)
@@ -0,0 +1,114 @@
+/*
+ * 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.samples.eardeployment;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test the wsdl is published to local filesystem; this test assumes
+ * client and server share the filesystem.
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class WSDLPublishTestCase extends JBossWSTest
+{
+ private File wsdlFileDir;
+ private static long testStart;
+
+ public static Test suite()
+ {
+ testStart = System.currentTimeMillis();
+ return new JBossWSTestSetup(WSDLPublishTestCase.class, "jaxws-samples-eardeployment.ear");
+ }
+
+ public void testEJB3Endpoint() throws Exception
+ {
+ String soapAddress = "http://" + getServerHost() + ":8080/earejb3/Endpoint";
+ QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
+
+ File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator
+ + "jaxws-samples-eardeployment-ejb3.jar" + File.separator + "Endpoint.wsdl");
+
+ assertTrue("Wsdl file not found", file.exists());
+ assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000);
+
+ URL wsdlUrl = file.toURI().toURL();
+
+ Service service = Service.create(wsdlUrl, serviceName);
+ Endpoint port = service.getPort(Endpoint.class);
+
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress);
+
+ String helloWorld = "Hello world!";
+ String retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
+
+ public void testJSEEndpoint() throws Exception
+ {
+ String soapAddress = "http://" + getServerHost() + ":8080/earjse/JSEBean";
+ QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
+
+ File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator
+ + "jaxws-samples-eardeployment-pojo.war" + File.separator + "Endpoint.wsdl");
+
+ assertTrue("Wsdl file not found", file.exists());
+ assertTrue("Stale wsdl file found", file.lastModified() > testStart - 1000);
+
+ URL wsdlUrl = file.toURI().toURL();
+
+ Service service = Service.create(wsdlUrl, serviceName);
+ Endpoint port = service.getPort(Endpoint.class);
+
+ BindingProvider bp = (BindingProvider)port;
+ bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, soapAddress);
+
+ String helloWorld = "Hello world!";
+ String retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+ }
+
+ private File getWsdlFileDir() throws IOException
+ {
+ if (wsdlFileDir == null)
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/earjse/support");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ wsdlFileDir = new File(br.readLine(), "wsdl");
+ }
+ return wsdlFileDir;
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml 2010-04-07 02:33:24 UTC (rev 11947)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/eardeployment/WEB-INF/web.xml 2010-04-07 09:58:04 UTC (rev 11948)
@@ -14,6 +14,16 @@
<servlet-name>TestService</servlet-name>
<url-pattern>/JSEBean/*</url-pattern>
</servlet-mapping>
+
+ <servlet>
+ <servlet-name>SupportServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.eardeployment.SupportServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SupportServlet</servlet-name>
+ <url-pattern>/support/*</url-pattern>
+ </servlet-mapping>
</web-app>
14 years, 1 month
JBossWS SVN: r11946 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-06 11:04:58 -0400 (Tue, 06 Apr 2010)
New Revision: 11946
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-2987] excluding jms tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-06 14:05:18 UTC (rev 11945)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-04-06 15:04:58 UTC (rev 11946)
@@ -60,4 +60,4 @@
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
-org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.*
+org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-06 14:05:18 UTC (rev 11945)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-04-06 15:04:58 UTC (rev 11946)
@@ -60,4 +60,4 @@
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
-org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.*
+org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-06 14:05:18 UTC (rev 11945)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-04-06 15:04:58 UTC (rev 11946)
@@ -60,4 +60,4 @@
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
-org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.*
+org/jboss/test/ws/jaxws/samples/jmstransport/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-06 14:05:18 UTC (rev 11945)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-04-06 15:04:58 UTC (rev 11946)
@@ -54,4 +54,4 @@
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
# [JBWS-2987] Review JMS integration
-org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.*
+org/jboss/test/ws/jaxws/samples/jmstransport/**
14 years, 1 month
JBossWS SVN: r11945 - common/trunk/src/main/java/org/jboss/ws.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-06 10:05:18 -0400 (Tue, 06 Apr 2010)
New Revision: 11945
Modified:
common/trunk/src/main/java/org/jboss/ws/Constants.java
Log:
[JBWS-2974] Setting eager bus load as default
Modified: common/trunk/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/Constants.java 2010-04-06 13:43:18 UTC (rev 11944)
+++ common/trunk/src/main/java/org/jboss/ws/Constants.java 2010-04-06 14:05:18 UTC (rev 11945)
@@ -329,5 +329,5 @@
static final boolean BC_CONTEXT_MODE = Boolean.parseBoolean(System.getProperty("org.jboss.ws.backward_compatible_context_creator", "false"));
- static final boolean LAZY_LOAD_CXF_BUS = Boolean.parseBoolean(System.getProperty("org.jboss.ws.lazyLoadCxfBus", "true"));
+ static final boolean LAZY_LOAD_CXF_BUS = Boolean.parseBoolean(System.getProperty("org.jboss.ws.lazyLoadCxfBus", "false"));
}
14 years, 1 month
JBossWS SVN: r11944 - in stack/metro/trunk: modules/client and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-04-06 09:43:18 -0400 (Tue, 06 Apr 2010)
New Revision: 11944
Modified:
stack/metro/trunk/modules/client/pom.xml
stack/metro/trunk/pom.xml
Log:
[JBWS-2988] Adding dependency on jboss-logging
Modified: stack/metro/trunk/modules/client/pom.xml
===================================================================
--- stack/metro/trunk/modules/client/pom.xml 2010-04-06 13:22:05 UTC (rev 11943)
+++ stack/metro/trunk/modules/client/pom.xml 2010-04-06 13:43:18 UTC (rev 11944)
@@ -86,6 +86,14 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
<dependency>
<groupId>javax.jws</groupId>
@@ -118,7 +126,7 @@
<customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
</manifest>
<manifestEntries>
- <Class-Path>jbossws-framework.jar jaxws-common.jar jaxws-api.jar stax-api.jar wstx.jar</Class-Path>
+ <Class-Path>jbossws-framework.jar jaxws-common.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2010-04-06 13:22:05 UTC (rev 11943)
+++ stack/metro/trunk/pom.xml 2010-04-06 13:43:18 UTC (rev 11944)
@@ -57,6 +57,7 @@
-->
<!-- END -->
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
+ <jboss.logging.version>2.2.0.CR1</jboss.logging.version>
<commons.logging.version>1.1.1</commons.logging.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12</jaxb.impl.version>
@@ -304,6 +305,16 @@
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${jboss.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${jboss.logging.version}</version>
+ </dependency>
<dependency>
<groupId>javax.jws</groupId>
14 years, 1 month