JBossWS SVN: r18298 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2014-01-30 17:44:04 -0500 (Thu, 30 Jan 2014)
New Revision: 18298
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsCallbackHandler.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsOutInterceptor.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties
Log:
[JBWS-3738] Working ActAs test.
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-30 22:44:04 UTC (rev 18298)
@@ -475,15 +475,11 @@
needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
<include
- name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsServiceIface.class"/>
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAs*.class"/>
<include
- name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsServiceImpl.class"/>
- <include
- name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsOutInterceptor.class"/>
- <include
name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/>
<include
- name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsCallbackHandler.class"/>
+ name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceIface.class"/>
</classes>
<webinf
dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF">
@@ -495,9 +491,15 @@
<include name="actasstore.jks"/>
<include name="actasKeystore.properties"/>
</zipfileset>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/META-INF"
+ prefix="META-INF">
+ <include name="clientstore.jks"/>
+ <include name="clientKeystore.properties"/>
+ </zipfileset>
<manifest>
<attribute name="Dependencies"
- value="org.jboss.ws.cxf.jbossws-cxf-client"/>
+ value="org.jboss.ws.cxf.jbossws-cxf-client, org.apache.cxf.impl"/>
</manifest>
</war>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsCallbackHandler.java 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsCallbackHandler.java 2014-01-30 22:44:04 UTC (rev 18298)
@@ -37,7 +37,7 @@
{
Map<String, String> passwords = new HashMap<String, String>();
passwords.put("myactaskey", "aspass");
- passwords.put("alice", "aspass");
+ passwords.put("alice", "clarinet");
return passwords;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsOutInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsOutInterceptor.java 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsOutInterceptor.java 2014-01-30 22:44:04 UTC (rev 18298)
@@ -27,6 +27,9 @@
import org.apache.cxf.message.Message;
import org.apache.cxf.interceptor.Fault;
+import java.util.ArrayList;
+import java.util.Set;
+
/**
* User: rsearls(a)redhat.com
* Date: 1/26/14
@@ -34,14 +37,13 @@
public class ActAsOutInterceptor extends AbstractPhaseInterceptor<Message> {
public ActAsOutInterceptor () {
- // This can be in any stage before the WS-SP interceptors
- // setup the STS client and issued token interceptor.
super(Phase.SETUP);
}
@Override
public void handleMessage(Message message) throws Fault {
- String tmpStr = "<wst:ActAs xmlns:wst=\"http://docs.oasis-open.org/ws-sx/ws-trust/200512\">eve</wst:ActAs>";
+
+ String tmpStr = "<wst:ActAs xmlns:wst=\"http://docs.oasis-open.org/ws-sx/ws-trust/200512\">myactaskey</wst:ActAs>";
message.put(SecurityConstants.STS_TOKEN_ACT_AS, tmpStr);
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsServiceImpl.java 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ActAsServiceImpl.java 2014-01-30 22:44:04 UTC (rev 18298)
@@ -21,11 +21,23 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.annotations.EndpointProperties;
import org.apache.cxf.annotations.EndpointProperty;
-import org.apache.cxf.interceptor.InInterceptors;
+import org.apache.cxf.interceptor.OutInterceptors;
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.apache.cxf.ws.security.trust.STSClient;
import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.*;
+import java.util.Map;
/**
* User: rsearls(a)redhat.com
@@ -47,11 +59,98 @@
@EndpointProperty(key = "ws-security.encryption.properties", value = "actasKeystore.properties"),
@EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.trust.ActAsCallbackHandler")
})
-//---@InInterceptors(interceptors = {"org.jboss.test.ws.jaxws.samples.wsse.policy.trust.ActAsOutInterceptor"})
+@OutInterceptors(interceptors = {"org.jboss.test.ws.jaxws.samples.wsse.policy.trust.ActAsOutInterceptor"})
public class ActAsServiceImpl implements ActAsServiceIface
{
- public String sayHello()
+ public String sayHello() {
+ try {
+ ServiceIface proxy = setupService();
+ return "ActAs " + proxy.sayHello();
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ private ServiceIface setupService()throws MalformedURLException {
+ ServiceIface proxy = null;
+ Bus bus = BusFactory.newInstance().createBus();
+
+ try {
+ BusFactory.setThreadDefaultBus(bus);
+
+ final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-trust/SecurityService";
+ final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ final URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (ServiceIface) service.getPort(ServiceIface.class);
+
+ Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext();
+ ctx.put(SecurityConstants.CALLBACK_HANDLER, new ActAsCallbackHandler());
+
+
+ ctx.put(SecurityConstants.SIGNATURE_PROPERTIES,
+ Thread.currentThread().getContextClassLoader().getResource("actasKeystore.properties" ));
+ ctx.put(SecurityConstants.SIGNATURE_USERNAME, "myactaskey" );
+ ctx.put(SecurityConstants.ENCRYPT_PROPERTIES,
+ Thread.currentThread().getContextClassLoader().getResource("../../META-INF/clientKeystore.properties" ));
+ ctx.put(SecurityConstants.ENCRYPT_USERNAME, "myservicekey");
+
+
+ STSClient stsClient = new STSClient(bus);
+ Map<String, Object> props = stsClient.getProperties();
+ props.put(SecurityConstants.USERNAME, "alice");
+ //- these are not needed. They are provided by the above (ctx) map.
+ // props.put(SecurityConstants.CALLBACK_HANDLER, new ActAsCallbackHandler());
+ // props.put(SecurityConstants.ENCRYPT_PROPERTIES,
+ // Thread.currentThread().getContextClassLoader().getResource("../../META-INF/clientKeystore.properties" ));
+ props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey");
+ props.put(SecurityConstants.STS_TOKEN_USERNAME, "myactaskey" );
+ props.put(SecurityConstants.STS_TOKEN_PROPERTIES,
+ Thread.currentThread().getContextClassLoader().getResource("actasKeystore.properties" ));
+ props.put(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO, "true");
+
+ ctx.put(SecurityConstants.STS_CLIENT, stsClient);
+
+ } finally {
+ bus.shutdown(true);
+ }
+
+ return proxy;
+ }
+
+ private String getServerHost()
{
- return "ActAs WS-Trust Hello World!";
+ final String host = System.getProperty("jboss.bind.address", "localhost");
+ return toIPv6URLFormat(host);
}
+
+ private String toIPv6URLFormat(final String host)
+ {
+ try
+ {
+ if (host.startsWith(":"))
+ {
+ throw new IllegalArgumentException("JBossWS test suite requires IPv6 addresses to be wrapped with [] brackets. Expected format is: [" + host + "]");
+ }
+ if (host.startsWith("["))
+ {
+ if (System.getProperty("java.net.preferIPv4Stack") == null)
+ {
+ throw new IllegalStateException("always provide java.net.preferIPv4Stack JVM property when using IPv6 address format");
+ }
+ if (System.getProperty("java.net.preferIPv6Addresses") == null)
+ {
+ throw new IllegalStateException("always provide java.net.preferIPv6Addresses JVM property when using IPv6 address format");
+ }
+ }
+ final boolean isIPv6Address = InetAddress.getByName(host) instanceof Inet6Address;
+ final boolean isIPv6Formatted = isIPv6Address && host.startsWith("[");
+ return isIPv6Address && !isIPv6Formatted ? "[" + host + "]" : host;
+ }
+ catch (final UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/ServiceImpl.java 2014-01-30 22:44:04 UTC (rev 18298)
@@ -25,6 +25,7 @@
import org.apache.cxf.annotations.EndpointProperties;
import org.apache.cxf.annotations.EndpointProperty;
+import org.apache.cxf.interceptor.InInterceptors;
@WebService
(
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.java 2014-01-30 22:44:04 UTC (rev 18298)
@@ -74,7 +74,6 @@
WSTrustTestUtils.setupWsseAndSTSClientActAs((BindingProvider) proxy, bus);
assertEquals("ActAs WS-Trust Hello World!", proxy.sayHello());
-
}
finally
{
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-01-30 22:44:04 UTC (rev 18298)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
@@ -145,7 +147,7 @@
STSClient stsClient = new STSClient(bus);
Map<String, Object> props = stsClient.getProperties();
- props.put(SecurityConstants.USERNAME, "alice");
+ props.put(SecurityConstants.USERNAME, "bob" /*"alice"*/);
props.put(SecurityConstants.CALLBACK_HANDLER, new ClientCallbackHandler());
props.put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey");
@@ -156,6 +158,7 @@
ctx.put(SecurityConstants.STS_CLIENT, stsClient);
}
+
private static String appendIssuedTokenSuffix(String prop)
{
return prop + ".it";
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties 2014-01-30 22:44:04 UTC (rev 18298)
@@ -1,2 +1,3 @@
# A sample roles.properties file for use with the UsersRolesLoginModule
-alice=friend
\ No newline at end of file
+alice=friend
+bob=friend
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties 2014-01-30 17:50:25 UTC (rev 18297)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties 2014-01-30 22:44:04 UTC (rev 18298)
@@ -1,2 +1,3 @@
# A sample users.properties file for use with the UsersRolesLoginModule
alice=clarinet
+bob=trombone
10 years, 10 months
JBossWS SVN: r18297 - common/trunk/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-30 12:50:25 -0500 (Thu, 30 Jan 2014)
New Revision: 18297
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
Log:
Revisit AbstractServerConfig.getServerIntegrationServerConfig() and use [JBWS-3755] mechanism for knowing when to set the static reference
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-01-30 17:37:40 UTC (rev 18296)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-01-30 17:50:25 UTC (rev 18297)
@@ -35,7 +35,6 @@
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.management.CommonConfigStore;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.management.StackConfig;
import org.jboss.wsf.spi.management.StackConfigFactory;
import org.jboss.wsf.spi.management.WebServerInfo;
@@ -85,7 +84,7 @@
protected final CommonConfigStore<EndpointConfig> endpointConfigStore = new CommonConfigStoreImpl<EndpointConfig>();
// The server integration classloader' ServerConfig instance reference
- private static ServerConfig serverConfig;
+ private static volatile ServerConfig serverConfig;
public MBeanServer getMbeanServer()
{
@@ -270,11 +269,8 @@
clientConfigStore.reload();
endpointConfigStore.reload();
- //cleanup the server integration classloader' service config reference as
- //a new server config can be created due to a server reload.
- synchronized (AbstractServerConfig.class) //synchronization to ensure visibility
- {
- serverConfig = null;
+ if (ClassLoaderProvider.isSet()) {
+ serverConfig = this;
}
}
@@ -294,15 +290,7 @@
if (!ClassLoaderProvider.isSet()) {
return null;
}
- synchronized (AbstractServerConfig.class) //ensure both atomicity and visibility
- {
- if (serverConfig == null)
- {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- serverConfig = SPIProvider.getInstance().getSPI(ServerConfigFactory.class, cl).getServerConfig();
- }
- return serverConfig;
- }
+ return serverConfig;
}
public String getImplementationTitle()
10 years, 10 months
JBossWS SVN: r18296 - in stack/cxf/trunk/modules/testsuite: shared-tests/src/test/ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-30 12:37:40 -0500 (Thu, 30 Jan 2014)
New Revision: 18296
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
Log:
More on permissions
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-01-30 17:13:26 UTC (rev 18295)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-01-30 17:37:40 UTC (rev 18296)
@@ -119,8 +119,10 @@
</classes>
<classes dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig">
<include name="META-INF/jaxws-client-config.xml"/>
- <include name="META-INF/permissions.xml"/>
</classes>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<manifest>
<attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- Apache CXF impl required for testing purposes -->
</manifest>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-30 17:13:26 UTC (rev 18295)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-30 17:37:40 UTC (rev 18296)
@@ -90,11 +90,13 @@
<include name="client.wsdl" />
<include name="validatingClient.wsdl" />
</zipfileset>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
</war>
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF">
<include name="jaxws-client-config.xml" />
- <include name="permissions.xml" />
</metainf>
</jar>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-01-30 17:13:26 UTC (rev 18295)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-01-30 17:37:40 UTC (rev 18296)
@@ -129,8 +129,10 @@
</classes>
<classes dir="${tests.output.dir}/test-resources/jaxws/clientConfig">
<include name="META-INF/jaxws-client-config.xml" />
- <include name="META-INF/permissions.xml" />
</classes>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/clientConfig/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.common" />
</manifest>
10 years, 10 months
JBossWS SVN: r18295 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-30 12:13:26 -0500 (Thu, 30 Jan 2014)
New Revision: 18295
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
Log:
[JBWS-3755] Use ClassLoaderProvider.isSet() to know when to look for the ServerConfig in ProviderImpl
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-01-30 17:10:12 UTC (rev 18294)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2014-01-30 17:13:26 UTC (rev 18295)
@@ -56,11 +56,10 @@
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.jboss.ws.api.configuration.AbstractClientFeature;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.ws.common.utils.DelegateClassLoader;
-import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.config.ClientConfig;
import org.jboss.wsf.stack.cxf.Loggers;
import org.jboss.wsf.stack.cxf.Messages;
@@ -166,16 +165,6 @@
*/
public class ProviderImpl extends org.apache.cxf.jaxws22.spi.ProviderImpl
{
- private static final boolean jbossModulesEnv;
- private static ServerConfig serverConfig = null;
- private static boolean serverConfigInit = false;
-
- static {
- //check if running in a JBoss Modules environment: the jbossws-cxf and cxf classes come
- //from different classloader when using jboss-modules (no flat classloader)
- jbossModulesEnv = (ProviderImpl.class.getClassLoader() != org.apache.cxf.jaxws22.spi.ProviderImpl.class.getClassLoader());
- }
-
@Override
protected org.apache.cxf.jaxws.EndpointImpl createEndpointImpl(Bus bus, String bindingId, Object implementor,
WebServiceFeature... features)
@@ -586,8 +575,8 @@
Binding binding = ((BindingProvider)obj).getBinding();
Client client = obj instanceof DispatchImpl<?> ? ((DispatchImpl<?>)obj).getClient() : ClientProxy.getClient(obj);
client.getOutInterceptors().add(new HandlerChainSortInterceptor(binding));
- if (jbossModulesEnv) { //optimization for avoiding checking for a server config when we know for sure we're out-of-container
- ServerConfig sc = getServerConfig();
+ if (ClassLoaderProvider.isSet()) { //optimization for avoiding checking for a server config when we know for sure we're out-of-container
+ ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
if (sc != null) {
ClientConfig config = sc.getClientConfig(ClientConfig.STANDARD_CLIENT_CONFIG);
if (config != null) {
@@ -607,21 +596,4 @@
}
}
- //lazy get the server config (and try once per classloader only)
- private static synchronized ServerConfig getServerConfig()
- {
- if (!serverConfigInit)
- {
- try {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- serverConfig = SPIProvider.getInstance().getSPI(ServerConfigFactory.class, cl).getServerConfig();
- } catch (Exception e) {
- Loggers.ROOT_LOGGER.cannotRetrieveServerConfigIgnoreForClients(e);
- } finally {
- serverConfigInit = true;
- }
- }
- return serverConfig;
- }
-
}
10 years, 10 months
JBossWS SVN: r18294 - common/trunk/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-30 12:10:12 -0500 (Thu, 30 Jan 2014)
New Revision: 18294
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
Log:
[JBWS-3755] Protect AbstractServerConfig.getServerIntegrationServerConfig() with ClassLoaderProvider.isSet()
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-01-30 17:08:21 UTC (rev 18293)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-01-30 17:10:12 UTC (rev 18294)
@@ -291,6 +291,9 @@
public static ServerConfig getServerIntegrationServerConfig()
{
+ if (!ClassLoaderProvider.isSet()) {
+ return null;
+ }
synchronized (AbstractServerConfig.class) //ensure both atomicity and visibility
{
if (serverConfig == null)
10 years, 10 months
JBossWS SVN: r18293 - spi/trunk/src/main/java/org/jboss/wsf/spi/classloading.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-30 12:08:21 -0500 (Thu, 30 Jan 2014)
New Revision: 18293
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
Log:
[JBWS-3755] Adding ClassLoaderProvider.isSet() static method to tell if a custom classloader provider has been installed (which is usually done during boot of the AS only)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2014-01-30 13:18:00 UTC (rev 18292)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2014-01-30 17:08:21 UTC (rev 18293)
@@ -53,16 +53,23 @@
return getContextClassLoader();
}
};
+ private static volatile boolean set = false;
public static void setDefaultProvider(ClassLoaderProvider p)
{
provider = p;
+ set = true;
}
public static ClassLoaderProvider getDefaultProvider()
{
return provider;
}
+
+ public static boolean isSet()
+ {
+ return set;
+ }
/**
* Return the ClassLoader instance having visibility over the application server ws subsystem only
10 years, 10 months
JBossWS SVN: r18292 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-30 08:18:00 -0500 (Thu, 30 Jan 2014)
New Revision: 18292
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
Log:
More permissions.xml
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-01-30 10:00:02 UTC (rev 18291)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-01-30 13:18:00 UTC (rev 18292)
@@ -119,6 +119,7 @@
</classes>
<classes dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig">
<include name="META-INF/jaxws-client-config.xml"/>
+ <include name="META-INF/permissions.xml"/>
</classes>
<manifest>
<attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- Apache CXF impl required for testing purposes -->
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml 2014-01-30 13:18:00 UTC (rev 18292)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.as.server.LOOKUP_CURRENT_SERVICE_CONTAINER</name>
+ </permission>
+</permissions>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/permissions.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-01-30 10:00:02 UTC (rev 18291)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-01-30 13:18:00 UTC (rev 18292)
@@ -129,6 +129,7 @@
</classes>
<classes dir="${tests.output.dir}/test-resources/jaxws/clientConfig">
<include name="META-INF/jaxws-client-config.xml" />
+ <include name="META-INF/permissions.xml" />
</classes>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.common" />
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml 2014-01-30 13:18:00 UTC (rev 18292)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.as.server.LOOKUP_CURRENT_SERVICE_CONTAINER</name>
+ </permission>
+</permissions>
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 10 months
JBossWS SVN: r18291 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-30 05:00:02 -0500 (Thu, 30 Jan 2014)
New Revision: 18291
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
Log:
Adding some permissions
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-29 16:00:52 UTC (rev 18290)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-01-30 10:00:02 UTC (rev 18291)
@@ -94,6 +94,7 @@
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.jar">
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF">
<include name="jaxws-client-config.xml" />
+ <include name="permissions.xml" />
</metainf>
</jar>
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2014-01-30 10:00:02 UTC (rev 18291)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.as.server.LOOKUP_CURRENT_SERVICE_CONTAINER</name>
+ </permission>
+</permissions>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-01-29 16:00:52 UTC (rev 18290)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-01-30 10:00:02 UTC (rev 18291)
@@ -562,6 +562,9 @@
<webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF" erroronmissingdir="false">
<include name="wsdl/**"/>
</webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/publish/META-INF" prefix="META-INF">
+ <include name="permissions.xml"/>
+ </zipfileset>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.common" />
</manifest>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml 2014-01-30 10:00:02 UTC (rev 18291)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+ version="7">
+ <permission>
+ <class-name>java.lang.RuntimePermission</class-name>
+ <name>org.jboss.as.server.LOOKUP_CURRENT_SERVICE_CONTAINER</name>
+ </permission>
+</permissions>
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 10 months
JBossWS SVN: r18290 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-29 11:00:52 -0500 (Wed, 29 Jan 2014)
New Revision: 18290
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
Log:
[JBWS-3702] Fixing binary distro regression
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-01-29 14:08:20 UTC (rev 18289)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-01-29 16:00:52 UTC (rev 18290)
@@ -170,6 +170,8 @@
The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="integration.target.client.classpath">
+ <!-- Use httpserver based transport -->
+ <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-httpserver.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - START -->
<pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
@@ -333,6 +335,8 @@
The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="integration.target.client.classpath">
+ <!-- Use undertow based transport -->
+ <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-undertow.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - START -->
<pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-01-29 14:08:20 UTC (rev 18289)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-01-29 16:00:52 UTC (rev 18290)
@@ -89,6 +89,9 @@
<exclude name="**/jbossws-native-services.jar"/>
<exclude name="**/jbossws-jboss*.jar"/>
<exclude name="**/jbossws-wildfly*.jar"/>
+ <!-- httpserver vs undertow transport selection in build-testsuite (container specific) -->
+ <exclude name="**/jbossws-cxf-transports-httpserver.jar"/>
+ <exclude name="**/jbossws-cxf-transports-undertow.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
<exclude name="**/jbossws*.jar"/>
10 years, 10 months
JBossWS SVN: r18289 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-01-29 09:08:20 -0500 (Wed, 29 Jan 2014)
New Revision: 18289
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3754] Revisit LittleProxy dependencies
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-01-29 08:56:41 UTC (rev 18288)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-01-29 14:08:20 UTC (rev 18289)
@@ -101,25 +101,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.littleshoot</groupId>
- <artifactId>littleproxy</artifactId>
- <version>${org.littleshoot.littleproxy.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>${bc.version}</version>
@@ -628,6 +609,26 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss720-tests-integration</artifactId>
</dependency>
+ <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions -->
+ <dependency>
+ <groupId>org.littleshoot</groupId>
+ <artifactId>littleproxy</artifactId>
+ <version>${org.littleshoot.littleproxy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -698,6 +699,31 @@
<artifactId>wildfly-webservices-tests-integration</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions -->
+ <dependency>
+ <groupId>org.littleshoot</groupId>
+ <artifactId>littleproxy</artifactId>
+ <version>${org.littleshoot.littleproxy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ <!-- Let the container messaging subsystem control the Netty dependency version -->
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
10 years, 10 months