JBossWS SVN: r13636 - in common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common: invocation and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 07:22:32 -0500 (Fri, 28 Jan 2011)
New Revision: 13636
Added:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java
Log:
[JBPAPP-5052] backporting ThreadLocal aware WebServiceContext implementation
Added: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java (rev 0)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java 2011-01-28 12:22:32 UTC (rev 13636)
@@ -0,0 +1,57 @@
+/*
+ * 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.wsf.common.invocation;
+
+import java.security.Principal;
+
+import javax.ejb.EJBContext;
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.wsf.spi.invocation.WebServiceContextDelegate;
+
+/**
+ * EJB web service context which security related methods delegate to EJB container.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class WebServiceContextEJB extends WebServiceContextDelegate
+{
+
+ public WebServiceContextEJB(final WebServiceContext ctx)
+ {
+ super(ctx);
+ }
+
+ public Principal getUserPrincipal()
+ {
+ final EJBContext ejbContext = getAttachment(EJBContext.class);
+ return ejbContext.getCallerPrincipal();
+ }
+
+ public boolean isUserInRole(String role)
+ {
+ final EJBContext ejbContext = getAttachment(EJBContext.class);
+ return ejbContext.isCallerInRole(role);
+ }
+
+}
Added: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java (rev 0)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java 2011-01-28 12:22:32 UTC (rev 13636)
@@ -0,0 +1,65 @@
+/*
+ * 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.wsf.common.invocation;
+
+import java.security.Principal;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.wsf.spi.invocation.WebServiceContextDelegate;
+
+/**
+ * JSE web service context which security related methods delegate to servlet container.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WebServiceContextJSE extends WebServiceContextDelegate
+{
+
+ private final HttpServletRequest httpRequest;
+
+ public WebServiceContextJSE(final WebServiceContext ctx)
+ {
+ super(ctx);
+
+ if (ctx.getMessageContext().get(MessageContext.SERVLET_REQUEST) == null)
+ throw new IllegalStateException("Cannot obtain HttpServletRequest from message context");
+
+ this.httpRequest = (HttpServletRequest)ctx.getMessageContext().get(MessageContext.SERVLET_REQUEST);
+ }
+
+ @Override
+ public Principal getUserPrincipal()
+ {
+ return this.httpRequest.getUserPrincipal();
+ }
+
+ @Override
+ public boolean isUserInRole(String role)
+ {
+ return this.httpRequest.isUserInRole(role);
+ }
+
+}
13 years, 11 months
JBossWS SVN: r13635 - in framework/branches/jbossws-framework-3.1.2/testsuite/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 07:21:00 -0500 (Fri, 28 Jan 2011)
New Revision: 13635
Added:
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/
framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml
Modified:
framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBPAPP-5052] providing test cases for ThreadLocal aware WebServiceContext
Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2011-01-28 12:18:02 UTC (rev 13634)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/ant-import/build-jars-jaxws.xml 2011-01-28 12:21:00 UTC (rev 13635)
@@ -755,6 +755,23 @@
</fileset>
</jar>
+ <!-- jaxws-jbws2934 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2934.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2934/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" />
+ </classes>
+ </war>
+
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2934.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" />
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws2955 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2955.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2955/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java 2011-01-28 12:21:00 UTC (rev 13635)
@@ -0,0 +1,86 @@
+/*
+ * 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.jbws2934;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * Abstract endpoint implementation reused in both JSE and EJB endpoint.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+abstract class AbstractEndpoint implements Endpoint
+{
+
+ protected AbstractEndpoint()
+ {
+ super();
+ }
+
+ @Resource
+ WebServiceContext wsCtx1;
+ WebServiceContext wsCtx2;
+
+ @Resource
+ void setWebServiceContext(WebServiceContext wsCtx)
+ {
+ this.wsCtx2 = wsCtx;
+ }
+
+ @PostConstruct
+ private void init()
+ {
+ this.assertWebServiceContexts();
+ }
+
+ protected int getQueryParameterInternal(String key)
+ {
+ this.assertWebServiceContexts();
+ int ctx1Value = this.getValue(this.wsCtx1, key);
+ int ctx2Value = this.getValue(this.wsCtx2, key);
+ if (ctx1Value != ctx2Value)
+ throw new WebServiceException("Values have to be equivalent, they're comming from the same request");
+
+ return ++ctx1Value;
+ }
+
+ protected int getValue(WebServiceContext wsCtx, String queryKey)
+ {
+ HttpServletRequest servletReq = (HttpServletRequest)wsCtx.getMessageContext().get(MessageContext.SERVLET_REQUEST);
+ String queryString = servletReq.getQueryString();
+ int equalsSignPosition = queryString.indexOf('=');
+ return Integer.valueOf(queryString.substring(equalsSignPosition + 1));
+ }
+
+ protected void assertWebServiceContexts()
+ {
+ if (this.wsCtx1 == null)
+ throw new WebServiceException("Web service context 1 is null");
+ if (this.wsCtx2 == null)
+ throw new WebServiceException("Web service context 2 is null");
+ }
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2011-01-28 12:21:00 UTC (rev 13635)
@@ -0,0 +1,133 @@
+/*
+ * 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.jbws2934;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+abstract class AbstractTestCase extends JBossWSTest
+{
+ private static final int THREADS_COUNT = 20;
+ private static final int REQUESTS_COUNT = 20;
+ private static String endpointAddress;
+ 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/jbws2934", "EndpointService");
+ endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2934";
+ URL wsdlURL = new URL(endpointAddress + "?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.setQueryParameter(proxy, i);
+ int retVal = proxy.getQueryParameter(jobName);
+ log.debug("Thread=" + this.jobName + ", iteration=" + i);
+ if (retVal != (i + 1))
+ throw new RuntimeException("Thread=" + this.jobName + ", iteration=" + i + ", received=" + retVal);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Exception caught: " + e.getMessage());
+ this.exception = e;
+ }
+ }
+
+ private void setQueryParameter(Endpoint proxy, int value)
+ {
+ BindingProvider bp = (BindingProvider)proxy;
+ String queryString = "?" + this.jobName + "=" + value;
+ bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress + queryString);
+ }
+
+ Exception getException()
+ {
+ return this.exception;
+ }
+ }
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java 2011-01-28 12:21:00 UTC (rev 13635)
@@ -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.jbws2934;
+
+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/jbws2934")
+public interface Endpoint
+{
+ @WebMethod
+ public int getQueryParameter(String key);
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java 2011-01-28 12:21:00 UTC (rev 13635)
@@ -0,0 +1,60 @@
+/*
+ * 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.jbws2934;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.ws.WebServiceException;
+
+import javax.ejb.Stateless;
+import org.jboss.wsf.spi.annotation.AuthMethod;
+import org.jboss.wsf.spi.annotation.TransportGuarantee;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * Endpoint EJB implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@Stateless
+@WebService
+(
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ targetNamespace="http://jboss.org/jbws2934",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint"
+)
+@WebContext
+(
+ contextRoot = "/jaxws-jbws2934",
+ urlPattern = "/*"
+)
+public class EndpointEJB extends AbstractEndpoint
+{
+ @WebMethod
+ public int getQueryParameter(String key)
+ {
+ return super.getQueryParameterInternal(key);
+ }
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java 2011-01-28 12:21:00 UTC (rev 13635)
@@ -0,0 +1,46 @@
+/*
+ * 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.jbws2934;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint JSE implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ targetNamespace="http://jboss.org/jbws2934",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint"
+)
+public class EndpointJSE extends AbstractEndpoint
+{
+ @WebMethod
+ public int getQueryParameter(String key)
+ {
+ return super.getQueryParameterInternal(key);
+ }
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2011-01-28 12:21:00 UTC (rev 13635)
@@ -0,0 +1,39 @@
+/*
+ * 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.jbws2934;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - EJB version.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS2934EJBTestCase extends AbstractTestCase
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2934EJBTestCase.class, "jaxws-jbws2934.jar");
+ }
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2011-01-28 12:21:00 UTC (rev 13635)
@@ -0,0 +1,39 @@
+/*
+ * 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.jbws2934;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - JSE version.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS2934JSETestCase extends AbstractTestCase
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2934JSETestCase.class, "jaxws-jbws2934.war");
+ }
+}
Added: framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml (rev 0)
+++ framework/branches/jbossws-framework-3.1.2/testsuite/test/resources/jaxws/jbws2934/WEB-INF/web.xml 2011-01-28 12:21:00 UTC (rev 13635)
@@ -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.jbws2934.EndpointJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
13 years, 11 months
JBossWS SVN: r13634 - stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-28 07:18:02 -0500 (Fri, 28 Jan 2011)
New Revision: 13634
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
Log:
[JBPAPP-4971] CXF Install build.xml creates files inappropriately on EWP
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2011-01-28 10:37:46 UTC (rev 13633)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2011-01-28 12:18:02 UTC (rev 13634)
@@ -40,23 +40,29 @@
<import file="${build.dir}/jbossws-installer-macros.xml"/>
- <target name="secure-console">
+ <target name="secure-console" depends="secure-all,secure-web,secure-production,secure-standard,secure-default"/>
+
+ <target name="secure-all" if="jbossws.all.available">
<!-- all -->
<copy file="build/web.xml" tofile="${jboss510.home}/server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
<copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
-
+ </target>
+ <target name="secure-production" if="jbossws.production.available">
<!-- production -->
<copy file="build/web.xml" tofile="${jboss510.home}/server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
<copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
-
+ </target>
+ <target name="secure-web" if="jbossws.web.available">
<!-- web -->
<copy file="build/web.xml" tofile="${jboss510.home}/server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
<copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
-
+ </target>
+ <target name="secure-standard" if="jbossws.standard.available">
<!-- standard -->
<copy file="build/web.xml" tofile="${jboss510.home}/server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
<copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
-
+ </target>
+ <target name="secure-default" if="jbossws.default.available">
<!-- default -->
<copy file="build/web.xml" tofile="${jboss510.home}/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
<copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
@@ -93,4 +99,4 @@
<delete dir="${output.dir}"/>
</target>
-</project>
\ No newline at end of file
+</project>
13 years, 11 months
JBossWS SVN: r13633 - in stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3: modules/dist/src/main/scripts and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-28 05:37:46 -0500 (Fri, 28 Jan 2011)
New Revision: 13633
Removed:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
Log:
Clean up exclude test files and zip binaray distribution in the stack.output.dir
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-28 10:20:07 UTC (rev 13632)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-28 10:37:46 UTC (rev 13633)
@@ -18,6 +18,7 @@
<property name="dist.dir" value="${stack.dir}/modules/dist"/>
<property name="dist.distro.dir" value="${dist.dir}/src/main/distro"/>
<property name="dist.output.dir" value="${dist.dir}/target"/>
+ <property name="stack.output.dir" value="${stack.dir}/target"/>
<property name="stack.modules.dir" value="${stack.dir}/modules"/>
<property name="stack.management.dir" value="${stack.modules.dir}/management"/>
<property name="stack.client.dir" value="${stack.modules.dir}/client"/>
@@ -111,7 +112,7 @@
</exec>
</target>
- <target name="build-bin-dist" depends="prepare,os-init" description="Build the binary distribution">
+ <target name="build-bin-dist" depends="prepare,os-init,makedir" description="Build the binary distribution">
<!-- Use a system property to overwrite the empty default value -->
<property name="maven.opts" value=""/>
@@ -121,10 +122,10 @@
<delete dir="${dist.output.dir}/jbossws-cxf-bin-dist"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Pdist -Dbindist install"/>
+ <arg line="${maven.opts} -Pdist -Dbindist clean install"/>
</exec>
- <zip destfile="${dist.output.dir}/jbossws-cxf-bin-dist.zip">
+ <zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip">
<zipfileset
dir="${dist.output.dir}/assembly/jbossws-cxf-bin-dist"
includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example"
@@ -132,12 +133,12 @@
</zip>
</target>
- <target name="build-src-dist" depends="prepare,os-init" description="Build the source distribution">
+ <target name="build-src-dist" depends="prepare,os-init,makedir" description="Build the source distribution">
<!-- Use a system property to overwrite the empty default value -->
<property name="maven.opts" value=""/>
<echo/>
- <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist install"/>
+ <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist clean install"/>
<echo/>
<delete dir="${dist.output.dir}/jbossws-cxf-src-dist"/>
@@ -145,12 +146,21 @@
<arg line="${maven.opts} -Pdist -Dsrcdist install"/>
</exec>
- <zip destfile="${dist.output.dir}/jbossws-cxf-src-dist.zip">
+ <zip destfile="${stack.output.dir}/jbossws-cxf-src-dist.zip">
<zipfileset
dir="${dist.output.dir}/assembly/jbossws-cxf-src-dist"
includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project"
prefix="jbossws-cxf-src-dist"/>
</zip>
</target>
+
+
+ <target name="check.exist">
+ <available file="${stack.output.dir}" property="file.exists" value="true" />
+ </target>
+
+ <target name="makedir" depends="check.exist" unless="file.exists">
+ <mkdir dir="${stack.output.dir}" />
+ </target>
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-28 10:20:07 UTC (rev 13632)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-28 10:37:46 UTC (rev 13633)
@@ -34,14 +34,13 @@
</includes>
</fileSet>
<fileSet>
- <directory></directory>
+ <directory>../../</directory>
<outputDirectory>jbossws-cxf-src-dist/</outputDirectory>
<includes>
<include>.classpath</include>
<include>.project</include>
<include>build.xml</include>
<include>pom.xml</include>
- <include>profiles.xml.example</include>
</includes>
</fileSet>
</fileSets>
Deleted: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt 2011-01-28 10:20:07 UTC (rev 13632)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss600.txt 2011-01-28 10:37:46 UTC (rev 13633)
@@ -1,26 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [CXF-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBAS-8363] Virtual host issue in JBossWeb
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# Seems MSFT interop. endpoints are down :(
-org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
Deleted: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt 2011-01-28 10:20:07 UTC (rev 13632)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/test-excludes-jboss601.txt 2011-01-28 10:37:46 UTC (rev 13633)
@@ -1,26 +0,0 @@
-# UsernameTestCase requires trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [CXF-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBAS-8363] Virtual host issue in JBossWeb
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# Seems MSFT interop. endpoints are down :(
-org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
13 years, 11 months
JBossWS SVN: r13632 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 05:20:07 -0500 (Fri, 28 Jan 2011)
New Revision: 13632
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBPAPP-5748] configure remoting to prevent socket leaks
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-28 10:17:37 UTC (rev 13631)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-28 10:20:07 UTC (rev 13632)
@@ -75,6 +75,8 @@
private static Logger log = Logger.getLogger(HTTPRemotingConnection.class);
private static final String REMOTING_DESTRUCTION_DELAY =
System.getProperty("org.jboss.ws.client.remoting.destruction.delay", "5000");
+ private static final String REMOTING_DISCONNECT_AFTER_USE =
+ System.getProperty("org.jboss.ws.client.remoting.disconnect.after.use", "true");
private Map<String, Object> clientConfig = new HashMap<String, Object>();
@@ -203,6 +205,9 @@
locator = new InvokerLocator(targetAddress);
locator.getParameters().put(Client.INVOKER_DESTRUCTION_DELAY, REMOTING_DESTRUCTION_DELAY); // [JBPAPP-5826] reuse SSL sessions
+ // TODO: Use HTTPClientInvoker.DISCONNECT_AFTER_USE instead of hardcoded string
+ // "disconnectAfterUse" once Remoting 2.5.3.SP2 is released to maven repository.
+ locator.getParameters().put("disconnectAfterUse", REMOTING_DISCONNECT_AFTER_USE); // [JBPAPP-5748] prevent socket leaks
}
catch (MalformedURLException e)
{
13 years, 11 months
JBossWS SVN: r13631 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 05:17:37 -0500 (Fri, 28 Jan 2011)
New Revision: 13631
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBPAPP-5826] document patch code
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-28 08:33:13 UTC (rev 13630)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-28 10:17:37 UTC (rev 13631)
@@ -74,7 +74,7 @@
// provide logging
private static Logger log = Logger.getLogger(HTTPRemotingConnection.class);
private static final String REMOTING_DESTRUCTION_DELAY =
- System.getProperty("org.jboss.ws.client.remoting.destruction.delay", "5000");
+ System.getProperty("org.jboss.ws.client.remoting.destruction.delay", "5000");
private Map<String, Object> clientConfig = new HashMap<String, Object>();
@@ -202,7 +202,7 @@
}
locator = new InvokerLocator(targetAddress);
- locator.getParameters().put(Client.INVOKER_DESTRUCTION_DELAY, REMOTING_DESTRUCTION_DELAY);
+ locator.getParameters().put(Client.INVOKER_DESTRUCTION_DELAY, REMOTING_DESTRUCTION_DELAY); // [JBPAPP-5826] reuse SSL sessions
}
catch (MalformedURLException e)
{
13 years, 11 months
JBossWS SVN: r13630 - shared-testsuite/trunk/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-28 03:33:13 -0500 (Fri, 28 Jan 2011)
New Revision: 13630
Modified:
shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3205] Removing custom log manager setup; to be better investigated
Modified: shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-01-28 07:02:28 UTC (rev 13629)
+++ shared-testsuite/trunk/src/test/ant-import/build-testsuite.xml 2011-01-28 08:33:13 UTC (rev 13630)
@@ -504,7 +504,6 @@
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/>
<sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
@@ -555,7 +554,6 @@
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/>
<sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.wsf.common.logging.JDKLogManager"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/>
<sysproperty key="jboss.bind.address" value="${node0}"/>
13 years, 11 months
JBossWS SVN: r13629 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 02:02:28 -0500 (Fri, 28 Jan 2011)
New Revision: 13629
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
[JBPAPP-5826] configuring remoting to reuse SSL sessions
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-28 06:59:34 UTC (rev 13628)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-28 07:02:28 UTC (rev 13629)
@@ -73,6 +73,8 @@
{
// provide logging
private static Logger log = Logger.getLogger(HTTPRemotingConnection.class);
+ private static final String REMOTING_DESTRUCTION_DELAY =
+ System.getProperty("org.jboss.ws.client.remoting.destruction.delay", "5000");
private Map<String, Object> clientConfig = new HashMap<String, Object>();
@@ -200,6 +202,7 @@
}
locator = new InvokerLocator(targetAddress);
+ locator.getParameters().put(Client.INVOKER_DESTRUCTION_DELAY, REMOTING_DESTRUCTION_DELAY);
}
catch (MalformedURLException e)
{
13 years, 11 months
JBossWS SVN: r13628 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 01:59:34 -0500 (Fri, 28 Jan 2011)
New Revision: 13628
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
Log:
rollback revision 13617 - [JBPAPP-5748] configuring remoting to reuse SSL sessions
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-27 20:05:53 UTC (rev 13627)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2011-01-28 06:59:34 UTC (rev 13628)
@@ -73,8 +73,6 @@
{
// provide logging
private static Logger log = Logger.getLogger(HTTPRemotingConnection.class);
- private static final String REMOTING_DESTRUCTION_DELAY =
- System.getProperty("org.jboss.ws.client.remoting.destruction.delay", "5000");
private Map<String, Object> clientConfig = new HashMap<String, Object>();
@@ -202,7 +200,6 @@
}
locator = new InvokerLocator(targetAddress);
- locator.getParameters().put(Client.INVOKER_DESTRUCTION_DELAY, REMOTING_DESTRUCTION_DELAY);
}
catch (MalformedURLException e)
{
13 years, 11 months
JBossWS SVN: r13627 - stack/cxf/branches/JBPAPP-5764.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-27 15:05:53 -0500 (Thu, 27 Jan 2011)
New Revision: 13627
Modified:
stack/cxf/branches/JBPAPP-5764/pom.xml
Log:
Moving to Apache CXF 2.2.9
Modified: stack/cxf/branches/JBPAPP-5764/pom.xml
===================================================================
--- stack/cxf/branches/JBPAPP-5764/pom.xml 2011-01-27 19:39:50 UTC (rev 13626)
+++ stack/cxf/branches/JBPAPP-5764/pom.xml 2011-01-27 20:05:53 UTC (rev 13627)
@@ -52,7 +52,7 @@
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
-->
<!-- END -->
- <cxf.version>2.2.8</cxf.version>
+ <cxf.version>2.2.9</cxf.version>
<cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>3.1</cxf.asm.version>
13 years, 11 months