JBossWS SVN: r15541 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-30 11:08:08 -0500 (Mon, 30 Jan 2012)
New Revision: 15541
Modified:
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
[JBPAPP-7461] Synch remoting version
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-01-30 13:54:04 UTC (rev 15540)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-01-30 16:08:08 UTC (rev 15541)
@@ -64,7 +64,7 @@
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
- <jboss.remoting.version>2.5.4.SP1</jboss.remoting.version>
+ <jboss.remoting.version>2.5.4.SP3</jboss.remoting.version>
<jboss.logging.version>2.1.0.GA</jboss.logging.version>
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
13 years, 10 months
JBossWS SVN: r15540 - thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-8012/rt/core/src/main/java/org/apache/cxf/transport/http.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2012-01-30 08:54:04 -0500 (Mon, 30 Jan 2012)
New Revision: 15540
Modified:
thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-8012/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
Log:
[JBPAPP-8012] Added method to allow soap12 addresses to be found and rewritten
Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-8012/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-8012/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java 2012-01-30 11:50:24 UTC (rev 15539)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-8012/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java 2012-01-30 13:54:04 UTC (rev 15540)
@@ -310,11 +310,8 @@
for (Element el : elementList) {
String name = el.getAttribute("name");
if (name.equals(ei.getName().getLocalPart())) {
- Element soapAddress = DOMUtils.findAllElementsByTagNameNS(el,
- "http://schemas.xmlsoap.org/wsdl/soap/",
- "address")
- .iterator().next();
- soapAddress.setAttribute("location", base);
+ rewriteAddress(base, el, "http://schemas.xmlsoap.org/wsdl/soap/");
+ rewriteAddress(base, el, "http://schemas.xmlsoap.org/wsdl/soap12/");
}
}
}
@@ -326,6 +323,14 @@
//likely not DOM level 3
}
}
+
+ private void rewriteAddress(String base, Element el, String soapNS) {
+ List<Element> sadEls = DOMUtils.findAllElementsByTagNameNS(el,soapNS,
+ "address");
+ for (Element soapAddress : sadEls) {
+ soapAddress.setAttribute("location", base);
+ }
+ }
static String resolveWithCatalogs(OASISCatalogManager catalogs, String start, String base) {
if (catalogs == null) {
13 years, 10 months
JBossWS SVN: r15539 - thirdparty/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2012-01-30 06:50:24 -0500 (Mon, 30 Jan 2012)
New Revision: 15539
Added:
thirdparty/cxf/branches/cxf-2.2.12-patch-02_JBPAPP-8012/
Log:
[JBPAPP-8012] created one off patch branch
13 years, 10 months
JBossWS SVN: r15538 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-27 12:37:04 -0500 (Fri, 27 Jan 2012)
New Revision: 15538
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
Log:
[JBWS-2251] Applying patch
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2012-01-27 14:27:49 UTC (rev 15537)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2012-01-27 17:37:04 UTC (rev 15538)
@@ -51,6 +51,8 @@
import java.util.ResourceBundle;
import java.util.StringTokenizer;
+import javax.security.auth.x500.X500Principal;
+
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
import org.jboss.ws.api.util.ServiceLoader;
@@ -479,6 +481,7 @@
return null;
}
+ @SuppressWarnings("rawtypes")
public X509Certificate getCertificateByIssuerSerial(String issuer, String serial) throws WSSecurityException
{
if (keyStore == null)
@@ -498,11 +501,12 @@
continue;
X509Certificate x509 = (X509Certificate)cert;
- if (issuer.equals(x509.getIssuerDN().toString()) && serial.equals(x509.getSerialNumber().toString()))
+ X500Principal principal = new X500Principal(issuer);
+ if (principal.equals(x509.getIssuerX500Principal()) && serial.equals(x509.getSerialNumber().toString()))
return x509;
}
}
- catch (KeyStoreException e)
+ catch (Exception e)
{
throw new WSSecurityException(BundleUtils.getMessage(bundle, "PROBLEMS_RETRIEVING_CERT", e.getMessage()), e);
}
13 years, 11 months
JBossWS SVN: r15537 - in common/trunk/src/main/java/org/jboss/ws/common: management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-27 09:27:49 -0500 (Fri, 27 Jan 2012)
New Revision: 15537
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
Log:
[JBWS-3420] Solving AS7 ws endpoint deployment performance regression
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2012-01-26 18:15:11 UTC (rev 15536)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2012-01-27 14:27:49 UTC (rev 15537)
@@ -67,9 +67,9 @@
// TODO: remove this hack - review API
String protocol = (String)dep.getService().getProperty("protocol");
String host = (String)dep.getService().getProperty("host");
- Integer port = (Integer)dep.getService().getProperty("port");
- Integer securePort = null;
+ PortValue port = new PortValue((Integer)dep.getService().getProperty("port"), null);
+
if (protocol == null)
{
SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
@@ -77,8 +77,7 @@
ServerConfig serverConfig = spi.getServerConfig();
host = serverConfig.getWebServiceHost();
- port = serverConfig.getWebServicePort();
- securePort = serverConfig.getWebServiceSecurePort();
+ port.setServerConfig(serverConfig);
}
Map<String, Endpoint> endpointsMap = new HashMap<String, Endpoint>();
List<Endpoint> deleteList = new LinkedList<Endpoint>();
@@ -87,7 +86,7 @@
if (ep instanceof HttpEndpoint)
{
boolean confidential = isConfidentialTransportGuarantee(dep, ep);
- int currentPort = confidential ? securePort : port;
+ int currentPort = port.getValue(confidential);
String hostAndPort = host + (currentPort > 0 ? ":" + currentPort : "");
HttpEndpoint httpEp = (HttpEndpoint)ep;
@@ -121,6 +120,7 @@
}
}
+
protected boolean isConfidentialTransportGuarantee(final Deployment dep, final Endpoint ep)
{
if (isJaxrpcDeployment(dep)) return false;
@@ -182,4 +182,43 @@
return "CONFIDENTIAL".equals(transportGuarantee);
}
+ private class PortValue {
+ private ServerConfig config;
+ private Integer port;
+ private Integer securePort;
+
+ public PortValue(Integer port, Integer securePort) {
+ this.port = port;
+ this.securePort = securePort;
+ }
+
+ public void setServerConfig(ServerConfig config)
+ {
+ this.port = null;
+ this.securePort = null;
+ this.config = config;
+ }
+
+ public Integer getValue(boolean confidential) {
+ return confidential ? getSecurePortValue() : getPortValue();
+ }
+
+ public Integer getPortValue()
+ {
+ if (this.port == null && this.config != null)
+ {
+ this.port = this.config.getWebServicePort();
+ }
+ return this.port;
+ }
+
+ public Integer getSecurePortValue()
+ {
+ if (this.securePort == null && this.config != null)
+ {
+ this.securePort = this.config.getWebServiceSecurePort();
+ }
+ return this.securePort;
+ }
+ }
}
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 2012-01-26 18:15:11 UTC (rev 15536)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2012-01-27 14:27:49 UTC (rev 15537)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, 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.
*
@@ -27,10 +27,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
-import java.util.Set;
-import javax.management.AttributeNotFoundException;
-import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -153,31 +150,14 @@
public int getWebServicePort()
{
if (webServicePort <= 0)
- webServicePort = getConnectorPort("HTTP/1.1", false);
+ webServicePort = getConnectorPort(false);
int localPort = webServicePort;
if (localPort <= 0)
{
- ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- try
- {
- WebServerInfo webServerInfo = spiProvider.getSPI(WebServerInfoFactory.class, cl).newWebServerInfo();
- localPort = webServerInfo.getPort("HTTP/1.1", false);
- }
- catch (WSFException e)
- {
- log.debug("Can not get local webservice port from configured WebServerInfo!");
- if (log.isTraceEnabled()) {
- log.trace("Ignoring exception: ", e);
- }
- }
- if (localPort <= 0)
- {
- // Do not initialize webServicePort with the default, the connector port may become available later
- log.debug("Unable to calculate 'WebServicePort', using default '8080'");
- localPort = 8080;
- }
+ // Do not initialize webServicePort with the default, the connector port may become available later
+ log.debug("Unable to calculate 'WebServicePort', using default '8080'");
+ localPort = 8080;
}
return localPort;
@@ -186,34 +166,34 @@
public int getWebServiceSecurePort()
{
if (webServiceSecurePort <= 0)
- webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
+ webServiceSecurePort = getConnectorPort(true);
int localPort = webServiceSecurePort;
if (localPort <= 0)
{
- ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- try
- {
- WebServerInfo webServerInfo = spiProvider.getSPI(WebServerInfoFactory.class, cl).newWebServerInfo();
-
- localPort = webServerInfo.getPort("HTTP/1.1", true);
- }
- catch (WSFException e)
- {
- log.warn(BundleUtils.getMessage(bundle, "COULD_NOT_GET_WEBSERVERINFO"));
- }
-
- if (localPort <= 0)
- {
- // Do not initialize webServiceSecurePort with the default, the connector port may become available later
- log.debug("Unable to calculate 'WebServiceSecurePort', using default '8443'");
- localPort = 8443;
- }
+ // Do not initialize webServiceSecurePort with the default, the connector port may become available later
+ log.debug("Unable to calculate 'WebServiceSecurePort', using default '8443'");
+ localPort = 8443;
}
return localPort;
}
+
+ private int getConnectorPort(boolean secure) {
+ ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ int port = 0;
+ try
+ {
+ WebServerInfo webServerInfo = spiProvider.getSPI(WebServerInfoFactory.class, cl).newWebServerInfo();
+ port = webServerInfo.getPort("HTTP/1.1", secure);
+ }
+ catch (WSFException e)
+ {
+ log.warn(BundleUtils.getMessage(bundle, "COULD_NOT_GET_WEBSERVERINFO"));
+ }
+ return port;
+ }
public void create() throws Exception
{
@@ -230,51 +210,6 @@
{
getMbeanServer().unregisterMBean(AbstractServerConfigMBean.OBJECT_NAME);
}
-
- @SuppressWarnings("rawtypes")
- private int getConnectorPort(final String protocol, final boolean secure)
- {
- int port = -1;
-
- try
- {
- ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
-
- Set connectorNames = getMbeanServer().queryNames(connectors, null);
- for (Object current : connectorNames)
- {
- ObjectName currentName = (ObjectName)current;
-
- try
- {
- int connectorPort = (Integer)getMbeanServer().getAttribute(currentName, "port");
- boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName, "secure");
- String connectorProtocol = (String)getMbeanServer().getAttribute(currentName, "protocol");
-
- if (protocol.equals(connectorProtocol) && secure == connectorSecure)
- {
- if (port > -1)
- {
- log.warn(BundleUtils.getMessage(bundle, "FOUND_MULTIPLE_CONNECTORS", new Object[]{ protocol, secure, port }));
- }
- else
- {
- port = connectorPort;
- }
- }
- }
- catch (AttributeNotFoundException ignored)
- {
- }
- }
-
- return port;
- }
- catch (JMException e)
- {
- return -1;
- }
- }
public String getImplementationTitle()
{
13 years, 11 months
JBossWS SVN: r15536 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-26 13:15:11 -0500 (Thu, 26 Jan 2012)
New Revision: 15536
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Removing excludes for unexistent tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-26 18:14:41 UTC (rev 15535)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-26 18:15:11 UTC (rev 15536)
@@ -664,9 +664,6 @@
<!--# [JBAS-8363] Virtual host issue in JBossWeb-->
<exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
- <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
-
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
@@ -700,9 +697,6 @@
<!-- # [JBWS-3330] fixed on AS 7.0.1 & above -->
<exclude>org/jboss/test/ws/management/recording/**</exclude>
- <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
<!-- [AS7-1101][JBWS-3322], fixed on AS 7.0.1 & above -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
@@ -855,9 +849,6 @@
<!--# [JBAS-8363] Virtual host issue in JBossWeb-->
<exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
- <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
-
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
@@ -888,9 +879,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
<!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
@@ -1041,9 +1029,6 @@
<!--# [JBAS-8363] Virtual host issue in JBossWeb-->
<exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
- <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
-
<!--# Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
@@ -1074,9 +1059,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
<!-- [AS7-1101][JBWS-3322], fixed on AS 7.1.0 & above -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
@@ -1309,10 +1291,6 @@
<!--# [JBWS-2397] Fix jbws1797 testcase-->
<exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
- <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
<!-- # Seems MSFT interop. endpoints are down :(-->
<exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
13 years, 11 months
JBossWS SVN: r15535 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-26 13:14:41 -0500 (Thu, 26 Jan 2012)
New Revision: 15535
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
Removing excludes for unexistent tests
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-01-26 18:13:03 UTC (rev 15534)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-01-26 18:14:41 UTC (rev 15535)
@@ -519,10 +519,7 @@
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
- <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>
<!-- # [JBWS-3252] Investigate WSA interop tests regression -->
<exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude>
@@ -562,9 +559,6 @@
<!-- [JBWS-3330] Restore RecordProcessor functionalities, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/management/recording/**</exclude>
- <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
@@ -696,10 +690,7 @@
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
- <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>
<!-- # [JBWS-3252] Investigate WSA interop tests regression -->
<exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude>
@@ -736,9 +727,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
@@ -868,10 +856,7 @@
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
- <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>
<!-- # [JBWS-3252] Investigate WSA interop tests regression -->
<exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude>
@@ -908,9 +893,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
- <!--# [JBAS-9188] On AS7 We don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
<!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7, solved in AS 7.0.1 or greater -->
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
@@ -1064,11 +1046,7 @@
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
- <!-- # [JBAS-9188] On AS7 we don't support nested EJB & WAR archives neither in .sar nor in .jar archives -->
- <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
<!-- # [JBWS-3252] Investigate WSA interop tests regression -->
<exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude>
13 years, 11 months
JBossWS SVN: r15534 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-26 13:13:03 -0500 (Thu, 26 Jan 2012)
New Revision: 15534
Removed:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1854/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2630/
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBAS-9188] Removing testcases for rejected jira excluded on all target containers
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-01-26 17:46:40 UTC (rev 15533)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-01-26 18:13:03 UTC (rev 15534)
@@ -506,24 +506,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1854 -->
- <war destfile="${tests.output.dir}/test-libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1854/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws1854/EndpointImpl.class" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/WEB-INF">
- <include name="jboss-web.xml" />
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1854.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-jbws1854.war" />
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1854/META-INF">
- <include name="jboss-service.xml" />
- </metainf>
- </jar>
-
<!-- jaxws-jbws1872 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1872.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -840,18 +822,6 @@
</webinf>
</war>
- <!-- jaxws-jbws2630 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2630-service.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2630/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2630/Endpoint*.class" />
- </classes>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2630.jar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-jbws2630-service.war" />
- </fileset>
- </jar>
-
<!-- jaxws-jbws2634 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2634.jar">
<fileset dir="${tests.output.dir}/test-classes">
13 years, 11 months
JBossWS SVN: r15533 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-26 12:46:40 -0500 (Thu, 26 Jan 2012)
New Revision: 15533
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3419] Removing excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-01-26 17:46:01 UTC (rev 15532)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-01-26 17:46:40 UTC (rev 15533)
@@ -1077,9 +1077,6 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- # [JBWS-3419] waiting for pull request -->
- <exclude>org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase*</exclude>
-
<!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
13 years, 11 months
JBossWS SVN: r15532 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-26 12:46:01 -0500 (Thu, 26 Jan 2012)
New Revision: 15532
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyCallbackHandlerImpl.java
Log:
[JBWS-3419] Make sure the correct endpoint registry is passed to NettyCallbackHandlerImpl too
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyCallbackHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyCallbackHandlerImpl.java 2012-01-26 17:17:44 UTC (rev 15531)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyCallbackHandlerImpl.java 2012-01-26 17:46:01 UTC (rev 15532)
@@ -38,6 +38,7 @@
import org.jboss.ws.core.server.netty.NettyCallbackHandler;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.InvocationContext;
@@ -64,7 +65,7 @@
/** Endpoints registry. */
private static final EndpointRegistry ENDPOINTS_REGISTRY = NettyCallbackHandlerImpl.SPI_PROVIDER.getSPI(
- EndpointRegistryFactory.class).getEndpointRegistry();
+ EndpointRegistryFactory.class, ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader()).getEndpointRegistry();
/** @PreDestroy registry. */
private final List<PreDestroyHolder> preDestroyRegistry = new LinkedList<PreDestroyHolder>();
13 years, 11 months