1.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/DataSourceResolver.java	Sun Sep 16 21:49:31 2007 +0000
     1.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/DataSourceResolver.java	Mon Sep 17 06:08:52 2007 +0000
     1.3 @@ -111,6 +111,11 @@
     1.4  
     1.5          return missing;
     1.6      }
     1.7 +    
     1.8 +    public Set<RequestedJdbcResource> getProjectDataSources(Project project) {
     1.9 +        DesignTimeDataSourceService dataSourceService = Lookup.getDefault().lookup(DesignTimeDataSourceService.class);
    1.10 +        return dataSourceService.getProjectDataSources(project);
    1.11 +    }
    1.12  
    1.13      public boolean isDataSourceUnique(Project currentProj, String dsName, String url) {        
    1.14          String[] dynamicDataSources = ProjectDataSourceTracker.getDynamicDataSources(currentProj);

     2.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNode.java	Sun Sep 16 21:49:31 2007 +0000
     2.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/explorer/ProjectDataSourceNode.java	Mon Sep 17 06:08:52 2007 +0000
     2.3 @@ -26,12 +26,12 @@
     2.4  import org.netbeans.modules.visualweb.dataconnectivity.project.datasource.ProjectDataSourcesChangeEvent;
     2.5  import java.awt.Image;
     2.6  import java.io.CharConversionException;
     2.7 +import java.util.Set;
     2.8  import org.netbeans.api.db.explorer.ConnectionListener;
     2.9  import org.netbeans.api.db.explorer.ConnectionManager;
    2.10 +import org.netbeans.modules.visualweb.api.j2ee.common.RequestedJdbcResource;
    2.11  import org.netbeans.modules.visualweb.dataconnectivity.datasource.DataSourceResolver;
    2.12 -import org.netbeans.modules.visualweb.dataconnectivity.model.ProjectDataSourceManager;
    2.13  import org.netbeans.modules.visualweb.dataconnectivity.utils.ImportDataSource;
    2.14 -import org.netbeans.modules.visualweb.project.jsf.api.JsfProjectUtils;
    2.15  import org.openide.nodes.AbstractNode;
    2.16  import org.openide.nodes.Node;
    2.17  import org.openide.util.Utilities;
    2.18 @@ -109,7 +109,9 @@
    2.19          // Manage the migration of legacy projects
    2.20          if (ImportDataSource.isLegacyProject(nbProject) && !modelingHasStarted) {//NOI18N   
    2.21              modelingHasStarted = true;
    2.22 -            DataSourceResolver.getInstance().modelProjectForDataSources(nbProject);
    2.23 +            if (DataSourceResolver.getInstance().getProjectDataSources(nbProject).isEmpty() || BrokenDataSourceSupport.isBroken(nbProject)) {
    2.24 +                DataSourceResolver.getInstance().modelProjectForDataSources(nbProject);
    2.25 +            }
    2.26          }              
    2.27          
    2.28          // Check if Data Source Reference node has any child nodes, if it does, check if any data sources are missing