Author: thomas.diesler(a)jboss.com
Date: 2007-04-14 19:29:24 -0400 (Sat, 14 Apr 2007)
New Revision: 2859
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 <webservice-description-name> as <context-root> for EJB3 only
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:14:11 UTC (rev 2858)
+++
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-04-14
23:29:24 UTC (rev 2859)
@@ -64,13 +64,12 @@
return umd;
}
- // If you modify this, do it in ApplicationMetaDataAdaptorEJB3 as well
private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd,
ApplicationMetaData apmd)
{
Webservices webservices = apmd.getWebservices();
if (webservices != null)
{
- umd.setWebServiceContextRoot(webservices.getContextRoot());
+ String contextRoot = webservices.getContextRoot();
umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
List<WebserviceDescription> wsDescriptions =
webservices.getWebserviceDescriptions();
@@ -83,6 +82,8 @@
umd.setConfigName(wsd.getConfigName());
umd.setConfigFile(wsd.getConfigFile());
}
+
+ 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:14:11 UTC (rev 2858)
+++
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-04-14
23:29:24 UTC (rev 2859)
@@ -67,7 +67,6 @@
return umd;
}
- // If you modify this, do it in ApplicationMetaDataAdaptor as well
private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD
jarDD)
{
// nothing to do
@@ -77,7 +76,7 @@
Webservices webservices = jarDD.getWebservices();
if (webservices != null)
{
- umd.setWebServiceContextRoot(webservices.getContextRoot());
+ String contextRoot = webservices.getContextRoot();
umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
List<WebserviceDescription> wsDescriptions =
webservices.getWebserviceDescriptions();
@@ -89,7 +88,14 @@
WebserviceDescription wsd = wsDescriptions.get(0);
umd.setConfigName(wsd.getConfigName());
umd.setConfigFile(wsd.getConfigFile());
+
+ // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1
+ // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress
+ if (contextRoot == null)
+ contextRoot = "/" + wsd.getDescriptionName();
}
+
+ umd.setWebServiceContextRoot(contextRoot);
}
}
Show replies by date