[jboss-svn-commits] JBL Code SVN: r28533 - in labs/jbossesb/workspace/tfennelly/httpg2/product: rosetta/src/org/jboss/internal/soa/esb/listeners/war and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 28 07:57:26 EDT 2009
Author: tfennelly
Date: 2009-07-28 07:57:26 -0400 (Tue, 28 Jul 2009)
New Revision: 28533
Modified:
labs/jbossesb/workspace/tfennelly/httpg2/product/etc/schemas/xml/jbossesb-1.2.0.xsd
labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpListenerMapper.java
labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/readme.txt
labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java
labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/readme.txt
labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java
Log:
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/etc/schemas/xml/jbossesb-1.2.0.xsd
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/etc/schemas/xml/jbossesb-1.2.0.xsd 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/etc/schemas/xml/jbossesb-1.2.0.xsd 2009-07-28 11:57:26 UTC (rev 28533)
@@ -1725,7 +1725,7 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="jesb:listener">
- <xsd:attribute name="urlPattern" type="xsd:string" use="required">
+ <xsd:attribute name="urlPattern" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation xml:lang="en">
The URL Pattern of requests to be filtered to this listener.
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java 2009-07-28 11:57:26 UTC (rev 28533)
@@ -23,6 +23,7 @@
import org.jboss.internal.soa.esb.listeners.war.WebDeploymentArchive;
import org.jboss.soa.esb.listeners.config.DeploymentResourceLocator;
import org.jboss.soa.esb.listeners.gateway.HttpGatewayServlet;
+import org.jboss.soa.esb.listeners.ListenerTagNames;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.ConfigurationException;
@@ -35,13 +36,8 @@
*/
public class HttpGatewayDeploymentFactory implements WebGatewayDeploymentFactory {
- private static Logger logger = Logger.getLogger(HttpGatewayDeploymentFactory.class);
-
- private String busName;
-
public void setBusName(String busName) {
- AssertArgument.isNotNullAndNotEmpty(busName, "busName");
- this.busName = busName;
+ // Not relevant to this factory!
}
public void setDeploymentResourceLocator(DeploymentResourceLocator resourceLocator) {
@@ -54,11 +50,17 @@
// Set the endpoint urlPattern so as to map requests from that namespace into
// this servlet instance...
- String urlPattern = webEndpointConfig.getAttribute("urlPattern", "");
- if(urlPattern.startsWith("/")) {
- servlet.getUrlMappings().add("/http" + urlPattern);
+ String urlPattern = webEndpointConfig.getAttribute("urlPattern");
+ if(urlPattern != null) {
+ if(urlPattern.startsWith("/")) {
+ servlet.getUrlMappings().add("/http" + urlPattern);
+ } else {
+ servlet.getUrlMappings().add("/http/" + urlPattern);
+ }
} else {
- servlet.getUrlMappings().add("/http/" + urlPattern);
+ String serviceCat = webEndpointConfig.getAttribute(ListenerTagNames.TARGET_SERVICE_CATEGORY_TAG);
+ String serviceName = webEndpointConfig.getAttribute(ListenerTagNames.TARGET_SERVICE_NAME_TAG);
+ servlet.getUrlMappings().add("/http/" + serviceCat + "/" + serviceName);
}
// Map all config tree attributes as servlet parameters...
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-07-28 11:57:26 UTC (rev 28533)
@@ -459,7 +459,7 @@
// Servlet....
final Servlet servlet = new Servlet(serviceInfo.getServletName(), serviceInfo.getClassName());
- servlet.getUrlMappings().add(serviceInfo.getServletPath());
+ servlet.getUrlMappings().add("/ebws" + serviceInfo.getServletPath());
webDeployment.getWebModel().getServlets().add(servlet);
// Filter...
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpListenerMapper.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpListenerMapper.java 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/HttpListenerMapper.java 2009-07-28 11:57:26 UTC (rev 28533)
@@ -57,21 +57,15 @@
MapperUtil.mapProperties(listener.getPropertyList(), listenerNode);
if(listener.getIsGateway()) {
- String webXml = bus.getWebXml();
- String jbossWebXml = bus.getJbossWebXml();
String urlPattern = listener.getUrlPattern();
PayloadAs.Enum payloadAs = listener.getPayloadAs();
listenerNode.setAttribute("gatewayClass", HttpGatewayDeploymentFactory.class.getName());
listenerNode.setAttribute(ListenerTagNames.IS_GATEWAY_TAG, "true");
- if(webXml != null) {
- listenerNode.setAttribute("webXml", webXml);
+ if(urlPattern != null) {
+ listenerNode.setAttribute("urlPattern", urlPattern);
}
- if(jbossWebXml != null) {
- listenerNode.setAttribute("jbossWebXml", jbossWebXml);
- }
- listenerNode.setAttribute("urlPattern", urlPattern);
if(payloadAs != null) {
listenerNode.setAttribute("payloadAs", payloadAs.toString());
}
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/readme.txt
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/readme.txt 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/readme.txt 2009-07-28 11:57:26 UTC (rev 28533)
@@ -22,7 +22,7 @@
To Run from Soapui:
===========================
- 1. Use the following URL: 'http://127.0.0.1:8080/Quickstart_publish_as_webservice/ESBServiceSample/HelloWorldPubService?wsdl'.
+ 1. Use the following URL: 'http://127.0.0.1:8080/Quickstart_publish_as_webservice/ebws/ESBServiceSample/HelloWorldPubService?wsdl'.
2. Copy the contents of soap-userpass-message.xml.
3. Exceute the web service call from soapui.
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java 2009-07-28 11:57:26 UTC (rev 28533)
@@ -36,7 +36,7 @@
final String soap = StreamUtils.getResourceAsString(args[0], "UTF-8");
HttpClient client = new HttpClient();
PostMethod postMethod = new PostMethod(
- "http://127.0.0.1:8080/Quickstart_publish_as_webservice/ESBServiceSample/HelloWorldPubService?wsdl");
+ "http://127.0.0.1:8080/Quickstart_publish_as_webservice/ebws/ESBServiceSample/HelloWorldPubService?wsdl");
StringRequestEntity requestEntity = new StringRequestEntity(soap);
postMethod.setRequestEntity(requestEntity);
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/readme.txt
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/readme.txt 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/readme.txt 2009-07-28 11:57:26 UTC (rev 28533)
@@ -19,7 +19,7 @@
To Run from Soapui:
===========================
- 1. Use the following URL: 'http://127.0.0.1:8080/Quickstart_publish_as_webservice_inonly/ESBServiceSample/HelloWorldPubServiceInOnly?wsdl'.
+ 1. Use the following URL: 'http://127.0.0.1:8080/Quickstart_publish_as_webservice_inonly/ebws/ESBServiceSample/HelloWorldPubServiceInOnly?wsdl'.
2. Copy the contents of soap-userpass-message.xml.
3. Exceute the web service call from soapui.
Modified: labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java
===================================================================
--- labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java 2009-07-28 11:09:53 UTC (rev 28532)
+++ labs/jbossesb/workspace/tfennelly/httpg2/product/samples/quickstarts/publish_as_webservice_inonly/src/org/jboss/soa/esb/samples/quickstart/publishAsWebservice/test/SOAPTest.java 2009-07-28 11:57:26 UTC (rev 28533)
@@ -36,7 +36,7 @@
final String soap = StreamUtils.getResourceAsString(args[0], "UTF-8");
HttpClient client = new HttpClient();
PostMethod postMethod = new PostMethod(
- "http://127.0.0.1:8080/Quickstart_publish_as_webservice_inonly/ESBServiceSample/HelloWorldPubServiceInOnly?wsdl");
+ "http://127.0.0.1:8080/Quickstart_publish_as_webservice_inonly/ebws/ESBServiceSample/HelloWorldPubServiceInOnly?wsdl");
StringRequestEntity requestEntity = new StringRequestEntity(soap);
postMethod.setRequestEntity(requestEntity);
More information about the jboss-svn-commits
mailing list