[jboss-svn-commits] JBL Code SVN: r29563 - in labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss: soa/esb/listeners/config and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 8 14:20:23 EDT 2009
Author: dward
Date: 2009-10-08 14:20:22 -0400 (Thu, 08 Oct 2009)
New Revision: 29563
Modified:
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/XMLBeansModel.java
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/XMLBeansModel.java
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/XMLBeansModel.java
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java
Log:
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java 2009-10-08 17:51:16 UTC (rev 29562)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java 2009-10-08 18:20:22 UTC (rev 29563)
@@ -81,7 +81,7 @@
HttpConfiguration httpConfig = HttpConfiguration.getInstance();
String path = servlet.getWebModel().getEsbName();
path = path.substring(0, path.length() - 4) + urlMapping; // remove ".war" and add urlMapping
- if (path.endsWith("*")) {
+ while (path.endsWith("*") || path.endsWith("/")) {
path = path.substring(0, path.length()-1);
}
String address = ( secure ? httpConfig.getSecureAddress(path) : httpConfig.getAddress(path) );
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-10-08 17:51:16 UTC (rev 29562)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-10-08 18:20:22 UTC (rev 29563)
@@ -542,6 +542,7 @@
publishers.add(
new DefaultContractReferencePublisher(
service, serviceContract.getDescription(), endpointAddress ) );
+ break; // first ServiceContract matching a Servlet wins!
}
}
}
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/XMLBeansModel.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/XMLBeansModel.java 2009-10-08 17:51:16 UTC (rev 29562)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers/XMLBeansModel.java 2009-10-08 18:20:22 UTC (rev 29563)
@@ -572,6 +572,7 @@
provider
);
serviceContractList.add(serviceContract);
+ break; // first Action with a ContractProvider wins!
}
}
}
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/XMLBeansModel.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/XMLBeansModel.java 2009-10-08 17:51:16 UTC (rev 29562)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers110/XMLBeansModel.java 2009-10-08 18:20:22 UTC (rev 29563)
@@ -573,6 +573,7 @@
provider
);
serviceContractList.add(serviceContract);
+ break; // first Action with a ContractProvider wins!
}
}
}
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/XMLBeansModel.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/XMLBeansModel.java 2009-10-08 17:51:16 UTC (rev 29562)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/config/mappers120/XMLBeansModel.java 2009-10-08 18:20:22 UTC (rev 29563)
@@ -625,6 +625,7 @@
provider
);
serviceContractList.add(serviceContract);
+ break; // first Action with a ContractProvider wins!
}
}
}
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java 2009-10-08 17:51:16 UTC (rev 29562)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java 2009-10-08 18:20:22 UTC (rev 29563)
@@ -257,6 +257,7 @@
publishers.add(
new DefaultContractReferencePublisher(
service, serviceContract.getDescription(), endpointAddress ) );
+ break; // first ServiceContract matching a Servlet wins!
}
}
}
More information about the jboss-svn-commits
mailing list