Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 19:14:11 -0400 (Sat, 14 Apr 2007)
New Revision: 2858
Modified:
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java
Log:
Use explicit context root
Modified:
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
===================================================================
---
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-04-14
23:12:24 UTC (rev 2857)
+++
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-04-14
23:14:11 UTC (rev 2858)
@@ -70,7 +70,7 @@
Webservices webservices = apmd.getWebservices();
if (webservices != null)
{
- String contextRoot = webservices.getContextRoot();
+ umd.setWebServiceContextRoot(webservices.getContextRoot());
umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
List<WebserviceDescription> wsDescriptions =
webservices.getWebserviceDescriptions();
@@ -82,12 +82,7 @@
WebserviceDescription wsd = wsDescriptions.get(0);
umd.setConfigName(wsd.getConfigName());
umd.setConfigFile(wsd.getConfigFile());
-
- if (contextRoot == null)
- contextRoot = "/" + wsd.getDescriptionName();
}
-
- umd.setWebServiceContextRoot(contextRoot);
}
}
Modified:
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java
===================================================================
---
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-04-14
23:12:24 UTC (rev 2857)
+++
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-04-14
23:14:11 UTC (rev 2858)
@@ -77,7 +77,7 @@
Webservices webservices = jarDD.getWebservices();
if (webservices != null)
{
- String contextRoot = webservices.getContextRoot();
+ umd.setWebServiceContextRoot(webservices.getContextRoot());
umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
List<WebserviceDescription> wsDescriptions =
webservices.getWebserviceDescriptions();
@@ -89,12 +89,7 @@
WebserviceDescription wsd = wsDescriptions.get(0);
umd.setConfigName(wsd.getConfigName());
umd.setConfigFile(wsd.getConfigFile());
-
- if (contextRoot == null)
- contextRoot = "/" + wsd.getDescriptionName();
}
-
- umd.setWebServiceContextRoot(contextRoot);
}
}