JBossWS SVN: r11062 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-29 03:58:26 -0400 (Thu, 29 Oct 2009)
New Revision: 11062
Added:
stack/native/branches/jbossws-native-3.1.2.SP4/
Log:
Creating 3.1.2.SP4 native stack branch from 3.1.2.SP3-patch-02 branch to fix recently found issues for EAP5.0.0
Copied: stack/native/branches/jbossws-native-3.1.2.SP4 (from rev 11061, stack/native/branches/jbossws-native-3.1.2.SP3-patch-02)
15 years, 2 months
JBossWS SVN: r11060 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-29 03:52:40 -0400 (Thu, 29 Oct 2009)
New Revision: 11060
Added:
framework/branches/jbossws-framework-3.1.2.SP5/
Log:
Creating new branch from 3.1.2.SP4 framework tag in order to fix recently found issues for EAP5.0.0
Copied: framework/branches/jbossws-framework-3.1.2.SP5 (from rev 11059, framework/tags/jbossws-framework-3.1.2.SP4)
15 years, 2 months
JBossWS SVN: r11059 - in stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021: modules/core/src/main/java/org/jboss/ws/core/server and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-28 12:52:45 -0400 (Wed, 28 Oct 2009)
New Revision: 11059
Added:
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl
Removed:
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl
Modified:
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jmsservice.wsdl
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/pom.xml
Log:
[JBPAPP-3021] Malformed URL exception when deploying wsdl with jms address.
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-10-28 16:52:45 UTC (rev 11059)
@@ -23,6 +23,8 @@
import java.io.File;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import org.jboss.logging.Logger;
@@ -52,7 +54,7 @@
public class WSDLRequestHandler
{
// provide logging
- private Logger log = Logger.getLogger(WSDLRequestHandler.class);
+ private static Logger log = Logger.getLogger(WSDLRequestHandler.class);
private EndpointMetaData epMetaData;
@@ -207,25 +209,28 @@
{
String orgLocation = locationAttr.getNodeValue();
- URL orgURL = new URL(orgLocation);
- String orgHost = orgURL.getHost();
- String orgPath = orgURL.getPath();
+ if (isHttp(orgLocation))
+ {
+ URL orgURL = new URL(orgLocation);
+ String orgHost = orgURL.getHost();
+ String orgPath = orgURL.getPath();
- if (ServerConfig.UNDEFINED_HOSTNAME.equals(orgHost))
- {
- URL newURL = new URL(wsdlHost);
- String newProtocol = newURL.getProtocol();
- String newHost = newURL.getHost();
- int newPort = newURL.getPort();
+ if (ServerConfig.UNDEFINED_HOSTNAME.equals(orgHost))
+ {
+ URL newURL = new URL(wsdlHost);
+ String newProtocol = newURL.getProtocol();
+ String newHost = newURL.getHost();
+ int newPort = newURL.getPort();
- String newLocation = newProtocol + "://" + newHost;
- if (newPort != -1)
- newLocation += ":" + newPort;
+ String newLocation = newProtocol + "://" + newHost;
+ if (newPort != -1)
+ newLocation += ":" + newPort;
- newLocation += orgPath;
- locationAttr.setNodeValue(newLocation);
+ newLocation += orgPath;
+ locationAttr.setNodeValue(newLocation);
- log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'");
+ log.trace("Mapping address from '" + orgLocation + "' to '" + newLocation + "'");
+ }
}
}
}
@@ -237,4 +242,26 @@
}
}
+ private static boolean isHttp(String orgLocation)
+ {
+ try
+ {
+ String scheme = new URI(orgLocation).getScheme();
+ if (scheme != null && scheme.startsWith("http"))
+ {
+ return true;
+ }
+ else
+ {
+ log.info("Skipping rewrite of non-http address: " + orgLocation);
+ return false;
+ }
+ }
+ catch (URISyntaxException e)
+ {
+ log.error("Skipping rewrite of invalid address: " + orgLocation, e);
+ return false;
+ }
+ }
+
}
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-10-28 16:52:45 UTC (rev 11059)
@@ -313,15 +313,11 @@
if ("CONFIDENTIAL".equals(transportGuarantee))
uriScheme = "https";
- String servicePath = sepMetaData.getContextRoot() + sepMetaData.getURLPattern();
- String serviceEndpointURL = getServiceEndpointAddress(uriScheme, servicePath);
+ if (requiresRewrite(orgAddress, uriScheme))
+ {
+ String servicePath = sepMetaData.getContextRoot() + sepMetaData.getURLPattern();
+ String serviceEndpointURL = getServiceEndpointAddress(uriScheme, servicePath);
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- boolean alwaysModify = config.isModifySOAPAddress();
-
- if (alwaysModify || uriScheme == null || orgAddress.indexOf("REPLACE_WITH_ACTUAL_URL") >= 0)
- {
log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'");
wsdlEndpoint.setAddress(serviceEndpointURL);
sepMetaData.setEndpointAddress(serviceEndpointURL);
@@ -339,7 +335,8 @@
}
catch (MalformedURLException e)
{
- throw new WSException("Malformed URL: " + orgAddress);
+ log.warn("Malformed URL: " + orgAddress);
+ sepMetaData.setEndpointAddress(orgAddress);
}
}
}
@@ -349,6 +346,23 @@
if (endpointFound == false)
throw new WSException("Cannot find port in wsdl: " + portName);
}
+
+ private static boolean requiresRewrite(String orgAddress, String uriScheme)
+ {
+ if (uriScheme != null)
+ {
+ if (!uriScheme.toLowerCase().startsWith("http"))
+ {
+ //perform rewrite on http/https addresses only
+ return false;
+ }
+ }
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ boolean alwaysModify = config.isModifySOAPAddress();
+
+ return (alwaysModify || uriScheme == null || orgAddress.indexOf("REPLACE_WITH_ACTUAL_URL") >= 0);
+ }
private static void replaceWSDL11PortAddress(WSDLDefinitions wsdlDefinitions, QName portQName, String serviceEndpointURL)
{
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-10-28 16:52:45 UTC (rev 11059)
@@ -119,6 +119,9 @@
<include name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/>
<include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.class"/>
</fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
+ <include name="wsdl/*.wsdl"/>
+ </metainf>
</jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar">
<fileset dir="${tests.output.dir}/test-libs">
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2009-10-28 16:52:45 UTC (rev 11059)
@@ -86,7 +86,7 @@
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
IOUtils.copyStream(baos, new FileInputStream(logFile));
- assertEquals(baos.toString().trim(), "init() destroy()");
+ assertEquals("init() destroy()", baos.toString().trim());
logFile.delete();
}
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-10-28 16:52:45 UTC (rev 11059)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.jmstransport;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.net.URL;
import javax.jms.Message;
@@ -37,12 +39,12 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import junit.framework.Test;
+
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.wsf.common.DOMUtils;
-import junit.framework.Test;
-
/**
* A web service client that connects to a MDB endpoint.
*
@@ -57,12 +59,26 @@
{
return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport.sar");
}
+
+ public void testPublishedContract() throws Exception
+ {
+ //test the published contract using the 2nd port, which is an http one
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-jmstransport/OrganizationJMSEndpoint?wsdl");
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(wsdlURL.openStream()));
+ String line;
+ while ((line = reader.readLine()) != null)
+ {
+ sb.append(line);
+ }
+ assertTrue(sb.toString().contains("jms://queue/RequestQueue?replyToName=queue/ResponseQueue"));
+ }
public void testJMSEndpointPort() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/samples/jmstransport/jmsservice.wsdl");
QName serviceName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationJMSEndpointService");
- QName portName = new QName("http://org.jboss.ws/samples/jmstransport", "JMSEndpointPort");
+ QName portName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationJMSEndpointPort");
Service service = Service.create(wsdlURL, serviceName);
Organization port = service.getPort(portName, Organization.class);
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java 2009-10-28 16:52:45 UTC (rev 11059)
@@ -40,7 +40,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 09-Jan-2008
*/
-@WebService (targetNamespace = "http://org.jboss.ws/samples/jmstransport")
+@WebService (targetNamespace = "http://org.jboss.ws/samples/jmstransport", wsdlLocation="META-INF/wsdl/jmsservice.wsdl")
@WebContext (contextRoot = "/jaxws-samples-jmstransport")
@SOAPBinding(style = SOAPBinding.Style.RPC)
Copied: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl (from rev 10903, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl)
Deleted: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl 2009-10-13 17:22:20 UTC (rev 10903)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl 2009-10-28 16:52:45 UTC (rev 11059)
@@ -1,55 +0,0 @@
-<definitions name='OrganizationJMSEndpointService' targetNamespace='http://org.jboss.ws/samples/jmstransport' xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/jmstransport' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types></types>
-
- <message name='OrganizationJMSEndpoint_getContactInfoResponse'>
- <part name='return' type='xsd:string'></part>
- </message>
- <message name='OrganizationJMSEndpoint_getContactInfo'>
- <part name='arg0' type='xsd:string'></part>
- </message>
-
- <portType name='OrganizationJMSEndpoint'>
- <operation name='getContactInfo' parameterOrder='arg0'>
- <input message='tns:OrganizationJMSEndpoint_getContactInfo'></input>
- <output message='tns:OrganizationJMSEndpoint_getContactInfoResponse'></output>
- </operation>
- </portType>
-
- <binding name='HTTPBinding' type='tns:OrganizationJMSEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='getContactInfo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
- </output>
- </operation>
- </binding>
-
- <binding name='JMSBinding' type='tns:OrganizationJMSEndpoint'>
- <soap:binding style='rpc' transport='http://www.example.org/2006/06/soap/bindings/JMS/'/>
- <operation name='getContactInfo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
- </output>
- </operation>
- </binding>
-
- <service name='OrganizationJMSEndpointService'>
- <port binding='tns:HTTPBinding' name='HTTPEndpointPort'>
- <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-jmstransport/OrganizationJMSEndpoint'/>
- </port>
- <port binding='tns:JMSBinding' name='OrganizationJMSEndpointPort'>
- <soap:address location='jms://queue/RequestQueue?replyToName=queue/ResponseQueue'/>
- </port>
- </service>
-
-</definitions>
\ No newline at end of file
Copied: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl (from rev 10903, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl)
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl (rev 0)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/wsdl/jmsservice.wsdl 2009-10-28 16:52:45 UTC (rev 11059)
@@ -0,0 +1,55 @@
+<definitions name='OrganizationJMSEndpointService' targetNamespace='http://org.jboss.ws/samples/jmstransport' xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/jmstransport' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types></types>
+
+ <message name='OrganizationJMSEndpoint_getContactInfoResponse'>
+ <part name='return' type='xsd:string'></part>
+ </message>
+ <message name='OrganizationJMSEndpoint_getContactInfo'>
+ <part name='arg0' type='xsd:string'></part>
+ </message>
+
+ <portType name='OrganizationJMSEndpoint'>
+ <operation name='getContactInfo' parameterOrder='arg0'>
+ <input message='tns:OrganizationJMSEndpoint_getContactInfo'></input>
+ <output message='tns:OrganizationJMSEndpoint_getContactInfoResponse'></output>
+ </operation>
+ </portType>
+
+ <binding name='HTTPBinding' type='tns:OrganizationJMSEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='getContactInfo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <binding name='JMSBinding' type='tns:OrganizationJMSEndpoint'>
+ <soap:binding style='rpc' transport='http://www.example.org/2006/06/soap/bindings/JMS/'/>
+ <operation name='getContactInfo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/samples/jmstransport' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='OrganizationJMSEndpointService'>
+ <port binding='tns:HTTPBinding' name='HTTPEndpointPort'>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-jmstransport/OrganizationJMSEndpoint'/>
+ </port>
+ <port binding='tns:JMSBinding' name='OrganizationJMSEndpointPort'>
+ <soap:address location='jms://queue/RequestQueue?replyToName=queue/ResponseQueue'/>
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jmsservice.wsdl
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jmsservice.wsdl 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jmsservice.wsdl 2009-10-28 16:52:45 UTC (rev 11059)
@@ -47,7 +47,7 @@
<port binding='tns:HTTPBinding' name='HTTPEndpointPort'>
<soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-jmstransport/OrganizationJMSEndpoint'/>
</port>
- <port binding='tns:JMSBinding' name='JMSEndpointPort'>
+ <port binding='tns:JMSBinding' name='OrganizationJMSEndpointPort'>
<soap:address location='jms://queue/RequestQueue?replyToName=queue/ResponseQueue'/>
</port>
</service>
Modified: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/pom.xml 2009-10-28 14:46:22 UTC (rev 11058)
+++ stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/pom.xml 2009-10-28 16:52:45 UTC (rev 11059)
@@ -48,7 +48,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.1.0.SP2</jbossws.common.version>
- <jbossws.framework.version>3.1.2.SP4</jbossws.framework.version>
+ <jbossws.framework.version>3.1.2.SP4_JBPAPP-3021</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP1</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
15 years, 2 months
JBossWS SVN: r11058 - framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-28 10:46:22 -0400 (Wed, 28 Oct 2009)
New Revision: 11058
Modified:
framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/pom.xml
Log:
[JBPAPP-3021] Set the version.
Modified: framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/pom.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/pom.xml 2009-10-28 14:41:50 UTC (rev 11057)
+++ framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/pom.xml 2009-10-28 14:46:22 UTC (rev 11058)
@@ -6,7 +6,7 @@
<artifactId>jbossws-framework</artifactId>
<packaging>jar</packaging>
- <version>3.1.2.SP4</version>
+ <version>3.1.2.SP4_JBPAPP-3021</version>
<!-- Parent -->
<parent>
15 years, 2 months
JBossWS SVN: r11057 - framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/src/main/java/org/jboss/wsf/framework/management.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-28 10:41:50 -0400 (Wed, 28 Oct 2009)
New Revision: 11057
Modified:
framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java
Log:
[JBPAPP-3021] Malformed URL exception when deploying wsdl with jms address.
Modified: framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java 2009-10-28 12:58:02 UTC (rev 11056)
+++ framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java 2009-10-28 14:41:50 UTC (rev 11057)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URI;
import java.net.URL;
import java.util.Set;
@@ -103,8 +104,7 @@
writer.print("</tr>");
writer.print("<tr>");
writer.print(" <td>Endpoint Address</td>");
- String address = createAddress(requestURL, ep.getAddress());
- writer.print(" <td><a href='" + address + "?wsdl'>" + address + "?wsdl</a></td>");
+ writer.print(" <td>" + getAddressHtmlTag(requestURL, ep) + "</td>");
writer.print("</tr>");
writer.print("<tr>");
writer.print(" <td colspan=2>");
@@ -181,6 +181,29 @@
writer.println("</head>");
}
+ private String getAddressHtmlTag(final URL requestURL, final Endpoint ep) throws IOException
+ {
+ String address = createAddress(requestURL, ep.getAddress());
+ try
+ {
+ String scheme = new URI(address).getScheme();
+ if (scheme.equalsIgnoreCase("jms"))
+ {
+ return ep.getAddress();
+ }
+ }
+ catch (Exception e)
+ {
+ //ignore
+ }
+ StringBuilder sb = new StringBuilder("<a href='");
+ sb.append(address);
+ sb.append("?wsdl'>");
+ sb.append(address);
+ sb.append("</a>");
+ return sb.toString();
+ }
+
private String createAddress(final URL requestURL, final String endpointAddress) throws IOException
{
String address = endpointAddress;
15 years, 2 months
JBossWS SVN: r11056 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-28 08:58:02 -0400 (Wed, 28 Oct 2009)
New Revision: 11056
Added:
framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021/
Log:
[JBPAPP-3021] Branch for patch.
Copied: framework/branches/jbossws-framework-3.1.2.SP4_JBPAPP-3021 (from rev 11055, framework/tags/jbossws-framework-3.1.2.SP4)
15 years, 2 months
JBossWS SVN: r11055 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-10-28 08:33:58 -0400 (Wed, 28 Oct 2009)
New Revision: 11055
Added:
stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021/
Log:
[JBPAPP-3021] Branch for patch.
Copied: stack/native/tags/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-3021 (from rev 11054, stack/native/tags/jbossws-native-3.1.2.SP3-patch-02)
15 years, 2 months
JBossWS SVN: r11054 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2009-10-28 04:59:44 -0400 (Wed, 28 Oct 2009)
New Revision: 11054
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
Log:
To Fix the build
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-10-27 16:10:55 UTC (rev 11053)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-10-28 08:59:44 UTC (rev 11054)
@@ -56,7 +56,7 @@
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSCXFConfigurer;
-import org.jbossws.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
+import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2009-10-28 08:59:44 UTC (rev 11054)
@@ -0,0 +1,64 @@
+package org.jboss.wsf.stack.cxf.management;
+
+import java.util.Iterator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.annotation.PostConstruct;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+import org.apache.cxf.bus.ManagedBus;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.management.jmx.InstrumentationManagerImpl;
+
+
+/**
+ * The InstrumentationManagerImpl extension class to set the JBoss MBeanServer.
+ * @author <a herf="mailto:ema@redhat.com> Jim Ma</a>
+ *
+ */
+
+public class InstrumentationManagerExtImpl extends InstrumentationManagerImpl
+{
+ private static final Logger LOG = LogUtils.getL7dLogger(InstrumentationManagerExtImpl.class);
+ private MBeanServer mbeanServer = null;
+
+
+ /**
+ * TODO: to see if this can be moved to cxf code base
+ */
+ public void initMBeanServer()
+ {
+ this.setServer(this.getJBossMbeanServer());
+
+ ManagedBus mbus = new ManagedBus(this.getBus());
+ try
+ {
+ register(mbus);
+ }
+ catch (JMException e)
+ {
+ LOG.log(Level.SEVERE, "Register bus " + this.getBus() + " failure :" + e.getMessage());
+ }
+
+ }
+
+ protected MBeanServer getJBossMbeanServer()
+ {
+
+ if (mbeanServer == null)
+ {
+ for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
+ {
+ mbeanServer = (MBeanServer)i.next();
+ if (mbeanServer.getClass().getName().startsWith("org.jboss"))
+ {
+ break;
+ }
+ }
+ }
+ return mbeanServer;
+ }
+}
15 years, 2 months