[jbossws-commits] JBossWS SVN: r14505 - stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.

[jbossws-commits at lists.jboss.org]

Author: jim.ma
Date: 2011-06-10 00:38:12 -0400 (Fri, 10 Jun 2011)
New Revision: 14505

Modified:
   stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
[JBWS-3286]:Get jaxws endpoint configuration from ServerConfig

Modified: stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java	2011-06-09 16:19:51 UTC (rev 14504)
+++ stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java	2011-06-10 04:38:12 UTC (rev 14505)
@@ -26,8 +26,12 @@
 
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.jboss.ws.api.annotation.EndpointConfig;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.deployment.Endpoint;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
 import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser;
 import org.jboss.wsf.spi.metadata.config.ConfigRoot;
 import org.jboss.wsf.stack.cxf.AbstractInvoker;
@@ -93,17 +97,31 @@
          if (epConfig != null)
          {
             String configFile = epConfig.configFile();
-            try
+            if (configFile.isEmpty())
             {
-               UnifiedVirtualFile vf = deploymentRoot.findChild(configFile);
-               ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL());
-               endpoint.setEndpointConfig(config.getEndpointConfigByName(epConfig.configName()));
+               try
+               {
+                  UnifiedVirtualFile vf = deploymentRoot.findChild(configFile);
+                  ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL());
+                  endpoint.setEndpointConfig(config.getEndpointConfigByName(epConfig.configName()));
+               }
+               catch (IOException e)
+               {
+                  throw new RuntimeException("Could not find " + configFile);
+               }
+            } else {
+               SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+               ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); 
+               for(org.jboss.wsf.spi.metadata.config.EndpointConfig config : serverConfig.getEndpointConfigs())
+               {
+                  if (config.getConfigName().equals(epConfig.configName()))
+                  {
+                     endpoint.setEndpointConfig(config);
+                     break;
+                  }
+               }               
             }
-            catch (IOException e)
-            {
-               throw new RuntimeException("Could not find " + configFile);
-            }
-            //TODO [JBWS-3286] use default endpoint configuration as a fallback
+           
          }
       }
    }