Index: appserv-core/src/java/com/sun/enterprise/webservice/EjbRuntimeEndpointInfo.java
===================================================================
--- appserv-core/src/java/com/sun/enterprise/webservice/EjbRuntimeEndpointInfo.java	(revision 2989)
+++ appserv-core/src/java/com/sun/enterprise/webservice/EjbRuntimeEndpointInfo.java	(revision 2991)
@@ -244,13 +244,26 @@
                         Collection docs = null;
                         if(endpoint.getWebService().hasWsdlFile()) {
                             BaseManager mgr;
+                            String appBaseDir = null;
+                            com.sun.enterprise.instance.InstanceEnvironment iEnv = null;
                             if(endpoint.getBundleDescriptor().getApplication().isVirtual()) {
                                 mgr = DeploymentServiceUtils.getInstanceManager(DeployableObjectType.EJB);
+                                
+                                iEnv = mgr.getInstanceEnvironment();
+                                appBaseDir = iEnv.getModuleRepositoryPath();
                             } else {
                                 mgr = DeploymentServiceUtils.getInstanceManager(DeployableObjectType.APP);
+                                
+                                iEnv = mgr.getInstanceEnvironment();
+                                appBaseDir = iEnv.getApplicationRepositoryPath();
                             }
-                            String deployedDir = 
-                                mgr.getLocation(endpoint.getBundleDescriptor().getApplication().getRegistrationName());
+                            String appName = endpoint.getBundleDescriptor().getApplication().getRegistrationName();
+                            File appDir = new File(appBaseDir,appName);
+                            String unresolvedDeployedDir = com.sun.enterprise.deployment.phasing.DeploymentServiceUtils.getLocation(appDir);
+                            com.sun.enterprise.config.serverbeans.PropertyResolver resolver
+                            = new com.sun.enterprise.config.serverbeans.PropertyResolver(mgr.getConfigContext(),iEnv.getName());
+                            String deployedDir = resolver.resolve(unresolvedDeployedDir);
+
                             File pkgedWsdl = null;
                             if(deployedDir != null) {
                                 if(endpoint.getBundleDescriptor().getApplication().isVirtual()) {
Index: appserv-core/src/java/com/sun/enterprise/webservice/JAXWSServlet.java
===================================================================
--- appserv-core/src/java/com/sun/enterprise/webservice/JAXWSServlet.java	(revision 2989)
+++ appserv-core/src/java/com/sun/enterprise/webservice/JAXWSServlet.java	(revision 2991)
@@ -315,13 +315,23 @@
         Collection docs = null;
         if(endpoint.getWebService().hasWsdlFile()) {
             BaseManager mgr;
+            String deployedDir = null;
             if(endpoint.getBundleDescriptor().getApplication().isVirtual()) {
                 mgr = DeploymentServiceUtils.getInstanceManager(DeployableObjectType.WEB);
+                deployedDir = 
+                    mgr.getLocation(endpoint.getBundleDescriptor().getApplication().getRegistrationName());
             } else {
                 mgr = DeploymentServiceUtils.getInstanceManager(DeployableObjectType.APP);
+                
+                com.sun.enterprise.instance.InstanceEnvironment iEnv = mgr.getInstanceEnvironment();
+                String instanceAppsDir = iEnv.getApplicationRepositoryPath();
+                String appName = endpoint.getBundleDescriptor().getApplication().getRegistrationName();
+                File appDir = new File(instanceAppsDir,appName);
+                deployedDir = com.sun.enterprise.deployment.phasing.DeploymentServiceUtils.getLocation(appDir);
+                com.sun.enterprise.config.serverbeans.PropertyResolver resolver
+                = new com.sun.enterprise.config.serverbeans.PropertyResolver(mgr.getConfigContext(),iEnv.getName());
+                deployedDir = resolver.resolve(deployedDir);
             }
-            String deployedDir = 
-                mgr.getLocation(endpoint.getBundleDescriptor().getApplication().getRegistrationName());
             File pkgedWsdl = null;
             if(deployedDir != null) {
                 if(endpoint.getBundleDescriptor().getApplication().isVirtual()) {